antd-mobile 5.4.0 → 5.6.0

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

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Popover = void 0;
 
-var _react = _interopRequireWildcard(require("react"));
+var _tslib = require("tslib");
 
-var _rcTooltip = _interopRequireDefault(require("rc-tooltip"));
+var _react = _interopRequireWildcard(require("react"));
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
@@ -15,10 +15,26 @@ var _usePropsValue = require("../../utils/use-props-value");
 
 var _withDefaultProps = require("../../utils/with-default-props");
 
+var _nativeProps = require("../../utils/native-props");
+
 var _withStopPropagation = require("../../utils/with-stop-propagation");
 
 var _arrow = require("./arrow");
 
+var _renderToContainer = require("../../utils/render-to-container");
+
+var _tempFloatingUiMin = require("./temp-floating-ui.min.js");
+
+var _wrapper = require("./wrapper");
+
+var _shouldRender = require("../../utils/should-render");
+
+var _ahooks = require("ahooks");
+
+var _normalizePlacement = require("./normalize-placement");
+
+var _convertPx = require("../../utils/convert-px");
+
 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); }
@@ -33,12 +49,11 @@ const defaultProps = {
   getContainer: () => document.body
 };
 const Popover = (0, _react.forwardRef)((p, ref) => {
-  var _a;
-
   const props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
   const {
     mode = 'light'
   } = props;
+  const placement = (0, _normalizePlacement.normalizePlacement)(props.placement);
   const [visible, setVisible] = (0, _usePropsValue.usePropsValue)({
     value: props.visible,
     defaultValue: props.defaultVisible,
@@ -51,24 +66,114 @@ const Popover = (0, _react.forwardRef)((p, ref) => {
       visible
     };
   }, [visible]);
-  const overlay = (0, _withStopPropagation.withStopPropagation)(props.stopPropagation, _react.default.createElement("div", {
+  const targetRef = (0, _react.useRef)(null);
+  const floatingRef = (0, _react.useRef)(null);
+  const arrowRef = (0, _react.useRef)(null);
+  const floating = (0, _withStopPropagation.withStopPropagation)(props.stopPropagation, (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
+    className: (0, _classnames.default)(classPrefix, `${classPrefix}-${mode}`, !visible && `${classPrefix}-hidden`),
+    ref: floatingRef
+  }, _react.default.createElement("div", {
+    className: `${classPrefix}-arrow`,
+    ref: arrowRef
+  }, _react.default.createElement(_arrow.Arrow, {
+    className: `${classPrefix}-arrow-icon`
+  })), _react.default.createElement("div", {
+    className: `${classPrefix}-inner`
+  }, _react.default.createElement("div", {
     className: `${classPrefix}-inner-content`
-  }, props.content));
-  return _react.default.createElement(_rcTooltip.default, Object.assign({}, props, {
-    placement: props.placement,
-    align: props.align,
-    overlayClassName: (0, _classnames.default)(`${classPrefix}-${mode}`, props.className),
-    overlayStyle: props.style,
-    destroyTooltipOnHide: props.destroyOnHide,
-    prefixCls: classPrefix,
-    getTooltipContainer: props.getContainer || (() => document.body),
-    visible: visible,
-    arrowContent: _react.default.createElement(_arrow.Arrow, {
-      className: `${classPrefix}-arrow-icon`
-    }),
-    onVisibleChange: setVisible,
-    trigger: (_a = props.trigger) !== null && _a !== void 0 ? _a : [],
-    overlay: overlay
-  }), props.children);
+  }, props.content)))));
+  const [targetElement, setTargetElement] = (0, _react.useState)(null);
+
+  function update() {
+    var _a, _b, _c;
+
+    return (0, _tslib.__awaiter)(this, void 0, void 0, function* () {
+      const target = (_b = (_a = targetRef.current) === null || _a === void 0 ? void 0 : _a.element) !== null && _b !== void 0 ? _b : null;
+      const floating = floatingRef.current;
+      const arrowElement = arrowRef.current;
+      setTargetElement(target);
+      if (!target || !floating || !arrowElement) return;
+      const {
+        x,
+        y,
+        placement: realPlacement,
+        middlewareData
+      } = yield (0, _tempFloatingUiMin.computePosition)(target, floating, {
+        placement,
+        middleware: [(0, _tempFloatingUiMin.offset)((0, _convertPx.convertPx)(12)), (0, _tempFloatingUiMin.shift)({
+          padding: (0, _convertPx.convertPx)(4),
+          crossAxis: false,
+          limiter: (0, _tempFloatingUiMin.limitShift)()
+        }), (0, _tempFloatingUiMin.flip)(), (0, _tempFloatingUiMin.hide)(), (0, _tempFloatingUiMin.arrow)({
+          element: arrowElement,
+          padding: (0, _convertPx.convertPx)(12)
+        })]
+      });
+      Object.assign(floating.style, {
+        left: `${x}px`,
+        top: `${y}px`
+      });
+      const side = realPlacement.split('-')[0];
+      const arrowSide = {
+        top: 'bottom',
+        right: 'left',
+        bottom: 'top',
+        left: 'right'
+      }[side];
+      const {
+        x: arrowX,
+        y: arrowY
+      } = (_c = middlewareData.arrow) !== null && _c !== void 0 ? _c : {};
+      Object.assign(arrowElement.style, {
+        left: arrowX != null ? `${arrowX}px` : '',
+        top: arrowY != null ? `${arrowY}px` : '',
+        right: '',
+        bottom: '',
+        [arrowSide]: `-${(0, _convertPx.convertPx)(8)}px`
+      });
+      const arrowRotate = {
+        top: '0deg',
+        bottom: '180deg',
+        left: '270deg',
+        right: '90deg'
+      }[side];
+      arrowElement.style.setProperty('--arrow-icon-rotate', arrowRotate);
+    });
+  }
+
+  (0, _ahooks.useIsomorphicLayoutEffect)(() => {
+    update();
+  });
+  (0, _react.useEffect)(() => {
+    if (!targetElement) return;
+    if (!props.trigger) return;
+
+    function handleClick() {
+      console.log('handleClick');
+      setVisible(v => !v);
+    }
+
+    targetElement.addEventListener('click', handleClick);
+    return () => {
+      targetElement.removeEventListener('click', handleClick);
+    };
+  }, [targetElement, props.trigger]);
+  (0, _react.useEffect)(() => {
+    const floatingElement = floatingRef.current;
+    if (!targetElement || !floatingElement) return;
+    return (0, _tempFloatingUiMin.autoUpdate)(targetElement, floatingElement, update);
+  }, [targetElement]);
+  (0, _ahooks.useClickAway)(() => {
+    if (!props.trigger) return;
+    setVisible(false);
+  }, () => {
+    var _a;
+
+    return (_a = targetRef.current) === null || _a === void 0 ? void 0 : _a.element;
+  });
+  const shouldRender = (0, _shouldRender.useShouldRender)(visible, false, props.destroyOnHide);
+  return _react.default.createElement(_react.default.Fragment, null, _react.default.createElement(_wrapper.Wrapper, {
+    ref: targetRef
+  }, props.children), shouldRender && (0, _renderToContainer.renderToContainer)(props.getContainer, floating));
 });
 exports.Popover = Popover;

