@rc-component/trigger 2.2.6 → 3.1.0

package/lib/interface.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import type { CSSMotionProps } from 'rc-motion';
+import type { CSSMotionProps } from '@rc-component/motion';
 export type Placement = 'top' | 'left' | 'right' | 'bottom' | 'topLeft' | 'topRight' | 'bottomLeft' | 'bottomRight' | 'leftTop' | 'leftBottom' | 'rightTop' | 'rightBottom';
 export type AlignPointTopBottom = 't' | 'b' | 'c';
 export type AlignPointLeftRight = 'l' | 'r' | 'c';

package/lib/mock.js

@@ -1,27 +1,24 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var React = _interopRequireWildcard(require("react"));
 var _index = require("./index");
-var MockPortal = function MockPortal(_ref) {
-  var open = _ref.open,
-    autoDestroy = _ref.autoDestroy,
-    children = _ref.children,
-    getContainer = _ref.getContainer;
-  var _React$useState = React.useState(open),
-    _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
-    visible = _React$useState2[0],
-    setVisible = _React$useState2[1];
-  React.useEffect(function () {
-    getContainer === null || getContainer === void 0 || getContainer();
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+const MockPortal = ({
+  open,
+  autoDestroy,
+  children,
+  getContainer
+}) => {
+  const [visible, setVisible] = React.useState(open);
+  React.useEffect(() => {
+    getContainer?.();
   });
-  React.useEffect(function () {
+  React.useEffect(() => {
     if (open) {
       setVisible(true);
     } else if (autoDestroy) {

package/lib/util.d.ts

@@ -1,8 +1,5 @@
-import type { CSSMotionProps } from 'rc-motion';
-import type { AlignType, AnimationType, BuildInPlacements, TransitionNameType } from './interface';
+import type { AlignType, BuildInPlacements } from './interface';
 export declare function getAlignPopupClassName(builtinPlacements: BuildInPlacements, prefixCls: string, align: AlignType, isAlignPoint: boolean): string;
-/** @deprecated We should not use this if we can refactor all deps */
-export declare function getMotion(prefixCls: string, motion: CSSMotionProps, animation: AnimationType, transitionName: TransitionNameType): CSSMotionProps;
 export declare function getWin(ele: HTMLElement): Window & typeof globalThis;
 /**
  * Get all the scrollable parent elements of the element

package/lib/util.js

@@ -1,55 +1,32 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.collectScroller = collectScroller;
 exports.getAlignPopupClassName = getAlignPopupClassName;
-exports.getMotion = getMotion;
 exports.getVisibleArea = getVisibleArea;
 exports.getWin = getWin;
 exports.toNum = toNum;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-function isPointsEq() {
-  var a1 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  var a2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  var isAlignPoint = arguments.length > 2 ? arguments[2] : undefined;
+function isPointsEq(a1 = [], a2 = [], isAlignPoint) {
   if (isAlignPoint) {
     return a1[0] === a2[0];
   }
   return a1[0] === a2[0] && a1[1] === a2[1];
 }
 function getAlignPopupClassName(builtinPlacements, prefixCls, align, isAlignPoint) {
-  var points = align.points;
-  var placements = Object.keys(builtinPlacements);
-  for (var i = 0; i < placements.length; i += 1) {
-    var _builtinPlacements$pl;
-    var placement = placements[i];
-    if (isPointsEq((_builtinPlacements$pl = builtinPlacements[placement]) === null || _builtinPlacements$pl === void 0 ? void 0 : _builtinPlacements$pl.points, points, isAlignPoint)) {
-      return "".concat(prefixCls, "-placement-").concat(placement);
+  const {
+    points
+  } = align;
+  const placements = Object.keys(builtinPlacements);
+  for (let i = 0; i < placements.length; i += 1) {
+    const placement = placements[i];
+    if (isPointsEq(builtinPlacements[placement]?.points, points, isAlignPoint)) {
+      return `${prefixCls}-placement-${placement}`;
     }
   }
   return '';
 }
-
-/** @deprecated We should not use this if we can refactor all deps */
-function getMotion(prefixCls, motion, animation, transitionName) {
-  if (motion) {
-    return motion;
-  }
-  if (animation) {
-    return {
-      motionName: "".concat(prefixCls, "-").concat(animation)
-    };
-  }
-  if (transitionName) {
-    return {
-      motionName: transitionName
-    };
-  }
-  return null;
-}
 function getWin(ele) {
   return ele.ownerDocument.defaultView;
 }
@@ -60,25 +37,23 @@ function getWin(ele) {
  * @param areaOnly  Only return the parent which will cut visible area
  */
 function collectScroller(ele) {
-  var scrollerList = [];
-  var current = ele === null || ele === void 0 ? void 0 : ele.parentElement;
-  var scrollStyle = ['hidden', 'scroll', 'clip', 'auto'];
+  const scrollerList = [];
+  let current = ele?.parentElement;
+  const scrollStyle = ['hidden', 'scroll', 'clip', 'auto'];
   while (current) {
-    var _getWin$getComputedSt = getWin(current).getComputedStyle(current),
-      overflowX = _getWin$getComputedSt.overflowX,
-      overflowY = _getWin$getComputedSt.overflowY,
-      overflow = _getWin$getComputedSt.overflow;
-    if ([overflowX, overflowY, overflow].some(function (o) {
-      return scrollStyle.includes(o);
-    })) {
+    const {
+      overflowX,
+      overflowY,
+      overflow
+    } = getWin(current).getComputedStyle(current);
+    if ([overflowX, overflowY, overflow].some(o => scrollStyle.includes(o))) {
       scrollerList.push(current);
     }
     current = current.parentElement;
   }
   return scrollerList;
 }
-function toNum(num) {
-  var defaultValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+function toNum(num, defaultValue = 1) {
   return Number.isNaN(num) ? defaultValue : num;
 }
 function getPxValue(val) {
@@ -107,56 +82,61 @@ function getPxValue(val) {
  * Get visible area of element
  */
 function getVisibleArea(initArea, scrollerList) {
-  var visibleArea = (0, _objectSpread2.default)({}, initArea);
-  (scrollerList || []).forEach(function (ele) {
+  const visibleArea = {
+    ...initArea
+  };
+  (scrollerList || []).forEach(ele => {
     if (ele instanceof HTMLBodyElement || ele instanceof HTMLHtmlElement) {
       return;
     }
 
     // Skip if static position which will not affect visible area
-    var _getWin$getComputedSt2 = getWin(ele).getComputedStyle(ele),
-      overflow = _getWin$getComputedSt2.overflow,
-      overflowClipMargin = _getWin$getComputedSt2.overflowClipMargin,
-      borderTopWidth = _getWin$getComputedSt2.borderTopWidth,
-      borderBottomWidth = _getWin$getComputedSt2.borderBottomWidth,
-      borderLeftWidth = _getWin$getComputedSt2.borderLeftWidth,
-      borderRightWidth = _getWin$getComputedSt2.borderRightWidth;
-    var eleRect = ele.getBoundingClientRect();
-    var eleOutHeight = ele.offsetHeight,
-      eleInnerHeight = ele.clientHeight,
-      eleOutWidth = ele.offsetWidth,
-      eleInnerWidth = ele.clientWidth;
-    var borderTopNum = getPxValue(borderTopWidth);
-    var borderBottomNum = getPxValue(borderBottomWidth);
-    var borderLeftNum = getPxValue(borderLeftWidth);
-    var borderRightNum = getPxValue(borderRightWidth);
-    var scaleX = toNum(Math.round(eleRect.width / eleOutWidth * 1000) / 1000);
-    var scaleY = toNum(Math.round(eleRect.height / eleOutHeight * 1000) / 1000);
+    const {
+      overflow,
+      overflowClipMargin,
+      borderTopWidth,
+      borderBottomWidth,
+      borderLeftWidth,
+      borderRightWidth
+    } = getWin(ele).getComputedStyle(ele);
+    const eleRect = ele.getBoundingClientRect();
+    const {
+      offsetHeight: eleOutHeight,
+      clientHeight: eleInnerHeight,
+      offsetWidth: eleOutWidth,
+      clientWidth: eleInnerWidth
+    } = ele;
+    const borderTopNum = getPxValue(borderTopWidth);
+    const borderBottomNum = getPxValue(borderBottomWidth);
+    const borderLeftNum = getPxValue(borderLeftWidth);
+    const borderRightNum = getPxValue(borderRightWidth);
+    const scaleX = toNum(Math.round(eleRect.width / eleOutWidth * 1000) / 1000);
+    const scaleY = toNum(Math.round(eleRect.height / eleOutHeight * 1000) / 1000);
 
     // Original visible area
-    var eleScrollWidth = (eleOutWidth - eleInnerWidth - borderLeftNum - borderRightNum) * scaleX;
-    var eleScrollHeight = (eleOutHeight - eleInnerHeight - borderTopNum - borderBottomNum) * scaleY;
+    const eleScrollWidth = (eleOutWidth - eleInnerWidth - borderLeftNum - borderRightNum) * scaleX;
+    const eleScrollHeight = (eleOutHeight - eleInnerHeight - borderTopNum - borderBottomNum) * scaleY;
 
     // Cut border size
-    var scaledBorderTopWidth = borderTopNum * scaleY;
-    var scaledBorderBottomWidth = borderBottomNum * scaleY;
-    var scaledBorderLeftWidth = borderLeftNum * scaleX;
-    var scaledBorderRightWidth = borderRightNum * scaleX;
+    const scaledBorderTopWidth = borderTopNum * scaleY;
+    const scaledBorderBottomWidth = borderBottomNum * scaleY;
+    const scaledBorderLeftWidth = borderLeftNum * scaleX;
+    const scaledBorderRightWidth = borderRightNum * scaleX;
 
     // Clip margin
-    var clipMarginWidth = 0;
-    var clipMarginHeight = 0;
+    let clipMarginWidth = 0;
+    let clipMarginHeight = 0;
     if (overflow === 'clip') {
-      var clipNum = getPxValue(overflowClipMargin);
+      const clipNum = getPxValue(overflowClipMargin);
       clipMarginWidth = clipNum * scaleX;
       clipMarginHeight = clipNum * scaleY;
     }
 
     // Region
-    var eleLeft = eleRect.x + scaledBorderLeftWidth - clipMarginWidth;
-    var eleTop = eleRect.y + scaledBorderTopWidth - clipMarginHeight;
-    var eleRight = eleLeft + eleRect.width + 2 * clipMarginWidth - scaledBorderLeftWidth - scaledBorderRightWidth - eleScrollWidth;
-    var eleBottom = eleTop + eleRect.height + 2 * clipMarginHeight - scaledBorderTopWidth - scaledBorderBottomWidth - eleScrollHeight;
+    const eleLeft = eleRect.x + scaledBorderLeftWidth - clipMarginWidth;
+    const eleTop = eleRect.y + scaledBorderTopWidth - clipMarginHeight;
+    const eleRight = eleLeft + eleRect.width + 2 * clipMarginWidth - scaledBorderLeftWidth - scaledBorderRightWidth - eleScrollWidth;
+    const eleBottom = eleTop + eleRect.height + 2 * clipMarginHeight - scaledBorderTopWidth - scaledBorderBottomWidth - eleScrollHeight;
     visibleArea.left = Math.max(visibleArea.left, eleLeft);
     visibleArea.top = Math.max(visibleArea.top, eleTop);
     visibleArea.right = Math.min(visibleArea.right, eleRight);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rc-component/trigger",
-  "version": "2.2.6",
+  "version": "3.1.0",
   "description": "base abstract trigger component for react",
   "engines": {
     "node": ">=8.x"
@@ -33,7 +33,7 @@
     "start": "dumi dev",
     "build": "dumi build",
     "compile": "father build && lessc assets/index.less assets/index.css",
-    "prepublishOnly": "npm run compile && np --yolo --no-publish",
+    "prepublishOnly": "npm run compile && rc-np",
     "lint": "eslint src/ docs/examples/ --ext .tsx,.ts,.jsx,.js",
     "test": "rc-test",
     "prettier": "prettier --write .",
@@ -41,21 +41,21 @@
     "now-build": "npm run build"
   },
   "devDependencies": {
-    "@rc-component/father-plugin": "^1.0.0",
+    "@rc-component/father-plugin": "^2.0.0",
+    "@rc-component/np": "^1.0.3",
     "@testing-library/jest-dom": "^6.1.4",
     "@testing-library/react": "^16.0.0",
     "@types/classnames": "^2.2.10",
     "@types/jest": "^29.5.2",
     "@types/node": "^22.0.2",
     "@types/react": "^18.0.0",
-    "@types/react-dom": "^18.0.11",
+    "@types/react-dom": "^18.0.0",
     "@umijs/fabric": "^4.0.1",
     "cross-env": "^7.0.1",
     "dumi": "^2.1.0",
     "eslint": "^8.51.0",
     "father": "^4.0.0",
     "less": "^4.2.0",
-    "np": "^10.0.5",
     "prettier": "^3.3.3",
     "rc-test": "^7.0.13",
     "react": "^18.0.0",
@@ -64,15 +64,14 @@
     "typescript": "^5.1.6"
   },
   "dependencies": {
-    "@babel/runtime": "^7.23.2",
-    "@rc-component/portal": "^1.1.0",
-    "classnames": "^2.3.2",
-    "rc-motion": "^2.0.0",
-    "rc-resize-observer": "^1.3.1",
-    "rc-util": "^5.44.0"
+    "@rc-component/motion": "^1.1.4",
+    "@rc-component/portal": "^2.0.0",
+    "@rc-component/resize-observer": "^1.0.0",
+    "@rc-component/util": "^1.2.1",
+    "classnames": "^2.3.2"
   },
   "peerDependencies": {
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0"
   }
-}
+}