@tramvai/module-autoscroll 5.50.0 → 5.53.78

package/lib/components/Autoscroll.es.js

@@ -15,8 +15,9 @@ const scrollToTop = (behavior, top) => {
         window.scrollTo(0, top);
     }
 };
-const isAutoScrollEnabled = (route) => {
-    return !route.navigateState?.disableAutoscroll;
+const isAutoScrollEnabled = (route, prevRoute) => {
+    const isDisabled = route.navigateState?.disableAutoscroll || prevRoute.navigateState?.disableAutoscroll;
+    return !isDisabled;
 };
 const scrollToAnchor = (anchor, behavior) => {
     try {
@@ -29,20 +30,29 @@ const scrollToAnchor = (anchor, behavior) => {
         return false;
     }
 };
+function usePreviousValue(value) {
+    const prevValueRef = useRef(value);
+    /** Сохраняем предыдущее значение */
+    useEffect(() => {
+        prevValueRef.current = value;
+    }, [value]);
+    return prevValueRef.current;
+}
 // Поведение с подскроллом похоже на
 // https://reacttraining.com/react-router/web/guides/scroll-restoration/scroll-to-top
 function Autoscroll() {
     const globalScrollBehavior = useDi(optional(AUTOSCROLL_BEHAVIOR_MODE_TOKEN)) || DEFAULT_AUTOSCROLL_BEHAVIOR;
     const scrollTop = useDi(optional(AUTOSCROLL_SCROLL_TOP_TOKEN)) ?? DEFAULT_AUTOSCROLL_SCROLL_TOP;
     const route = useRoute();
+    const prevRoute = usePreviousValue(route);
     const url = useUrl();
     const routeRef = useRef(url);
-    const shouldScroll = useRef(!!routeRef.current.hash && isAutoScrollEnabled(route));
+    const shouldScroll = useRef(!!routeRef.current.hash && isAutoScrollEnabled(route, prevRoute));
     // Так как отрисовка нужного нам элемента происходит после обновления route, при первом срабатывании эффекта мы обновляем shouldScroll, а при втором скроллим
     useEffect(() => {
         if (url.pathname !== routeRef.current.pathname || url.hash !== routeRef.current.hash) {
             routeRef.current = url;
-            shouldScroll.current = isAutoScrollEnabled(route);
+            shouldScroll.current = isAutoScrollEnabled(route, prevRoute);
         }
         if (!shouldScroll.current) {
             return;

package/lib/components/Autoscroll.js

@@ -19,8 +19,9 @@ const scrollToTop = (behavior, top) => {
         window.scrollTo(0, top);
     }
 };
-const isAutoScrollEnabled = (route) => {
-    return !route.navigateState?.disableAutoscroll;
+const isAutoScrollEnabled = (route, prevRoute) => {
+    const isDisabled = route.navigateState?.disableAutoscroll || prevRoute.navigateState?.disableAutoscroll;
+    return !isDisabled;
 };
 const scrollToAnchor = (anchor, behavior) => {
     try {
@@ -33,20 +34,29 @@ const scrollToAnchor = (anchor, behavior) => {
         return false;
     }
 };
+function usePreviousValue(value) {
+    const prevValueRef = react$1.useRef(value);
+    /** Сохраняем предыдущее значение */
+    react$1.useEffect(() => {
+        prevValueRef.current = value;
+    }, [value]);
+    return prevValueRef.current;
+}
 // Поведение с подскроллом похоже на
 // https://reacttraining.com/react-router/web/guides/scroll-restoration/scroll-to-top
 function Autoscroll() {
     const globalScrollBehavior = react.useDi(dippy.optional(tokens.AUTOSCROLL_BEHAVIOR_MODE_TOKEN)) || DEFAULT_AUTOSCROLL_BEHAVIOR;
     const scrollTop = react.useDi(dippy.optional(tokens.AUTOSCROLL_SCROLL_TOP_TOKEN)) ?? DEFAULT_AUTOSCROLL_SCROLL_TOP;
     const route = moduleRouter.useRoute();
+    const prevRoute = usePreviousValue(route);
     const url = moduleRouter.useUrl();
     const routeRef = react$1.useRef(url);
-    const shouldScroll = react$1.useRef(!!routeRef.current.hash && isAutoScrollEnabled(route));
+    const shouldScroll = react$1.useRef(!!routeRef.current.hash && isAutoScrollEnabled(route, prevRoute));
     // Так как отрисовка нужного нам элемента происходит после обновления route, при первом срабатывании эффекта мы обновляем shouldScroll, а при втором скроллим
     react$1.useEffect(() => {
         if (url.pathname !== routeRef.current.pathname || url.hash !== routeRef.current.hash) {
             routeRef.current = url;
-            shouldScroll.current = isAutoScrollEnabled(route);
+            shouldScroll.current = isAutoScrollEnabled(route, prevRoute);
         }
         if (!shouldScroll.current) {
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tramvai/module-autoscroll",
-  "version": "5.50.0",
+  "version": "5.53.78",
   "description": "Компонент с автопрокруткой к началу страницы",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -17,11 +17,11 @@
     "watch": "tsc -w"
   },
   "peerDependencies": {
-    "@tinkoff/dippy": "0.11.4",
-    "@tramvai/core": "5.50.0",
-    "@tramvai/module-router": "5.50.0",
-    "@tramvai/react": "5.50.0",
-    "@tramvai/tokens-render": "5.50.0",
+    "@tinkoff/dippy": "0.11.5",
+    "@tramvai/core": "5.53.78",
+    "@tramvai/module-router": "5.53.78",
+    "@tramvai/react": "5.53.78",
+    "@tramvai/tokens-render": "5.53.78",
     "react": ">=16.14.0",
     "tslib": "^2.4.0"
   },