package/2x/cjs/components/popover/temp-floating-ui.min.d.ts

@@ -0,0 +1 @@
+export * from '@floating-ui/dom'

package/2x/cjs/components/popover/temp-floating-ui.min.js

@@ -0,0 +1 @@
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports,require("@floating-ui/core")):"function"==typeof define&&define.amd?define(["exports","@floating-ui/core"],e):e((t="undefined"!=typeof globalThis?globalThis:t||self).FloatingUIDOM={},t.FloatingUICore)}(this,(function(t,e){"use strict";function n(t){return"[object Window]"===(null==t?void 0:t.toString())}function o(t){if(null==t)return window;if(!n(t)){const e=t.ownerDocument;return e&&e.defaultView||window}return t}function i(t){return o(t).getComputedStyle(t)}function r(t){return n(t)?"":t?(t.nodeName||"").toLowerCase():""}function l(t){return t instanceof o(t).HTMLElement}function c(t){return t instanceof o(t).Element}function f(t){return t instanceof o(t).ShadowRoot||t instanceof ShadowRoot}function u(t){const{overflow:e,overflowX:n,overflowY:o}=i(t);return/auto|scroll|overlay|hidden/.test(e+o+n)}function s(t){return["table","td","th"].includes(r(t))}function d(t){const e=navigator.userAgent.toLowerCase().includes("firefox"),n=i(t);return"none"!==n.transform||"none"!==n.perspective||"paint"===n.contain||["transform","perspective"].includes(n.willChange)||e&&"filter"===n.willChange||e&&!!n.filter&&"none"!==n.filter}const h=Math.min,a=Math.max,g=Math.round;function p(t,e){void 0===e&&(e=!1);const n=t.getBoundingClientRect();let o=1,i=1;return e&&l(t)&&(o=t.offsetWidth>0&&g(n.width)/t.offsetWidth||1,i=t.offsetHeight>0&&g(n.height)/t.offsetHeight||1),{width:n.width/o,height:n.height/i,top:n.top/i,right:n.right/o,bottom:n.bottom/i,left:n.left/o,x:n.left/o,y:n.top/i}}function m(t){return(e=t,(e instanceof o(e).Node?t.ownerDocument:t.document)||window.document).documentElement;var e}function y(t){return n(t)?{scrollLeft:t.pageXOffset,scrollTop:t.pageYOffset}:{scrollLeft:t.scrollLeft,scrollTop:t.scrollTop}}function w(t){return p(m(t)).left+y(t).scrollLeft}function b(t,e,n){const o=l(e),i=m(e),c=p(t,o&&function(t){const e=p(t);return g(e.width)!==t.offsetWidth||g(e.height)!==t.offsetHeight}(e));let f={scrollLeft:0,scrollTop:0};const s={x:0,y:0};if(o||!o&&"fixed"!==n)if(("body"!==r(e)||u(i))&&(f=y(e)),l(e)){const t=p(e,!0);s.x=t.x+e.clientLeft,s.y=t.y+e.clientTop}else i&&(s.x=w(i));return{x:c.left+f.scrollLeft-s.x,y:c.top+f.scrollTop-s.y,width:c.width,height:c.height}}function v(t){return"html"===r(t)?t:t.assignedSlot||t.parentNode||(f(t)?t.host:null)||m(t)}function x(t){return l(t)&&"fixed"!==getComputedStyle(t).position?t.offsetParent:null}function L(t){const e=o(t);let n=x(t);for(;n&&s(n)&&"static"===getComputedStyle(n).position;)n=x(n);return n&&("html"===r(n)||"body"===r(n)&&"static"===getComputedStyle(n).position&&!d(n))?e:n||function(t){let e=v(t);for(f(e)&&(e=e.host);l(e)&&!["html","body"].includes(r(e));){if(d(e))return e;e=e.parentNode}return null}(t)||e}function O(t){if(l(t))return{width:t.offsetWidth,height:t.offsetHeight};const e=p(t);return{width:e.width,height:e.height}}function P(t){const e=v(t);return["html","body","#document"].includes(r(e))?t.ownerDocument.body:l(e)&&u(e)?e:P(e)}function R(t,e){var n;void 0===e&&(e=[]);const i=P(t),r=i===(null==(n=t.ownerDocument)?void 0:n.body),l=o(i),c=r?[l].concat(l.visualViewport||[],u(i)?i:[]):i,f=e.concat(c);return r?f:f.concat(R(v(c)))}function T(t,n){return"viewport"===n?e.rectToClientRect(function(t){const e=o(t),n=m(t),i=e.visualViewport;let r=n.clientWidth,l=n.clientHeight,c=0,f=0;return i&&(r=i.width,l=i.height,Math.abs(e.innerWidth/i.scale-i.width)<.01&&(c=i.offsetLeft,f=i.offsetTop)),{width:r,height:l,x:c,y:f}}(t)):c(n)?function(t){const e=p(t),n=e.top+t.clientTop,o=e.left+t.clientLeft;return{top:n,left:o,x:o,y:n,right:o+t.clientWidth,bottom:n+t.clientHeight,width:t.clientWidth,height:t.clientHeight}}(n):e.rectToClientRect(function(t){var e;const n=m(t),o=y(t),r=null==(e=t.ownerDocument)?void 0:e.body,l=a(n.scrollWidth,n.clientWidth,r?r.scrollWidth:0,r?r.clientWidth:0),c=a(n.scrollHeight,n.clientHeight,r?r.scrollHeight:0,r?r.clientHeight:0);let f=-o.scrollLeft+w(t);const u=-o.scrollTop;return"rtl"===i(r||n).direction&&(f+=a(n.clientWidth,r?r.clientWidth:0)-l),{width:l,height:c,x:f,y:u}}(m(t)))}function C(t){const e=R(t),n=["absolute","fixed"].includes(i(t).position)&&l(t)?L(t):t;return c(n)?e.filter((t=>c(t)&&function(t,e){const n=null==e.getRootNode?void 0:e.getRootNode();if(t.contains(e))return!0;if(n&&f(n)){let n=e;do{if(n&&t===n)return!0;n=n.parentNode||n.host}while(n)}return!1}(t,n)&&"body"!==r(t))):[]}const W={getClippingRect:function(t){let{element:e,boundary:n,rootBoundary:o}=t;const i=[..."clippingAncestors"===n?C(e):[].concat(n),o],r=i[0],l=i.reduce(((t,n)=>{const o=T(e,n);return t.top=a(o.top,t.top),t.right=h(o.right,t.right),t.bottom=h(o.bottom,t.bottom),t.left=a(o.left,t.left),t}),T(e,r));return{width:l.right-l.left,height:l.bottom-l.top,x:l.left,y:l.top}},convertOffsetParentRelativeRectToViewportRelativeRect:function(t){let{rect:e,offsetParent:n,strategy:o}=t;const i=l(n),c=m(n);if(n===c)return e;let f={scrollLeft:0,scrollTop:0};const s={x:0,y:0};if((i||!i&&"fixed"!==o)&&(("body"!==r(n)||u(c))&&(f=y(n)),l(n))){const t=p(n,!0);s.x=t.x+n.clientLeft,s.y=t.y+n.clientTop}return{...e,x:e.x-f.scrollLeft+s.x,y:e.y-f.scrollTop+s.y}},isElement:c,getDimensions:O,getOffsetParent:L,getDocumentElement:m,getElementRects:t=>{let{reference:e,floating:n,strategy:o}=t;return{reference:b(e,L(n),o),floating:{...O(n),x:0,y:0}}},getClientRects:t=>Array.from(t.getClientRects()),isRTL:t=>"rtl"===i(t).direction};Object.defineProperty(t,"arrow",{enumerable:!0,get:function(){return e.arrow}}),Object.defineProperty(t,"autoPlacement",{enumerable:!0,get:function(){return e.autoPlacement}}),Object.defineProperty(t,"detectOverflow",{enumerable:!0,get:function(){return e.detectOverflow}}),Object.defineProperty(t,"flip",{enumerable:!0,get:function(){return e.flip}}),Object.defineProperty(t,"hide",{enumerable:!0,get:function(){return e.hide}}),Object.defineProperty(t,"inline",{enumerable:!0,get:function(){return e.inline}}),Object.defineProperty(t,"limitShift",{enumerable:!0,get:function(){return e.limitShift}}),Object.defineProperty(t,"offset",{enumerable:!0,get:function(){return e.offset}}),Object.defineProperty(t,"shift",{enumerable:!0,get:function(){return e.shift}}),Object.defineProperty(t,"size",{enumerable:!0,get:function(){return e.size}}),t.autoUpdate=function(t,e,n,o){void 0===o&&(o={});const{ancestorScroll:i=!0,ancestorResize:r=!0,elementResize:l=!0,animationFrame:f=!1}=o;let u=!1;const s=i&&!f,d=r&&!f,h=l&&!f,a=s||d?[...c(t)?R(t):[],...R(e)]:[];a.forEach((t=>{s&&t.addEventListener("scroll",n,{passive:!0}),d&&t.addEventListener("resize",n)}));let g,m=null;h&&(m=new ResizeObserver(n),c(t)&&m.observe(t),m.observe(e));let y=f?p(t):null;return f&&function e(){if(u)return;const o=p(t);!y||o.x===y.x&&o.y===y.y&&o.width===y.width&&o.height===y.height||n();y=o,g=requestAnimationFrame(e)}(),()=>{var t;u=!0,a.forEach((t=>{s&&t.removeEventListener("scroll",n),d&&t.removeEventListener("resize",n)})),null==(t=m)||t.disconnect(),m=null,f&&cancelAnimationFrame(g)}},t.computePosition=(t,n,o)=>e.computePosition(t,n,{platform:W,...o}),t.getOverflowAncestors=R,Object.defineProperty(t,"__esModule",{value:!0})}));

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

