@metron-labs/quote-react 0.1.20 → 0.1.21

package/dist/app/EstimatingTools.js

@@ -1,6 +1,6 @@
 "use client";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { assetUrl } from "../lib/assets";
 import { getQuoteConfig } from "../lib/config";
 import { ESTIMATOR_TOOLS } from "../components/estimators/registry";
@@ -21,6 +21,15 @@ function EstimatingToolsInner({ fullPage = false, hideHeader = false, internal =
     const activeEstimator = ESTIMATOR_TOOLS.find((tool) => tool.id === activeEstimatorId);
     const { cart, updateCartQty, updateCartSellUnits, updateCartConversions, removeFromCart, clearCart } = useCart();
     const { adding, basketError, addToBasket } = useFixedBasket(activeEstimator?.title ?? "calculator");
+    // Every screen change, forward or back, lands at the top.
+    const view = showBasket ? "basket" : adding ? "adding" : review ? "review" : activeEstimatorId ?? "list";
+    const scrolledView = useRef(view);
+    useEffect(() => {
+        if (scrolledView.current === view)
+            return;
+        scrolledView.current = view;
+        window.scrollTo(0, 0);
+    }, [view]);
     const reviewOrBasket = (requirements) => {
         if (!activeEstimator)
             return;

package/dist/app/QuickQuote.js

@@ -99,7 +99,6 @@ function QuickQuoteInner({ fullPage = false, hideHeader = false, internal = fals
     const goToBasket = useCallback(() => {
         writeQuoteHistory("basket");
         setStage("basket");
-        window.scrollTo(0, 0);
     }, [writeQuoteHistory]);
     const backToResults = useCallback(() => {
         const quoteStage = window.history.state?.boqQuoteStage;
@@ -108,6 +107,15 @@ function QuickQuoteInner({ fullPage = false, hideHeader = false, internal = fals
         else
             setStage(scheduleResult ? "results" : "entry");
     }, [scheduleResult]);
+    // Every screen change, forward or back, lands at the top. Runs after the new screen has
+    // rendered, so it also wins over the browser restoring the old scroll on history.back().
+    const scrolledStage = useRef(stage);
+    useEffect(() => {
+        if (scrolledStage.current === stage)
+            return;
+        scrolledStage.current = stage;
+        window.scrollTo(0, 0);
+    }, [stage]);
     // Reset back to the method-selection screen. The uploaded catalogue stays in
     // place — it's a session-level prerequisite, not part of an individual quote.
     const resetToEntry = () => {