react-native-wheel-pick 1.1.9 → 1.2.1

package/README.md

@@ -19,9 +19,9 @@ This is not original but inspired by [react-native-wheel-datepicker](https://git
 
 React Native >= 0.60+
 ```
-npm install react-native-wheel-pick --save --legacy-peer-deps
-npm install @react-native-picker/picker --save
-npm install @react-native-community/datetimepicker --save
+npm install react-native-wheel-pick --save-dev --legacy-peer-deps
+npm install @react-native-picker/picker --save-dev --legacy-peer-deps
+npm install @react-native-community/datetimepicker --save-dev --legacy-peer-deps
 npx pod-install
 
 npx react-native run-ios // re-build native-code
@@ -52,6 +52,10 @@ import { Picker, DatePicker } from 'react-native-wheel-pick';
   onDateChange={date => { console.log(date) }}
 />
 
+// for TypeScript
+onValueChange={(value: string) => { console.log(value) }}
+onDateChange={(date: Date) => { console.log(date) }}
+
 ```
 ## More Example 
 
@@ -73,7 +77,7 @@ import { Picker, DatePicker } from 'react-native-wheel-pick';
 
 ```
 ```jsx
-// pickerData also support array of object.
+// pickerData also support array of object. (Optional)
 
 // Way 1
 <Picker
@@ -83,6 +87,8 @@ import { Picker, DatePicker } from 'react-native-wheel-pick';
 />
 
 // Optional Way 2
+// `label` only use for show Text to UI.
+// You cannot get `label` from onValueChange
 <Picker
   style={{ backgroundColor: 'white', width: 300, height: 215 }}
   selectedValue='5765387680'
@@ -95,7 +101,7 @@ import { Picker, DatePicker } from 'react-native-wheel-pick';
     { value : '5765387682', label : 'item6' },
     { value : '5765387683', label : 'item7' },
   ]}
-  onValueChange={value => { console.log(value) }}
+  onValueChange={value => { console.log(value) }} // '5765387680'
 />
 ```
 ```jsx
