taro-react-uilib 1.1.0 → 1.2.0

package/dist/styles/components/themeprovider.scss

@@ -0,0 +1,3 @@
+.nothing-enpty {
+  color: unset;
+}

package/dist/styles/components/toast.scss

@@ -54,9 +54,9 @@
   align-items: center;
   justify-content: center;
   font-size: 14PX;
+  z-index: 1000;
   &-content {
     position: absolute;
-    z-index: 998;
     min-width: 250px;
     box-sizing: border-box;
     border-radius: 10px;

package/dist/styles/index.scss

@@ -1,5 +1,5 @@
 @import "./themes/variable.scss";
-@import "./themes/default.scss";
+// @import "./themes/default.scss";
 @import "./themes/base.scss";
 @import "./themes/animation.scss";
 

package/dist/styles/themes/default.scss

@@ -5,28 +5,28 @@ $color-disabled: #d5d5d5;
 $color-warning: #ff512d;
 $color-warning-light: #ff5a66;
 
-$background-color: #f6f6f6;
+$background-color: #f6f6f6 !default;
 
-$body-background-color: $background-color;
-$component-background-color: $background-color;
+$body-background-color: $background-color !default;
+$component-background-color: $background-color !default;
 
-$font-color: #333;
-$font-color-secondary: #666;
-$font-color-tertiary: #999;
+$font-color: #333 !default;
+$font-color-secondary: #666 !default;
+$font-color-tertiary: #999 !default;
 
-$border-color: #e6e6e6;
+$border-color: #e6e6e6 !default;
 
 $btn-font-size: 34px;
 
 $btn-color: linear-gradient(90deg, $color-primary 0%, $color-primary-dark 100%);
 $btn-shadow-primary: 0 10px 20px rgba(247, 174, 5, 0.3);
 
-$mask-color: rgba(0, 0, 0, 0.3);
+$mask-color: rgba(0, 0, 0, 0.3) !default;
 
-$toast-bg-light: #4c4c4c;
-$toast-bg-dark: #4c4c4c;
+$toast-bg-light: #4c4c4c !default;
+$toast-bg-dark: #4c4c4c !default;
 
-$dialog-color-dark: #fff;
-$dialog-color-light: rgba(255, 255, 255, 0.9);
+$dialog-color-dark: #fff !default;
+$dialog-color-light: rgba(255, 255, 255, 0.9) !default;
 
-$border-radius: 10px;
+$border-radius: 10px !default;

package/dist/styles/themes/variable.scss

@@ -19,6 +19,7 @@ $xh-prefix: ".xh";
   --mask-color: #{$mask-color};
   --toast-bg-color: #{$toast-bg-light};
   --dialog-color: #{$dialog-color-light};
+  --btn-font-size: #{$btn-font-size};
 }
 
 @media (prefers-color-scheme: dark) {
@@ -40,5 +41,6 @@ $xh-prefix: ".xh";
     --mask-color: #{$mask-color};
     --toast-bg-color: #{$toast-bg-dark};
     --dialog-color: #{$dialog-color-dark};
+    --btn-font-size: #{$btn-font-size};
   }
 }

package/lib/components/Checkbox/Group/index.js

@@ -0,0 +1,49 @@
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+import React, { useMemo, useState } from "react";
+import classNames from "classnames";
+import CheckBox from "..";
+const CheckboxGroup = props => {
+    const { option, onChange, defaultChecked, padding, border, style, checkboxStyle } = props, rest = __rest(props, ["option", "onChange", "defaultChecked", "padding", "border", "style", "checkboxStyle"]);
+    const getOpions = useMemo(() => {
+        return option.map((item) => {
+            let checkedItem = typeof defaultChecked === "string" ? [defaultChecked] : defaultChecked;
+            if (typeof item === "string") {
+                return {
+                    label: item,
+                    value: item,
+                    checked: checkedItem === null || checkedItem === void 0 ? void 0 : checkedItem.includes(item),
+                };
+            }
+            else {
+                if (checkedItem === null || checkedItem === void 0 ? void 0 : checkedItem.includes(item.value)) {
+                    item.checked = true;
+                }
+                return item;
+            }
+        });
+    }, [option, defaultChecked]);
+    const [innerOption, setInnerOption] = useState(getOpions);
+    const handleChange = (checked, index) => {
+        const newoption = [...innerOption];
+        newoption[index].checked = checked;
+        setInnerOption(newoption);
+        const newValue = newoption.filter(k => k.checked).map(item => item.value);
+        onChange === null || onChange === void 0 ? void 0 : onChange(newValue);
+    };
+    const cls = classNames("xh-checkbox-group", { padding }, { border });
+    return (React.createElement("div", { className: cls, style: style }, innerOption.map((item, index) => {
+        return (React.createElement(CheckBox, Object.assign({ label: item.label, value: item.value, disabled: item.disabled, checked: item.checked, key: index, style: checkboxStyle, onChange: checked => handleChange(checked, index) }, rest)));
+    })));
+};
+export default CheckboxGroup;
+//# sourceMappingURL=index.js.map

