@seakoi/native-ui 1.0.0 → 1.1.1

package/dist/commonjs/components/base/index.js

@@ -14,7 +14,7 @@ Object.keys(_index).forEach(function (key) {
     }
   });
 });
-var _index2 = require("./async-boundary/index.js");
+var _index2 = require("./address-picker-view/index.js");
 Object.keys(_index2).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index2[key]) return;
@@ -25,7 +25,7 @@ Object.keys(_index2).forEach(function (key) {
     }
   });
 });
-var _index3 = require("./avatar/index.js");
+var _index3 = require("./async-boundary/index.js");
 Object.keys(_index3).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index3[key]) return;
@@ -36,7 +36,7 @@ Object.keys(_index3).forEach(function (key) {
     }
   });
 });
-var _index4 = require("./back-to-top/index.js");
+var _index4 = require("./avatar/index.js");
 Object.keys(_index4).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index4[key]) return;
@@ -47,7 +47,7 @@ Object.keys(_index4).forEach(function (key) {
     }
   });
 });
-var _index5 = require("./badge/index.js");
+var _index5 = require("./back-to-top/index.js");
 Object.keys(_index5).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index5[key]) return;
@@ -58,7 +58,7 @@ Object.keys(_index5).forEach(function (key) {
     }
   });
 });
-var _index6 = require("./button/index.js");
+var _index6 = require("./badge/index.js");
 Object.keys(_index6).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index6[key]) return;
@@ -69,7 +69,7 @@ Object.keys(_index6).forEach(function (key) {
     }
   });
 });
-var _index7 = require("./calendar/index.js");
+var _index7 = require("./button/index.js");
 Object.keys(_index7).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index7[key]) return;
@@ -80,7 +80,7 @@ Object.keys(_index7).forEach(function (key) {
     }
   });
 });
-var _index8 = require("./cell/index.js");
+var _index8 = require("./calendar/index.js");
 Object.keys(_index8).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index8[key]) return;
@@ -91,7 +91,7 @@ Object.keys(_index8).forEach(function (key) {
     }
   });
 });
-var _index9 = require("./checkbox/index.js");
+var _index9 = require("./carousel/index.js");
 Object.keys(_index9).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index9[key]) return;
@@ -102,7 +102,7 @@ Object.keys(_index9).forEach(function (key) {
     }
   });
 });
-var _index0 = require("./collapse/index.js");
+var _index0 = require("./cell/index.js");
 Object.keys(_index0).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index0[key]) return;
@@ -113,7 +113,7 @@ Object.keys(_index0).forEach(function (key) {
     }
   });
 });
-var _index1 = require("./countdown/index.js");
+var _index1 = require("./checkbox/index.js");
 Object.keys(_index1).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index1[key]) return;
@@ -124,7 +124,7 @@ Object.keys(_index1).forEach(function (key) {
     }
   });
 });
-var _index10 = require("./date-picker/index.js");
+var _index10 = require("./collapse/index.js");
 Object.keys(_index10).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index10[key]) return;
@@ -135,7 +135,7 @@ Object.keys(_index10).forEach(function (key) {
     }
   });
 });
-var _index11 = require("./date-picker-view/index.js");
+var _index11 = require("./countdown/index.js");
 Object.keys(_index11).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index11[key]) return;
@@ -146,7 +146,7 @@ Object.keys(_index11).forEach(function (key) {
     }
   });
 });
-var _index12 = require("./divider/index.js");
+var _index12 = require("./date-picker/index.js");
 Object.keys(_index12).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index12[key]) return;
@@ -157,7 +157,7 @@ Object.keys(_index12).forEach(function (key) {
     }
   });
 });
-var _index13 = require("./flex/index.js");
+var _index13 = require("./date-picker-view/index.js");
 Object.keys(_index13).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index13[key]) return;
@@ -168,7 +168,7 @@ Object.keys(_index13).forEach(function (key) {
     }
   });
 });
-var _index14 = require("./form/index.js");
+var _index14 = require("./divider/index.js");
 Object.keys(_index14).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index14[key]) return;
@@ -179,7 +179,7 @@ Object.keys(_index14).forEach(function (key) {
     }
   });
 });
-var _index15 = require("./input/index.js");
+var _index15 = require("./flex/index.js");
 Object.keys(_index15).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index15[key]) return;
@@ -190,7 +190,7 @@ Object.keys(_index15).forEach(function (key) {
     }
   });
 });
-var _index16 = require("./link/index.js");
+var _index16 = require("./form/index.js");
 Object.keys(_index16).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index16[key]) return;
