@tramvai/state 1.79.0 → 1.82.2

package/lib/connect/hooks/useIsomorphicLayoutEffect.d.ts

@@ -1,2 +1 @@
-import { useLayoutEffect } from 'react';
-export declare const useIsomorphicLayoutEffect: typeof useLayoutEffect;
+export { useIsomorphicLayoutEffect } from '@tinkoff/react-hooks';

package/lib/index.es.js

@@ -6,10 +6,11 @@ import shallowEqual from '@tinkoff/utils/is/shallowEqual';
 import strictEqual from '@tinkoff/utils/is/strictEqual';
 import hoistStatics from 'hoist-non-react-statics';
 import invariant from 'invariant';
-import React, { createContext, useContext, useMemo, useLayoutEffect, useEffect, useRef, useReducer, useCallback } from 'react';
+import React, { createContext, useContext, useMemo, useRef, useReducer, useCallback } from 'react';
 import { isValidElementType } from 'react-is';
 import isArray from '@tinkoff/utils/is/array';
-import { useShallowEqual } from '@tinkoff/react-hooks';
+import { useShallowEqual, useIsomorphicLayoutEffect } from '@tinkoff/react-hooks';
+export { useIsomorphicLayoutEffect } from '@tinkoff/react-hooks';
 import noop from '@tinkoff/utils/function/noop';
 import toArray from '@tinkoff/utils/array/toArray';
 import always from '@tinkoff/utils/function/always';
@@ -671,16 +672,6 @@ function useActions(actions) {
     }, [actionsRef, context]);
 }
 
-// React currently throws a warning when using useLayoutEffect on the server.
-// To get around it, we can conditionally useEffect on the server (no-op) and
-// useLayoutEffect in the browser. We need useLayoutEffect to ensure the store
-// subscription callback always has the selector from the latest render commit
-// available, otherwise a store update may happen between render and the effect,
-// which may cause missed updates; we also must ensure the store subscription
-// is created synchronously, otherwise a store update may occur before the
-// subscription is created and an inconsistent state may be observed
-const useIsomorphicLayoutEffect = typeof window !== 'undefined' ? useLayoutEffect : useEffect;
-
 function useStore(reducer) {
     const context = useConsumerContext();
     const reducerRef = useRef(reducer);
@@ -1380,4 +1371,4 @@ function createConnect({ connectHOC = connectAdvanced, mapStateToPropsFactories:
 const connect = /* @__PURE__ */ createConnect();
 const { Consumer } = ConnectContext;
 
-export { BaseStore, ChildDispatcherContext, Consumer, Dispatcher, DispatcherContext, Provider, Subscription, connect, convertAction, createConnect, createDispatcher, createEvent, createReducer, index as devTools, useActions, useConsumerContext, useIsomorphicLayoutEffect, useSelector, useStore, useStoreSelector };
+export { BaseStore, ChildDispatcherContext, Consumer, Dispatcher, DispatcherContext, Provider, Subscription, connect, convertAction, createConnect, createDispatcher, createEvent, createReducer, index as devTools, useActions, useConsumerContext, useSelector, useStore, useStoreSelector };

package/lib/index.js

@@ -694,16 +694,6 @@ function useActions(actions) {
     }, [actionsRef, context]);
 }
 
-// React currently throws a warning when using useLayoutEffect on the server.
-// To get around it, we can conditionally useEffect on the server (no-op) and
-// useLayoutEffect in the browser. We need useLayoutEffect to ensure the store
-// subscription callback always has the selector from the latest render commit
-// available, otherwise a store update may happen between render and the effect,
-// which may cause missed updates; we also must ensure the store subscription
-// is created synchronously, otherwise a store update may occur before the
-// subscription is created and an inconsistent state may be observed
-const useIsomorphicLayoutEffect = typeof window !== 'undefined' ? React.useLayoutEffect : React.useEffect;
-
 function useStore(reducer) {
     const context = useConsumerContext();
     const reducerRef = React.useRef(reducer);
@@ -718,7 +708,7 @@ function useStore(reducer) {
         addedReducerRef.current = reducer.storeName;
     }
     const stateRef = React.useRef(context.getState(reducer));
-    useIsomorphicLayoutEffect(() => {
+    reactHooks.useIsomorphicLayoutEffect(() => {
         const subscribe = (updatedState) => {
             // если состояние текущего редьюсера изменилось,
             // обновляем локальное состояние и ререндерим компонент
@@ -788,12 +778,12 @@ function useSelector(storesOrStore, selector, equalityFn = shallowEqual__default
         }
         throw new Error(errorMessage);
     }
-    useIsomorphicLayoutEffect(() => {
+    reactHooks.useIsomorphicLayoutEffect(() => {
         latestSelector.current = selector;
         latestSelectedState.current = selectedState;
         latestSubscriptionCallbackError.current = undefined;
     });
-    useIsomorphicLayoutEffect(() => {
+    reactHooks.useIsomorphicLayoutEffect(() => {
         let didUnsubscribe = false;
         function checkForUpdates() {
             renderIsScheduled.current = false;
@@ -972,7 +962,7 @@ pure = true,
             // We need this to execute synchronously every time we re-render. However, React warns
             // about useLayoutEffect in SSR, so we try to detect environment and fall back to
             // just useEffect instead to avoid the warning, since neither will run anyway.
-            useIsomorphicLayoutEffect(() => {
+            reactHooks.useIsomorphicLayoutEffect(() => {
                 // We want to capture the wrapper props and child props we used for later comparisons
                 lastWrapperProps.current = wrapperProps;
                 lastChildProps.current = actualChildProps;
@@ -982,7 +972,7 @@ pure = true,
                 }
             });
             // Our re-subscribe logic only runs when the store/subscription setup changes
-            useIsomorphicLayoutEffect(() => {
+            reactHooks.useIsomorphicLayoutEffect(() => {
                 // If we're not subscribed to the store, nothing to do here
                 if (!subscription)
                     return;
@@ -1403,6 +1393,10 @@ function createConnect({ connectHOC = connectAdvanced, mapStateToPropsFactories:
 const connect = /* @__PURE__ */ createConnect();
 const { Consumer } = ConnectContext;
 
+Object.defineProperty(exports, 'useIsomorphicLayoutEffect', {
+    enumerable: true,
+    get: function () { return reactHooks.useIsomorphicLayoutEffect; }
+});
 exports.BaseStore = BaseStore;
 exports.ChildDispatcherContext = ChildDispatcherContext;
 exports.Consumer = Consumer;
@@ -1419,7 +1413,6 @@ exports.createReducer = createReducer;
 exports.devTools = index;
 exports.useActions = useActions;
 exports.useConsumerContext = useConsumerContext;
-exports.useIsomorphicLayoutEffect = useIsomorphicLayoutEffect;
 exports.useSelector = useSelector;
 exports.useStore = useStore;
 exports.useStoreSelector = useStoreSelector;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/state",
-  "version": "1.79.0",
+  "version": "1.82.2",
   "description": "",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -18,9 +18,9 @@
     "build-for-publish": "true"
   },
   "dependencies": {
-    "@tinkoff/react-hooks": "0.0.23",
+    "@tinkoff/react-hooks": "0.0.24",
     "@tinkoff/utils": "^2.1.2",
-    "@tramvai/types-actions-state-context": "1.79.0",
+    "@tramvai/types-actions-state-context": "1.82.2",
     "@types/hoist-non-react-statics": "^3.3.1",
     "invariant": "^2.2.4",
     "react-is": ">=17",