package/lib/components/Checkbox/Group/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/components/Checkbox/Group/index.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAa,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5D,OAAO,UAAU,MAAM,YAAY,CAAC;AAEpC,OAAO,QAAQ,MAAM,IAAI,CAAC;AAuB1B,MAAM,aAAa,GAAiC,KAAK,CAAC,EAAE;IAC1D,MAAM,EACJ,MAAM,EACN,QAAQ,EACR,cAAc,EACd,OAAO,EACP,MAAM,EACN,KAAK,EACL,aAAa,KAEX,KAAK,EADJ,IAAI,UACL,KAAK,EATH,uFASL,CAAQ,CAAC;IAEV,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE;QAC7B,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,IAA+B,EAAE,EAAE;YACpD,IAAI,WAAW,GACb,OAAO,cAAc,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC;YACzE,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;gBAC5B,OAAO;oBACL,KAAK,EAAE,IAAI;oBACX,KAAK,EAAE,IAAI;oBACX,OAAO,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,QAAQ,CAAC,IAAI,CAAC;iBACrC,CAAC;aACH;iBAAM;gBACL,IAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;oBACrC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;iBACrB;gBACD,OAAO,IAAI,CAAC;aACb;QACH,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;IAE7B,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;IAE1D,MAAM,YAAY,GAAG,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;QACtC,MAAM,SAAS,GAAG,CAAC,GAAG,WAAW,CAAC,CAAC;QACnC,SAAS,CAAC,KAAK,CAAC,CAAC,OAAO,GAAG,OAAO,CAAC;QACnC,cAAc,CAAC,SAAS,CAAC,CAAC;QAC1B,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1E,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,QAAQ,CAAC,CAAC;IACvB,CAAC,CAAC;IAEF,MAAM,GAAG,GAAG,UAAU,CAAC,mBAAmB,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IACrE,OAAO,CACL,6BAAK,SAAS,EAAE,GAAG,EAAE,KAAK,EAAE,KAAK,IAC9B,WAAW,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;QAC/B,OAAO,CACL,oBAAC,QAAQ,kBACP,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,QAAQ,EAAE,IAAI,CAAC,QAAQ,EACvB,OAAO,EAAE,IAAI,CAAC,OAAO,EACrB,GAAG,EAAE,KAAK,EACV,KAAK,EAAE,aAAa,EACpB,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,IAC7C,IAAI,EACR,CACH,CAAC;IACJ,CAAC,CAAC,CACE,CACP,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/lib/components/Checkbox/index.js

