antd-mobile 5.3.0 → 5.5.0

package/es/components/popover/popover.css

@@ -29,90 +29,6 @@
 .adm-popover-hidden {
   display: none;
 }
-.adm-popover-placement-top,
-.adm-popover-placement-topLeft,
-.adm-popover-placement-topRight {
-  padding-bottom: var(--arrow-size);
-}
-.adm-popover-placement-top .adm-popover-arrow,
-.adm-popover-placement-topLeft .adm-popover-arrow,
-.adm-popover-placement-topRight .adm-popover-arrow {
-  bottom: 0;
-  --arrow-icon-rotate: 0deg;
-}
-.adm-popover-placement-top .adm-popover-arrow {
-  left: 50%;
-  transform: translateX(-50%);
-}
-.adm-popover-placement-topLeft .adm-popover-arrow {
-  left: 12px;
-}
-.adm-popover-placement-topRight .adm-popover-arrow {
-  right: 12px;
-}
-.adm-popover-placement-right,
-.adm-popover-placement-rightTop,
-.adm-popover-placement-rightBottom {
-  padding-left: var(--arrow-size);
-}
-.adm-popover-placement-right .adm-popover-arrow,
-.adm-popover-placement-rightTop .adm-popover-arrow,
-.adm-popover-placement-rightBottom .adm-popover-arrow {
-  left: 0;
-  --arrow-icon-rotate: 90deg;
-}
-.adm-popover-placement-right .adm-popover-arrow {
-  top: 50%;
-  transform: translateY(-50%);
-}
-.adm-popover-placement-rightTop .adm-popover-arrow {
-  top: 12px;
-}
-.adm-popover-placement-rightBottom .adm-popover-arrow {
-  bottom: 12px;
-}
-.adm-popover-placement-bottom,
-.adm-popover-placement-bottomLeft,
-.adm-popover-placement-bottomRight {
-  padding-top: var(--arrow-size);
-}
-.adm-popover-placement-bottom .adm-popover-arrow,
-.adm-popover-placement-bottomLeft .adm-popover-arrow,
-.adm-popover-placement-bottomRight .adm-popover-arrow {
-  top: 0;
-  --arrow-icon-rotate: 180deg;
-}
-.adm-popover-placement-bottom .adm-popover-arrow {
-  left: 50%;
-  transform: translateX(-50%);
-}
-.adm-popover-placement-bottomLeft .adm-popover-arrow {
-  left: 12px;
-}
-.adm-popover-placement-bottomRight .adm-popover-arrow {
-  right: 12px;
-}
-.adm-popover-placement-left,
-.adm-popover-placement-leftTop,
-.adm-popover-placement-leftBottom {
-  padding-right: var(--arrow-size);
-}
-.adm-popover-placement-left .adm-popover-arrow,
-.adm-popover-placement-leftTop .adm-popover-arrow,
-.adm-popover-placement-leftBottom .adm-popover-arrow {
-  right: 0;
-  --arrow-icon-rotate: 270deg;
-}
-.adm-popover-placement-left .adm-popover-arrow {
-  top: 50%;
-  transform: translateY(-50%);
-}
-.adm-popover-placement-leftTop .adm-popover-arrow {
-  top: 12px;
-}
-.adm-popover-placement-leftBottom .adm-popover-arrow {
-  bottom: 12px;
-}
 .adm-popover-inner {
   background-color: var(--background);
   background-clip: padding-box;

package/es/components/popover/popover.d.ts

@@ -1,30 +1,36 @@
 import React, { ReactElement } from 'react';
-import type { TooltipProps } from 'rc-tooltip/lib/Tooltip';
 import { NativeProps } from '../../utils/native-props';
 import { PropagationEvent } from '../../utils/with-stop-propagation';
 import { GetContainer } from '../../utils/render-to-container';
+import { DeprecatedPlacement, Placement } from './index';
 export declare type PopoverProps = {
+    defaultVisible?: boolean;
+    visible?: boolean;
+    onVisibleChange?: (visible: boolean) => void;
     getContainer?: GetContainer;
     destroyOnHide?: boolean;
     children: ReactElement;
     mode?: 'light' | 'dark';
     trigger?: 'click';
-    placement?: 'top' | 'left' | 'right' | 'bottom' | 'topLeft' | 'topRight' | 'bottomLeft' | 'bottomRight' | 'leftTop' | 'leftBottom' | 'rightTop' | 'rightBottom';
+    placement?: Placement | DeprecatedPlacement;
     stopPropagation?: PropagationEvent[];
     content: React.ReactNode;
-} & Pick<TooltipProps, 'defaultVisible' | 'visible' | 'onVisibleChange' | 'align'> & NativeProps<'--z-index'>;
+} & NativeProps<'--z-index'>;
 export declare type PopoverRef = {
     show: () => void;
     hide: () => void;
     visible: boolean;
 };
 export declare const Popover: React.ForwardRefExoticComponent<{
+    defaultVisible?: boolean | undefined;
+    visible?: boolean | undefined;
+    onVisibleChange?: ((visible: boolean) => void) | undefined;
     getContainer?: GetContainer | undefined;
     destroyOnHide?: boolean | undefined;
     children: ReactElement;
     mode?: "dark" | "light" | undefined;
     trigger?: "click" | undefined;
-    placement?: "left" | "right" | "bottom" | "top" | "topLeft" | "topRight" | "bottomLeft" | "bottomRight" | "leftTop" | "leftBottom" | "rightTop" | "rightBottom" | undefined;
+    placement?: DeprecatedPlacement | Placement | undefined;
     stopPropagation?: "click"[] | undefined;
     content: React.ReactNode;
-} & Pick<TooltipProps, "visible" | "align" | "defaultVisible" | "onVisibleChange"> & NativeProps<"--z-index"> & React.RefAttributes<PopoverRef>>;
+} & NativeProps<"--z-index"> & React.RefAttributes<PopoverRef>>;

