ipanel-rnapp-ajb-base 1.0.19 → 1.0.20

package/app/components/common/PickerV2/index.js

@@ -9,7 +9,7 @@ import px from '../../../utils/scaleSize';
 // } from 'react-native-reanimated';
 const pickerStyles = {
 okView:{borderLeftColor:'#F0F0F0',borderLeftWidth:1},
-okText: {color: '#E86003',width:px(500)}, 
+okText: {color: '#E86003',width:px(500),fontWeight:'600'}, 
 dismissText: {color: '#666',width:px(500),},
 container:{borderTopLeftRadius:px(20),borderTopRightRadius:px(20)},
 wheelWrapperAdd:{paddingVertical:px(60)},

package/app/components/common/PickerV2Base/picker-view/Wheel.tsx

@@ -6,6 +6,7 @@ import {
   Platform,
   ScrollView,
   View,
+  TouchableWithoutFeedback
 } from 'react-native'
 
 type ColumnItem = {
@@ -27,11 +28,13 @@ type Props = {
 class Wheel extends React.Component<Props> {
   scrollerRef: any
 
-  scrollBuffer: number
+  scrollBuffer: any
 
   selectValue: any
   isScrolling: boolean
 
+  animateFlaf:any
+
   componentDidMount() {
     const { value, column, itemHeight } = this.props
     setTimeout(() => {
@@ -40,6 +43,7 @@ class Wheel extends React.Component<Props> {
   }
 
   shouldComponentUpdate(nextProps: Props) {
+    if(this.animateFlaf){return true}
     const { value, column, itemHeight, wheelHeight } = nextProps
     if (
       value !== this.props.value ||
@@ -53,6 +57,7 @@ class Wheel extends React.Component<Props> {
   }
 
   componentDidUpdate(prevProps: Props) {
+    if(this.animateFlaf){return false}
     const { column } = prevProps
     if (column !== this.props.column) {
       this.scrollTo(
@@ -62,11 +67,12 @@ class Wheel extends React.Component<Props> {
     }
   }
 
-  scrollTo = (y: any) => {
+  scrollTo = (y: any,flag?:any) => {
     this.scrollerRef?.scrollTo?.({
       y,
-      animated: false,
+      animated: flag === 'animate'?true:false,
     })
+    this.animateFlaf = false
   }
 
   getSelectIndex(column: ColumnItem[], value?: Value) {
@@ -154,6 +160,18 @@ class Wheel extends React.Component<Props> {
     this.isScrolling = false
   }
 
+  handleItemClick = (item:any,index:any) =>{
+    if(this.props.value === item?.value){return}
+    this.animateFlaf = true
+    this.props.onSelect(item?.value, this.props.index)
+    setTimeout(() => {
+      this.scrollTo(
+        this.getSelectIndex(this.props.column, item?.value) *
+          this.props.itemHeight,'animate'
+      )
+    })
+  }
+
   renderItems = () => {
     const { column, renderLabel, itemHeight, wheelHeight } = this.props
     return (
@@ -162,7 +180,11 @@ class Wheel extends React.Component<Props> {
           paddingVertical: (wheelHeight - itemHeight) / (this.props.column.length===3?3:
             this.props.column.length>3?3:8),
         }}>
-        {column.map((item, index) => renderLabel(item, index))}
+        {column.map((item, index) => {
+           return <TouchableWithoutFeedback key={index} onPress={()=>this.handleItemClick(item,index)}>
+                {renderLabel(item, index)}
+           </TouchableWithoutFeedback>
+        })}
       </View>
     )
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ipanel-rnapp-ajb-base",
-  "version": "1.0.19",
-  "ipanelVersion": "1.0.342",
+  "version": "1.0.20",
+  "ipanelVersion": "1.0.345",
   "description": "",
   "main": "index.js",
   "bin": {