@@ -0,0 +1,43 @@
+import React from "react";
+import classNames from "classnames";
+import { CheckboxGroup } from "@tarojs/components";
+import useGenerateId from "@/hooks/useGenerateId";
+import Group from "./Group";
+import "./index.scss";
+const XHCheckbox = props => {
+    const { className, name, label, id, circle, onChange, align, direction, justify, checked, disabled, value, style, color = "#f6ab00", } = props;
+    const finalId = useGenerateId(id, "xh-checkbox-id");
+    const handleOnchange = e => {
+        let finalchecked = checked || false;
+        let value = "";
+        if (process.env.TARO_ENV === "h5") {
+            finalchecked = e.target.checked;
+            value = e.target.value;
+        }
+        else {
+            finalchecked = e.detail.value.length > 0;
+            value = e.detail.value[0];
+        }
+        onChange && onChange(finalchecked, value);
+    };
+    const cls = classNames("xh-checkbox", className, align, direction, justify, {
+        h5: process.env.TARO_ENV === "h5",
+    });
+    if (process.env.TARO_ENV !== "h5") {
+        return (React.createElement(CheckboxGroup, { onChange: handleOnchange },
+            React.createElement("label", { htmlFor: finalId, className: cls, style: style },
+                React.createElement("input", { type: "checkbox", id: finalId, name: name, className: classNames("xh-checkbox-input", {
+                        tt: process.env.TARO_ENV === "tt",
+                    }), onChange: handleOnchange, disabled: disabled, value: value, checked: checked, color: color }),
+                React.createElement("span", { className: classNames("xh-checkbox-input-fake", circle && "circle", { tt: process.env.TARO_ENV === "tt" }) }),
+                React.createElement("span", { className: "xh-checkbox-label" }, label))));
+    }
+    return (React.createElement("label", { htmlFor: finalId, className: cls, style: style },
+        React.createElement("input", { type: "checkbox", id: finalId, name: name, className: "xh-checkbox-input", onChange: handleOnchange, value: value, defaultChecked: checked }),
+        React.createElement("span", { className: classNames("xh-checkbox-input-fake", circle && "circle") }),
+        React.createElement("span", { className: "xh-checkbox-label" }, label)));
+};
+const CheckBox = XHCheckbox;
+CheckBox.Group = Group;
+export default CheckBox;
+//# sourceMappingURL=index.js.map

package/lib/components/Checkbox/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Checkbox/index.tsx"],"names":[],"mappings":"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"}

package/lib/components/Picker/Picker.js

@@ -1,109 +1,205 @@
-import React, { useRef, useState, } from "react";
-import { View } from "@tarojs/components";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
+import React, { useState, useEffect, useRef, } from "react";
 import classNames from "classnames";
 import Popup from "../Popup";
