@rc-component/trigger 2.2.6 → 3.1.0

package/es/hooks/useWatch.js

@@ -1,20 +1,19 @@
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import useLayoutEffect from "rc-util/es/hooks/useLayoutEffect";
+import useLayoutEffect from "@rc-component/util/es/hooks/useLayoutEffect";
 import { collectScroller, getWin } from "../util";
 export default function useWatch(open, target, popup, onAlign, onScroll) {
-  useLayoutEffect(function () {
+  useLayoutEffect(() => {
     if (open && target && popup) {
-      var targetElement = target;
-      var popupElement = popup;
-      var targetScrollList = collectScroller(targetElement);
-      var popupScrollList = collectScroller(popupElement);
-      var win = getWin(popupElement);
-      var mergedList = new Set([win].concat(_toConsumableArray(targetScrollList), _toConsumableArray(popupScrollList)));
+      const targetElement = target;
+      const popupElement = popup;
+      const targetScrollList = collectScroller(targetElement);
+      const popupScrollList = collectScroller(popupElement);
+      const win = 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
         });
@@ -25,8 +24,8 @@ export default 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/es/hooks/useWinClick.js

@@ -1,31 +1,30 @@
-import { getShadowRoot } from "rc-util/es/Dom/shadow";
-import { warning } from "rc-util/es/warning";
+import { getShadowRoot } from "@rc-component/util/es/Dom/shadow";
+import { warning } from "@rc-component/util/es/warning";
 import * as React from 'react';
 import { getWin } from "../util";
 export default 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 = getWin(popupEle);
+      const win = getWin(popupEle);
       win.addEventListener('pointerdown', onPointerDown, true);
       win.addEventListener('mousedown', onTriggerClose, true);
       win.addEventListener('contextmenu', onTriggerClose, true);
 
       // shadow root
-      var targetShadowRoot = getShadowRoot(targetEle);
+      const targetShadowRoot = getShadowRoot(targetEle);
       if (targetShadowRoot) {
         targetShadowRoot.addEventListener('mousedown', onTriggerClose, true);
         targetShadowRoot.addEventListener('contextmenu', onTriggerClose, true);
@@ -33,12 +32,11 @@ export default function useWinClick(open, clickToHide, targetEle, popupEle, mask
 
       // 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);
-        warning(targetRoot === popupRoot, "trigger element and popup element should in same shadow root.");
+        const targetRoot = targetEle?.getRootNode?.();
+        const popupRoot = popupEle.getRootNode?.();
+        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/es/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`