antd-mobile 5.1.0 → 5.2.2

package/2x/cjs/components/form/index.css

@@ -1,6 +1,18 @@
+.adm-form {
+  --border-inner: solid 2px var(--adm-border-color);
+  --border-top: solid 2px var(--adm-border-color);
+  --border-bottom: solid 2px var(--adm-border-color);
+  ---border-inner: var(--border-inner);
+  ---border-top: var(--border-top);
+  ---border-bottom: var(--border-bottom);
+}
+
 .adm-form .adm-list.adm-list {
   --padding-left: 32px;
   --padding-right: 24px;
+  --border-inner: var(---border-inner);
+  --border-top: var(---border-top);
+  --border-bottom: var(---border-bottom);
 }
 
 .adm-form .adm-form-footer {

package/2x/cjs/components/form/index.d.ts

@@ -6,11 +6,11 @@ export type { FormProps, FormInstance } from './form';
 export type { FormItemProps } from './form-item';
 export type { FormSubscribeProps } from './form-subscribe';
 export type { ValidateMessages, FieldData, NamePath, } from 'rc-field-form/es/interface';
-declare const _default: import("react").ForwardRefExoticComponent<Pick<import("rc-field-form").FormProps<any>, "children" | "form" | "name" | "initialValues" | "preserve" | "validateMessages" | "validateTrigger" | "onFieldsChange" | "onFinish" | "onFinishFailed" | "onValuesChange"> & import("../../utils/native-props").NativeProps<never> & Partial<import("./context").FormContextType> & {
+declare const _default: import("react").ForwardRefExoticComponent<Pick<import("rc-field-form").FormProps<any>, "children" | "form" | "name" | "initialValues" | "preserve" | "validateMessages" | "validateTrigger" | "onFieldsChange" | "onFinish" | "onFinishFailed" | "onValuesChange"> & import("../../utils/native-props").NativeProps<"--border-inner" | "--border-top" | "--border-bottom"> & Partial<import("./context").FormContextType> & {
     footer?: import("react").ReactNode;
-    layout?: "horizontal" | "vertical" | undefined;
+    layout?: FormLayout | undefined;
     mode?: "default" | "card" | undefined;
-} & import("react").RefAttributes<Pick<import("rc-field-form").FormInstance<any>, "submit" | "getFieldValue" | "getFieldsValue" | "getFieldError" | "getFieldsError" | "isFieldTouched" | "isFieldsTouched" | "resetFields" | "setFields" | "setFieldsValue" | "validateFields">>> & {
+} & import("react").RefAttributes<import("./form").FormInstance>> & {
     Item: import("react").FC<import("./form-item").FormItemProps>;
     Subscribe: import("react").VFC<import("./form-subscribe").FormSubscribeProps>;
     Header: import("react").FC<{}>;

package/2x/cjs/components/image-viewer/image-viewer.d.ts

@@ -16,7 +16,7 @@ export declare type MultiImageViewerProps = Omit<ImageViewerProps, 'image'> & {
     defaultIndex?: number;
     onIndexChange?: (index: number) => void;
 };
-export declare const MultiImageViewer: React.ForwardRefExoticComponent<Pick<ImageViewerProps, "visible" | "onClose" | "afterClose" | "getContainer" | "maxZoom"> & {
+export declare const MultiImageViewer: React.ForwardRefExoticComponent<Omit<ImageViewerProps, "image"> & {
     images?: string[] | undefined;
     defaultIndex?: number | undefined;
     onIndexChange?: ((index: number) => void) | undefined;

package/2x/cjs/components/image-viewer/index.d.ts

@@ -4,7 +4,7 @@ import { showMultiImageViewer, showImageViewer, clearImageViewer } from './metho
 export type { ImageViewerProps, MultiImageViewerProps, MultiImageViewerRef, } from './image-viewer';
 export type { ImageViewerHandler } from './methods';
 declare const _default: import("react").FC<import("./image-viewer").ImageViewerProps> & {
-    Multi: import("react").ForwardRefExoticComponent<Pick<import("./image-viewer").ImageViewerProps, "visible" | "onClose" | "afterClose" | "getContainer" | "maxZoom"> & {
+    Multi: import("react").ForwardRefExoticComponent<Omit<import("./image-viewer").ImageViewerProps, "image"> & {
         images?: string[] | undefined;
         defaultIndex?: number | undefined;
         onIndexChange?: ((index: number) => void) | undefined;

package/2x/cjs/components/input/input.d.ts

@@ -21,7 +21,7 @@ export declare type InputRef = {
     focus: () => void;
     blur: () => void;
 };
-export declare const Input: React.ForwardRefExoticComponent<Pick<React.DetailedHTMLProps<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>, "pattern" | "type" | "onCompositionEnd" | "onCompositionStart" | "onFocus" | "onBlur" | "onKeyDown" | "onKeyUp" | "autoCapitalize" | "autoCorrect" | "inputMode" | "autoComplete" | "maxLength" | "minLength"> & {
+export declare const Input: React.ForwardRefExoticComponent<Pick<NativeInputProps, "pattern" | "type" | "onCompositionEnd" | "onCompositionStart" | "onFocus" | "onBlur" | "onKeyDown" | "onKeyUp" | "autoCapitalize" | "autoCorrect" | "inputMode" | "autoComplete" | "maxLength" | "minLength"> & {
     value?: string | undefined;
     defaultValue?: string | undefined;
     onChange?: ((val: string) => void) | undefined;
@@ -32,7 +32,7 @@ export declare const Input: React.ForwardRefExoticComponent<Pick<React.DetailedH
     onClear?: (() => void) | undefined;
     id?: string | undefined;
     onEnterPress?: ((e: React.KeyboardEvent<HTMLInputElement>) => void) | undefined;
-    enterKeyHint?: "enter" | "search" | "done" | "go" | "next" | "previous" | "send" | undefined;
+    enterKeyHint?: "search" | "enter" | "done" | "go" | "next" | "previous" | "send" | undefined;
     min?: number | undefined;
     max?: number | undefined;
 } & NativeProps<"--color" | "--font-size" | "--placeholder-color" | "--text-align"> & React.RefAttributes<InputRef>>;

package/2x/cjs/components/jumbo-tabs/jumbo-tabs.d.ts

@@ -5,6 +5,7 @@ export declare type JumboTabProps = {
     description: ReactNode;
     disabled?: boolean;
     forceRender?: boolean;
+    destroyOnClose?: boolean;
 } & NativeProps;
 export declare const JumboTab: FC<JumboTabProps>;
 export declare type JumboTabsProps = {

package/2x/cjs/components/jumbo-tabs/jumbo-tabs.js

@@ -21,6 +21,8 @@ var _useTabListScroll = require("../../utils/use-tab-list-scroll");
 
 var _scrollMask = _interopRequireDefault(require("../scroll-mask"));
 
+var _shouldRender = require("../../utils/should-render");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -114,23 +116,18 @@ const JumboTabs = props => {
       return null;
     }
 
-    if (pane.key === activeKey) {
-      return _react.default.createElement("div", {
-        key: pane.key,
-        className: `${classPrefix}-content`
-      }, pane.props.children);
-    }
-
-    if (pane.props.forceRender) {
-      return _react.default.createElement("div", {
-        key: pane.key,
-        style: {
-          display: 'none'
-        }
-      }, pane.props.children);
-    }
-
-    return null;
+    const active = pane.key === activeKey;
+    return _react.default.createElement(_shouldRender.ShouldRender, {
+      key: pane.key,
+      active: active,
+      forceRender: pane.props.forceRender,
+      destroyOnClose: pane.props.destroyOnClose
+    }, _react.default.createElement("div", {
+      className: `${classPrefix}-content`,
+      style: {
+        display: active ? 'block' : 'none'
+      }
+    }, pane.props.children));
   })));
 };
 

package/2x/cjs/components/mask/mask.js

@@ -21,7 +21,7 @@ var _withDefaultProps = require("../../utils/with-default-props");
 
 var _configProvider = require("../config-provider");
 
-var _useShouldRender = require("../../utils/use-should-render");
+var _shouldRender = require("../../utils/should-render");
 
 var _withStopPropagation = require("../../utils/with-stop-propagation");
 
@@ -89,7 +89,7 @@ const Mask = p => {
       }
     }
   });
-  const shouldRender = (0, _useShouldRender.useShouldRender)(active, props.forceRender, props.destroyOnClose);
+  const shouldRender = (0, _shouldRender.useShouldRender)(active, props.forceRender, props.destroyOnClose);
   const node = (0, _withStopPropagation.withStopPropagation)(props.stopPropagation, (0, _nativeProps.withNativeProps)(props, _react.default.createElement(_web.animated.div, {
     className: classPrefix,
     ref: ref,

package/2x/cjs/components/modal/clear.d.ts

@@ -0,0 +1 @@
+export declare function clear(): void;

package/2x/cjs/components/modal/clear.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.clear = clear;
+
+var _show = require("./show");
+
+function clear() {
+  _show.closeFnSet.forEach(close => {
+    close();
+  });
+}

package/2x/cjs/components/modal/index.d.ts

@@ -3,6 +3,7 @@ import './modal.less';
 import { show } from './show';
 import { alert } from './alert';
 import { confirm } from './confirm';
+import { clear } from './clear';
 export type { ModalProps } from './modal';
 export type { Action } from './modal-action-button';
 export type { ModalShowProps, ModalShowRef } from './show';
@@ -12,5 +13,6 @@ declare const _default: import("react").FC<import("./modal").ModalProps> & {
     show: typeof show;
     alert: typeof alert;
     confirm: typeof confirm;
+    clear: typeof clear;
 };
 export default _default;

package/2x/cjs/components/modal/index.js

@@ -13,6 +13,8 @@ var _alert = require("./alert");
 
 var _confirm = require("./confirm");
 
+var _clear = require("./clear");
+
 var _attachPropertiesToComponent = require("../../utils/attach-properties-to-component");
 
 var _modal2 = require("./modal");
@@ -20,7 +22,8 @@ var _modal2 = require("./modal");
 var _default = (0, _attachPropertiesToComponent.attachPropertiesToComponent)(_modal2.Modal, {
   show: _show.show,
   alert: _alert.alert,
-  confirm: _confirm.confirm
+  confirm: _confirm.confirm,
+  clear: _clear.clear
 });
 
 exports.default = _default;

package/2x/cjs/components/modal/modal.css

@@ -19,56 +19,61 @@
   transform: translate(-50%, -50%);
 }
 
-.adm-modal-main {
+.adm-modal-body {
   width: 100%;
   max-height: 70vh;
   box-sizing: border-box;
   font-size: 28px;
   background-color: white;
   border-radius: 16px;
-  overflow-x: hidden;
-  overflow-y: auto;
+  overflow: hidden;
   display: flex;
   flex-direction: column;
 }
 
-.adm-modal-main > * {
+.adm-modal-body > * {
   flex: none;
 }
 
-.adm-modal-main > .adm-modal-image-container {
+.adm-modal-body > .adm-modal-content {
   flex: auto;
 }
 
-.adm-modal-main .adm-modal-body {
-  padding: 40px 24px 24px;
-  display: flex;
-  flex-direction: column;
+.adm-modal-body:not(.adm-modal-with-image) {
+  padding-top: 40px;
 }
 
-.adm-modal-main .adm-modal-body > * + * {
-  margin-top: 16px;
+.adm-modal-body .adm-modal-image-container {
+  margin-bottom: 24px;
+  max-height: 40vh;
+  overflow-y: scroll;
 }
 
-.adm-modal-main .adm-modal-body-header-wrapper {
-  display: flex;
-  justify-content: center;
+.adm-modal-body .adm-modal-header {
+  margin-bottom: 16px;
+  padding: 0 24px;
 }
 
-.adm-modal-main .adm-modal-body-title {
+.adm-modal-body .adm-modal-title {
+  margin-bottom: 16px;
+  padding: 0 24px;
   font-weight: bold;
   font-size: 36px;
   line-height: 50px;
   text-align: center;
 }
 
-.adm-modal-main .adm-modal-body-content {
+.adm-modal-body .adm-modal-content {
+  padding: 0 24px 24px;
+  max-height: 70vh;
+  overflow-x: hidden;
+  overflow-y: auto;
   font-size: 30px;
   line-height: 1.4;
   color: #333;
 }
 
-.adm-modal-main .adm-modal-close {
+.adm-modal-body .adm-modal-close {
   position: absolute;
   right: 16px;
   top: 16px;
@@ -82,6 +87,11 @@
   padding: 16px 24px 24px;
 }
 
+.adm-modal-footer-empty {
+  padding: 0;
+  height: 16px;
+}
+
 .adm-modal-footer.adm-space {
   --gap-vertical: 40px;
 }
@@ -102,8 +112,4 @@
 
 .adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary):active {
   opacity: 0.7;
-}
-
-.adm-modal-image-container {
-  overflow-y: auto;
 }

package/2x/cjs/components/modal/modal.js

@@ -81,49 +81,29 @@ const Modal = p => {
     }
   });
   const [active, setActive] = (0, _react.useState)(props.visible);
-  const node = (0, _withStopPropagation.withStopPropagation)(props.stopPropagation, (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
-    className: classPrefix,
-    style: {
-      display: active ? 'unset' : 'none'
-    }
-  }, _react.default.createElement(_mask.default, {
-    visible: props.visible,
-    onMaskClick: props.closeOnMaskClick ? props.onClose : undefined,
-    style: props.maskStyle,
-    className: (0, _classnames.default)(`${classPrefix}-mask`, props.maskClassName)
-  }), _react.default.createElement("div", {
-    className: `${classPrefix}-wrap`,
-    style: {
-      pointerEvents: props.visible ? 'unset' : 'none'
-    }
-  }, _react.default.createElement(_web.animated.div, {
-    style: Object.assign({}, style),
-    onClick: e => e.stopPropagation(),
-    className: `${classPrefix}-main`
+
+  const body = _react.default.createElement("div", {
+    className: (0, _classnames.default)(cls('body'), props.image && cls('with-image'), props.bodyClassName),
+    style: props.bodyStyle
   }, props.showCloseButton && _react.default.createElement("a", {
-    className: (0, _classnames.default)(`${classPrefix}-close`, 'adm-plain-anchor'),
+    className: (0, _classnames.default)(cls('close'), 'adm-plain-anchor'),
     onClick: props.onClose
   }, _react.default.createElement(_antdMobileIcons.CloseOutline, null)), !!props.image && _react.default.createElement("div", {
-    className: `${classPrefix}-image-container`
+    className: cls('image-container')
   }, _react.default.createElement(_image.default, {
     src: props.image,
     alt: 'modal header image',
     width: '100%'
-  })), _react.default.createElement("div", {
-    style: props.bodyStyle,
-    className: (0, _classnames.default)(`${classPrefix}-body`, props.bodyClassName)
-  }, !!props.header && _react.default.createElement("div", {
-    className: `${classPrefix}-body-header-wrapper`
-  }, _react.default.createElement("div", {
-    className: `${classPrefix}-body-header`
-  }, props.header)), !!props.title && _react.default.createElement("div", {
-    className: `${classPrefix}-body-title`
-  }, props.title), !!props.content && _react.default.createElement("div", {
-    className: `${classPrefix}-body-content`
-  }, typeof props.content === 'string' ? _react.default.createElement(_autoCenter.default, null, props.content) : props.content)), _react.default.createElement(_space.default, {
+  })), !!props.header && _react.default.createElement("div", {
+    className: cls('header')
+  }, _react.default.createElement(_autoCenter.default, null, props.header)), !!props.title && _react.default.createElement("div", {
+    className: cls('title')
+  }, props.title), _react.default.createElement("div", {
+    className: cls('content')
+  }, typeof props.content === 'string' ? _react.default.createElement(_autoCenter.default, null, props.content) : props.content), _react.default.createElement(_space.default, {
     direction: 'vertical',
     block: true,
-    className: `${classPrefix}-footer`
+    className: (0, _classnames.default)(cls('footer'), props.actions.length === 0 && cls('footer-empty'))
   }, props.actions.map((action, index) => {
     return _react.default.createElement(_modalActionButton.ModalActionButton, {
       key: action.key,
@@ -138,8 +118,31 @@ const Modal = p => {
         }
       })
     });
-  })))))));
+  })));
+
+  const node = (0, _withStopPropagation.withStopPropagation)(props.stopPropagation, (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
+    className: cls(),
+    style: {
+      display: active ? 'unset' : 'none'
+    }
+  }, _react.default.createElement(_mask.default, {
+    visible: props.visible,
+    onMaskClick: props.closeOnMaskClick ? props.onClose : undefined,
+    style: props.maskStyle,
+    className: (0, _classnames.default)(cls('mask'), props.maskClassName)
+  }), _react.default.createElement("div", {
+    className: cls('wrap'),
+    style: {
+      pointerEvents: props.visible ? 'unset' : 'none'
+    }
+  }, _react.default.createElement(_web.animated.div, {
+    style: style
+  }, body)))));
   return (0, _renderToContainer.renderToContainer)(props.getContainer, node);
 };
 
-exports.Modal = Modal;
+exports.Modal = Modal;
+
+function cls(name = '') {
+  return 'adm-modal' + (name && '-') + name;
+}

package/2x/cjs/components/modal/show.d.ts

@@ -3,6 +3,7 @@ export declare type ModalShowProps = Omit<ModalProps, 'visible'>;
 export declare type ModalShowRef = {
     close: () => void;
 };
+export declare const closeFnSet: Set<() => void>;
 export declare function show(props: ModalShowProps): {
     close: () => void;
 };

package/2x/cjs/components/modal/show.js

@@ -3,6 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.closeFnSet = void 0;
 exports.show = show;
 
 var _react = _interopRequireWildcard(require("react"));
@@ -15,6 +16,9 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+const closeFnSet = new Set();
+exports.closeFnSet = closeFnSet;
+
 function show(props) {
   const Wrapper = (0, _react.forwardRef)((_, ref) => {
     const [visible, setVisible] = (0, _react.useState)(false);
@@ -32,26 +36,34 @@ function show(props) {
     (0, _react.useImperativeHandle)(ref, () => ({
       close: handleClose
     }));
+
+    function handleAfterClose() {
+      var _a;
+
+      (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
+      unmount();
+      closeFnSet.delete(close);
+    }
+
     return _react.default.createElement(_modal.Modal, Object.assign({}, props, {
       visible: visible,
       onClose: handleClose,
-      afterClose: () => {
-        var _a;
-
-        (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
-        unmount();
-      }
+      afterClose: handleAfterClose
     }));
   });
   const ref = (0, _react.createRef)();
   const unmount = (0, _renderToBody.renderToBody)(_react.default.createElement(Wrapper, {
     ref: ref
   }));
-  return {
-    close: () => {
-      var _a;
 
-      (_a = ref.current) === null || _a === void 0 ? void 0 : _a.close();
-    }
+  const close = () => {
+    var _a;
+
+    (_a = ref.current) === null || _a === void 0 ? void 0 : _a.close();
+  };
+
+  closeFnSet.add(close);
+  return {
+    close
   };
 }

package/2x/cjs/components/passcode-input/passcode-input.d.ts

@@ -30,6 +30,6 @@ export declare const PasscodeInput: React.ForwardRefExoticComponent<{
     seperated?: boolean | undefined;
     onBlur?: (() => void) | undefined;
     onFocus?: (() => void) | undefined;
-    keyboard?: React.ReactElement<NumberKeyboardProps, string | ((props: any) => React.ReactElement<any, any> | null) | (new (props: any) => React.Component<any, any, any>)> | undefined;
+    keyboard?: React.ReactElement<NumberKeyboardProps, string | React.JSXElementConstructor<any>> | undefined;
     onFill?: ((val: string) => void) | undefined;
 } & NativeProps<"--border-radius" | "--border-color" | "--cell-size" | "--dot-size" | "--cell-gap"> & React.RefAttributes<PasscodeInputRef>>;

package/2x/cjs/components/picker/prompt.d.ts

@@ -1,2 +1,2 @@
-import type { PickerProps } from './index';
-export declare function prompt(props: Omit<PickerProps, 'value' | 'visible' | 'children'>): Promise<(string | null)[] | null>;
+import type { PickerProps, PickerValue } from './index';
+export declare function prompt(props: Omit<PickerProps, 'value' | 'visible' | 'children'>): Promise<PickerValue[] | null>;

package/2x/cjs/components/picker-view/picker-view.css

@@ -60,16 +60,6 @@
   white-space: nowrap;
 }
 
-.adm-picker-view-column-item.adm-picker-view-column-item-dummy {
-  position: fixed;
-  left: 0;
-  bottom: 0;
-  padding: 0;
-  opacity: 0;
-  user-select: none;
-  pointer-events: none;
-}
-
 .adm-picker-view-column-accessible {
   width: 100%;
   height: 100%;

package/2x/cjs/components/picker-view/wheel.js

@@ -19,7 +19,7 @@ var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 
 var _ahooks = require("ahooks");
 
-var _classnames = _interopRequireDefault(require("classnames"));
+var _measureCssLength = require("../../utils/measure-css-length");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -50,16 +50,12 @@ const Wheel = (0, _react.memo)(props => {
     }
   }));
   const draggingRef = (0, _react.useRef)(false);
-  const dummyItemRef = (0, _react.useRef)(null);
+  const rootRef = (0, _react.useRef)(null);
   const itemHeight = (0, _react.useRef)(34);
   (0, _ahooks.useIsomorphicLayoutEffect)(() => {
-    const dummyItem = dummyItemRef.current;
-    if (!dummyItem) return;
-    const rect = dummyItem.getBoundingClientRect();
-
-    if (rect.height > 0) {
-      itemHeight.current = rect.height;
-    }
+    const root = rootRef.current;
+    if (!root) return;
+    itemHeight.current = (0, _measureCssLength.measureCSSLength)(window.getComputedStyle(root).getPropertyValue('--item-height'));
   });
   (0, _ahooks.useIsomorphicLayoutEffect)(() => {
     if (draggingRef.current) return;
@@ -155,12 +151,9 @@ const Wheel = (0, _react.memo)(props => {
   }
 
   return _react.default.createElement("div", Object.assign({
+    ref: rootRef,
     className: `${classPrefix}-column`
-  }, bind()), _react.default.createElement("div", {
-    ref: dummyItemRef,
-    className: (0, _classnames.default)(`${classPrefix}-column-item`, `${classPrefix}-column-item-dummy`),
-    "aria-hidden": true
-  }), _react.default.createElement(_web.animated.div, {
+  }, bind()), _react.default.createElement(_web.animated.div, {
     style: {
       translateY: y
     },

package/2x/cjs/components/popover/arrow.js

@@ -17,10 +17,9 @@ const Arrow = (0, _react.memo)(props => {
   return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("svg", {
     viewBox: '0 0 30 16'
   }, _react.default.createElement("g", {
-    transform: 'translate(-1300.000000, -841.000000)',
     fill: 'currentColor'
   }, _react.default.createElement("path", {
-    d: 'M1300,841 L1330,841 L1318.07289,855.312538 C1316.65863,857.009645 1314.13637,857.238942 1312.43926,855.824685 C1312.25341,855.669808 1312.08199,855.49839 1311.92711,855.312538 L1300,841 L1300,841 Z'
+    d: 'M0,0 L30,0 L18.07289,14.312538 C16.65863,16.009645 14.13637,16.238942 12.43926,14.824685 C12.25341,14.669808 12.08199,14.49839 11.92711,14.312538 L0,0 L0,0 Z'
   }))));
 });
 exports.Arrow = Arrow;

package/2x/cjs/components/popover/index.d.ts

@@ -4,16 +4,16 @@ import './popover-menu.less';
 export type { PopoverProps, PopoverRef } from './popover';
 export type { PopoverMenuProps, Action } from './popover-menu';
 declare const _default: import("react").ForwardRefExoticComponent<{
-    getContainer?: HTMLElement | (() => HTMLElement) | null | undefined;
+    getContainer?: import("../../utils/render-to-container").GetContainer | undefined;
     destroyOnHide?: boolean | undefined;
-    children: import("react").ReactElement<any, string | ((props: any) => import("react").ReactElement<any, any> | null) | (new (props: any) => import("react").Component<any, any, any>)>;
+    children: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     mode?: "dark" | "light" | undefined;
     trigger?: "click" | undefined;
     placement?: "left" | "right" | "bottom" | "top" | "topLeft" | "topRight" | "bottomLeft" | "bottomRight" | "leftTop" | "leftBottom" | "rightTop" | "rightBottom" | undefined;
     stopPropagation?: "click"[] | undefined;
     content: import("react").ReactNode;
 } & Pick<import("rc-tooltip/lib/Tooltip").TooltipProps, "visible" | "align" | "defaultVisible" | "onVisibleChange"> & import("../../utils/native-props").NativeProps<"--z-index"> & import("react").RefAttributes<import("./popover").PopoverRef>> & {
-    Menu: import("react").ForwardRefExoticComponent<Pick<import("./popover").PopoverProps, "children" | "style" | "visible" | "className" | "tabIndex" | "mode" | "align" | "getContainer" | "stopPropagation" | "defaultVisible" | "onVisibleChange" | "trigger" | "placement" | "destroyOnHide"> & {
+    Menu: import("react").ForwardRefExoticComponent<Omit<import("./popover").PopoverProps, "content"> & {
         actions: import("./popover-menu").Action[];
         onAction?: ((item: import("./popover-menu").Action) => void) | undefined;
     } & import("react").RefAttributes<import("./popover").PopoverRef>>;

package/2x/cjs/components/popover/popover-menu.d.ts

@@ -11,7 +11,7 @@ export declare type PopoverMenuProps = Omit<PopoverProps, 'content'> & {
     actions: Action[];
     onAction?: (item: Action) => void;
 };
-export declare const PopoverMenu: React.ForwardRefExoticComponent<Pick<PopoverProps, "children" | "style" | "visible" | "className" | "tabIndex" | "mode" | "align" | "getContainer" | "stopPropagation" | "defaultVisible" | "onVisibleChange" | "trigger" | "placement" | "destroyOnHide"> & {
+export declare const PopoverMenu: React.ForwardRefExoticComponent<Omit<PopoverProps, "content"> & {
     actions: Action[];
     onAction?: ((item: Action) => void) | undefined;
 } & React.RefAttributes<PopoverRef>>;

package/2x/cjs/components/popover/popover.d.ts

@@ -19,7 +19,7 @@ export declare type PopoverRef = {
     visible: boolean;
 };
 export declare const Popover: React.ForwardRefExoticComponent<{
-    getContainer?: HTMLElement | (() => HTMLElement) | null | undefined;
+    getContainer?: GetContainer | undefined;
     destroyOnHide?: boolean | undefined;
     children: ReactElement;
     mode?: "dark" | "light" | undefined;

package/2x/cjs/components/popup/popup.js

@@ -23,7 +23,7 @@ var _renderToContainer = require("../../utils/render-to-container");
 
 var _web = require("@react-spring/web");
 
-var _useShouldRender = require("../../utils/use-should-render");
+var _shouldRender = require("../../utils/should-render");
 
 var _withStopPropagation = require("../../utils/with-stop-propagation");
 
@@ -48,7 +48,7 @@ const Popup = p => {
   const ref = (0, _react.useRef)(null);
   const [active, setActive] = (0, _react.useState)(props.visible);
   (0, _useLockScroll.useLockScroll)(ref, active);
-  const shouldRender = (0, _useShouldRender.useShouldRender)(active, props.forceRender, props.destroyOnClose);
+  const shouldRender = (0, _shouldRender.useShouldRender)(active, props.forceRender, props.destroyOnClose);
   const unmountedRef = (0, _ahooks.useUnmountedRef)();
   const {
     percent

package/2x/cjs/components/search-bar/search-bar.js

@@ -67,6 +67,7 @@ const SearchBar = (0, _react.forwardRef)((p, ref) => {
 
   const renderCancelButton = () => {
     let isShowCancel = false;
+    const showCancelButton = props.showCancelButton;
 
     if (typeof props.showCancelButton === 'function') {
       isShowCancel = props.showCancelButton(hasFocus, value);