-import Button from "../Button";
-import { useAsyncEffect, useTouch } from "../../hooks";
-const Picker = (props) => {
-    const { visible, title, ItemComponent, Footer, data, onCancel, onConfirm, onClose, cancelText = "取消", confirmText = "确定", } = props;
-    const [selectIndex, setSelectIndex] = useState(0);
-    const rootRef = useRef(null);
-    const threshold = 30; // 可拉超出的最高距离
-    const [transformDistance, setTransformDistance] = useState(0); // 滚动区域translateY
-    const lastTranslateY = useRef(0);
-    const [perItemHeight, setPerItemHeight] = useState(0); // 每个item的高度
-    const touch = useTouch();
-    const renderItem = () => {
-        return data.map((item, index) => {
-            let text = typeof item === "string" ? item : item.text;
-            const itemClass = classNames("xh-picker-body-view-item", {
-                active: selectIndex === index,
-            });
-            return (React.createElement(View, { className: itemClass, onClick: e => handleSelect(index, e), key: index }, ItemComponent ? ItemComponent({ data: item }) : text));
+import PickerSlot from "../PickerSlot";
+import useRefs from "../../hooks/useRefs";
+const InternalPicker = (props, ref) => {
+    const { visible, title, data = [], defaultValueData, onConfirm, onClose, onCloseUpdate, onChange, className, style, mode, swipeDuration } = props, rest = __rest(props, ["visible", "title", "data", "defaultValueData", "onConfirm", "onClose", "onCloseUpdate", "onChange", "className", "style", "mode", "swipeDuration"]);
+    const [chooseValueData, setchooseValueData] = useState([]); // 选择的数据的 value 值, 每一条数据的 value 值
+    const [columnIndex, setcolumnIndex] = useState(0); // 选中列
+    const pickerRef = useRef(null);
+    const [refs, setRefs] = useRefs();
+    const [columnsList, setColumnsList] = useState([]); // 格式化后每一列的数据
+    const isConfirmEvent = useRef(false);
+    // 默认值修改
+    useEffect(() => {
+        if (defaultValueData &&
+            defaultValueData.length !== 0 &&
+            defaultValueData.toString() !== chooseValueData.toString()) {
+            const data = [...defaultValueData];
+            setchooseValueData(data);
+            setColumnsList(normalListData());
+        }
+    }, [defaultValueData]);
+    // 选中值进行修改
+    useEffect(() => {
+        onChange && onChange(columnIndex, chooseValueData, selectedOptions());
+        if (isConfirmEvent.current) {
+            isConfirmEvent.current = false;
+            onConfirm && onConfirm(selectedOptions(), columnIndex);
+        }
+    }, [chooseValueData]);
+    // 列表格式修改
+    useEffect(() => {
+        init();
+    }, [data]);
+    const closeActionSheet = e => {
+        e.stopPropagation();
+        onClose && onClose();
+        // onCloseUpdate &&
+        //   onCloseUpdate(chooseValueData, selectedOptions(), pickerRef);
+    };
+    // 点击确定
+    const confirm = e => {
+        e.stopPropagation();
+        let movings = false;
+        refs.forEach((_ref) => {
+            if (_ref.moving)
+                movings = true;
+            _ref.stopMomentum();
+        });
+        if (movings) {
+            isConfirmEvent.current = true;
+        }
+        else {
+            onConfirm && onConfirm(selectedOptions(), columnIndex);
+        }
+        onClose && onClose();
+        setTimeout(() => {
+            isConfirmEvent.current = false;
+        }, 0);
+    };
+    const selectedOptions = () => {
+        const optins = [];
+        columnsList.map((column, index) => {
+            let currOptions = [];
+            currOptions = column.filter(item => (typeof item === "object" ? item.value : item) ===
+                chooseValueData[index]);
+            if (currOptions[0]) {
+                optins.push(currOptions[0]);
+            }
+            else {
+                column[0] && optins.push(column[0]);
+            }
+            return column;
         });
+        return optins;
     };
-    const renderHeader = () => {
-        return (React.createElement(React.Fragment, null,
-            React.createElement(Button, { className: "xh-picker-header-button picker-cancel", shape: "square", size: "mini", type: "ghost", onClick: handleCancel }, cancelText),
-            title && React.createElement("div", { className: "xh-picker-header-title" }, title),
-            React.createElement(Button, { className: "xh-picker-header-button picker-confirm", shape: "square", size: "mini", type: "ghost", onClick: handleConfirm }, confirmText)));
+    // 选择每一列的数据
+    const chooseItem = (option, columnIndex) => {
+        if (option && Object.keys(option).length) {
+            // 移动后是否与之前有差异
+            if (chooseValueData[columnIndex] !==
+                (typeof option === "string" ? option : option.value)) {
+                if (columnsType() === "cascade") {
+                    chooseValueData[columnIndex] =
+                        typeof option === "object" ? option.value : option || "";
+                    setchooseValueData([...chooseValueData]);
+                    let index = columnIndex;
+                    let cursor = option;
+                    while (typeof cursor === "object" &&
+                        cursor &&
+                        cursor.children &&
+                        cursor.children[0]) {
+                        chooseValueData[index + 1] = cursor.children[0].value;
+                        setchooseValueData([...chooseValueData]);
+                        index++;
+                        cursor = cursor.children[0];
+                    }
+                    // 当前改变列的下一列 children 值为空
+                    if (typeof cursor === "object" && cursor && cursor.children) {
+                        chooseValueData[index + 1] = "";
+                        setchooseValueData([...chooseValueData]);
+                    }
+                    setColumnsList(normalListData());
+                }
+                else {
+                    setchooseValueData(data => {
+                        const cdata = [...data];
+                        cdata[columnIndex] =
+                            (typeof option === "string" ? option : option.value) || "";
+                        return cdata;
+                    });
+                }
+                setcolumnIndex(columnIndex);
+            }
+        }
     };
-    useAsyncEffect(async () => {
-        if (visible) {
-            const { height } = await rootRef.current.getBoundingClientRect();
-            const perheight = height / data.length;
-            setPerItemHeight(perheight);
+    // 传入的数据格式化
+    const normalListData = () => {
+        const type = columnsType();
+        switch (type) {
+            case "multiple":
+                return data;
+            case "cascade":
+                // 级联数据处理
+                return formatCascade(data, chooseValueData);
+            default:
+                return [data];
         }
-    }, [visible, data.length]);
-    function handleSelect(index, e) {
-        setSelectIndex(index);
-        handleConfirm(e, index);
-    }
-    function getValue(index) {
-        return data[index];
-    }
-    function handleCancel(e) {
-        setSelectIndex(selectIndex);
-        onCancel && onCancel(e);
-        onClose && onClose(e);
-    }
-    function handleConfirm(e, index = selectIndex) {
-        const value = getValue(index);
-        onConfirm && onConfirm(value, index);
-        onClose && onClose(e);
-    }
-    const handleToucMove = (e) => {
-        e.preventDefault();
-        e.stopPropagation();
-        // 试验
-        touch.touchmove(e);
-        const distanceY = touch.touchMoveDistance.y;
-        if (distanceY === 0)
-            return; // 点击事件
-        console.log(distanceY);
-        console.log("distanceY");
-        let finaltrans = distanceY + lastTranslateY.current;
-        if (Math.abs(finaltrans) < perItemHeight / 3)
-            return;
-        if (finaltrans >= perItemHeight)
-            return;
-        if (finaltrans <= -perItemHeight * data.length - threshold)
-            return;
-        setTransformDistance(finaltrans);
     };
-    const handleTouchStart = (e) => {
-        e.preventDefault();
-        lastTranslateY.current = transformDistance; // end的时候记录最后一次transiton
-        // shiyan
-        touch.touchstart(e);
+    // 每一列的类型
+    const columnsType = () => {
+        const firstColumn = data[0];
+        if (firstColumn) {
+            if (Array.isArray(firstColumn)) {
+                return "multiple";
+            }
+            if (typeof firstColumn === "object" && "children" in firstColumn) {
+                return "cascade";
+            }
+        }
+        return "single";
+    };
+    // 级联数据格式化
+    const formatCascade = (columns, defaultValues) => {
+        const formatted = [];
+        let cursor = {
+            text: "",
+            value: "",
+            children: columns,
+        };
+        let columnIndex = 0;
+        while (cursor && cursor.children) {
+            const options = cursor.children;
+            const value = defaultValues[columnIndex];
+            let index = options.findIndex(columnItem => columnItem.value === value);
+            if (index === -1)
+                index = 0;
+            cursor = cursor.children[index];
+            columnIndex++;
+            formatted.push(options);
+        }
+        return formatted;
+    };
+    const init = () => {
+        const data = [];
+        const normalData = normalListData();
+        setColumnsList(normalData);
+        normalData.length > 0 &&
+            normalData.forEach(item => {
+                const perItem = item[0];
+                perItem &&
+                    data.push(typeof perItem === "string" ? perItem : perItem.value);
+            });
+        if (!defaultValueData && chooseValueData.length === 0) {
+            setchooseValueData([...data]);
+        }
     };
-    const handleTouchEnd = (e) => {
-        touch.touchend(e);
-        e.preventDefault();
-        const total = perItemHeight * data.length;
-        let index = data.length -
-            Math.round((total - Math.abs(transformDistance)) / perItemHeight);
-        if (index < 0 ||
-            (transformDistance > 0 && transformDistance <= perItemHeight) // 如果往上滚动到顶
-        )
-            index = 0;
-        if (index > data.length - 1)
-            index = data.length - 1;
-        setTransformDistance(-(index * perItemHeight));
-        setSelectIndex(index);
+    const renderToolbar = () => {
+        return (React.createElement("div", { className: "xh-picker-header" },
+            React.createElement("span", { className: "xh-picker-header-button picker-cancel", onClick: closeActionSheet }, "\u53D6\u6D88"),
+            React.createElement("div", { className: "xh-picker-header-title" }, title || ""),
+            React.createElement("span", { className: "xh-picker-header-button picker-confirm", onClick: confirm }, "\u786E\u5B9A")));
     };
     return (React.createElement(Popup, { visible: visible },
-        React.createElement(View, { className: "xh-picker" },
-            React.createElement(View, { className: "xh-picker-header" }, renderHeader()),
-            React.createElement(View, { className: "xh-picker-body" },
-                React.createElement(View, { className: "xh-picker-body-view", ref: rootRef, onTouchStart: handleTouchStart, onTouchMove: handleToucMove, onTouchEnd: handleTouchEnd, style: {
-                        transform: `translateY(${transformDistance}px)`,
-                    }, "catch-move": true }, renderItem()),
-                React.createElement(View, { className: "xh-picker-body-mask" },
-                    React.createElement(View, { className: "xh-picker-body-mask-top" }),
-                    React.createElement(View, { className: "xh-picker-body-mask-middle" }),
-                    React.createElement(View, { className: "xh-picker-body-mask-bottom" }))),
-            React.createElement(View, { className: "xh-picker-footer" }, Footer))));
+        React.createElement("div", Object.assign({ className: classNames("xh-picker", className), style: style, ref: ref }, rest),
+            renderToolbar(),
+            React.createElement("div", { className: "xh-picker-panel", ref: pickerRef }, columnsList === null || columnsList === void 0 ? void 0 : columnsList.map((item, index) => {
+                return (React.createElement(PickerSlot, { ref: setRefs(index), defaultValue: chooseValueData === null || chooseValueData === void 0 ? void 0 : chooseValueData[index], data: item, mode: mode, onConfirm: chooseItem, swipeDuration: swipeDuration, key: index, keyIndex: index }));
+            })))));
 };
+const Picker = React.forwardRef(InternalPicker);
 export default Picker;
 //# sourceMappingURL=Picker.js.map

package/lib/components/Picker/Picker.js.map

@@ -1 +1 @@
-{"version":3,"file":"Picker.js","sourceRoot":"","sources":["../../../src/components/Picker/Picker.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Picker.js","sourceRoot":"","sources":["../../../src/components/Picker/Picker.tsx"],"names":[],"mappings":"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"}

package/lib/components/Picker/index.js

@@ -21,15 +21,12 @@ const PickerField = (props) => {
             return;
         setVisible(true);
     }
-    function handleClose(e) {
-        e.stopPropagation();
+    function handleClose() {
         setVisible(false);
     }
     return (React.createElement("div", { className: classNames("xh-picker-field", className), onClick: handleClick },
         children,
-        React.createElement(Picker, Object.assign({ visible: visible }, rest, { 
-            // onCancel={handleClose}
-            onClose: handleClose }))));
+        React.createElement(Picker, Object.assign({ visible: visible }, rest, { onCancel: handleClose, onClose: handleClose }))));
 };
 export default PickerField;
 //# sourceMappingURL=index.js.map

package/lib/components/Picker/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Picker/index.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EACZ,QAAQ,GAKT,MAAM,OAAO,CAAC;AACf,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,MAAuB,MAAM,UAAU,CAAC;AAE/C,OAAO,cAAc,CAAC;AAYtB,MAAM,WAAW,GAAG,CAClB,KAA0B,EACZ,EAAE;IAChB,MAAM,EAAE,SAAS,EAAE,QAAQ,KAAc,KAAK,EAAd,IAAI,UAAK,KAAK,EAAxC,yBAAgC,CAAQ,CAAC;IAC/C,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE9C,SAAS,WAAW;QAClB,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC;YAAE,OAAO;QAElC,UAAU,CAAC,IAAI,CAAC,CAAC;IACnB,CAAC;IAED,SAAS,WAAW,CAAC,CAAa;QAChC,CAAC,CAAC,eAAe,EAAE,CAAC;QACpB,UAAU,CAAC,KAAK,CAAC,CAAC;IACpB,CAAC;IAED,OAAO,CACL,6BACE,SAAS,EAAE,UAAU,CAAC,iBAAiB,EAAE,SAAS,CAAC,EACnD,OAAO,EAAE,WAAW;QAEnB,QAAQ;QACT,oBAAC,MAAM,kBACL,OAAO,EAAE,OAAO,IACZ,IAAI;YACR,yBAAyB;YACzB,OAAO,EAAE,WAAW,IACpB,CACE,CACP,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,WAAW,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/components/Picker/index.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EACZ,QAAQ,GAIT,MAAM,OAAO,CAAC;AACf,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,MAAM,MAAM,UAAU,CAAC;AAE9B,OAAO,cAAc,CAAC;AAatB,MAAM,WAAW,GAAG,CAClB,KAA0B,EACZ,EAAE;IAChB,MAAM,EAAE,SAAS,EAAE,QAAQ,KAAc,KAAK,EAAd,IAAI,UAAK,KAAK,EAAxC,yBAAgC,CAAQ,CAAC;IAC/C,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE9C,SAAS,WAAW;QAClB,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC;YAAE,OAAO;QAClC,UAAU,CAAC,IAAI,CAAC,CAAC;IACnB,CAAC;IAED,SAAS,WAAW;QAClB,UAAU,CAAC,KAAK,CAAC,CAAC;IACpB,CAAC;IAED,OAAO,CACL,6BACE,SAAS,EAAE,UAAU,CAAC,iBAAiB,EAAE,SAAS,CAAC,EACnD,OAAO,EAAE,WAAW;QAEnB,QAAQ;QACT,oBAAC,MAAM,kBACL,OAAO,EAAE,OAAO,IACZ,IAAI,IACR,QAAQ,EAAE,WAAW,EACrB,OAAO,EAAE,WAAW,IACpB,CACE,CACP,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,WAAW,CAAC"}