@@ -0,0 +1,7 @@
+import React from 'react';
+export declare class Wrapper extends React.Component<{}, {}> {
+    element: Element | null;
+    componentDidMount(): void;
+    componentDidUpdate(): void;
+    render(): React.ReactNode;
+}

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

@@ -0,0 +1,41 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.Wrapper = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _reactDom = require("react-dom");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+class Wrapper extends _react.default.Component {
+  constructor() {
+    super(...arguments);
+    this.element = null;
+  }
+
+  componentDidMount() {
+    this.componentDidUpdate();
+  }
+
+  componentDidUpdate() {
+    // eslint-disable-next-line
+    const node = (0, _reactDom.findDOMNode)(this);
+
+    if (node instanceof Element) {
+      this.element = node;
+    } else {
+      this.element = null;
+    }
+  }
+
+  render() {
+    return _react.default.Children.only(this.props.children);
+  }
+
+}
+
+exports.Wrapper = Wrapper;

package/2x/cjs/components/pull-to-refresh/pull-to-refresh.js

@@ -126,15 +126,30 @@ const PullToRefresh = p => {
 
     const [, y] = state.movement;
 
-    if (state.first) {
-      const element = elementRef.current;
-      if (!element) return;
-      const scrollParent = (0, _getScrollParent.getScrollParent)(element);
-      if (!scrollParent) return;
-      const top = 'scrollTop' in scrollParent ? scrollParent.scrollTop : scrollParent.scrollY;
-
-      if (top <= 0 && y > 0) {
-        pullingRef.current = true;
+    if (state.first && y > 0) {
+      const target = state.event.target;
+      if (!target || !(target instanceof Element)) return;
+      let scrollParent = (0, _getScrollParent.getScrollParent)(target);
+
+      while (true) {
+        if (!scrollParent) return;
+        const scrollTop = getScrollTop(scrollParent);
+
+        if (scrollTop > 0) {
+          return;
+        }
+
+        if (scrollParent instanceof Window) {
+          break;
+        }
+
+        scrollParent = (0, _getScrollParent.getScrollParent)(scrollParent.parentNode);
+      }
+
+      pullingRef.current = true;
+
+      function getScrollTop(element) {
+        return 'scrollTop' in element ? element.scrollTop : element.scrollY;
       }
     }
 

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

@@ -23,6 +23,8 @@ var _devLog = require("../../utils/dev-log");
 
 var _isDev = require("../../utils/is-dev");
 
+var _nativeInput = require("../checkbox/native-input");
+
 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); }
@@ -93,16 +95,10 @@ const Radio = p => {
       [`${classPrefix}-disabled`]: disabled,
       [`${classPrefix}-block`]: props.block
     })
