@rc-component/trigger 2.2.5 → 3.0.0

package/lib/hooks/useWatch.js

@@ -1,27 +1,26 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = useWatch;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _useLayoutEffect = _interopRequireDefault(require("rc-util/lib/hooks/useLayoutEffect"));
+var _useLayoutEffect = _interopRequireDefault(require("@rc-component/util/lib/hooks/useLayoutEffect"));
 var _util = require("../util");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function useWatch(open, target, popup, onAlign, onScroll) {
-  (0, _useLayoutEffect.default)(function () {
+  (0, _useLayoutEffect.default)(() => {
     if (open && target && popup) {
-      var targetElement = target;
-      var popupElement = popup;
-      var targetScrollList = (0, _util.collectScroller)(targetElement);
-      var popupScrollList = (0, _util.collectScroller)(popupElement);
-      var win = (0, _util.getWin)(popupElement);
-      var mergedList = new Set([win].concat((0, _toConsumableArray2.default)(targetScrollList), (0, _toConsumableArray2.default)(popupScrollList)));
+      const targetElement = target;
+      const popupElement = popup;
+      const targetScrollList = (0, _util.collectScroller)(targetElement);
+      const popupScrollList = (0, _util.collectScroller)(popupElement);
+      const win = (0, _util.getWin)(popupElement);
+      const mergedList = new Set([win, ...targetScrollList, ...popupScrollList]);
       function notifyScroll() {
         onAlign();
         onScroll();
       }
-      mergedList.forEach(function (scroller) {
+      mergedList.forEach(scroller => {
         scroller.addEventListener('scroll', notifyScroll, {
           passive: true
         });
@@ -32,8 +31,8 @@ function useWatch(open, target, popup, onAlign, onScroll) {
 
       // First time always do align
       onAlign();
-      return function () {
-        mergedList.forEach(function (scroller) {
+      return () => {
+        mergedList.forEach(scroller => {
           scroller.removeEventListener('scroll', notifyScroll);
           win.removeEventListener('resize', notifyScroll);
         });

package/lib/hooks/useWinClick.js

@@ -1,38 +1,38 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = useWinClick;
-var _shadow = require("rc-util/lib/Dom/shadow");
-var _warning = require("rc-util/lib/warning");
+var _shadow = require("@rc-component/util/lib/Dom/shadow");
+var _warning = require("@rc-component/util/lib/warning");
 var React = _interopRequireWildcard(require("react"));
 var _util = require("../util");
+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; }
 function useWinClick(open, clickToHide, targetEle, popupEle, mask, maskClosable, inPopupOrChild, triggerOpen) {
-  var openRef = React.useRef(open);
+  const openRef = React.useRef(open);
   openRef.current = open;
-  var popupPointerDownRef = React.useRef(false);
+  const popupPointerDownRef = React.useRef(false);
 
   // Click to hide is special action since click popup element should not hide
-  React.useEffect(function () {
+  React.useEffect(() => {
     if (clickToHide && popupEle && (!mask || maskClosable)) {
-      var onPointerDown = function onPointerDown() {
+      const onPointerDown = () => {
         popupPointerDownRef.current = false;
       };
-      var onTriggerClose = function onTriggerClose(e) {
-        var _e$composedPath;
-        if (openRef.current && !inPopupOrChild(((_e$composedPath = e.composedPath) === null || _e$composedPath === void 0 || (_e$composedPath = _e$composedPath.call(e)) === null || _e$composedPath === void 0 ? void 0 : _e$composedPath[0]) || e.target) && !popupPointerDownRef.current) {
+      const onTriggerClose = e => {
+        if (openRef.current && !inPopupOrChild(e.composedPath?.()?.[0] || e.target) && !popupPointerDownRef.current) {
           triggerOpen(false);
         }
       };
-      var win = (0, _util.getWin)(popupEle);
+      const win = (0, _util.getWin)(popupEle);
       win.addEventListener('pointerdown', onPointerDown, true);
       win.addEventListener('mousedown', onTriggerClose, true);
       win.addEventListener('contextmenu', onTriggerClose, true);
 
       // shadow root
-      var targetShadowRoot = (0, _shadow.getShadowRoot)(targetEle);
+      const targetShadowRoot = (0, _shadow.getShadowRoot)(targetEle);
       if (targetShadowRoot) {
         targetShadowRoot.addEventListener('mousedown', onTriggerClose, true);
         targetShadowRoot.addEventListener('contextmenu', onTriggerClose, true);
@@ -40,12 +40,11 @@ function useWinClick(open, clickToHide, targetEle, popupEle, mask, maskClosable,
 
       // Warning if target and popup not in same root
       if (process.env.NODE_ENV !== 'production') {
-        var _targetEle$getRootNod, _popupEle$getRootNode;
-        var targetRoot = targetEle === null || targetEle === void 0 || (_targetEle$getRootNod = targetEle.getRootNode) === null || _targetEle$getRootNod === void 0 ? void 0 : _targetEle$getRootNod.call(targetEle);
-        var popupRoot = (_popupEle$getRootNode = popupEle.getRootNode) === null || _popupEle$getRootNode === void 0 ? void 0 : _popupEle$getRootNode.call(popupEle);
-        (0, _warning.warning)(targetRoot === popupRoot, "trigger element and popup element should in same shadow root.");
+        const targetRoot = targetEle?.getRootNode?.();
+        const popupRoot = popupEle.getRootNode?.();
+        (0, _warning.warning)(targetRoot === popupRoot, `trigger element and popup element should in same shadow root.`);
       }
-      return function () {
+      return () => {
         win.removeEventListener('pointerdown', onPointerDown, true);
         win.removeEventListener('mousedown', onTriggerClose, true);
         win.removeEventListener('contextmenu', onTriggerClose, true);

package/lib/index.d.ts

@@ -1,6 +1,6 @@
-import type { CSSMotionProps } from 'rc-motion';
+import type { CSSMotionProps } from '@rc-component/motion';
 import * as React from 'react';
-import type { ActionType, AlignType, AnimationType, ArrowTypeOuter, BuildInPlacements, TransitionNameType } from './interface';
+import type { ActionType, AlignType, ArrowTypeOuter, BuildInPlacements } from './interface';
 export type { ActionType, AlignType, ArrowTypeOuter as ArrowType, BuildInPlacements, };
 export interface TriggerRef {
     nativeElement: HTMLElement;
@@ -23,22 +23,12 @@ export interface TriggerProps {
     getPopupContainer?: (node: HTMLElement) => HTMLElement;
     forceRender?: boolean;
     autoDestroy?: boolean;
-    /** @deprecated Please use `autoDestroy` instead */
-    destroyPopupOnHide?: boolean;
     mask?: boolean;
     maskClosable?: boolean;
     /** Set popup motion. You can ref `rc-motion` for more info. */
     popupMotion?: CSSMotionProps;
     /** Set mask motion. You can ref `rc-motion` for more info. */
     maskMotion?: CSSMotionProps;
-    /** @deprecated Please us `popupMotion` instead. */
-    popupTransitionName?: TransitionNameType;
-    /** @deprecated Please us `popupMotion` instead. */
-    popupAnimation?: AnimationType;
-    /** @deprecated Please us `maskMotion` instead. */
-    maskTransitionName?: TransitionNameType;
-    /** @deprecated Please us `maskMotion` instead. */
-    maskAnimation?: AnimationType;
     mouseEnterDelay?: number;
     mouseLeaveDelay?: number;
     focusDelay?: number;
@@ -59,8 +49,6 @@ export interface TriggerProps {
      */
     fresh?: boolean;
     arrow?: boolean | ArrowTypeOuter;
-    /** @deprecated Add `className` on `children`. Please add `className` directly instead. */
-    className?: string;
     /**
      * @private Get trigger DOM node.
      * Used for some component is function component which can not access by `findDOMNode`