antd-mobile 5.0.0-rc.8 → 5.1.0

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

@@ -1,20 +1,16 @@
 import { useMemo } from 'react';
 import memoize from 'lodash/memoize';
 export function usePickerValueExtend(columns) {
-  var generateItems = useMemo(function () {
-    return memoize(function (val) {
-      return val.map(function (v, index) {
+  const generateItems = useMemo(() => {
+    return memoize(val => {
+      return val.map((v, index) => {
         var _a;
 
-        var column = columns[index];
+        const column = columns[index];
         if (!column) return null;
-        return (_a = column.find(function (item) {
-          return item.value === v;
-        })) !== null && _a !== void 0 ? _a : null;
+        return (_a = column.find(item => item.value === v)) !== null && _a !== void 0 ? _a : null;
       });
-    }, function (val) {
-      return JSON.stringify(val);
-    });
+    }, val => JSON.stringify(val));
   }, [columns]);
 
   function generateValueExtend(val) {

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

@@ -1,144 +1,152 @@
-import React, { memo, useLayoutEffect, useRef } from 'react';
+import React, { memo, useRef } from 'react';
 import { useSpring, animated } from '@react-spring/web';
 import { useDrag } from '@use-gesture/react';
-import { convertPx } from '../../utils/convert-px';
 import { rubberbandIfOutOfBounds } from '../../utils/rubberband';
 import { bound } from '../../utils/bound';
 import isEqual from 'lodash/isEqual';
-var classPrefix = "adm-picker-view";
-export var Wheel = /*#__PURE__*/memo(function (props) {
-  var itemHeight = convertPx(34);
-  var value = props.value,
-      column = props.column;
+import { useIsomorphicLayoutEffect } from 'ahooks';
+import classNames from 'classnames';
+const classPrefix = `adm-picker-view`;
+export const Wheel = memo(props => {
+  const {
+    value,
+    column
+  } = props;
 
   function onSelect(val) {
     props.onSelect(val, props.index);
   }
 
-  var _useSpring = useSpring(function () {
-    return {
-      from: {
-        y: 0
-      },
-      config: {
-        tension: 400,
-        mass: 0.8
-      }
-    };
-  }),
-      y = _useSpring[0].y,
-      api = _useSpring[1];
+  const [{
+    y
+  }, api] = useSpring(() => ({
+    from: {
+      y: 0
+    },
+    config: {
+      tension: 400,
+      mass: 0.8
+    }
+  }));
+  const draggingRef = useRef(false);
+  const dummyItemRef = useRef(null);
+  const itemHeight = useRef(34);
+  useIsomorphicLayoutEffect(() => {
+    const dummyItem = dummyItemRef.current;
+    if (!dummyItem) return;
+    const rect = dummyItem.getBoundingClientRect();
 
-  var draggingRef = useRef(false);
-  useLayoutEffect(function () {
+    if (rect.height > 0) {
+      itemHeight.current = rect.height;
+    }
+  });
+  useIsomorphicLayoutEffect(() => {
     if (draggingRef.current) return;
     if (!value) return;
-    var targetIndex = column.findIndex(function (item) {
-      return item.value === value;
-    });
+    const targetIndex = column.findIndex(item => item.value === value);
     if (targetIndex < 0) return;
-    var finalPosition = targetIndex * -itemHeight;
+    const finalPosition = targetIndex * -itemHeight.current;
     api.start({
       y: finalPosition,
       immediate: y.goal !== finalPosition
     });
   }, [value, column]);
-  useLayoutEffect(function () {
+  useIsomorphicLayoutEffect(() => {
     if (column.length === 0) {
       if (value !== null) {
         onSelect(null);
       }
     } else {
-      if (!column.some(function (item) {
-        return item.value === value;
-      })) {
-        var firstItem = column[0];
+      if (!column.some(item => item.value === value)) {
+        const firstItem = column[0];
         onSelect(firstItem.value);
       }
     }
   }, [column, value]);
 
   function scrollSelect(index) {
-    var finalPosition = index * -itemHeight;
+    const finalPosition = index * -itemHeight.current;
     api.start({
       y: finalPosition
     });
-    var item = column[index];
+    const item = column[index];
     if (!item) return;
     onSelect(item.value);
   }
 
-  var bind = useDrag(function (state) {
+  const bind = useDrag(state => {
     draggingRef.current = true;
-    var min = -((column.length - 1) * itemHeight);
-    var max = 0;
+    const min = -((column.length - 1) * itemHeight.current);
+    const max = 0;
 
     if (state.last) {
       draggingRef.current = false;
-      var position = state.offset[1] + state.velocity[1] * state.direction[1] * 50;
-      var targetIndex = min < max ? -Math.round(bound(position, min, max) / itemHeight) : 0;
+      const position = state.offset[1] + state.velocity[1] * state.direction[1] * 50;
+      const targetIndex = min < max ? -Math.round(bound(position, min, max) / itemHeight.current) : 0;
       scrollSelect(targetIndex);
     } else {
-      var _position = state.offset[1];
+      const position = state.offset[1];
       api.start({
-        y: rubberbandIfOutOfBounds(_position, min, max, itemHeight * 50, 0.2)
+        y: rubberbandIfOutOfBounds(position, min, max, itemHeight.current * 50, 0.2)
       });
     }
   }, {
     axis: 'y',
-    from: function from() {
-      return [0, y.get()];
-    },
+    from: () => [0, y.get()],
     filterTaps: true,
     pointer: {
       touch: true
     }
   });
-  var selectedIndex = null;
+  let selectedIndex = null;
 
   function renderAccessible() {
     if (selectedIndex === null) {
       return null;
     }
 
-    var current = column[selectedIndex];
-    var previousIndex = selectedIndex - 1;
-    var nextIndex = selectedIndex + 1;
-    var previous = column[previousIndex];
-    var next = column[nextIndex];
-    return /*#__PURE__*/React.createElement("div", {
+    const current = column[selectedIndex];
+    const previousIndex = selectedIndex - 1;
+    const nextIndex = selectedIndex + 1;
+    const previous = column[previousIndex];
+    const next = column[nextIndex];
+    return React.createElement("div", {
       className: 'adm-picker-view-column-accessible'
-    }, /*#__PURE__*/React.createElement("div", {
+    }, React.createElement("div", {
       className: 'adm-picker-view-column-accessible-current',
       role: 'button',
-      "aria-label": current ? "\u5F53\u524D\u9009\u62E9\u7684\u662F\uFF1A" + current.label : '当前未选择'
-    }, "-"), /*#__PURE__*/React.createElement("div", null, previous && /*#__PURE__*/React.createElement("div", {
+      "aria-label": current ? `当前选择的是：${current.label}` : '当前未选择'
+    }, "-"), React.createElement("div", null, previous && React.createElement("div", {
       className: 'adm-picker-view-column-accessible-button',
-      onClick: function onClick() {
+      onClick: () => {
         scrollSelect(previousIndex);
       },
       role: 'button',
-      "aria-label": "\u9009\u62E9\u4E0A\u4E00\u9879\uFF1A" + previous.label
-    }, "-")), /*#__PURE__*/React.createElement("div", null, next && /*#__PURE__*/React.createElement("div", {
+      "aria-label": `选择上一项：${previous.label}`
+    }, "-")), React.createElement("div", null, next && React.createElement("div", {
       className: 'adm-picker-view-column-accessible-button',
-      onClick: function onClick() {
+      onClick: () => {
         scrollSelect(nextIndex);
       },
       role: 'button',
-      "aria-label": "\u9009\u62E9\u4E0B\u4E00\u9879\uFF1A" + next.label
+      "aria-label": `选择下一项：${next.label}`
     }, "-")));
   }
 
-  return /*#__PURE__*/React.createElement("div", Object.assign({
-    className: classPrefix + "-column"
-  }, bind()), /*#__PURE__*/React.createElement(animated.div, {
+  return React.createElement("div", Object.assign({
+    className: `${classPrefix}-column`
+  }, bind()), React.createElement("div", {
+    ref: dummyItemRef,
+    className: classNames(`${classPrefix}-column-item`, `${classPrefix}-column-item-dummy`),
+    "aria-hidden": true
+  }), React.createElement(animated.div, {
     style: {
-      y: y
+      translateY: y
     },
-    className: classPrefix + "-column-wheel",
+    className: `${classPrefix}-column-wheel`,
     "aria-hidden": true
-  }, column.map(function (item, index) {
-    var selected = props.value === item.value;
+  }, column.map((item, index) => {
+    const selected = props.value === item.value;
     if (selected) selectedIndex = index;
 
     function handleClick() {
@@ -146,18 +154,18 @@ export var Wheel = /*#__PURE__*/memo(function (props) {
       scrollSelect(index);
     }
 
-    return /*#__PURE__*/React.createElement("div", {
+    return React.createElement("div", {
       key: item.value,
       "data-selected": item.value === value,
-      className: classPrefix + "-column-item",
+      className: `${classPrefix}-column-item`,
       onClick: handleClick,
       "aria-hidden": !selected,
       "aria-label": selected ? 'active' : ''
-    }, /*#__PURE__*/React.createElement("div", {
-      className: classPrefix + "-column-item-label"
+    }, React.createElement("div", {
+      className: `${classPrefix}-column-item-label`
     }, item.label));
   })), renderAccessible());
-}, function (prev, next) {
+}, (prev, next) => {
   if (prev.index !== next.index) return false;
   if (prev.value !== next.value) return false;
   if (prev.onSelect !== next.onSelect) return false;

package/2x/es/components/popover/arrow.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+import { NativeProps } from '../../utils/native-props';
+export declare const Arrow: React.NamedExoticComponent<NativeProps<never>>;

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

@@ -0,0 +1,12 @@
+import React, { memo } from 'react';
+import { withNativeProps } from '../../utils/native-props';
+export const Arrow = memo(props => {
+  return withNativeProps(props, React.createElement("svg", {
+    viewBox: '0 0 30 16'
+  }, React.createElement("g", {
+    transform: 'translate(-1300.000000, -841.000000)',
+    fill: 'currentColor'
+  }, React.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'
+  }))));
+});

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

@@ -1,29 +1,21 @@
 /// <reference types="react" />
 import './popover.less';
-export type { BasePopoverProps, PopoverRef } from './popover';
-export type { PopMenuProps, Action } from './pop-menu';
+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) | undefined;
+    getContainer?: HTMLElement | (() => HTMLElement) | null | 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>)>;
     mode?: "dark" | "light" | undefined;
     trigger?: "click" | undefined;
-    placement: "left" | "right" | "bottom" | "top" | "topLeft" | "topRight" | "bottomLeft" | "bottomRight" | "leftTop" | "leftBottom" | "rightTop" | "rightBottom";
-} & Pick<import("rc-tooltip/lib/Tooltip").TooltipProps, "visible" | "zIndex" | "align" | "defaultVisible" | "onVisibleChange" | "overlayStyle" | "overlayClassName"> & import("../../utils/native-props").NativeProps<"--z-index"> & {
+    placement?: "left" | "right" | "bottom" | "top" | "topLeft" | "topRight" | "bottomLeft" | "bottomRight" | "leftTop" | "leftBottom" | "rightTop" | "rightBottom" | undefined;
+    stopPropagation?: "click"[] | undefined;
     content: import("react").ReactNode;
-} & import("react").RefAttributes<import("./popover").PopoverRef>> & {
-    Menu: <T extends import("./pop-menu").Action = import("./pop-menu").Action>(props: {
-        getContainer?: (() => HTMLElement) | 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>)>;
-        mode?: "dark" | "light" | undefined;
-        trigger?: "click" | undefined;
-        placement: "left" | "right" | "bottom" | "top" | "topLeft" | "topRight" | "bottomLeft" | "bottomRight" | "leftTop" | "leftBottom" | "rightTop" | "rightBottom";
-    } & Pick<import("rc-tooltip/lib/Tooltip").TooltipProps, "visible" | "zIndex" | "align" | "defaultVisible" | "onVisibleChange" | "overlayStyle" | "overlayClassName"> & import("../../utils/native-props").NativeProps<"--z-index"> & {
-        actions: T[];
-        onAction?: ((text: T) => void) | undefined;
-    } & {
-        ref?: ((instance: import("./popover").PopoverRef | null) => void) | import("react").RefObject<import("./popover").PopoverRef> | null | undefined;
-    }) => import("react").ReactElement<any, string | ((props: any) => import("react").ReactElement<any, any> | null) | (new (props: any) => import("react").Component<any, any, any>)>;
+} & 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"> & {
+        actions: import("./popover-menu").Action[];
+        onAction?: ((item: import("./popover-menu").Action) => void) | undefined;
+    } & import("react").RefAttributes<import("./popover").PopoverRef>>;
 };
 export default _default;

package/2x/es/components/popover/index.js

@@ -1,7 +1,8 @@
 import "./popover.css";
+import "./popover-menu.css";
 import { attachPropertiesToComponent } from '../../utils/attach-properties-to-component';
-import { PopMenu } from './pop-menu';
+import { PopoverMenu } from './popover-menu';
 import { Popover } from './popover';
 export default attachPropertiesToComponent(Popover, {
-  Menu: PopMenu
+  Menu: PopoverMenu
 });

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

@@ -0,0 +1,63 @@
+.adm-popover-menu {
+  --border-color: var(--adm-border-color);
+}
+
+.adm-popover-menu.adm-popover {
+  --content-padding: 0;
+}
+
+.adm-popover-menu-list {
+  overflow: hidden;
+  min-width: 240px;
+}
+
+.adm-popover-menu-list-inner {
+  margin-top: -2px;
+}
+
+.adm-popover-menu-item {
+  display: flex;
+  padding-left: 40px;
+  justify-content: flex-start;
+  align-items: center;
+  position: relative;
+}
+
+.adm-popover-menu-item-icon {
+  flex: none;
+  padding-right: 16px;
+  font-size: 40px;
+}
+
+.adm-popover-menu-item-text {
+  flex: auto;
+  padding: 28px 40px 28px 0;
+  border-top: solid 2px var(--border-color);
+}
+
+.adm-popover-menu-item-disabled {
+  cursor: not-allowed;
+}
+
+.adm-popover-menu-item-disabled > * {
+  opacity: 0.4;
+}
+
+.adm-popover-menu-item:active:not(.adm-popover-menu-item-disabled) {
+  background-color: var(--border-color);
+}
+
+.adm-popover-menu-item:active:not(.adm-popover-menu-item-disabled)::after {
+  content: ' ';
+  display: block;
+  position: absolute;
+  width: 100%;
+  bottom: -2px;
+  left: 0;
+  border-bottom: solid 2px var(--border-color);
+}
+
+.adm-popover.adm-popover-dark.adm-popover-menu {
+  --border-color: #333333;
+  --background: rgba(0, 0, 0, 0.9);
+}

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

@@ -0,0 +1,17 @@
+import React from 'react';
+import { PopoverProps, PopoverRef } from './popover';
+export declare type Action = {
+    text: React.ReactNode;
+    icon?: React.ReactNode;
+    disabled?: boolean;
+    key?: string | number;
+    onClick?: () => void;
+};
+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"> & {
+    actions: Action[];
+    onAction?: ((item: Action) => void) | undefined;
+} & React.RefAttributes<PopoverRef>>;

package/2x/es/components/popover/popover-menu.js

@@ -0,0 +1,52 @@
+import React, { forwardRef, useCallback, useImperativeHandle, useMemo, useRef } from 'react';
+import classNames from 'classnames';
+import { Popover } from './popover';
+const classPrefix = `adm-popover-menu`;
+export const PopoverMenu = forwardRef((props, ref) => {
+  const innerRef = useRef(null);
+  useImperativeHandle(ref, () => innerRef.current, []);
+  const onClick = useCallback(e => {
+    var _a;
+
+    const {
+      onAction
+    } = props;
+
+    if (onAction) {
+      onAction(e);
+    }
+
+    (_a = innerRef.current) === null || _a === void 0 ? void 0 : _a.hide();
+  }, [props.onAction]);
+  const overlay = useMemo(() => {
+    return React.createElement("div", {
+      className: `${classPrefix}-list`
+    }, React.createElement("div", {
+      className: `${classPrefix}-list-inner`
+    }, props.actions.map((action, index) => {
+      var _a;
+
+      return React.createElement("a", {
+        key: (_a = action.key) !== null && _a !== void 0 ? _a : index,
+        className: classNames(`${classPrefix}-item`, 'adm-plain-anchor', action.disabled && `${classPrefix}-item-disabled`),
+        onClick: () => {
+          var _a;
+
+          if (action.disabled) return;
+          onClick(action);
+          (_a = action.onClick) === null || _a === void 0 ? void 0 : _a.call(action);
+        }
+      }, action.icon && React.createElement("div", {
+        className: `${classPrefix}-item-icon`
+      }, action.icon), React.createElement("div", {
+        className: `${classPrefix}-item-text`
+      }, action.text));
+    })));
+  }, [props.actions, onClick]);
+  return React.createElement(Popover, Object.assign({
+    ref: innerRef
+  }, props, {
+    className: classNames(classPrefix, props.className),
+    content: overlay
+  }), props.children);
+});