-  }, _react.default.createElement("input", {
+  }, _react.default.createElement(_nativeInput.NativeInput, {
     type: 'radio',
     checked: checked,
-    onChange: e => {
-      setChecked(e.target.checked);
-    },
-    onClick: e => {
-      e.stopPropagation();
-      e.nativeEvent.stopImmediatePropagation();
-    },
+    onChange: setChecked,
     disabled: disabled,
     id: props.id
   }), renderIcon(), props.children && _react.default.createElement("div", {

package/2x/cjs/components/search-bar/search-bar.d.ts

@@ -29,4 +29,4 @@ export declare const SearchBar: React.ForwardRefExoticComponent<Pick<InputProps,
     onSearch?: ((val: string) => void) | undefined;
     onChange?: ((val: string) => void) | undefined;
     onCancel?: (() => void) | undefined;
-} & NativeProps<"--border-radius" | "--height" | "--padding-left" | "--placeholder-color" | "--background"> & React.RefAttributes<InputRef>>;
+} & NativeProps<"--border-radius" | "--height" | "--padding-left" | "--background" | "--placeholder-color"> & React.RefAttributes<InputRef>>;

package/2x/cjs/components/tab-bar/tab-bar.d.ts

@@ -3,7 +3,7 @@ import { NativeProps } from '../../utils/native-props';
 import { BadgeProps } from '../badge';
 export declare type TabBarItemProps = {
     icon?: ReactNode | ((active: boolean) => ReactNode);
-    title?: ReactNode;
+    title?: ReactNode | ((active: boolean) => ReactNode);
     badge?: BadgeProps['content'];
 } & NativeProps;
 export declare const TabBarItem: FC<TabBarItemProps>;

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

@@ -74,7 +74,7 @@ const TabBar = p => {
 
       const titleElement = item.props.title && _react.default.createElement("div", {
         className: `${classPrefix}-item-title`
-      }, item.props.title);
+      }, typeof item.props.title === 'function' ? item.props.title(active) : item.props.title);
 
       if (iconElement) {
         return _react.default.createElement(_react.default.Fragment, null, _react.default.createElement(_badge.default, {

package/2x/cjs/components/tree-select/tree-select.js

@@ -67,12 +67,12 @@ const TreeSelect = p => {
     let current = node;
 
     while (current) {
-      parentNodes.unshift(current);
+      parentNodes.push(current);
       const next = optionsParentMap.get(current[valueName]);
       current = next;
     }
 
-    const values = parentNodes.map(i => i[valueName]);
+    const values = parentNodes.reverse().map(i => i[valueName]);
     setValue(values);
     (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, values, {
       options: parentNodes

package/2x/cjs/utils/render-imperatively.d.ts

@@ -0,0 +1,10 @@
+import { ReactElement } from 'react';
+declare type ImperativeProps = {
+    visible?: boolean;
+    onClose?: () => void;
+    afterClose?: () => void;
+};
+export declare function renderImperatively(element: ReactElement<ImperativeProps>): {
+    close: () => void;
+};
+export {};

package/2x/cjs/utils/render-imperatively.js

@@ -0,0 +1,58 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.renderImperatively = renderImperatively;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _renderToBody = require("./render-to-body");
+
+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); }
+
+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; }
+
+function renderImperatively(element) {
+  let close = () => {};
+
+  const Wrapper = () => {
+    const [visible, setVisible] = (0, _react.useState)(false);
+    const closedRef = (0, _react.useRef)(false);
+    (0, _react.useEffect)(() => {
+      if (!closedRef.current) {
+        setVisible(true);
+      } else {
+        afterClose();
+      }
+    }, []);
+
+    function onClose() {
+      var _a, _b;
+
+      closedRef.current = true;
+      setVisible(false);
+      (_b = (_a = element.props).onClose) === null || _b === void 0 ? void 0 : _b.call(_a);
+    }
+
+    close = onClose;
+
+    function afterClose() {
+      var _a, _b;
+
+      unmount();
+      (_b = (_a = element.props).afterClose) === null || _b === void 0 ? void 0 : _b.call(_a);
+    }
+
+    return _react.default.cloneElement(element, Object.assign(Object.assign({}, element.props), {
+      visible,
+      onClose,
+      afterClose
+    }));
+  };
+
+  const unmount = (0, _renderToBody.renderToBody)(_react.default.createElement(Wrapper, null));
+  return {
+    close
+  };
+}

package/2x/cjs/utils/use-props-value.d.ts

@@ -1,7 +1,8 @@
+import { SetStateAction } from 'react';
 declare type Options<T> = {
     value?: T;
     defaultValue: T;
     onChange?: (v: T) => void;
 };
-export declare function usePropsValue<T>(options: Options<T>): readonly [T, (this: unknown, v: T) => void];
+export declare function usePropsValue<T>(options: Options<T>): readonly [T, (this: unknown, v: SetStateAction<T>) => void];
 export {};

package/2x/cjs/utils/use-props-value.js

@@ -23,12 +23,14 @@ function usePropsValue(options) {
   }
 
   const setState = (0, _ahooks.useMemoizedFn)(v => {
+    const nextValue = typeof v === 'function' ? v(stateRef.current) : v;
+
     if (value === undefined) {
-      stateRef.current = v;
+      stateRef.current = nextValue;
       update();
     }
 
-    onChange === null || onChange === void 0 ? void 0 : onChange(v);
+    onChange === null || onChange === void 0 ? void 0 : onChange(nextValue);
   });
   return [stateRef.current, setState];
 }

package/2x/es/components/action-sheet/action-sheet.d.ts

@@ -10,7 +10,7 @@ export declare type Action = {
     onClick?: () => void;
 };
 export declare type ActionSheetProps = {
-    visible: boolean;
+    visible?: boolean;
     actions: Action[];
     extra?: React.ReactNode;
     cancelText?: React.ReactNode;
@@ -22,11 +22,11 @@ export declare type ActionSheetProps = {
     closeOnMaskClick?: boolean;
     getContainer?: GetContainer;
     safeArea?: boolean;
+    popupClassName?: string;
+    popupStyle?: React.CSSProperties;
 } & NativeProps;
 export declare const ActionSheet: FC<ActionSheetProps>;
-export declare type ActionSheetRef = {
-    close: () => void;
-};
-export declare function showActionSheet(props: Omit<ActionSheetProps, 'visible'>): {
+export declare type ActionSheetShowHandler = {
     close: () => void;
 };
+export declare function showActionSheet(props: Omit<ActionSheetProps, 'visible'>): ActionSheetShowHandler;

package/2x/es/components/action-sheet/action-sheet.js

@@ -1,11 +1,11 @@
-import React, { createRef, forwardRef, useEffect, useImperativeHandle, useState } from 'react';
+import React from 'react';
 import { withNativeProps } from '../../utils/native-props';
 import { mergeProps } from '../../utils/with-default-props';
 import classNames from 'classnames';
 import Popup from '../popup';
 import Button from '../button';
-import { renderToBody } from '../../utils/render-to-body';
 import SafeArea from '../safe-area';
+import { renderImperatively } from '../../utils/render-imperatively';
 const classPrefix = `adm-action-sheet`;
 const defaultProps = {
   visible: false,
@@ -29,7 +29,8 @@ export const ActionSheet = p => {
       }
     },
     afterClose: props.afterClose,
-    className: `${classPrefix}-popup`,
+    className: classNames(`${classPrefix}-popup`, props.popupClassName),
+    style: props.popupStyle,
     getContainer: props.getContainer
   }, withNativeProps(props, React.createElement("div", {
     className: classPrefix
@@ -83,42 +84,5 @@ export const ActionSheet = p => {
   }))));
 };
 export function showActionSheet(props) {
-  const Wrapper = forwardRef((_, ref) => {
-    const [visible, setVisible] = useState(false);
-    useEffect(() => {
-      setVisible(true);
-    }, []);
-
-    function handleClose() {
-      var _a;
-
-      (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
-      setVisible(false);
-    }
-
-    useImperativeHandle(ref, () => ({
-      close: handleClose
-    }));
-    return React.createElement(ActionSheet, Object.assign({}, props, {
-      visible: visible,
-      onClose: handleClose,
-      afterClose: () => {
-        var _a;
-
-        (_a = props.afterClose) === null || _a === void 0 ? void 0 : _a.call(props);
-        unmount();
-      }
-    }));
-  });
-  const ref = createRef();
-  const unmount = renderToBody(React.createElement(Wrapper, {
-    ref: ref
-  }));
-  return {
-    close: () => {
-      var _a;
-
-      (_a = ref.current) === null || _a === void 0 ? void 0 : _a.close();
-    }
-  };
+  return renderImperatively(React.createElement(ActionSheet, Object.assign({}, props)));
 }

package/2x/es/components/action-sheet/index.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import './action-sheet.less';
 import { showActionSheet } from './action-sheet';
-export type { Action, ActionSheetProps, ActionSheetRef } from './action-sheet';
+export type { Action, ActionSheetProps, ActionSheetShowHandler, } from './action-sheet';
 declare const _default: import("react").FC<import("./action-sheet").ActionSheetProps> & {
     show: typeof showActionSheet;
 };

package/2x/es/components/badge/badge.js

@@ -11,7 +11,7 @@ export const Badge = props => {
   } = props;
   const isDot = content === dot;
   const badgeCls = classNames(classPrefix, !!children && `${classPrefix}-fixed`, isDot && `${classPrefix}-dot`, props.bordered && `${classPrefix}-bordered`);
-  const element = content ? withNativeProps(props, React.createElement("div", {
+  const element = content || content === 0 ? withNativeProps(props, React.createElement("div", {
     className: badgeCls,
     style: {
       '--color': color

package/2x/es/components/cascader-view/cascader-view.d.ts

@@ -9,6 +9,7 @@ export declare type CascaderOption = {
 };
 export declare type CascaderValueExtend = {
     items: (CascaderOption | null)[];
+    isLeaf: boolean;
 };
 export declare type CascaderViewProps = {
     options: CascaderOption[];

package/2x/es/components/cascader-view/cascader-view.js

@@ -61,6 +61,13 @@ export const CascaderView = p => {
   useEffect(() => {
     setTabActiveKey(levels.length - 1);
   }, [value]);
+  useEffect(() => {
+    const max = levels.length - 1;
+
+    if (tabActiveKey > max) {
+      setTabActiveKey(max);
+    }
+  }, [tabActiveKey, levels]);
 
   const onItemSelect = (selectValue, depth) => {
     const next = value.slice(0, depth);

package/2x/es/components/cascader-view/use-cascader-value-extend.js

@@ -21,11 +21,34 @@ export function useCascaderValueExtend(options) {
       return ret;
     }, val => JSON.stringify(val));
   }, [options]);
+  const generateIsLeaf = useMemo(() => {
+    return memoize(val => {
+      var _a;
+
+      let isLeaf = false;
+
+      for (const v of val) {
+        const target = options.find(option => option.value === v);
+
+        if (!target) {
+          break;
+        }
+
+        isLeaf = ((_a = target.children) === null || _a === void 0 ? void 0 : _a.length) === val.length;
+      }
+
+      return isLeaf;
+    }, val => JSON.stringify(val));
+  }, [options]);
 
   function generateValueExtend(val) {
     return {
       get items() {
         return generateItems(val);
+      },
+
+      get isLeaf() {
+        return generateIsLeaf(val);
       }
 
     };

package/2x/es/components/check-list/check-list-item.js

@@ -20,7 +20,7 @@ export const CheckListItem = props => {
   }, active ? context.activeIcon : null);
   return withNativeProps(props, React.createElement(List.Item, {
     title: props.title,
-    className: classNames(classPrefix, readOnly && `${classPrefix}-readonly`),
+    className: classNames(classPrefix, readOnly && `${classPrefix}-readonly`, active && `${classPrefix}-active`),
     description: props.description,
     prefix: props.prefix,
     onClick: e => {