antd-mobile 5.0.0-beta.9 → 5.0.0-rc.3

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

@@ -9,13 +9,21 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _popup = _interopRequireDefault(require("../popup"));
 
-var _column = require("./column");
-
 var _withDefaultProps = require("../../utils/with-default-props");
 
 var _nativeProps = require("../../utils/native-props");
 
-var _useControllableValue = require("../../utils/use-controllable-value");
+var _usePropsValue2 = require("../../utils/use-props-value");
+
+var _pickerView = _interopRequireDefault(require("../picker-view"));
+
+var _useColumns = require("../picker-view/use-columns");
+
+var _configProvider = require("../config-provider");
+
+var _usePickerValueExtend = require("../picker-view/use-picker-value-extend");
+
+var _ahooks = require("ahooks");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
@@ -27,20 +35,30 @@ var classPrefix = "adm-picker";
 var defaultProps = {
   defaultValue: []
 };
-var Picker = (0, _withDefaultProps.withDefaultProps)({
-  confirmText: '确定',
-  cancelText: '取消'
-})(function (p) {
+var Picker = /*#__PURE__*/(0, _react.memo)(function (p) {
   var _a;
 
-  var props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
-  var controllable = (0, _useControllableValue.useNewControllableValue)({
-    value: props.value,
-    defaultValue: props.defaultValue,
-    onChange: props.onConfirm
-  });
-  var value = controllable[0];
-  var setValue = controllable[1];
+  var _useConfig = (0, _configProvider.useConfig)(),
+      locale = _useConfig.locale;
+
+  var props = (0, _withDefaultProps.mergeProps)(defaultProps, {
+    confirmText: locale.common.confirm,
+    cancelText: locale.common.cancel
+  }, p);
+
+  var _usePropsValue = (0, _usePropsValue2.usePropsValue)(Object.assign(Object.assign({}, props), {
+    onChange: function onChange(val) {
+      var _a;
+
+      (_a = props.onConfirm) === null || _a === void 0 ? void 0 : _a.call(props, val, generateValueExtend(val));
+    }
+  })),
+      value = _usePropsValue[0],
+      setValue = _usePropsValue[1]; // TODO: columns generated twice in Picker and PickerView, which can be improved
+
+
+  var columns = (0, _useColumns.useColumns)(props.columns, value);
+  var generateValueExtend = (0, _usePickerValueExtend.usePickerValueExtend)(columns);
 
   var _useState = (0, _react.useState)(value),
       innerValue = _useState[0],
@@ -56,17 +74,15 @@ var Picker = (0, _withDefaultProps.withDefaultProps)({
       setInnerValue(value);
     }
   }, [value]);
-  var columns = (0, _react.useMemo)(function () {
-    var columns = typeof props.columns === 'function' ? props.columns(innerValue) : props.columns;
-    return columns.map(function (column) {
-      return column.map(function (item) {
-        return typeof item === 'string' ? {
-          label: item,
-          value: item
-        } : item;
-      });
-    });
-  }, [props.columns, innerValue]);
+  var onChange = (0, _ahooks.usePersistFn)(function (val, ext) {
+    var _a;
+
+    setInnerValue(val);
+
+    if (props.visible) {
+      (_a = props.onSelect) === null || _a === void 0 ? void 0 : _a.call(props, val, ext);
+    }
+  });
   var pickerElement = (0, _nativeProps.withNativeProps)(props, /*#__PURE__*/_react["default"].createElement("div", {
     className: classPrefix
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -79,7 +95,9 @@ var Picker = (0, _withDefaultProps.withDefaultProps)({
       (_a = props.onCancel) === null || _a === void 0 ? void 0 : _a.call(props);
       (_b = props.onClose) === null || _b === void 0 ? void 0 : _b.call(props);
     }
-  }, props.cancelText), /*#__PURE__*/_react["default"].createElement("a", {
+  }, props.cancelText), /*#__PURE__*/_react["default"].createElement("div", {
+    className: classPrefix + "-header-title"
+  }, props.title), /*#__PURE__*/_react["default"].createElement("a", {
     className: classPrefix + "-header-button",
     onClick: function onClick() {
       var _a;
@@ -88,27 +106,11 @@ var Picker = (0, _withDefaultProps.withDefaultProps)({
       (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
     }
   }, props.confirmText)), /*#__PURE__*/_react["default"].createElement("div", {
-    className: classPrefix + "-columns"
-  }, columns.map(function (column, index) {
-    return /*#__PURE__*/_react["default"].createElement(_column.Column, {
-      key: index,
-      column: column,
-      value: innerValue[index],
-      onSelect: function onSelect(val) {
-        setInnerValue(function (prev) {
-          var _a;
-
-          var nextValue = [].concat(prev);
-          nextValue[index] = val;
-          (_a = props.onSelect) === null || _a === void 0 ? void 0 : _a.call(props, nextValue);
-          return nextValue;
-        });
-      }
-    });
-  }), /*#__PURE__*/_react["default"].createElement("div", {
-    className: classPrefix + "-mask " + classPrefix + "-mask-top"
-  }), /*#__PURE__*/_react["default"].createElement("div", {
-    className: classPrefix + "-mask " + classPrefix + "-mask-bottom"
+    className: classPrefix + "-body"
+  }, /*#__PURE__*/_react["default"].createElement(_pickerView["default"], {
+    columns: props.columns,
+    value: innerValue,
+    onChange: onChange
   }))));
 
   var popupElement = /*#__PURE__*/_react["default"].createElement(_popup["default"], {
@@ -124,20 +126,10 @@ var Picker = (0, _withDefaultProps.withDefaultProps)({
     destroyOnClose: true,
     afterShow: props.afterShow,
     afterClose: props.afterClose,
-    onClick: props.onClick
+    onClick: props.onClick,
+    stopPropagation: props.stopPropagation
   }, pickerElement);
 
-  var items = (0, _react.useMemo)(function () {
-    return value.map(function (v, index) {
-      var _a;
-
-      var column = columns[index];
-      if (!column) return null;
-      return (_a = column.find(function (item) {
-        return item.value === v;
-      })) !== null && _a !== void 0 ? _a : null;
-    });
-  }, [value, columns]);
-  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, popupElement, (_a = props.children) === null || _a === void 0 ? void 0 : _a.call(props, items));
+  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, popupElement, (_a = props.children) === null || _a === void 0 ? void 0 : _a.call(props, generateValueExtend(value).items));
 });
 exports.Picker = Picker;

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

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

package/{cjs/components/picker → 2x/cjs/components/picker-view}/column.d.ts

@@ -1,5 +1,5 @@
 import { FC } from 'react';
-import type { PickerColumnItem, PickerValue } from './index';
+import { PickerColumnItem, PickerValue } from './index';
 interface Props {
     column: PickerColumnItem[];
     value: PickerValue;

package/{cjs/components/picker → 2x/cjs/components/picker-view}/column.js

@@ -9,7 +9,7 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _web = require("@react-spring/web");
 
-var _reactUseGesture = require("react-use-gesture");
+var _react2 = require("@use-gesture/react");
 
 var _convertPx = require("../../utils/convert-px");
 
@@ -21,7 +21,7 @@ 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; }
 
-var classPrefix = "adm-picker";
+var classPrefix = "adm-picker-view";
 
 var Column = function Column(props) {
   var itemHeight = (0, _convertPx.convertPx)(34);
@@ -43,19 +43,14 @@ var Column = function Column(props) {
       y = _useSpring[0].y,
       api = _useSpring[1];
 
+  var draggingRef = (0, _react.useRef)(false);
   (0, _react.useLayoutEffect)(function () {
-    if (!value) {
-      return;
-    }
-
+    if (draggingRef.current) return;
+    if (!value) return;
     var targetIndex = column.findIndex(function (item) {
       return item.value === value;
     });
-
-    if (targetIndex < 0) {
-      return;
-    }
-
+    if (targetIndex < 0) return;
     var finalPosition = targetIndex * -itemHeight;
     api.start({
       y: finalPosition,
@@ -75,31 +70,41 @@ var Column = function Column(props) {
         props.onSelect(firstItem.value);
       }
     }
-  });
-  var bind = (0, _reactUseGesture.useDrag)(function (state) {
+  }, [column, value]);
+
+  function scrollSelect(index) {
+    var finalPosition = index * -itemHeight;
+    api.start({
+      y: finalPosition
+    });
+    onSelect(column[index].value);
+  }
+
+  var bind = (0, _react2.useDrag)(function (state) {
+    draggingRef.current = true;
     var min = -((column.length - 1) * itemHeight);
     var max = 0;
 
     if (state.last) {
-      var position = state.movement[1] + state.vxvy[1] * 50;
+      draggingRef.current = false;
+      var position = state.offset[1] + state.velocity[1] * state.direction[1] * 50;
       var targetIndex = -Math.round((0, _bound.bound)(position, min, max) / itemHeight);
-      var finalPosition = targetIndex * -itemHeight;
-      api.start({
-        y: finalPosition
-      });
-      onSelect(column[targetIndex].value);
+      scrollSelect(targetIndex);
     } else {
-      var _position = state.movement[1];
+      var _position = state.offset[1];
       api.start({
         y: (0, _rubberband.rubberbandIfOutOfBounds)(_position, min, max, itemHeight * 50, 0.2)
       });
     }
   }, {
     axis: 'y',
-    initial: function initial() {
+    from: function from() {
       return [0, y.get()];
     },
-    filterTaps: true
+    filterTaps: true,
+    pointer: {
+      touch: true
+    }
   });
   return /*#__PURE__*/_react["default"].createElement("div", Object.assign({
     className: classPrefix + "-column"
@@ -110,11 +115,8 @@ var Column = function Column(props) {
     className: classPrefix + "-column-wheel"
   }, column.map(function (item, index) {
     function handleClick() {
-      var finalPosition = index * -itemHeight;
-      api.start({
-        y: finalPosition
-      });
-      onSelect(column[index].value);
+      draggingRef.current = false;
+      scrollSelect(index);
     }
 
     return /*#__PURE__*/_react["default"].createElement("div", {

package/2x/cjs/components/picker-view/index.d.ts

@@ -0,0 +1,4 @@
+import { PickerView } from './picker-view';
+import './picker-view.less';
+export type { PickerViewProps, PickerValue, PickerColumnItem, PickerColumn, PickerValueExtend, } from './picker-view';
+export default PickerView;

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

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _pickerView = require("./picker-view");
+
+require("./picker-view.css");
+
+var _default = _pickerView.PickerView;
+exports["default"] = _default;

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

@@ -0,0 +1,77 @@
+.adm-picker-view {
+  --height: 480px;
+  height: var(--height);
+  width: 100%;
+  display: flex;
+  position: relative;
+  overflow: hidden;
+}
+
+.adm-picker-view-column {
+  height: 100%;
+  flex: 1;
+  user-select: none;
+  touch-action: none;
+  position: relative;
+}
+
+.adm-picker-view-column-wheel {
+  width: 100%;
+  cursor: grab;
+  position: absolute;
+  top: calc(50% - 34px);
+  left: 0;
+}
+
+.adm-picker-view-column-wheel::before {
+  content: ' ';
+  display: block;
+  position: absolute;
+  width: 100%;
+  height: 100vh;
+  top: -100vh;
+}
+
+.adm-picker-view-column-wheel::after {
+  content: ' ';
+  display: block;
+  position: absolute;
+  width: 100%;
+  height: 100vh;
+  bottom: -100vh;
+}
+
+.adm-picker-view-column-item {
+  font-size: 32px;
+  padding: 0 12px;
+  height: 68px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.adm-picker-view-column-item-label {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.adm-picker-view-mask {
+  position: absolute;
+  left: 0;
+  width: 100%;
+  height: calc(50% - 24px);
+  pointer-events: none;
+}
+
+.adm-picker-view-mask-top {
+  top: -10px;
+  border-bottom: solid 2px var(--adm-border-color);
+  background: linear-gradient(0deg, rgba(255, 255, 255, 0.7) 50%, #ffffff);
+}
+
+.adm-picker-view-mask-bottom {
+  bottom: -10px;
+  border-top: solid 2px var(--adm-border-color);
+  background: linear-gradient(180deg, rgba(255, 255, 255, 0.7) 50%, #ffffff);
+}

package/2x/cjs/components/picker-view/picker-view.d.ts

@@ -0,0 +1,18 @@
+import React, { ReactNode } from 'react';
+import { NativeProps } from '../../utils/native-props';
+export declare type PickerValue = string | null;
+export declare type PickerValueExtend = {
+    items: (PickerColumnItem | null)[];
+};
+export declare type PickerColumnItem = {
+    label: ReactNode;
+    value: string;
+};
+export declare type PickerColumn = (string | PickerColumnItem)[];
+export declare type PickerViewProps = {
+    columns: PickerColumn[] | ((value: PickerValue[]) => PickerColumn[]);
+    value?: PickerValue[];
+    defaultValue?: PickerValue[];
+    onChange?: (value: PickerValue[], extend: PickerValueExtend) => void;
+} & NativeProps<'--height'>;
+export declare const PickerView: React.NamedExoticComponent<PickerViewProps>;

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

@@ -0,0 +1,85 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PickerView = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _withDefaultProps = require("../../utils/with-default-props");
+
+var _column = require("./column");
+
+var _useColumns = require("./use-columns");
+
+var _nativeProps = require("../../utils/native-props");
+
+var _usePickerValueExtend = require("./use-picker-value-extend");
+
+var _ahooks = require("ahooks");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(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; }
+
+var classPrefix = "adm-picker-view";
+var defaultProps = {
+  defaultValue: []
+};
+var PickerView = /*#__PURE__*/(0, _react.memo)(function (p) {
+  var props = (0, _withDefaultProps.mergeProps)(defaultProps, p);
+
+  var _useState = (0, _react.useState)(props.value === undefined ? props.defaultValue : props.value),
+      innerValue = _useState[0],
+      setInnerValue = _useState[1];
+
+  (0, _ahooks.useDebounceEffect)(function () {
+    var _a;
+
+    if (props.value === innerValue) return;
+    (_a = props.onChange) === null || _a === void 0 ? void 0 : _a.call(props, innerValue, generateValueExtend(innerValue));
+  }, [innerValue], {
+    wait: 0,
+    leading: false,
+    trailing: true
+  }); // Sync `value` to `innerValue`
+
+  (0, _react.useEffect)(function () {
+    if (props.value === undefined) return; // Uncontrolled mode
+
+    if (props.value === innerValue) return;
+    setInnerValue(props.value);
+  }, [props.value]); // Reset `innerValue` after 1s in case user does not update `value` when `onChange` is called
+
+  (0, _ahooks.useDebounceEffect)(function () {
+    if (props.value !== undefined && props.value !== innerValue) {
+      setInnerValue(props.value);
+    }
+  }, [props.value, innerValue], {
+    wait: 1000,
+    leading: false,
+    trailing: true
+  });
+  var columns = (0, _useColumns.useColumns)(props.columns, innerValue);
+  var generateValueExtend = (0, _usePickerValueExtend.usePickerValueExtend)(columns);
+  return (0, _nativeProps.withNativeProps)(props, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "" + classPrefix
+  }, columns.map(function (column, index) {
+    return /*#__PURE__*/_react["default"].createElement(_column.Column, {
+      key: index,
+      column: column,
+      value: innerValue[index],
+      onSelect: function onSelect(val) {
+        var nextInnerValue = [].concat(innerValue);
+        nextInnerValue[index] = val;
+        setInnerValue(nextInnerValue);
+      }
+    });
+  }), /*#__PURE__*/_react["default"].createElement("div", {
+    className: classPrefix + "-mask " + classPrefix + "-mask-top"
+  }), /*#__PURE__*/_react["default"].createElement("div", {
+    className: classPrefix + "-mask " + classPrefix + "-mask-bottom"
+  })));
+});
+exports.PickerView = PickerView;

package/2x/cjs/components/picker-view/use-columns.d.ts

@@ -0,0 +1,2 @@
+import { PickerColumn, PickerValue } from './picker-view';
+export declare function useColumns(rawColumns: PickerColumn[] | ((value: PickerValue[]) => PickerColumn[]), value: PickerValue[]): import("./picker-view").PickerColumnItem[][];

package/2x/cjs/components/picker-view/use-columns.js

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useColumns = useColumns;
+
+var _react = require("react");
+
+function useColumns(rawColumns, value) {
+  return (0, _react.useMemo)(function () {
+    var columns = typeof rawColumns === 'function' ? rawColumns(value) : rawColumns;
+    return columns.map(function (column) {
+      return column.map(function (item) {
+        return typeof item === 'string' ? {
+          label: item,
+          value: item
+        } : item;
+      });
+    });
+  }, [rawColumns, value]);
+}

package/2x/cjs/components/picker-view/use-picker-value-extend.d.ts

@@ -0,0 +1,2 @@
+import { PickerValue, PickerValueExtend, PickerColumnItem } from './picker-view';
+export declare function usePickerValueExtend(columns: PickerColumnItem[][]): (val: PickerValue[]) => PickerValueExtend;

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

@@ -0,0 +1,41 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.usePickerValueExtend = usePickerValueExtend;
+
+var _react = require("react");
+
+var _memoize = _interopRequireDefault(require("lodash/memoize"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function usePickerValueExtend(columns) {
+  var generateItems = (0, _react.useMemo)(function () {
+    return (0, _memoize["default"])(function (val) {
+      return val.map(function (v, index) {
+        var _a;
+
+        var column = columns[index];
+        if (!column) return null;
+        return (_a = column.find(function (item) {
+          return item.value === v;
+        })) !== null && _a !== void 0 ? _a : null;
+      });
+    }, function (val) {
+      return JSON.stringify(val);
+    });
+  }, [columns]);
+
+  function generateValueExtend(val) {
+    return {
+      get items() {
+        return generateItems(val);
+      }
+
+    };
+  }
+
+  return generateValueExtend;
+}

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

@@ -1,13 +1,15 @@
 /// <reference types="react" />
 import './popover.less';
-export type { Action } from './pop-menu';
+export type { BasePopoverProps, PopoverRef } from './popover';
+export type { PopMenuProps, Action } from './pop-menu';
 declare const _default: import("react").ForwardRefExoticComponent<{
     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?: string | undefined;
-} & Pick<import("rc-tooltip/lib/Tooltip").TooltipProps, "visible" | "zIndex" | "align" | "defaultVisible" | "placement" | "onVisibleChange" | "overlayStyle" | "overlayClassName"> & {
+    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"> & {
     content: import("react").ReactNode;
 } & import("react").RefAttributes<import("./popover").PopoverRef>> & {
     Menu: <T extends import("./pop-menu").Action = import("./pop-menu").Action>(props: {
@@ -15,10 +17,11 @@ declare const _default: import("react").ForwardRefExoticComponent<{
         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?: string | undefined;
-    } & Pick<import("rc-tooltip/lib/Tooltip").TooltipProps, "visible" | "zIndex" | "align" | "defaultVisible" | "placement" | "onVisibleChange" | "overlayStyle" | "overlayClassName"> & {
+        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[];
-        onSelect?: ((text: T) => void) | undefined;
+        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>)>;

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

@@ -8,20 +8,20 @@ export declare type Action = {
     onClick?: () => void;
     [key: string]: any;
 };
-declare type PopoverPropsWithActions<T> = BasePopoverProps & {
+export declare type PopMenuProps<T> = BasePopoverProps & {
     actions: T[];
-    onSelect?: (text: T) => void;
+    onAction?: (text: T) => void;
 };
 export declare const PopMenu: <T extends Action = Action>(props: {
     getContainer?: (() => HTMLElement) | undefined;
     destroyOnHide?: boolean | undefined;
     children: React.ReactElement<any, string | ((props: any) => React.ReactElement<any, any> | null) | (new (props: any) => React.Component<any, any, any>)>;
     mode?: "dark" | "light" | undefined;
-    trigger?: string | undefined;
-} & Pick<import("rc-tooltip/lib/Tooltip").TooltipProps, "visible" | "zIndex" | "align" | "defaultVisible" | "placement" | "onVisibleChange" | "overlayStyle" | "overlayClassName"> & {
+    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[];
-    onSelect?: ((text: T) => void) | undefined;
+    onAction?: ((text: T) => void) | undefined;
 } & {
     ref?: ((instance: PopoverRef | null) => void) | React.RefObject<PopoverRef> | null | undefined;
 }) => ReactElement;
-export {};

package/2x/cjs/components/popover/pop-menu.js

@@ -29,14 +29,14 @@ var PopMenu = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _onClick = (0, _react.useCallback)(function (e) {
     var _a;
 
-    var onSelect = props.onSelect;
+    var onAction = props.onAction;
 
-    if (onSelect) {
-      onSelect(e);
+    if (onAction) {
+      onAction(e);
     }
 
     (_a = innerRef.current) === null || _a === void 0 ? void 0 : _a.hide();
-  }, [props.onSelect]);
+  }, [props.onAction]);
 
   var overlay = (0, _react.useMemo)(function () {
     return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, (props.actions || []).map(function (ele, index) {
@@ -50,8 +50,12 @@ var PopMenu = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       }, /*#__PURE__*/_react["default"].createElement(_button["default"], {
         disabled: ele.disabled,
         onClick: function onClick() {
+          var _a;
+
           if (!ele.disabled) {
             _onClick(ele);
+
+            (_a = ele.onClick) === null || _a === void 0 ? void 0 : _a.call(ele);
           }
         },
         fill: 'none',