@nutui/nutui-react-taro 3.0.0-beta.9 → 3.0.0

package/dist/es/packages/picker/picker.js

@@ -4,28 +4,26 @@ import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import React, { useState, useEffect, useRef, useImperativeHandle } from "react";
+import { View } from "@tarojs/components";
 import classNames from "classnames";
-import Taro from "@tarojs/taro";
-import { View, PickerView, PickerViewColumn } from "@tarojs/components";
-import { Popup } from "../popup/popup";
-import PickerPanel from "./pickerpanel";
-import useRefs from "../../utils/use-refs";
-import { useConfig } from "../configprovider/configprovider";
-import { usePropsValue } from "../../utils/use-props-value";
+import isEqual from "react-fast-compare";
+import PickerView from "../pickerview/index";
+import Popup from "../popup/index";
+import SafeArea from "../safearea/index";
+import useRefs from "../../hooks/use-refs";
+import { useConfig } from "../configprovider/index";
+import { usePropsValue } from "../../hooks/use-props-value";
 import { ComponentDefaults } from "../../utils/typings";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
-    visible: false,
     title: '',
     options: [],
-    value: [],
+    value: undefined,
     defaultValue: [],
-    threeDimensional: true,
-    closeOnOverlayClick: true,
-    duration: 1000
+    closeOnOverlayClick: true
 });
 var InternalPicker = function(props, ref) {
     var locale = useConfig().locale;
-    var _ref = _object_spread({}, defaultProps, props), children = _ref.children, visible = _ref.visible, title = _ref.title, _ref_options = _ref.options, options = _ref_options === void 0 ? [] : _ref_options, closeOnOverlayClick = _ref.closeOnOverlayClick, _ref_popupProps = _ref.popupProps, popupProps = _ref_popupProps === void 0 ? {} : _ref_popupProps, _ref_defaultValue = _ref.defaultValue, defaultValue = _ref_defaultValue === void 0 ? [] : _ref_defaultValue, className = _ref.className, style = _ref.style, threeDimensional = _ref.threeDimensional, duration = _ref.duration, onConfirm = _ref.onConfirm, onCancel = _ref.onCancel, onClose = _ref.onClose, afterClose = _ref.afterClose, onChange = _ref.onChange, rest = _object_without_properties(_ref, [
+    var _ref = _object_spread({}, defaultProps, props), children = _ref.children, visible = _ref.visible, title = _ref.title, _ref_options = _ref.options, options = _ref_options === void 0 ? [] : _ref_options, closeOnOverlayClick = _ref.closeOnOverlayClick, _ref_popupProps = _ref.popupProps, popupProps = _ref_popupProps === void 0 ? {} : _ref_popupProps, _ref_defaultValue = _ref.defaultValue, defaultValue = _ref_defaultValue === void 0 ? [] : _ref_defaultValue, className = _ref.className, style = _ref.style, threeDimensional = _ref.threeDimensional, duration = _ref.duration, onConfirm = _ref.onConfirm, onCancel = _ref.onCancel, onClose = _ref.onClose, onChange = _ref.onChange, rest = _object_without_properties(_ref, [
         "children",
         "visible",
         "title",
@@ -40,7 +38,6 @@ var InternalPicker = function(props, ref) {
         "onConfirm",
         "onCancel",
         "onClose",
-        "afterClose",
         "onChange"
     ]);
     var classPrefix = 'nut-picker';
@@ -49,29 +46,22 @@ var InternalPicker = function(props, ref) {
         value: props.value,
         defaultValue: _to_consumable_array(defaultValue),
         finalValue: _to_consumable_array(defaultValue),
-        onChange: function(val) {
+        onChange: function(value) {
             var _props_onConfirm;
-            (_props_onConfirm = props.onConfirm) === null || _props_onConfirm === void 0 ? void 0 : _props_onConfirm.call(props, setSelectedOptions(), val);
+            (_props_onConfirm = props.onConfirm) === null || _props_onConfirm === void 0 ? void 0 : _props_onConfirm.call(props, selectedOptionsRef.current, value);
         }
     }), 2), selectedValue = _usePropsValue[0], setSelectedValue = _usePropsValue[1];
     var _usePropsValue1 = _sliced_to_array(usePropsValue({
         value: props.visible,
         defaultValue: false,
         finalValue: false,
-        onChange: function(val) {
-            var _props_onClose;
-            (_props_onClose = props.onClose) === null || _props_onClose === void 0 ? void 0 : _props_onClose.call(props, setSelectedOptions(), innerValue);
+        onChange: function(v) {
+            if (!v) {
+                var _props_onClose;
+                (_props_onClose = props.onClose) === null || _props_onClose === void 0 ? void 0 : _props_onClose.call(props, selectedOptionsRef.current, innerValue);
+            }
         }
     }), 2), innerVisible = _usePropsValue1[0], setInnerVisible = _usePropsValue1[1];
-    var _useState = _sliced_to_array(useState(selectedValue), 2), innerValue = _useState[0], setInnerValue = _useState[1];
-    var _useState1 = _sliced_to_array(useState([]), 2), currentValue = _useState1[0], setCurrentValue = _useState1[1];
-    var _useState2 // 选中列
-     = _sliced_to_array(useState(0), 2), columnIndex = _useState2[0], setColumnIndex = _useState2[1];
-    var pickerRef = useRef(null);
-    var _useRefs = _sliced_to_array(useRefs(), 2), refs = _useRefs[0], setRefs = _useRefs[1];
-    var _useState3 // 格式化后每一列的数据
-     = _sliced_to_array(useState([]), 2), columnsList = _useState3[0], setColumnsList = _useState3[1];
-    var isConfirmEvent = useRef(false);
     var actions = {
         open: function() {
             setInnerVisible(true);
@@ -83,180 +73,50 @@ var InternalPicker = function(props, ref) {
     useImperativeHandle(ref, function() {
         return actions;
     });
-    // 级联数据格式化
-    var formatCascade = function(columns, values) {
-        var _loop = function() {
-            var options = columnOptions.children;
-            var value = values[columnIndex];
-            var index = options.findIndex(function(columnItem) {
-                return columnItem.value === value;
-            });
-            if (index === -1) index = 0;
-            columnOptions = columnOptions.children[index];
-            columnIndex++;
-            formatted.push(options);
-        };
-        var formatted = [];
-        var columnOptions = {
-            text: '',
-            value: '',
-            children: columns
-        };
-        var columnIndex = 0;
-        while(columnOptions && columnOptions.children)_loop();
-        return formatted;
-    };
-    // 数据类型：多列、嵌套、单列
-    var columnsType = function() {
-        var firstColumn = options[0];
-        if (firstColumn) {
-            if (Array.isArray(firstColumn)) {
-                return 'multiple';
-            }
-            if ('children' in firstColumn) {
-                return 'cascade';
-            }
-        }
-        return 'single';
-    };
-    // 传入的数据格式化
-    var normalListData = function(innerValue) {
-        var type = columnsType();
-        switch(type){
-            case 'multiple':
-                return options;
-            case 'cascade':
-                // 级联数据处理
-                return formatCascade(options, innerValue);
-            default:
-                return [
-                    options
-                ];
-        }
-    };
-    var init = function() {
-        var normalData = normalListData(innerValue);
-        setColumnsList(normalData);
-        // 初始化默认选中数据
-        var data = [];
-        normalData.length > 0 && normalData.map(function(item) {
-            item[0] && data.push(item[0].value);
-            return item;
-        });
-        if (!innerValue.length && innerValue.length === 0) {
-            setInnerValue(_to_consumable_array(data));
-        }
-    };
-    useEffect(function() {
-        setInnerValue(innerValue !== selectedValue ? selectedValue : innerValue);
-    }, [
-        innerVisible,
-        selectedValue
-    ]);
+    var _useState = _sliced_to_array(useState(_to_consumable_array(selectedValue)), 2), innerValue = _useState[0], setInnerValue = _useState[1];
+    var innerValueRef = useRef(innerValue);
+    var _useState1 = _sliced_to_array(useState([]), 2), innerOptions = _useState1[0], setInnerOptions = _useState1[1];
+    var selectedOptionsRef = useRef([]);
+    var _useRefs = _sliced_to_array(useRefs(), 2), refs = _useRefs[0], setRefs = _useRefs[1];
     useEffect(function() {
         if (innerVisible) {
-            init();
-        }
-    }, [
-        options,
-        innerVisible
-    ]);
-    // 选中值进行修改
-    useEffect(function() {
-        if (!innerVisible) {
-            return;
+            setInnerValue(selectedValue);
+            setInnerOptions(options);
         }
-        Taro.getEnv() !== 'WEB' && setCurrentValue(defaultValuesConvert());
-        onChange && onChange(setSelectedOptions(), innerValue, columnIndex);
     }, [
-        innerValue,
-        columnsList,
+        selectedValue,
+        innerOptions,
         innerVisible
     ]);
-    var setSelectedOptions = function() {
-        var options = [];
-        var currOptions = [];
-        columnsList.forEach(function(columnOptions, index) {
-            currOptions = columnOptions.filter(function(item) {
-                return item.value === innerValue[index];
-            });
-            if (currOptions[0]) {
-                options.push(currOptions[0]);
-            } else {
-                columnOptions[0] && options.push(columnOptions[0]);
-            }
-        });
-        return options;
-    };
-    var defaultValuesConvert = function() {
-        var defaultIndexs = [];
-        if (innerValue.length > 0) {
-            innerValue.forEach(function(value, index) {
-                var _columnsList_index;
-                for(var i = 0; i < (columnsList === null || columnsList === void 0 ? void 0 : (_columnsList_index = columnsList[index]) === null || _columnsList_index === void 0 ? void 0 : _columnsList_index.length); i++){
-                    if (columnsList[index][i].value === value) {
-                        defaultIndexs.push(i);
-                        break;
-                    }
-                }
-            });
-        } else if (columnsList && columnsList.length > 0) {
-            columnsList.forEach(function(item) {
-                defaultIndexs.push(0);
-                item.length > 0 && selectedValue.push(item[0].value);
-            });
-        }
-        return defaultIndexs;
-    };
-    // 更新已选择数据
-    var chooseItem = function(columnOptions, columnIndex) {
-        var values = [];
-        var start = columnIndex;
-        if (columnOptions && Object.keys(columnOptions).length) {
-            // 切换数据后，数据有变动才触发。
-            if (values[columnIndex] !== columnOptions.value) {
-                if (columnsType() === 'cascade') {
-                    var _columnOptions_children, _columnOptions_children1;
-                    values[columnIndex] = columnOptions.value || '';
-                    while(columnOptions === null || columnOptions === void 0 ? void 0 : (_columnOptions_children = columnOptions.children) === null || _columnOptions_children === void 0 ? void 0 : _columnOptions_children[0]){
-                        values[columnIndex + 1] = columnOptions.children[0].value;
-                        columnIndex++;
-                        columnOptions = columnOptions.children[0];
-                    }
-                    // 当前改变列的下一列 children 值为空
-                    if (columnOptions === null || columnOptions === void 0 ? void 0 : (_columnOptions_children1 = columnOptions.children) === null || _columnOptions_children1 === void 0 ? void 0 : _columnOptions_children1.length) {
-                        values[columnIndex + 1] = '';
-                    }
-                    var combineResult = _to_consumable_array(innerValue.slice(0, start)).concat(_to_consumable_array(values.splice(start)));
-                    setInnerValue(combineResult);
-                    setColumnsList(normalListData(combineResult));
-                } else {
-                    setInnerValue(function(data) {
-                        var cdata = _to_consumable_array(data);
-                        cdata[columnIndex] = Object.prototype.hasOwnProperty.call(columnOptions, 'value') ? columnOptions.value : '';
-                        return cdata;
-                    });
-                }
-                setColumnIndex(columnIndex);
-            }
+    var onChangeItem = function(param) {
+        var value = param.value, index = param.index, selectedOptions = param.selectedOptions;
+        if (selectedOptions === null || selectedOptions === void 0 ? void 0 : selectedOptions.length) {
+            selectedOptionsRef.current = selectedOptions;
         }
+        if (isEqual(value, innerValueRef.current)) return;
+        innerValueRef.current = value;
+        setInnerValue(value);
+        innerVisible && (onChange === null || onChange === void 0 ? void 0 : onChange({
+            selectedOptions: selectedOptions,
+            value: value,
+            index: index
+        }));
     };
-    // 点击确定
-    var confirm = function() {
+    var onConfirmEvent = function() {
         var moving = false;
         refs.forEach(function(ref) {
             if (ref.moving) moving = true;
             ref.stopMomentum();
         });
-        if (moving) {
-            isConfirmEvent.current = true;
-        } else {
+        if (!moving) {
             setSelectedValue(innerValue, true);
             setInnerVisible(false);
         }
-        setTimeout(function() {
-            isConfirmEvent.current = false;
-        }, 0);
+    };
+    var onCancelEvent = function() {
+        setInnerValue(selectedValue);
+        onCancel === null || onCancel === void 0 ? void 0 : onCancel();
+        setInnerVisible(false);
     };
     var renderTitleBar = function() {
         return /*#__PURE__*/ React.createElement(View, {
@@ -265,8 +125,7 @@ var InternalPicker = function(props, ref) {
             className: "".concat(classPrefix, "-cancel-btn"),
             onClick: function(e) {
                 e.stopPropagation();
-                onCancel === null || onCancel === void 0 ? void 0 : onCancel();
-                setInnerVisible(false);
+                onCancelEvent();
             }
         }, locale === null || locale === void 0 ? void 0 : locale.cancel), /*#__PURE__*/ React.createElement(View, {
             className: "".concat(classPrefix, "-title")
@@ -274,85 +133,42 @@ var InternalPicker = function(props, ref) {
             className: "".concat(classPrefix, "-confirm-btn"),
             onClick: function(e) {
                 e.stopPropagation();
-                confirm();
+                onConfirmEvent();
             }
         }, locale.confirm));
     };
-    var _useState4 = _sliced_to_array(useState(false), 2), setPickingStatus = _useState4[1];
-    var pickerStart = function() {
-        setPickingStatus(true);
-    };
-    var pickerEnd = function() {
-        setPickingStatus(false);
-    };
-    var pickerChange = function(data) {
-        var prevDefaultValue = currentValue;
-        var changeIndex = 0;
-        // 判断变化的是第几个
-        var list = data.detail.value;
-        for(var i = 0, len = list.length; i < len; i++){
-            if (prevDefaultValue[i] !== list[i]) {
-                changeIndex = i;
-                break;
+    var renderPickerElement = function() {
+        return /*#__PURE__*/ React.createElement(View, _object_spread({
+            className: classes,
+            style: style
+        }, rest), renderTitleBar(), typeof children !== 'function' && children, /*#__PURE__*/ React.createElement(View, {
+            className: "".concat(classPrefix, "-panel")
+        }, /*#__PURE__*/ React.createElement(PickerView, {
+            setRefs: setRefs,
+            value: innerValue,
+            options: props.options,
+            threeDimensional: threeDimensional,
+            duration: duration,
+            onChange: function(param) {
+                var value = param.value, index = param.index, selectedOptions = param.selectedOptions;
+                onChangeItem({
+                    value: value,
+                    index: index,
+                    selectedOptions: selectedOptions
+                });
             }
-        }
-        // 选择的是哪个 option
-        chooseItem(columnsList[changeIndex][data.detail.value[changeIndex]], changeIndex);
+        })));
     };
     return /*#__PURE__*/ React.createElement(React.Fragment, null, typeof children === 'function' && children(selectedValue), /*#__PURE__*/ React.createElement(Popup, _object_spread_props(_object_spread({}, popupProps), {
         visible: innerVisible,
         position: "bottom",
         onOverlayClick: function() {
-            if (closeOnOverlayClick) {
-                var _props_onCancel;
-                (_props_onCancel = props.onCancel) === null || _props_onCancel === void 0 ? void 0 : _props_onCancel.call(props);
-                setInnerVisible(false);
-            }
-        },
-        afterClose: function() {
-            afterClose === null || afterClose === void 0 ? void 0 : afterClose(setSelectedOptions(), innerValue, pickerRef);
+            if (!closeOnOverlayClick) return;
+            onCancelEvent();
         }
-    }), /*#__PURE__*/ React.createElement(View, _object_spread_props(_object_spread({
-        className: classes,
-        style: style
-    }, rest), {
-        catchMove: true
-    }), renderTitleBar(), typeof children !== 'function' && children, /*#__PURE__*/ React.createElement(View, {
-        className: "".concat(classPrefix, "-panel"),
-        ref: pickerRef
-    }, Taro.getEnv() === 'WEB' ? columnsList === null || columnsList === void 0 ? void 0 : columnsList.map(function(item, index) {
-        return /*#__PURE__*/ React.createElement(PickerPanel, {
-            ref: setRefs(index),
-            defaultValue: innerValue === null || innerValue === void 0 ? void 0 : innerValue[index],
-            options: item,
-            threeDimensional: threeDimensional,
-            chooseItem: function(value, index) {
-                return chooseItem(value, index);
-            },
-            duration: duration,
-            key: index,
-            keyIndex: index,
-            itemShow: visible
-        });
-    }) : /*#__PURE__*/ React.createElement(PickerView, {
-        ref: pickerRef,
-        value: currentValue,
-        immediateChange: true,
-        onPickStart: pickerStart,
-        onChange: pickerChange,
-        onPickEnd: pickerEnd,
-        indicatorClass: "nut-picker-indicator-taro",
-        className: "nut-picker-view-panel"
-    }, columnsList === null || columnsList === void 0 ? void 0 : columnsList.map(function(columnOptions, index) {
-        return /*#__PURE__*/ React.createElement(PickerViewColumn, {
-            key: "col".concat(index)
-        }, columnOptions.map(function(item, index) {
-            return /*#__PURE__*/ React.createElement(View, {
-                key: item.value || index,
-                className: "nut-picker-roller-item-title"
-            }, /*#__PURE__*/ React.createElement(React.Fragment, null, item.text));
-        }));
-    }))))));
+    }), innerVisible ? /*#__PURE__*/ React.createElement(React.Fragment, null, renderPickerElement(), " ") : null, /*#__PURE__*/ React.createElement(SafeArea, {
+        position: "bottom"
+    })));
 };
 var Picker = /*#__PURE__*/ React.forwardRef(InternalPicker);
 export default Picker;

package/dist/es/packages/picker/style/picker.scss

@@ -4,11 +4,12 @@
 
   &-control {
     display: flex;
-    height: $popup-title-height;
-    font-size: $popup-title-font-size;
     align-items: center;
     justify-content: space-between;
+    height: $popup-title-height;
     padding: $popup-title-padding;
+    box-sizing: border-box;
+    font-size: $popup-title-font-size;
   }
 
   &-cancel-btn {
@@ -34,135 +35,5 @@
 
   &-panel {
     display: flex;
-    position: relative;
-  }
-
-  &-indicator {
-    position: absolute;
-    top: 108px;
-    height: $picker-item-height;
-    width: 100%;
-    border: $picker-item-active-line-border;
-    border-left: 0;
-    border-right: 0;
-    color: $picker-item-text-color;
-    font-size: $picker-item-text-font-size;
-    z-index: 3;
-
-    &-taro {
-      height: $picker-item-height;
-      border: 0;
-
-      &::before,
-      &::after {
-        border: $picker-item-active-line-border;
-        border-left: 0;
-        border-right: 0;
-      }
-    }
-  }
-
-  &-list {
-    flex: 1;
-    position: relative;
-    height: $picker-list-height;
-    overflow: hidden;
-    text-align: center;
-  }
-
-  &-list-panel {
-    transform-style: preserve-3d;
-  }
-
-  &-mask {
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    background-image: $picker-mask-background;
-    background-position: top, bottom;
-    background-size: 100% 108px;
-    background-repeat: no-repeat;
-    transform: translateZ(0);
-    z-index: 3;
-  }
-
-  &-view-panel {
-    height: $picker-list-height;
-    flex-grow: 1;
-  }
-
-  &-content,
-  &-roller {
-    position: absolute;
-    top: 108px;
-    width: 100%;
-    height: $picker-item-height;
-  }
-
-  &-content {
-    background: #fff;
-    z-index: 2;
-    overflow: hidden;
-  }
-
-  &-item,
-  &-roller-item {
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    height: $picker-item-height;
-    line-height: $picker-item-height;
-    color: $picker-item-text-color;
-    font-size: $picker-item-text-font-size;
-    text-align: center;
-  }
-
-  &-item {
-    font-size: 16px;
-    background: #fff;
   }
-
-  &-roller {
-    z-index: 1;
-    transform-style: preserve-3d;
-  }
-
-  &-roller-item {
-    backface-visibility: hidden;
-    -moz-backface-visibility: hidden;
-    -webkit-backface-visibility: hidden;
-    position: absolute;
-    top: 0;
-    width: 100%;
-  }
-
-  &-roller-item-title {
-    display: block;
-    width: 100%;
-    height: $picker-item-height;
-    line-height: $picker-item-height;
-    text-align: center;
-    color: $color-title;
-    font-size: $font-size-base;
-  }
-
-  &-roller-item-hidden {
-    visibility: hidden;
-    opacity: 0;
-  }
-
-  &-placeholder {
-    height: 1px;
-  }
-}
-
-[dir='rtl'] .nut-picker-mask,
-.nut-rtl .nut-picker-mask {
-  background-image: var(
-    --picker-mask-background,
-    linear-gradient(-180deg, var(--nutui-white-12), var(--nutui-white-7)),
-    linear-gradient(0deg, var(--nutui-white-12), var(--nutui-white-7))
-  );
 }