antd-mobile 5.3.1 → 5.5.1

package/2x/es/components/popover/popover.css

@@ -34,110 +34,6 @@
   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: 24px;
-}
-
-.adm-popover-placement-topRight .adm-popover-arrow {
-  right: 24px;
-}
-
-.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: 24px;
-}
-
-.adm-popover-placement-rightBottom .adm-popover-arrow {
-  bottom: 24px;
-}
-
-.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: 24px;
-}
-
-.adm-popover-placement-bottomRight .adm-popover-arrow {
-  right: 24px;
-}
-
-.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: 24px;
-}
-
-.adm-popover-placement-leftBottom .adm-popover-arrow {
-  bottom: 24px;
-}
-
 .adm-popover-inner {
   background-color: var(--background);
   background-clip: padding-box;

package/2x/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/2x/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 './temp-floating-ui.min.js';
+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/2x/es/components/popover/temp-floating-ui.min.d.ts

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