@rc-component/trigger 3.6.16 → 3.7.1

package/es/index.d.ts

@@ -12,7 +12,9 @@ export interface TriggerRef {
     forceAlign: VoidFunction;
 }
 export interface TriggerProps {
-    children: React.ReactElement<any>;
+    children: React.ReactElement<any> | ((info: {
+        open: boolean;
+    }) => React.ReactElement<any>);
     action?: ActionType | ActionType[];
     showAction?: ActionType[];
     hideAction?: ActionType[];

package/es/index.js

@@ -16,6 +16,7 @@ import useWatch from "./hooks/useWatch";
 import useWinClick from "./hooks/useWinClick";
 import { getAlignPopupClassName } from "./util";
 import UniqueProvider from "./UniqueProvider";
+import { useControlledState } from '@rc-component/util';
 export { UniqueProvider };
 
 // Removed Props List
@@ -125,10 +126,6 @@ export function generateTrigger(PortalComponent = Portal) {
         externalForwardRef.current = node;
       }
     });
-
-    // ========================== Children ==========================
-    const child = React.Children.only(children);
-    const originChildProps = child?.props || {};
     const cloneProps = {};
     const inPopupOrChild = useEvent(ele => {
       const childDOM = targetEle;
@@ -142,23 +139,20 @@ export function generateTrigger(PortalComponent = Portal) {
     } : null;
 
     // ============================ Open ============================
-    const [internalOpen, setInternalOpen] = React.useState(defaultPopupVisible || false);
+    const [internalOpen, setInternalOpen] = useControlledState(defaultPopupVisible || false, popupVisible);
+    const mergedOpen = internalOpen || false;
 
-    // Render still use props as first priority
-    const mergedOpen = popupVisible ?? internalOpen;
-
-    // We use effect sync here in case `popupVisible` back to `undefined`
-    const setMergedOpen = useEvent(nextOpen => {
-      if (openUncontrolled) {
-        setInternalOpen(nextOpen);
-      }
-    });
+    // ========================== Children ==========================
+    const child = React.useMemo(() => {
+      const nextChild = typeof children === 'function' ? children({
+        open: mergedOpen
+      }) : children;
+      return React.Children.only(nextChild);
+    }, [children, mergedOpen]);
+    const originChildProps = child?.props || {};
 
     // Support ref
     const isOpen = useEvent(() => mergedOpen);
-    useLayoutEffect(() => {
-      setInternalOpen(popupVisible || false);
-    }, [popupVisible]);
 
     // Extract common options for UniqueProvider
     const getUniqueOptions = useEvent((delay = 0) => ({
@@ -201,7 +195,7 @@ export function generateTrigger(PortalComponent = Portal) {
     const lastTriggerRef = React.useRef([]);
     lastTriggerRef.current = [];
     const internalTriggerOpen = useEvent(nextOpen => {
-      setMergedOpen(nextOpen);
+      setInternalOpen(nextOpen);
 
       // Enter or Pointer will both trigger open state change
       // We only need take one to avoid duplicated change event trigger

package/lib/index.d.ts

@@ -12,7 +12,9 @@ export interface TriggerRef {
     forceAlign: VoidFunction;
 }
 export interface TriggerProps {
-    children: React.ReactElement<any>;
+    children: React.ReactElement<any> | ((info: {
+        open: boolean;
+    }) => React.ReactElement<any>);
     action?: ActionType | ActionType[];
     showAction?: ActionType[];
     hideAction?: ActionType[];

package/lib/index.js

@@ -29,6 +29,7 @@ var _useWatch = _interopRequireDefault(require("./hooks/useWatch"));
 var _useWinClick = _interopRequireDefault(require("./hooks/useWinClick"));
 var _util = require("./util");
 var _UniqueProvider = _interopRequireDefault(require("./UniqueProvider"));
+var _util2 = require("@rc-component/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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -139,10 +140,6 @@ function generateTrigger(PortalComponent = _portal.default) {
         externalForwardRef.current = node;
       }
     });
-
-    // ========================== Children ==========================
-    const child = React.Children.only(children);
-    const originChildProps = child?.props || {};
     const cloneProps = {};
     const inPopupOrChild = (0, _useEvent.default)(ele => {
       const childDOM = targetEle;
@@ -156,23 +153,20 @@ function generateTrigger(PortalComponent = _portal.default) {
     } : null;
 
     // ============================ Open ============================
-    const [internalOpen, setInternalOpen] = React.useState(defaultPopupVisible || false);
+    const [internalOpen, setInternalOpen] = (0, _util2.useControlledState)(defaultPopupVisible || false, popupVisible);
+    const mergedOpen = internalOpen || false;
 
-    // Render still use props as first priority
-    const mergedOpen = popupVisible ?? internalOpen;
-
-    // We use effect sync here in case `popupVisible` back to `undefined`
-    const setMergedOpen = (0, _useEvent.default)(nextOpen => {
-      if (openUncontrolled) {
-        setInternalOpen(nextOpen);
-      }
-    });
+    // ========================== Children ==========================
+    const child = React.useMemo(() => {
+      const nextChild = typeof children === 'function' ? children({
+        open: mergedOpen
+      }) : children;
+      return React.Children.only(nextChild);
+    }, [children, mergedOpen]);
+    const originChildProps = child?.props || {};
 
     // Support ref
     const isOpen = (0, _useEvent.default)(() => mergedOpen);
-    (0, _useLayoutEffect.default)(() => {
-      setInternalOpen(popupVisible || false);
-    }, [popupVisible]);
 
     // Extract common options for UniqueProvider
     const getUniqueOptions = (0, _useEvent.default)((delay = 0) => ({
@@ -215,7 +209,7 @@ function generateTrigger(PortalComponent = _portal.default) {
     const lastTriggerRef = React.useRef([]);
     lastTriggerRef.current = [];
     const internalTriggerOpen = (0, _useEvent.default)(nextOpen => {
-      setMergedOpen(nextOpen);
+      setInternalOpen(nextOpen);
 
       // Enter or Pointer will both trigger open state change
       // We only need take one to avoid duplicated change event trigger

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rc-component/trigger",
-  "version": "3.6.16",
+  "version": "3.7.1",
   "description": "base abstract trigger component for react",
   "engines": {
     "node": ">=8.x"