Browse Source

Removed dependency to moment.js (#242)

master
Kent Andersen 4 years ago
committed by GitHub
parent
commit
ba3705c3b4
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 20 deletions
  1. +1
    -1
      examples/detox/package.json
  2. +0
    -1
      package.json
  3. +11
    -13
      src/DatePickerAndroid.js
  4. +0
    -5
      yarn.lock

+ 1
- 1
examples/detox/package.json View File

@ -5,7 +5,7 @@
"scripts": { "scripts": {
"start": "react-native start", "start": "react-native start",
"postinstall": "yarn make-example-runnable", "postinstall": "yarn make-example-runnable",
"make-example-runnable": "(cd ../../ && npm i react react-native moment --no-save)",
"make-example-runnable": "(cd ../../ && npm i react react-native --no-save)",
"build:ios": "detox build --configuration ios.debug", "build:ios": "detox build --configuration ios.debug",
"build:android-debug": "detox build --configuration android.debug", "build:android-debug": "detox build --configuration android.debug",
"build:android-ci": "detox build --configuration android.ci", "build:android-ci": "detox build --configuration android.ci",

+ 0
- 1
package.json View File

@ -29,7 +29,6 @@
"react-native-date-picker" "react-native-date-picker"
], ],
"dependencies": { "dependencies": {
"moment": "^2.22.1"
}, },
"devDependencies": { "devDependencies": {
"@babel/preset-env": "^7.10.4", "@babel/preset-env": "^7.10.4",

+ 11
- 13
src/DatePickerAndroid.js View File

@ -1,6 +1,9 @@
import React from 'react' import React from 'react'
import { StyleSheet, requireNativeComponent } from 'react-native' import { StyleSheet, requireNativeComponent } from 'react-native'
import moment from 'moment'
function addMinutes(date, minutesToAdd) {
return new Date(date.valueOf() + minutesToAdd * 60 * 1000)
}
const NativeDatePicker = requireNativeComponent( const NativeDatePicker = requireNativeComponent(
`DatePickerManager`, `DatePickerManager`,
@ -33,7 +36,7 @@ class DatePickerAndroid extends React.PureComponent {
} }
_onChange = e => { _onChange = e => {
const jsDate = this._fromIsoWithTimeZoneOffset(e.nativeEvent.date).toDate()
const jsDate = this._fromIsoWithTimeZoneOffset(e.nativeEvent.date)
this.props.onDateChange && this.props.onDateChange(jsDate) this.props.onDateChange && this.props.onDateChange(jsDate)
if (this.props.onDateStringChange) { if (this.props.onDateStringChange) {
this.props.onDateStringChange(e.nativeEvent.dateString) this.props.onDateStringChange(e.nativeEvent.dateString)
@ -50,22 +53,17 @@ class DatePickerAndroid extends React.PureComponent {
_date = () => this._toIsoWithTimeZoneOffset(this.props.date) _date = () => this._toIsoWithTimeZoneOffset(this.props.date)
_fromIsoWithTimeZoneOffset = date => {
if (this.props.timeZoneOffsetInMinutes === undefined) return moment(date)
return moment
.utc(date)
.subtract(this.props.timeZoneOffsetInMinutes, 'minutes')
_fromIsoWithTimeZoneOffset = timestamp => {
const date = new Date(timestamp)
if (this.props.timeZoneOffsetInMinutes === undefined) return date
return addMinutes(date, -this.props.timeZoneOffsetInMinutes)
} }
_toIsoWithTimeZoneOffset = date => { _toIsoWithTimeZoneOffset = date => {
if (this.props.timeZoneOffsetInMinutes === undefined) if (this.props.timeZoneOffsetInMinutes === undefined)
return moment(date).toISOString()
return date.toISOString()
return moment
.utc(date)
.add(this.props.timeZoneOffsetInMinutes, 'minutes')
.toISOString()
return addMinutes(date, this.props.timeZoneOffsetInMinutes).toISOString()
} }
} }

+ 0
- 5
yarn.lock View File

@ -3080,11 +3080,6 @@ mixin-deep@^1.2.0:
for-in "^1.0.2" for-in "^1.0.2"
is-extendable "^1.0.1" is-extendable "^1.0.1"
moment@^2.22.1:
version "2.24.0"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz#0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"
integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
ms@2.0.0: ms@2.0.0:
version "2.0.0" version "2.0.0"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"

Loading…
Cancel
Save