@nickeylin/antd-mobile-pro 2.0.1 → 2.0.3

package/dist/cjs/components/action-sheet-picker/picker.js

@@ -34,6 +34,7 @@ __export(picker_exports, {
 module.exports = __toCommonJS(picker_exports);
 var import_ahooks = require("ahooks");
 var import_antd_mobile = require("antd-mobile");
+var import_lodash = require("lodash");
 var import_react = require("react");
 var import_forward_ref_with_generics = __toESM(require("../../utils/forward-ref-with-generics"));
 var import_config_provider = require("../config-provider");
@@ -49,13 +50,15 @@ function ActionSheetPickerRaw({
 }, ref) {
   const { locale } = (0, import_config_provider.useConfig)();
   const { value: valueKey = "key", text: textKey = "text" } = fieldNames ?? {};
-  const [visible, setVisible] = (0, import_ahooks.useControllableValue)({
-    value: visibleProp,
-    onChange(value2) {
-      if (!value2)
-        onClose == null ? void 0 : onClose();
-    }
-  });
+  const [visible, setVisible] = (0, import_ahooks.useControllableValue)(
+    (0, import_lodash.pickBy)({
+      value: visibleProp,
+      onChange(value2) {
+        if (!value2)
+          onClose == null ? void 0 : onClose();
+      }
+    })
+  );
   const [value, setValue] = (0, import_ahooks.useControllableValue)({
     value: valueProp,
     onChange(val) {
@@ -74,6 +77,7 @@ function ActionSheetPickerRaw({
   const actions = (0, import_react.useMemo)(
     () => ({
       open() {
+        console.log("open");
         setVisible(true);
       },
       close() {

package/dist/cjs/components/input-captcha/input-captcha.d.ts

@@ -23,7 +23,7 @@ declare const InputCaptcha: import("react").ForwardRefExoticComponent<{
     className?: string | undefined;
     style?: (import("react").CSSProperties & Partial<Record<never, string>>) | undefined;
     tabIndex?: number | undefined;
-} & import("react").AriaAttributes & Omit<InputProps, "className" | "style"> & {
+} & import("react").AriaAttributes & Omit<InputProps, "style" | "className"> & {
     inputClassName?: string | undefined;
     inputStyle?: InputProps['style'];
     /** 获取验证码按钮的 props */

package/dist/cjs/components/popup-page/popup-page.d.ts

@@ -5,6 +5,7 @@ import { PageProps } from '../page';
 export type PopupPageProps = Omit<PopupProps, 'showCloseButton' | 'children'> & Omit<PageProps, 'style'> & {
     pageStyle?: PageProps['style'];
     pageClassName?: PageProps['className'];
+    closeButtonPosition?: 'left' | 'right';
 } & NativeProps<'--page-height'>;
 declare const PopupPage: FC<PopupPageProps>;
 export default PopupPage;

package/dist/cjs/components/popup-page/popup-page.js

@@ -36,6 +36,7 @@ var import_rc_utils = require("@nickeylin/rc-utils");
 var import_antd_mobile = require("antd-mobile");
 var import_antd_mobile_icons = require("antd-mobile-icons");
 var import_classnames = __toESM(require("classnames"));
+var import_react = require("react");
 var import_bem = require("../../utils/bem");
 var import_page = __toESM(require("../page"));
 var bem = (0, import_bem.cn)("popup-page");
@@ -52,6 +53,7 @@ var PopupPage = ({
   error,
   onBack,
   title,
+  closeButtonPosition = "left",
   // popup prps
   ...props
 }) => {
@@ -62,6 +64,32 @@ var PopupPage = ({
         onClose == null ? void 0 : onClose();
     }
   });
+  const pageProps = (0, import_react.useMemo)(() => {
+    if (closeButtonPosition === "right") {
+      return {
+        navbar: {
+          right: /* @__PURE__ */ React.createElement(
+            import_antd_mobile_icons.CloseOutline,
+            {
+              className: bem("close-button"),
+              onClick: () => {
+                setVisible(false);
+                onBack == null ? void 0 : onBack();
+              }
+            }
+          ),
+          ...navbar
+        }
+      };
+    }
+    return {
+      navbar: { backIcon: /* @__PURE__ */ React.createElement(import_antd_mobile_icons.CloseOutline, null), ...navbar },
+      onBack() {
+        setVisible(false);
+        onBack == null ? void 0 : onBack();
+      }
+    };
+  }, [closeButtonPosition, navbar, onBack, setVisible]);
   return /* @__PURE__ */ React.createElement(
     import_antd_mobile.Popup,
     {
@@ -75,13 +103,9 @@ var PopupPage = ({
       {
         style: pageStyle,
         className: pageClassName,
-        navbar: { backIcon: /* @__PURE__ */ React.createElement(import_antd_mobile_icons.CloseOutline, null), ...navbar },
+        ...pageProps,
         ...{ loading, error, title },
-        showNavBar: true,
-        onBack: () => {
-          setVisible(false);
-          onBack == null ? void 0 : onBack();
-        }
+        showNavBar: true
       },
       children
     )

package/dist/cjs/components/popup-page/style.less

@@ -18,4 +18,8 @@
   &__default-action-footer {
     padding: 8px 14px;
   }
+
+  &__close-button {
+    font-size: 24px;
+  }
 }

package/dist/cjs/components/tree-picker/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import prompt from './prompt';
 import './tree-picker.less';
-declare const TreePicker: (<T extends import("..").TreeDataNode<object> = import("..").TreeDataNode<object>>(props: Omit<import("..").PopupPickerMixinProps<T | T[]>, "fieldNames"> & Pick<import("..").TreeProps<T>, "fieldNames" | "search" | "request" | "params" | "rowKey" | "dataSource"> & {
+declare const TreePicker: (<T extends import("..").TreeDataNode<object> = import("..").TreeDataNode<object>>(props: Omit<import("..").PopupPickerMixinProps<T | T[]>, "fieldNames"> & Pick<import("..").TreeProps<T>, "search" | "fieldNames" | "request" | "params" | "rowKey" | "dataSource"> & {
     treeProps?: Omit<import("..").TreeProps<T>, "rowKey"> | undefined;
     multiple?: boolean | undefined;
 } & {

package/dist/cjs/components/tree-picker/tree-picker.d.ts

@@ -9,7 +9,7 @@ export type TreePickerProps<T extends TreeDataNode<object> = TreeDataNode<object
      */
     multiple?: boolean;
 } & NativeProps;
-declare const TreePicker: <T extends TreeDataNode<object> = TreeDataNode<object>>(props: Omit<PopupPickerMixinProps<T | T[]>, "fieldNames"> & Pick<TreeProps<T>, "fieldNames" | "search" | "request" | "params" | "rowKey" | "dataSource"> & {
+declare const TreePicker: <T extends TreeDataNode<object> = TreeDataNode<object>>(props: Omit<PopupPickerMixinProps<T | T[]>, "fieldNames"> & Pick<TreeProps<T>, "search" | "fieldNames" | "request" | "params" | "rowKey" | "dataSource"> & {
     treeProps?: Omit<TreeProps<T>, "rowKey"> | undefined;
     /**
      * 启用多选时，将启用复选框禁用选择，即点击整行会选中复选框

package/dist/es/components/action-sheet-picker/picker.js

@@ -6,6 +6,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { useControllableValue } from 'ahooks';
 import { ActionSheet } from 'antd-mobile';
+import { pickBy } from 'lodash';
 import { useImperativeHandle, useMemo } from 'react';
 import forwardRefWithGenerics from "../../utils/forward-ref-with-generics";
 import { useConfig } from "../config-provider";
@@ -29,12 +30,12 @@ function ActionSheetPickerRaw(_ref, ref) {
     valueKey = _ref2$value === void 0 ? 'key' : _ref2$value,
     _ref2$text = _ref2.text,
     textKey = _ref2$text === void 0 ? 'text' : _ref2$text;
-  var _useControllableValue = useControllableValue({
+  var _useControllableValue = useControllableValue(pickBy({
       value: visibleProp,
       onChange: function onChange(value) {
         if (!value) onClose === null || onClose === void 0 || onClose();
       }
-    }),
+    })),
     _useControllableValue2 = _slicedToArray(_useControllableValue, 2),
     visible = _useControllableValue2[0],
     setVisible = _useControllableValue2[1];
@@ -71,6 +72,7 @@ function ActionSheetPickerRaw(_ref, ref) {
   var actions = useMemo(function () {
     return {
       open: function open() {
+        console.log('open');
         setVisible(true);
       },
       close: function close() {

package/dist/es/components/input-captcha/input-captcha.d.ts

@@ -23,7 +23,7 @@ declare const InputCaptcha: import("react").ForwardRefExoticComponent<{
     className?: string | undefined;
     style?: (import("react").CSSProperties & Partial<Record<never, string>>) | undefined;
     tabIndex?: number | undefined;
-} & import("react").AriaAttributes & Omit<InputProps, "className" | "style"> & {
+} & import("react").AriaAttributes & Omit<InputProps, "style" | "className"> & {
     inputClassName?: string | undefined;
     inputStyle?: InputProps['style'];
     /** 获取验证码按钮的 props */

package/dist/es/components/popup-page/popup-page.d.ts

@@ -5,6 +5,7 @@ import { PageProps } from '../page';
 export type PopupPageProps = Omit<PopupProps, 'showCloseButton' | 'children'> & Omit<PageProps, 'style'> & {
     pageStyle?: PageProps['style'];
     pageClassName?: PageProps['className'];
+    closeButtonPosition?: 'left' | 'right';
 } & NativeProps<'--page-height'>;
 declare const PopupPage: FC<PopupPageProps>;
 export default PopupPage;

package/dist/es/components/popup-page/popup-page.js

@@ -1,13 +1,14 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["children", "className", "visible", "onClose", "pageStyle", "pageClassName", "navbar", "loading", "error", "onBack", "title"];
+var _excluded = ["children", "className", "visible", "onClose", "pageStyle", "pageClassName", "navbar", "loading", "error", "onBack", "title", "closeButtonPosition"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { useMergedState } from '@nickeylin/rc-utils';
 import { Popup } from 'antd-mobile';
 import { CloseOutline } from 'antd-mobile-icons';
 import classNames from 'classnames';
+import { useMemo } from 'react';
 import { cn } from "../../utils/bem";
 import Page from "../page";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -24,6 +25,8 @@ var PopupPage = function PopupPage(_ref) {
     error = _ref.error,
     _onBack = _ref.onBack,
     title = _ref.title,
+    _ref$closeButtonPosit = _ref.closeButtonPosition,
+    closeButtonPosition = _ref$closeButtonPosit === void 0 ? 'left' : _ref$closeButtonPosit,
     props = _objectWithoutProperties(_ref, _excluded);
   var _useMergedState = useMergedState(false, {
       value: visibleProp,
@@ -34,28 +37,46 @@ var PopupPage = function PopupPage(_ref) {
     _useMergedState2 = _slicedToArray(_useMergedState, 2),
     visible = _useMergedState2[0],
     setVisible = _useMergedState2[1];
+  var pageProps = useMemo(function () {
+    if (closeButtonPosition === 'right') {
+      return {
+        navbar: _objectSpread({
+          right: /*#__PURE__*/_jsx(CloseOutline, {
+            className: bem('close-button'),
+            onClick: function onClick() {
+              setVisible(false);
+              _onBack === null || _onBack === void 0 || _onBack();
+            }
+          })
+        }, navbar)
+      };
+    }
+    return {
+      navbar: _objectSpread({
+        backIcon: /*#__PURE__*/_jsx(CloseOutline, {})
+      }, navbar),
+      onBack: function onBack() {
+        setVisible(false);
+        _onBack === null || _onBack === void 0 || _onBack();
+      }
+    };
+  }, [closeButtonPosition, navbar, _onBack, setVisible]);
   return /*#__PURE__*/_jsx(Popup, _objectSpread(_objectSpread({}, props), {}, {
     visible: visible,
     onClose: function onClose() {
       return setVisible(false);
     },
     className: classNames(bem(), className),
-    children: /*#__PURE__*/_jsx(Page, {
+    children: /*#__PURE__*/_jsx(Page, _objectSpread(_objectSpread({
       style: pageStyle,
-      className: pageClassName,
-      navbar: _objectSpread({
-        backIcon: /*#__PURE__*/_jsx(CloseOutline, {})
-      }, navbar),
+      className: pageClassName
+    }, pageProps), {}, {
       loading: loading,
       error: error,
       title: title,
       showNavBar: true,
-      onBack: function onBack() {
-        setVisible(false);
-        _onBack === null || _onBack === void 0 || _onBack();
-      },
       children: children
-    })
+    }))
   }));
 };
 export default PopupPage;

package/dist/es/components/popup-page/style.less

@@ -18,4 +18,8 @@
   &__default-action-footer {
     padding: 8px 14px;
   }
+
+  &__close-button {
+    font-size: 24px;
+  }
 }

package/dist/es/components/tree-picker/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import prompt from './prompt';
 import './tree-picker.less';
-declare const TreePicker: (<T extends import("..").TreeDataNode<object> = import("..").TreeDataNode<object>>(props: Omit<import("..").PopupPickerMixinProps<T | T[]>, "fieldNames"> & Pick<import("..").TreeProps<T>, "fieldNames" | "search" | "request" | "params" | "rowKey" | "dataSource"> & {
+declare const TreePicker: (<T extends import("..").TreeDataNode<object> = import("..").TreeDataNode<object>>(props: Omit<import("..").PopupPickerMixinProps<T | T[]>, "fieldNames"> & Pick<import("..").TreeProps<T>, "search" | "fieldNames" | "request" | "params" | "rowKey" | "dataSource"> & {
     treeProps?: Omit<import("..").TreeProps<T>, "rowKey"> | undefined;
     multiple?: boolean | undefined;
 } & {

package/dist/es/components/tree-picker/tree-picker.d.ts

@@ -9,7 +9,7 @@ export type TreePickerProps<T extends TreeDataNode<object> = TreeDataNode<object
      */
     multiple?: boolean;
 } & NativeProps;
-declare const TreePicker: <T extends TreeDataNode<object> = TreeDataNode<object>>(props: Omit<PopupPickerMixinProps<T | T[]>, "fieldNames"> & Pick<TreeProps<T>, "fieldNames" | "search" | "request" | "params" | "rowKey" | "dataSource"> & {
+declare const TreePicker: <T extends TreeDataNode<object> = TreeDataNode<object>>(props: Omit<PopupPickerMixinProps<T | T[]>, "fieldNames"> & Pick<TreeProps<T>, "search" | "fieldNames" | "request" | "params" | "rowKey" | "dataSource"> & {
     treeProps?: Omit<TreeProps<T>, "rowKey"> | undefined;
     /**
      * 启用多选时，将启用复选框禁用选择，即点击整行会选中复选框