package/es/components/popover/popover.js

@@ -1,10 +1,18 @@
-import React, { forwardRef, useImperativeHandle } from 'react';
-import Tooltip from 'rc-tooltip';
+import { __awaiter } from "tslib";
+import React, { forwardRef, useImperativeHandle, useRef, useState, useEffect } from 'react';
 import classNames from 'classnames';
 import { usePropsValue } from '../../utils/use-props-value';
 import { mergeProps } from '../../utils/with-default-props';
+import { withNativeProps } from '../../utils/native-props';
 import { withStopPropagation } from '../../utils/with-stop-propagation';
 import { Arrow } from './arrow';
+import { renderToContainer } from '../../utils/render-to-container';
+import { arrow, computePosition, flip, offset, autoUpdate, hide, shift, limitShift } from '@floating-ui/dom';
+import { Wrapper } from './wrapper';
+import { useShouldRender } from '../../utils/should-render';
+import { useClickAway, useIsomorphicLayoutEffect } from 'ahooks';
+import { normalizePlacement } from './normalize-placement';
+import { convertPx } from '../../utils/convert-px';
 const classPrefix = `adm-popover`;
 const defaultProps = {
   placement: 'top',
@@ -13,12 +21,11 @@ const defaultProps = {
   getContainer: () => document.body
 };
 export const Popover = forwardRef((p, ref) => {
-  var _a;
-
   const props = mergeProps(defaultProps, p);
   const {
     mode = 'light'
   } = props;
+  const placement = normalizePlacement(props.placement);
   const [visible, setVisible] = usePropsValue({
     value: props.visible,
     defaultValue: props.defaultVisible,
@@ -31,23 +38,112 @@ export const Popover = forwardRef((p, ref) => {
       visible
     };
   }, [visible]);
-  const overlay = withStopPropagation(props.stopPropagation, React.createElement("div", {
+  const targetRef = useRef(null);
+  const floatingRef = useRef(null);
+  const arrowRef = useRef(null);
+  const floating = withStopPropagation(props.stopPropagation, withNativeProps(props, React.createElement("div", {
+    className: classNames(classPrefix, `${classPrefix}-${mode}`, !visible && `${classPrefix}-hidden`),
+    ref: floatingRef
+  }, React.createElement("div", {
+    className: `${classPrefix}-arrow`,
+    ref: arrowRef
+  }, React.createElement(Arrow, {
+    className: `${classPrefix}-arrow-icon`
+  })), React.createElement("div", {
+    className: `${classPrefix}-inner`
+  }, React.createElement("div", {
     className: `${classPrefix}-inner-content`
-  }, props.content));
-  return React.createElement(Tooltip, Object.assign({}, props, {
-    placement: props.placement,
-    align: props.align,
-    overlayClassName: classNames(`${classPrefix}-${mode}`, props.className),
-    overlayStyle: props.style,
-    destroyTooltipOnHide: props.destroyOnHide,
-    prefixCls: classPrefix,
-    getTooltipContainer: props.getContainer || (() => document.body),
-    visible: visible,
-    arrowContent: React.createElement(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] = useState(null);
+
+  function update() {
+    var _a, _b, _c;
+
+    return __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 computePosition(target, floating, {
+        placement,
+        middleware: [offset(convertPx(12)), shift({
+          padding: convertPx(4),
+          crossAxis: false,
+          limiter: limitShift()
+        }), flip(), hide(), arrow({
+          element: arrowElement,
+          padding: 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]: `-${convertPx(8)}px`
+      });
+      const arrowRotate = {
+        top: '0deg',
+        bottom: '180deg',
+        left: '270deg',
+        right: '90deg'
+      }[side];
+      arrowElement.style.setProperty('--arrow-icon-rotate', arrowRotate);
+    });
+  }
+
+  useIsomorphicLayoutEffect(() => {
+    update();
+  });
+  useEffect(() => {
+    if (!targetElement) return;
+    if (!props.trigger) return;
+
+    function handleClick() {
+      setVisible(v => !v);
+    }
+
+    targetElement.addEventListener('click', handleClick);
+    return () => {
+      targetElement.removeEventListener('click', handleClick);
+    };
+  }, [targetElement, props.trigger]);
+  useEffect(() => {
+    const floatingElement = floatingRef.current;
+    if (!targetElement || !floatingElement) return;
+    return autoUpdate(targetElement, floatingElement, update);
+  }, [targetElement]);
+  useClickAway(() => {
+    if (!props.trigger) return;
+    setVisible(false);
+  }, () => {
+    var _a;
+
+    return (_a = targetRef.current) === null || _a === void 0 ? void 0 : _a.element;
+  });
+  const shouldRender = useShouldRender(visible, false, props.destroyOnHide);
+  return React.createElement(React.Fragment, null, React.createElement(Wrapper, {
+    ref: targetRef
+  }, props.children), shouldRender && renderToContainer(props.getContainer, floating));
 });

package/es/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/es/components/popover/wrapper.js

@@ -0,0 +1,28 @@
+import React from 'react';
+import { findDOMNode } from 'react-dom';
+export class Wrapper extends React.Component {
+  constructor() {
+    super(...arguments);
+    this.element = null;
+  }
+
+  componentDidMount() {
+    this.componentDidUpdate();
+  }
+
+  componentDidUpdate() {
+    // eslint-disable-next-line
+    const node = findDOMNode(this);
+
+    if (node instanceof Element) {
+      this.element = node;
+    } else {
+      this.element = null;
+    }
+  }
+
+  render() {
+    return React.Children.only(this.props.children);
+  }
+
+}

package/es/components/pull-to-refresh/pull-to-refresh.js

@@ -103,15 +103,30 @@ export const PullToRefresh = p => {
 
     const [, y] = state.movement;
 
-    if (state.first) {
-      const element = elementRef.current;
-      if (!element) return;
-      const scrollParent = 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 = getScrollParent(target);
+
+      while (true) {
+        if (!scrollParent) return;
+        const scrollTop = getScrollTop(scrollParent);
+
+        if (scrollTop > 0) {
+          return;
+        }
+
+        if (scrollParent instanceof Window) {
+          break;
+        }
+
+        scrollParent = getScrollParent(scrollParent.parentNode);
+      }
+
+      pullingRef.current = true;
+
+      function getScrollTop(element) {
+        return 'scrollTop' in element ? element.scrollTop : element.scrollY;
       }
     }
 

package/es/components/radio/radio.js

@@ -1,4 +1,4 @@
-import React, { useContext } from 'react';
+import React, { useContext, useEffect, useRef } from 'react';
 import { withNativeProps } from '../../utils/native-props';
 import classNames from 'classnames';
 import { RadioGroupContext } from './group-context';
@@ -64,22 +64,34 @@ export const Radio = p => {
     }, checked && React.createElement(CheckIcon, null));
   };
 
+  const inputRef = useRef(null);
+  const labelRef = useRef(null);
+  useEffect(() => {
+    var _a;
+
+    (_a = labelRef.current) === null || _a === void 0 ? void 0 : _a.addEventListener('click', e => {
+      if (e.target !== inputRef.current) {
+        e.stopPropagation();
+        e.stopImmediatePropagation();
+      }
+    }, {
+      capture: false
+    });
+  }, []);
   return withNativeProps(props, React.createElement("label", {
+    ref: labelRef,
     className: classNames(classPrefix, {
       [`${classPrefix}-checked`]: checked,
       [`${classPrefix}-disabled`]: disabled,
       [`${classPrefix}-block`]: props.block
     })
   }, React.createElement("input", {
+    ref: inputRef,
     type: 'radio',
     checked: checked,
     onChange: e => {
       setChecked(e.target.checked);
     },
-    onClick: e => {
-      e.stopPropagation();
-      e.nativeEvent.stopImmediatePropagation();
-    },
     disabled: disabled,
     id: props.id
   }), renderIcon(), props.children && React.createElement("div", {

package/es/components/search-bar/search-bar.js

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

package/es/components/swiper/swiper.js

@@ -230,7 +230,7 @@ export const Swiper = forwardRef(staged((p, ref) => {
           style: {
             [isVertical ? 'y' : 'x']: position.to(position => `${-position}%`)
           }
-        }, React.Children.map(validChildren, (child, index) => {
+        }, React.Children.map(validChildren, child => {
           return React.createElement("div", {
             className: 'adm-swiper-slide'
           }, child);

package/es/components/text-area/text-area.css

@@ -3,6 +3,8 @@
   --color: var(--adm-color-text);
   --placeholder-color: var(--adm-color-light);
   --disabled-color: var(--adm-color-weak);
+  --text-align: left;
+  --count-text-align: right;
   width: 100%;
   max-width: 100%;
   max-height: 100%;
@@ -26,6 +28,7 @@
   outline: none;
   appearance: none;
   min-height: 1.5em;
+  text-align: var(--text-align);
 }
 .adm-text-area-element::placeholder {
   color: var(--placeholder-color);
@@ -53,7 +56,7 @@
   pointer-events: none;
 }
 .adm-text-area-count {
-  text-align: right;
+  text-align: var(--count-text-align);
   color: var(--adm-color-weak);
   font-size: 17px;
   padding-top: 8px;

package/es/components/text-area/text-area.d.ts

@@ -14,7 +14,7 @@ export declare type TextAreaProps = Pick<React.DetailedHTMLProps<React.TextareaH
         maxRows?: number;
     };
     id?: string;
-} & NativeProps<'--font-size' | '--color' | '--placeholder-color' | '--disabled-color'>;
+} & NativeProps<'--font-size' | '--color' | '--placeholder-color' | '--disabled-color' | '--text-align' | '--count-text-align'>;
 export declare type TextAreaRef = {
     clear: () => void;
     focus: () => void;
@@ -33,4 +33,4 @@ export declare const TextArea: React.ForwardRefExoticComponent<Pick<React.Detail
         maxRows?: number | undefined;
     } | undefined;
     id?: string | undefined;
-} & NativeProps<"--color" | "--font-size" | "--placeholder-color" | "--disabled-color"> & React.RefAttributes<TextAreaRef>>;
+} & NativeProps<"--color" | "--font-size" | "--placeholder-color" | "--text-align" | "--disabled-color" | "--count-text-align"> & React.RefAttributes<TextAreaRef>>;

package/es/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/es/utils/use-props-value.js

@@ -14,12 +14,14 @@ export function usePropsValue(options) {
   }
 
   const setState = 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/package.json

@@ -1,7 +1,8 @@
 {
   "name": "antd-mobile",
-  "version": "5.3.0",
+  "version": "5.5.0",
   "dependencies": {
+    "@floating-ui/dom": "^0.3.1",
     "@react-spring/web": "^9.4.3",
     "@types/resize-observer-browser": "^0.1.7",
     "@use-gesture/react": "^10.2.7",
@@ -12,7 +13,6 @@
     "dayjs": "^1.10.8",
     "lodash": "^4.17.21",
     "rc-field-form": "^1.23.1",
-    "rc-tooltip": "^5.1.1",
     "staged-components": "^1.1.2",
     "tslib": "^2.3.1",
     "use-async-memo": "^1.2.3"