@@ -121,9 +127,27 @@ import { Picker, DatePicker } from 'react-native-wheel-pick';
   order='D-M-Y' // Default is M-D-Y
 />
 ```
+## FYI
+
+I rarely check this lib. (6 Months - 3 Years). Up on my life's time.
+
+If you want to pay me coffee for quickly check & merge your request. 
+You can sponsor me 
+
+[![](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86)](https://github.com/sponsors/TronNatthakorn) 
+
+OR you can fork this project instead.
+
 ## Release Note
 
-### 1.1.9 (July 3 2022)
+### 1.2.1 (June 4 2023)
+- Fix typescript warning
+
+[Android]
+- Update compileSDK to version 33.
+
+### 1.2.0 (July 3 2022)
+- Remove `deprecated-react-native-prop-types`
 - Support for peer dependencies React 18 by `--legacy-peer-deps`
 
 ### 1.1.7 (June 21 2022)
@@ -161,17 +185,6 @@ If you want it back pull request are welcome.
 [IOS]
 - Do not use PickerIOS and DatePickerIOS of 'react-native' anymore.
 
-## FYI
-
-For version 1.1.3 - I update this library support for React Native Version 0.68.2 / Android 11 / iOS 15.2
-
-If you use React Native Version less than 0.68.2 / Android older than 11 / iOS older than 15.2. 
-It is possible to have unexpected bug.
-
-I rarely check this lib. (6 Months - 3 Years). Up on my life's time.
-
-If you want to pay me coffee for quickly check & merge your request. Please contact me directly [facebook.com/tron.natthakorn](https://facebook.com/tron.natthakorn) OR you can fork this project.
-
 ## Preview for version <= 1.12
 
 ![](https://preview.ibb.co/iUjDZo/screen1.png)

package/android/build.gradle

@@ -6,22 +6,9 @@ buildscript {
 
 apply plugin: 'com.android.library'
 
-//def safeExtGet(prop, fallback) {
-//    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
-//}
-
 android {
-    compileSdkVersion 30
-    /// buildToolsVersion '30.0.2'
-    defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
-        ndk {
-            abiFilters "armeabi-v7a", "x86"
-        }
-    }
+    compileSdkVersion 33
+    namespace 'com.tron'
 }
 
 dependencies {

package/android/src/main/AndroidManifest.xml

@@ -1,3 +1,2 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.tron">
-</manifest>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+</manifest>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-wheel-pick",
-  "version": "1.1.9",
+  "version": "1.2.1",
   "description": "React native wheel picker iOS style with android.",
   "main": "src/index.js",
   "scripts": {
@@ -22,10 +22,12 @@
     "url": "https://github.com/TronNatthakorn/react-native-wheel-pick/issues"
   },
   "homepage": "https://github.com/TronNatthakorn/react-native-wheel-pick#readme",
+  "dependencies": {
+    "moment": "^2.19.1"
+  },
   "peerDependencies": {
     "moment": ">=2.0.0",
     "prop-types": "*",
-    "deprecated-react-native-prop-types": ">=2.3.0",
     "@react-native-community/datetimepicker": ">=6.1.3",
     "@react-native-picker/picker": ">=2.4.1"
   }

package/src/WheelCurvedPicker.android.js

@@ -1,9 +1,9 @@
 import React, { PureComponent } from 'react';
 import { requireNativeComponent, View } from 'react-native';
-import { ColorPropType, ViewPropTypes as RNViewPropTypes, } from 'deprecated-react-native-prop-types'
+// import { ColorPropType, ViewPropTypes as RNViewPropTypes, } from 'deprecated-react-native-prop-types'
 import PropTypes from 'prop-types';
 
-const ViewPropTypes = RNViewPropTypes || View.propTypes;
+// const ViewPropTypes = RNViewPropTypes || View.propTypes;
 let firstTimeOnChange = true
 
 const stateFromProps = (props) => {
@@ -22,9 +22,9 @@ const stateFromProps = (props) => {
 
 class WheelCurvedPicker extends PureComponent {
   static propTypes = {
-    ...ViewPropTypes,
+    // ...ViewPropTypes,
     data: PropTypes.array,
-    textColor: ColorPropType,
+    // textColor: ColorPropType,
     textSize: PropTypes.number,
     onValueChange: PropTypes.func.isRequired,
     selectedValue: PropTypes.any,

package/src/date-picker.android.js

@@ -1,11 +1,11 @@
 import React, { PureComponent } from 'react';
 import { StyleSheet, View } from 'react-native';
-import { ColorPropType, ViewPropTypes as RNViewPropTypes } from 'deprecated-react-native-prop-types'
+// import { ColorPropType, ViewPropTypes as RNViewPropTypes } from 'deprecated-react-native-prop-types'
 import PropTypes from 'prop-types';
 import moment from 'moment';
 import Picker from './picker';
 
-const ViewPropTypes = RNViewPropTypes || View.propTypes;
+// const ViewPropTypes = RNViewPropTypes || View.propTypes;
 const firstTimeOnChange = {
   year: true,
   month: true,
@@ -42,8 +42,8 @@ export default class DatePicker extends PureComponent {
     minimumDate: PropTypes.instanceOf(Date),
     mode: PropTypes.oneOf(['date', 'time', 'datetime']),
     onDateChange: PropTypes.func.isRequired,
-    style: ViewPropTypes.style,
-    textColor: ColorPropType,
+    // style: ViewPropTypes.style,
+    // textColor: ColorPropType,
     textSize: PropTypes.number,
   };
 
@@ -320,7 +320,7 @@ export default class DatePicker extends PureComponent {
 
   getValue() {
     const { year, month, date, hour, minute } = this.newValue;
-    const nextDate = new Date(year, month, date, hour, minute);
+    const nextDate = new Date(Date.UTC(year, month, date, hour, minute));
 
     if (nextDate < this.props.minimumDate) {
       return this.props.minimumDate;

package/src/index.d.ts

@@ -0,0 +1,18 @@
+'use strict';
+
+import { Platform } from 'react-native';
+import Picker from './picker';
+import DatePicker from './date-picker';
+
+let DatePickerComponent = DatePicker;
+
+export const registerCustomDatePickerIOS = (CustomDatePickerIOS) => {
+  if (Platform.OS === 'ios') {
+    DatePickerComponent = CustomDatePickerIOS;
+  }
+
+  return DatePickerComponent;
+};
+
+export const Picker;
+export const DatePicker;

package/src/picker.js

@@ -1,11 +1,10 @@
 import React, { Component } from 'react';
 import { StyleSheet, View, Text, Platform } from 'react-native';
-import { ColorPropType, ViewPropTypes as RNViewPropTypes, } from 'deprecated-react-native-prop-types'
+// import { ColorPropType, ViewPropTypes as RNViewPropTypes, } from 'deprecated-react-native-prop-types'
 import PropTypes from 'prop-types';
 import WheelCurvedPicker from './WheelCurvedPicker';
 
-const ViewPropTypes = RNViewPropTypes || View.propTypes;
-
+// const ViewPropTypes = RNViewPropTypes || View.propTypes;
 const PickerItem = WheelCurvedPicker.Item;
 
 const styles = StyleSheet.create({
@@ -18,12 +17,12 @@ const styles = StyleSheet.create({
 
 export default class Picker extends Component {
   static propTypes = {
-    textColor: ColorPropType,
+    // textColor: ColorPropType,
     textSize: PropTypes.number,
-    itemStyle: ViewPropTypes.style,
+    // itemStyle: ViewPropTypes.style,
     onValueChange: PropTypes.func.isRequired,
     pickerData: PropTypes.array.isRequired,
-    style: ViewPropTypes.style,
+    // style: ViewPropTypes.style,
     selectedValue: PropTypes.any,
   };