@@ -201,7 +201,7 @@ Object.keys(_index16).forEach(function (key) {
     }
   });
 });
-var _index17 = require("./loading/index.js");
+var _index17 = require("./input/index.js");
 Object.keys(_index17).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index17[key]) return;
@@ -212,7 +212,7 @@ Object.keys(_index17).forEach(function (key) {
     }
   });
 });
-var _index18 = require("./modal/index.js");
+var _index18 = require("./link/index.js");
 Object.keys(_index18).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index18[key]) return;
@@ -223,7 +223,7 @@ Object.keys(_index18).forEach(function (key) {
     }
   });
 });
-var _index19 = require("./nav-bar/index.js");
+var _index19 = require("./loading/index.js");
 Object.keys(_index19).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index19[key]) return;
@@ -234,7 +234,7 @@ Object.keys(_index19).forEach(function (key) {
     }
   });
 });
-var _index20 = require("./picker/index.js");
+var _index20 = require("./modal/index.js");
 Object.keys(_index20).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index20[key]) return;
@@ -245,7 +245,7 @@ Object.keys(_index20).forEach(function (key) {
     }
   });
 });
-var _index21 = require("./picker-view/index.js");
+var _index21 = require("./nav-bar/index.js");
 Object.keys(_index21).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index21[key]) return;
@@ -256,7 +256,7 @@ Object.keys(_index21).forEach(function (key) {
     }
   });
 });
-var _index22 = require("./portal/index.js");
+var _index22 = require("./picker/index.js");
 Object.keys(_index22).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index22[key]) return;
@@ -267,7 +267,7 @@ Object.keys(_index22).forEach(function (key) {
     }
   });
 });
-var _index23 = require("./radio/index.js");
+var _index23 = require("./picker-view/index.js");
 Object.keys(_index23).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index23[key]) return;
@@ -278,7 +278,7 @@ Object.keys(_index23).forEach(function (key) {
     }
   });
 });
-var _index24 = require("./result/index.js");
+var _index24 = require("./portal/index.js");
 Object.keys(_index24).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index24[key]) return;
@@ -289,7 +289,7 @@ Object.keys(_index24).forEach(function (key) {
     }
   });
 });
-var _index25 = require("./surface/index.js");
+var _index25 = require("./radio/index.js");
 Object.keys(_index25).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index25[key]) return;
@@ -300,7 +300,7 @@ Object.keys(_index25).forEach(function (key) {
     }
   });
 });
-var _index26 = require("./switch/index.js");
+var _index26 = require("./result/index.js");
 Object.keys(_index26).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index26[key]) return;
@@ -311,7 +311,7 @@ Object.keys(_index26).forEach(function (key) {
     }
   });
 });
-var _index27 = require("./tabs/index.js");
+var _index27 = require("./surface/index.js");
 Object.keys(_index27).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index27[key]) return;
@@ -322,7 +322,7 @@ Object.keys(_index27).forEach(function (key) {
     }
   });
 });
-var _index28 = require("./text/index.js");
+var _index28 = require("./switch/index.js");
 Object.keys(_index28).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _index28[key]) return;
@@ -332,4 +332,26 @@ Object.keys(_index28).forEach(function (key) {
       return _index28[key];
     }
   });
+});
+var _index29 = require("./tabs/index.js");
+Object.keys(_index29).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _index29[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _index29[key];
+    }
+  });
+});
+var _index30 = require("./text/index.js");
+Object.keys(_index30).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _index30[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function () {
+      return _index30[key];
+    }
+  });
 });

package/dist/commonjs/components/base/picker-view/picker-view.js

@@ -97,8 +97,8 @@ const PickerView = ({
     }
   });
   const handlers = (0, _react.useMemo)(() => {
-    return columns.map((_, index) => item => handleChange(item, index));
-  }, [columns, handleChange]);
+    return options.map((_, index) => item => handleChange(item, index));
+  }, [options, handleChange]);
 
   // 非受控模式的初始化：只在首次挂载时设置默认值
   const initializedRef = (0, _react.useRef)(false);

package/dist/module/components/base/address-picker/address-picker.js

@@ -1,192 +1,76 @@
 "use strict";
 
-import { CloseOutlined } from '@seakoi/svg-icons';
 import { useControllableValue, useMemoizedFn } from 'ahooks';
 import React, { useMemo, useState } from 'react';
