@rescui/collapse 0.8.4-RUI-297-Add-react-compiler-to-the-packages-build-f15074a13.11 → 0.8.5

package/lib/use-collapse-state.js

@@ -1,192 +1,117 @@
 "use client";
-import { c } from 'react-compiler-runtime';
-import { useReducer, useRef, useLayoutEffect } from 'react';
+import { useState, useCallback, useEffect, useLayoutEffect } from 'react';
+const useIsomorphicLayoutEffect = typeof window === 'undefined' ? useEffect : useLayoutEffect;
+
+const getCollapseTransition = element => element.getAnimations().find(animation => animation.transitionProperty === 'grid-template-rows');
+
 var COLLAPSE_STATES;
 
 (function (COLLAPSE_STATES) {
   COLLAPSE_STATES["OPENING"] = "OPENING";
   COLLAPSE_STATES["OPEN"] = "OPEN";
-  COLLAPSE_STATES["CLOSING_PREPARE"] = "CLOSING_PREPARE";
   COLLAPSE_STATES["CLOSING"] = "CLOSING";
   COLLAPSE_STATES["CLOSE"] = "CLOSE";
 })(COLLAPSE_STATES || (COLLAPSE_STATES = {}));
 
-function forceLayoutRecalculation(element) {
-  'use no memo'; // eslint-disable-next-line no-unused-expressions
-
-  element.offsetHeight;
-}
-
-function getInitialState(_ref) {
-  let {
-    shouldBeOpened,
-    cancelAnimation
-  } = _ref;
-
-  if (!shouldBeOpened) {
-    return COLLAPSE_STATES.CLOSE;
-  }
-
-  return cancelAnimation ? COLLAPSE_STATES.OPEN : COLLAPSE_STATES.OPENING;
-}
-
-function getStateForTarget(state, shouldBeOpened, cancelAnimation) {
-  if (cancelAnimation) {
-    return shouldBeOpened ? COLLAPSE_STATES.OPEN : COLLAPSE_STATES.CLOSE;
-  }
-
+function getStateForTarget(state, shouldBeOpened) {
   if (shouldBeOpened) {
-    // Closing has not started visually yet, so there is nothing to animate back.
-    if (state === COLLAPSE_STATES.CLOSING_PREPARE) {
-      return COLLAPSE_STATES.OPEN;
-    }
-
     return state === COLLAPSE_STATES.OPEN || state === COLLAPSE_STATES.OPENING ? state : COLLAPSE_STATES.OPENING;
   }
 
-  if (state === COLLAPSE_STATES.CLOSE || state === COLLAPSE_STATES.CLOSING_PREPARE || state === COLLAPSE_STATES.CLOSING) {
+  if (state === COLLAPSE_STATES.CLOSE || state === COLLAPSE_STATES.CLOSING) {
     return state;
   }
 
-  return state === COLLAPSE_STATES.OPEN ? COLLAPSE_STATES.CLOSING_PREPARE : COLLAPSE_STATES.CLOSING;
+  return COLLAPSE_STATES.CLOSING;
 }
 
-function collapseReducer(state, action) {
-  switch (action.type) {
-    case 'TARGET_CHANGED':
-      return getStateForTarget(state, action.shouldBeOpened, action.cancelAnimation);
-
-    case 'CLOSING_READY':
-      return state === COLLAPSE_STATES.CLOSING_PREPARE ? COLLAPSE_STATES.CLOSING : state;
+function useCollapseState(_ref) {
+  let {
+    shouldBeOpened,
+    contentRef
+  } = _ref;
+  const [state, setState] = useState(shouldBeOpened ? COLLAPSE_STATES.OPEN : COLLAPSE_STATES.CLOSE);
+  const completeTransition = useCallback(expectedState => {
+    setState(currentState => {
+      if (currentState !== expectedState) {
+        return currentState;
+      }
 
-    case 'TRANSITION_END':
-      if (action.shouldBeOpened && state === COLLAPSE_STATES.OPENING) {
+      if (expectedState === COLLAPSE_STATES.OPENING) {
         return COLLAPSE_STATES.OPEN;
       }
 
-      if (!action.shouldBeOpened && state === COLLAPSE_STATES.CLOSING) {
+      if (expectedState === COLLAPSE_STATES.CLOSING) {
         return COLLAPSE_STATES.CLOSE;
       }
 
-      return state;
+      return currentState;
+    });
+  }, []); // Track the grid track transition that currently belongs to OPENING/CLOSING:
+  // - normally, complete the phase after the track reaches its target;
+  // - a direction change can replace the transition, so follow the latest one;
+  // - if the phase changes, cleanup invalidates its waiter, so an old
+  //   transition cannot complete a newer phase;
+  // - if no transition is created (for example, its duration is 0s), complete
+  //   the phase immediately.
+
+  useIsomorphicLayoutEffect(() => {
+    if (state !== COLLAPSE_STATES.OPENING && state !== COLLAPSE_STATES.CLOSING) {
+      return undefined;
+    }
 
-    default:
-      return state;
-  }
-}
+    const contentElement = contentRef.current;
 
-function useCollapseState(t0) {
-  const $ = c(16);
-  const {
-    shouldBeOpened,
-    cancelAnimation
-  } = t0;
-  let t1;
-
-  if ($[0] !== cancelAnimation || $[1] !== shouldBeOpened) {
-    t1 = {
-      shouldBeOpened,
-      cancelAnimation
-    };
-    $[0] = cancelAnimation;
-    $[1] = shouldBeOpened;
-    $[2] = t1;
-  } else {
-    t1 = $[2];
-  }
+    if (!contentElement) {
+      return undefined;
+    }
 
-  const [state, dispatch] = useReducer(collapseReducer, t1, getInitialState);
-  const contentRef = useRef(null);
-  let t2;
-  let t3;
-
-  if ($[3] !== cancelAnimation || $[4] !== shouldBeOpened) {
-    t2 = () => {
-      dispatch({
-        type: "TARGET_CHANGED",
-        shouldBeOpened,
-        cancelAnimation
-      });
+    let isCurrentPhase = true;
+
+    const completeCurrentPhase = () => {
+      if (isCurrentPhase) {
+        completeTransition(state);
+      }
     };
 
-    t3 = [shouldBeOpened, cancelAnimation];
-    $[3] = cancelAnimation;
-    $[4] = shouldBeOpened;
-    $[5] = t2;
-    $[6] = t3;
-  } else {
-    t2 = $[5];
-    t3 = $[6];
-  }
+    const waitForCurrentTransition = previousTransition => {
+      if (!isCurrentPhase) {
+        return Promise.resolve();
+      }
 
-  useLayoutEffect(t2, t3);
-  let t4;
-  let t5;
+      const transition = getCollapseTransition(contentElement);
 
-  if ($[7] !== state) {
-    t4 = () => {
-      if (state !== COLLAPSE_STATES.CLOSING_PREPARE) {
-        return;
+      if (!transition || transition === previousTransition) {
+        return Promise.resolve();
       }
 
-      const frame = requestAnimationFrame(() => {
-        if (contentRef.current) {
-          forceLayoutRecalculation(contentRef.current);
+      return transition.finished.then(() => {
+        if (!isCurrentPhase) {
+          return Promise.resolve();
         }
 
-        dispatch({
-          type: "CLOSING_READY"
-        });
-      });
-      return () => cancelAnimationFrame(frame);
-    };
-
-    t5 = [state];
-    $[7] = state;
-    $[8] = t4;
-    $[9] = t5;
-  } else {
-    t4 = $[8];
-    t5 = $[9];
-  }
+        const replacementTransition = getCollapseTransition(contentElement);
 
-  useLayoutEffect(t4, t5);
-  let t6;
+        if (replacementTransition && replacementTransition !== transition) {
+          return waitForCurrentTransition(transition);
+        }
 
-  if ($[10] !== shouldBeOpened) {
-    t6 = () => {
-      dispatch({
-        type: "TRANSITION_END",
-        shouldBeOpened
-      });
+        return Promise.resolve();
+      }, () => waitForCurrentTransition(transition));
     };
 
-    $[10] = shouldBeOpened;
-    $[11] = t6;
-  } else {
-    t6 = $[11];
-  }
-
-  const onAnimationEnd = t6;
-  const t7 = state === COLLAPSE_STATES.CLOSING_PREPARE;
-  let t8;
-
-  if ($[12] !== onAnimationEnd || $[13] !== state || $[14] !== t7) {
-    t8 = {
-      contentRef,
-      isStartedClosing: t7,
-      onAnimationEnd,
-      state
+    waitForCurrentTransition().then(completeCurrentPhase);
+    return () => {
+      isCurrentPhase = false;
     };
-    $[12] = onAnimationEnd;
-    $[13] = state;
-    $[14] = t7;
-    $[15] = t8;
-  } else {
-    t8 = $[15];
+  }, [completeTransition, contentRef, state]);
+  const stateForTarget = getStateForTarget(state, shouldBeOpened); // React retries this component before rendering its children when the phase changes.
+
+  if (stateForTarget !== state) {
+    setState(stateForTarget);
   }
 
-  return t8;
+  return state;
 }
 
 export { COLLAPSE_STATES, useCollapseState };

package/lib/use-safe-id.d.ts

@@ -1,3 +1,4 @@
 import React from 'react';
-export declare function useFallbackId(): number;
+declare function useFallbackId(): number;
 export declare const useSafeId: typeof React.useId | typeof useFallbackId;
+export {};

package/lib/use-safe-id.js

@@ -7,4 +7,4 @@ function useFallbackId() {
 }
 
 const useSafeId = React.useId ?? useFallbackId;
-export { useFallbackId, useSafeId };
+export { useSafeId };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rescui/collapse",
-  "version": "0.8.4-RUI-297-Add-react-compiler-to-the-packages-build-f15074a13.11+f15074a13",
+  "version": "0.8.5",
   "description": "",
   "license": "Apache-2.0",
   "author": "JetBrains",
@@ -17,26 +17,24 @@
   },
   "dependencies": {
     "@babel/runtime-corejs3": "^7.26.0",
-    "@rescui/use-resize-observer": "0.3.4-RUI-297-Add-react-compiler-to-the-packages-build-f15074a13.11+f15074a13",
-    "classnames": "^2.2.6",
-    "react-compiler-runtime": "^1.0.0"
+    "classnames": "^2.2.6"
   },
   "peerDependencies": {
     "@rescui/ui-contexts": "^0.6.0",
     "prop-types": "^15",
-    "react": ">=17.0.0 <20"
+    "react": ">=16.8.0 <20"
   },
   "devDependencies": {
-    "@rescui/colors": "0.3.3-RUI-297-Add-react-compiler-to-the-packages-build-f15074a13.15+f15074a13",
-    "@rescui/scripts": "0.5.2",
-    "@rescui/typography": "0.27.3-RUI-297-Add-react-compiler-to-the-packages-build-f15074a13.15+f15074a13",
-    "@rescui/visual-regression": "0.1.4",
+    "@rescui/colors": "^0.3.3",
+    "@rescui/scripts": "^0.5.2",
+    "@rescui/typography": "^0.27.4",
+    "@rescui/visual-regression": "^0.1.4",
     "@types/classnames": "^2.2.11"
   },
   "scripts": {
-    "build": "rescui-scripts build --react-compiler-target 17 && yarn run build-pcss-api",
+    "build": "rescui-scripts build && yarn run build-pcss-api",
     "build-pcss-api": "rescui-scripts build-pcss-api --file public-api.p.css"
   },
   "nx": {},
-  "gitHead": "f15074a13a93f4cdfe7b9ac295f0a493e4a0ca0f"
+  "gitHead": "3711cbfc0c797014395421b008aa5331d6d47c6e"
 }