* picker: fix onSelect, onDeselect, onClear not work.

easysoft · Apr 8, 2024 · 24e8ad3 · 24e8ad3
1 parent c982270
commit 24e8ad3
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/lib/picker/dev.ts b/lib/picker/dev.ts
@@ -144,6 +144,8 @@ onPageUpdate(() => {
         defaultValue: 'banana',
         placeholder: '请选择你的最爱',
         searchHint: '搜索选项',
+        onSelect: (values) => console.log('onSelect', values),
+        onDeselect: (values) => console.log('onDeselect', values),
     });
     console.log('> singlePicker', singlePicker);
 
@@ -154,6 +156,8 @@ onPageUpdate(() => {
         defaultValue: 'banana,orange',
         placeholder: '请选择你的最爱',
         toolbar: true,
+        onSelect: (values) => console.log('onSelect', values),
+        onDeselect: (values) => console.log('onDeselect', values),
     });
     console.log('> multiPicker', multiPicker);
 

diff --git a/lib/picker/src/component/picker.tsx b/lib/picker/src/component/picker.tsx
@@ -269,6 +269,31 @@ export class Picker<S extends PickerState = PickerState, O extends PickerOptions
         super.componentWillUnmount();
     }
 
+    protected _handleChange(value: string, oldValue: string) {
+        super._handleChange(value, oldValue);
+        if (value !== oldValue) {
+            const {onDeselect, onSelect, onClear, multiple} = this.props;
+            const oldValueList = this.formatValueList(oldValue);
+            const valueList = this.valueList;
+            if (onClear && !valueList.length && oldValueList.length) {
+                onClear.call(this);
+            }
+            if (onDeselect) {
+                const deselectedList = oldValueList.filter(x => !valueList.includes(x));
+                if (deselectedList.length) {
+                    onDeselect.call(this, multiple ? deselectedList : deselectedList[0]);
+                }
+            }
+            if (onSelect) {
+                const selectedList = valueList.filter(x => !oldValueList.includes(x));
+                if (selectedList.length) {
+                    onSelect.call(this, multiple ? selectedList : selectedList[0]);
+                }
+            }
+        }
+
+    }
+
     protected _getTriggerProps(props: RenderableProps<O>, state: Readonly<S>): PickerSelectProps<S> {
         return {
             ...super._getTriggerProps(props, state),