-import { TouchableOpacity, View } from 'react-native';
-import { SafeAreaView } from 'react-native-safe-area-context';
-import { Button, PickerView, Text } from "./../index.js";
-import { useTheme } from "../../../native-provider/index.js";
+import { View } from 'react-native';
+import { Modal, PickerTrigger, Portal } from "./../index.js";
+import { AddressPickerView } from "../address-picker-view/index.js";
+import { getSelectedOptions } from "../address-picker-view/utils.js";
 import { useAddressPickerStyles } from "./style/index.js";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const ADDRESS_PICKER_CONFIG = {
-  province: {
-    depth: 1,
-    title: '请选择省'
-  },
-  city: {
-    depth: 2,
-    title: '请选择省市'
-  },
-  district: {
-    depth: 3,
-    title: '请选择省市区'
-  },
-  street: {
-    depth: 4,
-    title: '请选择省市区、街道'
-  }
-};
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 export const AddressPicker = props => {
   const {
-    confirmText = '确定',
-    cancelText = '取消',
-    onCancel,
-    onConfirm,
+    placeholder = '请选择',
+    disabled = false,
+    style,
+    children,
     columns,
-    itemHeight = 40,
-    selectType = 'district',
-    title,
+    onConfirm,
     ...restProps
   } = props;
-  const theme = useTheme();
-  const defaultTitle = ADDRESS_PICKER_CONFIG[selectType].title;
-  const finalTitle = title ?? defaultTitle;
   const styles = useAddressPickerStyles();
 
-  /** 管理已确认的值（与父组件同步） 受控与非受控*/
-  const [value, onChange] = useControllableValue(props, {
+  // 使用 ahooks 管理受控/非受控 value
+  const [value, setValue] = useControllableValue(props, {
     defaultValue: []
   });
+  const [visible, setVisible] = useState(false);
 
-  /** 管理选择器的值（内部状态*/
-  const [pickerValue, setPickerValue] = useState(value || []);
-  /** 管理上一次确认的值（用于判断是否需要更新内部状态） */
-  const [prevValue, setPrevValue] = useState(value);
-  if (value !== prevValue) {
-    setPrevValue(value);
-    setPickerValue(value || []);
-  }
-  /**
-   * @param v 选择器的值
-   * @description 当选择器的值发生变化时，更新内部状态
-   * @returns void
-   *  */
-  const handlePickerChange = useMemoizedFn(v => {
-    console.log('选择的数据', v);
-    setPickerValue(v);
+  // 计算显示文本
+  const displayText = useMemo(() => {
+    if (!value || value.length === 0) return '';
+    const options = getSelectedOptions(columns, value);
+    // 如果找到了对应的选项，显示 label；否则（可能是初次加载数据还没到），暂不显示或显示 value
+    if (options.length === 0) return '';
+    return options.map(option => option.label).join(' / ');
+  }, [value, columns]);
+  const handleOpen = useMemoizedFn(() => {
+    setVisible(true);
   });
-  /**
-   * @description 确认选择
-   * @returns void
-   * */
-  const handleConfirm = useMemoizedFn(() => {
-    const getSelectedOptions = (cols, vals) => {
-      const options = [];
-      let currentCols = cols;
-      for (const val of vals) {
-        if (!currentCols) {
-          break;
-        }
-        const target = currentCols.find(col => col.value === val);
-        if (target) {
-          options.push(target);
-          currentCols = target.children;
-        } else {
-          break;
-        }
-      }
-      return options;
-    };
-    const options = getSelectedOptions(columns, pickerValue);
-    onChange(pickerValue, options);
-    onConfirm?.(pickerValue, options);
+  const handleClose = useMemoizedFn(() => {
+    setVisible(false);
   });
-  /**
-   * @description 取消选择
-   * @returns void
-   * */
-  const handleCancel = useMemoizedFn(() => {
-    setPickerValue(value || []);
-    onCancel?.();
+  const handleConfirm = useMemoizedFn((vals, options) => {
+    setValue(vals);
+    setVisible(false);
+    onConfirm?.(vals, options);
   });
-
-  /**
-   * @description 剪裁列
-   * @param columns 列
-   * @param selectType 选择类型
-   * @returns 剪裁后的列
-   * */
-  const prunedColumns = useMemo(() => {
-    const depth = ADDRESS_PICKER_CONFIG[selectType].depth || 3;
-    const prune = (cols, currentDepth) => {
-      if (!cols) {
-        return [];
-      }
-      if (currentDepth >= depth) {
-        return cols.map(col => {
-          /** 剪裁列，移除子项 */
-          const {
-            children,
-            ...rest
-          } = col;
-          return rest;
-        });
-      }
-      /** 递归剪裁子项 */
-      return cols.map(col => {
-        const option = col;
-        if (option.children) {
-          return {
-            ...option,
-            children: prune(option.children, currentDepth + 1)
-          };
-        }
-        return option;
-      });
-    };
-    return prune(columns, 1);
-  }, [columns, selectType]);
-  return /*#__PURE__*/_jsx(View, {
-    style: styles.container,
-    children: /*#__PURE__*/_jsxs(SafeAreaView, {
-      edges: ['bottom', 'left', 'right'],
-      children: [/*#__PURE__*/_jsxs(View, {
-        style: styles.header,
-        children: [/*#__PURE__*/React.isValidElement(finalTitle) ? finalTitle : /*#__PURE__*/_jsx(Text, {
-          style: styles.title,
-          children: finalTitle
-        }), /*#__PURE__*/_jsx(TouchableOpacity, {
-          onPress: handleCancel,
-          style: styles.closeIcon,
-          hitSlop: {
-            top: 10,
-            bottom: 10,
-            left: 10,
-            right: 10
-          },
-          children: /*#__PURE__*/_jsx(CloseOutlined, {
-            size: 20,
-            color: theme.palette.fontGray3
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [/*#__PURE__*/_jsx(PickerTrigger, {
+      displayText: displayText,
+      placeholder: placeholder,
+      disabled: disabled,
+      style: style,
+      onPress: handleOpen,
+      children: children
+    }), /*#__PURE__*/_jsx(Portal, {
+      children: /*#__PURE__*/_jsx(Modal, {
+        visible: visible,
+        position: "bottom",
+        contentHeight: "50%",
+        onClose: handleClose,
+        children: /*#__PURE__*/_jsx(View, {
+          style: styles.container,
+          children: /*#__PURE__*/_jsx(AddressPickerView, {
+            ...restProps,
+            columns: columns,
+            value: value,
+            onConfirm: handleConfirm,
+            onCancel: handleClose,
+            onClose: handleClose
           })
-        })]
-      }), /*#__PURE__*/_jsx(View, {
-        style: styles.pickerContainer,
-        children: /*#__PURE__*/_jsx(PickerView, {
-          ...restProps,
-          columns: prunedColumns,
-          value: pickerValue,
-          onChange: handlePickerChange,
-          itemHeight: itemHeight
         })
-      }), /*#__PURE__*/_jsxs(View, {
-        style: styles.footer,
-        children: [/*#__PURE__*/_jsx(Button, {
-          text: cancelText,
-          variant: "base",
-          theme: "secondary",
-          size: "large",
-          onPress: handleCancel,
-          buttonStyle: styles.button
-        }), /*#__PURE__*/_jsx(Button, {
-          text: confirmText,
-          variant: "base",
-          theme: "primary",
-          size: "large",
-          onPress: handleConfirm,
-          buttonStyle: styles.button
-        })]
-      })]
-    })
+      })
+    })]
   });
 };

package/dist/module/components/base/address-picker/style/index.js

@@ -1,55 +1,8 @@
 "use strict";
 
 import { createThemedStyles } from "../../../../native-provider/index.js";
-export const useAddressPickerStyles = createThemedStyles(theme => ({
+export const useAddressPickerStyles = createThemedStyles(() => ({
   container: {
-    backgroundColor: theme.palette.white,
-    borderTopLeftRadius: theme.roundness.lg,
-    borderTopRightRadius: theme.roundness.lg,
-    overflow: 'hidden'
-  },
-  header: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    justifyContent: 'space-between',
-    paddingHorizontal: theme.spacing.lg,
-    paddingVertical: theme.spacing.md,
-    borderBottomWidth: 1,
-    borderBottomColor: theme.palette.gray1 // Verify palette color
-  },
-  title: {
-    fontSize: 16,
-    fontWeight: '600',
-    color: theme.palette.fontGray1
-  },
-  closeIcon: {
-    padding: 4
-  },
-  pickerContainer: {},
-  footer: {
-    flexDirection: 'row',
-    padding: theme.spacing.lg,
-    gap: theme.spacing.md,
-    borderTopWidth: 1,
-    borderTopColor: theme.palette.gray1
-  },
-  button: {
     flex: 1
-  },
-  columnHeaderContainer: {
-    flexDirection: 'row',
-    borderBottomWidth: 1,
-    borderBottomColor: theme.palette.gray1,
-    backgroundColor: theme.palette.gray1
-  },
-  columnHeader: {
-    flex: 1,
-    alignItems: 'center',
-    justifyContent: 'center',
-    paddingVertical: 8
-  },
-  columnHeaderText: {
-    fontSize: 12,
-    color: theme.palette.fontGray2
   }
 }));