@metron-labs/quote-react 0.1.56 → 0.1.58

package/dist/app/QuickQuote.js

@@ -10,7 +10,12 @@ import { ENTRY_DRAFT_KEY } from "./stages/EntryStage";
 import ScheduleResultsStage from "./stages/ScheduleResultsStage";
 import BasketStage from "./stages/BasketStage";
 import { CartProvider, useCart } from "../lib/cart/CartContext";
+import { installQuoteHistory, setStep, stepBack } from "../lib/quoteHistory";
 const SAVED_QUOTE_KEY = "metron-quick-quote";
+// A tab left open for days shouldn't come back with old matches and old prices.
+// ponytail: counts from the last edit, not from matching. Stamp the match time instead if
+// prices move faster than people edit.
+const SAVED_QUOTE_TTL_MS = 24 * 60 * 60 * 1000;
 // Its own provider, separate from the estimating tools' - a quote in progress and a set
 // of calculator results are different baskets.
 export default function QuickQuote(props) {
@@ -48,12 +53,17 @@ function QuickQuoteInner({ fullPage = false, hideHeader = false, internal = fals
     // a server-rendered host doesn't hit a hydration mismatch.
     const [restored, setRestored] = useState(false);
     useEffect(() => {
+        installQuoteHistory();
         const hash = window.location.hash;
         let saved = null;
         try {
             saved = JSON.parse(window.sessionStorage.getItem(SAVED_QUOTE_KEY) ?? "null");
         }
         catch { }
+        // Older than the TTL (or saved before there was a stamp): start fresh. The save effect
+        // below then removes it, as scheduleResult stays null.
+        if (saved && !(Date.now() - (saved.savedAt ?? 0) < SAVED_QUOTE_TTL_MS))
+            saved = null;
         if (saved?.scheduleResult) {
             setEntryMode("schedule");
             setScheduleResult(saved.scheduleResult);
@@ -68,7 +78,7 @@ function QuickQuoteInner({ fullPage = false, hideHeader = false, internal = fals
         else if (hash === "#matched-products" || hash === "#quote-request") {
             const url = new URL(window.location.href);
             url.hash = "";
-            window.history.replaceState(window.history.state, "", url);
+            setStep("replaceState", window.history.state, url);
         }
         setRestored(true);
     }, []);
@@ -81,7 +91,7 @@ function QuickQuoteInner({ fullPage = false, hideHeader = false, internal = fals
             if (!scheduleResult)
                 window.sessionStorage.removeItem(SAVED_QUOTE_KEY);
             else
-                window.sessionStorage.setItem(SAVED_QUOTE_KEY, JSON.stringify({ scheduleResult, reviewGateComplete: scheduleReviewGateComplete, cartSeeded, cart }));
+                window.sessionStorage.setItem(SAVED_QUOTE_KEY, JSON.stringify({ savedAt: Date.now(), scheduleResult, reviewGateComplete: scheduleReviewGateComplete, cartSeeded, cart }));
         }
         catch { }
     }, [restored, scheduleResult, scheduleReviewGateComplete, cartSeeded, cart]);
@@ -96,11 +106,12 @@ function QuickQuoteInner({ fullPage = false, hideHeader = false, internal = fals
         // New results while the URL still carries one of our steps (start over, or the host
         // re-rendered the page under us) reuse that entry, or back would land on a stale copy.
         const stale = next === "results" && (window.location.hash === "#matched-products" || window.location.hash === "#quote-request");
-        window.history[stale ? "replaceState" : "pushState"]({ boqQuoteStage: next }, "", url);
+        setStep(stale ? "replaceState" : "pushState", { boqQuoteStage: next }, url);
     }, []);
     const leavingBasket = useRef(false);
     useEffect(() => {
-        const onPopState = (event) => {
+        // Host routers (Turbo, Salesfire) are kept out of these by lib/quoteHistory.
+        const onPopState = () => {
             leavingBasket.current = false;
             const hash = window.location.hash;
             if (hash === "#quote-request")
@@ -112,24 +123,6 @@ function QuickQuoteInner({ fullPage = false, hideHeader = false, internal = fals
             }
             else
                 setStage("entry");
-            // Turbo's popstate listener (registered before ours, so it can't be pre-empted) stamps its
-            // restoration id over any entry without one - ours, or the host's own entry for this page.
-            // On the next back/forward it then treats that entry as its page visit and re-renders the
-            // page, wiping the quote. Once every listener has run, undo the stamp.
-            const original = event.state;
-            const href = window.location.href;
-            setTimeout(() => {
-                if (window.location.href !== href)
-                    return;
-                // Our own steps always get our state back, even if a stamp slipped through earlier -
-                // otherwise it sticks and every later visit to that step is a Turbo page visit.
-                if (hash === "#quote-request" || hash === "#matched-products" || hash === "#quote-entry") {
-                    window.history.replaceState({ boqQuoteStage: hash === "#quote-request" ? "basket" : hash === "#quote-entry" ? "entry" : "results" }, "", href);
-                    return;
-                }
-                if (!original?.turbo && window.history.state?.turbo)
-                    window.history.replaceState(original, "", href);
-            });
         };
         window.addEventListener("popstate", onPopState);
         return () => window.removeEventListener("popstate", onPopState);
@@ -147,7 +140,7 @@ function QuickQuoteInner({ fullPage = false, hideHeader = false, internal = fals
             if (leavingBasket.current)
                 return;
             leavingBasket.current = true;
-            window.history.back();
+            stepBack();
             return;
         }
         setStage(scheduleResult ? "results" : "entry");

package/dist/app/stages/EntryStage.js

@@ -7,6 +7,7 @@ import CloseIcon from "../../components/CloseIcon";
 import { FILE_EXTENSIONS, isPhotoFile, shrinkPhoto, validateLines, validateUploadFile } from "../../lib/boq/inputLimits";
 import { ProcessingContent } from "./ProcessingStage";
 import { useEscapeKey } from "../../lib/useEscapeKey";
+import { setStep, stepBack } from "../../lib/quoteHistory";
 const UPLOAD_ACCEPT = [...FILE_EXTENSIONS.schedule, ...FILE_EXTENSIONS.photo].join(",");
 const STEPS = {
     paste: [
@@ -67,7 +68,7 @@ export default function EntryStage({ onPasteSchedule, onUploadSchedule, onEntryM
             // the dialog would reuse this step and closing it would go back off the page.
             const url = new URL(window.location.href);
             url.hash = "";
-            window.history.replaceState(window.history.state, "", url);
+            setStep("replaceState", window.history.state, url);
             return;
         }
         lastTab.current = saved.tab;
@@ -110,7 +111,7 @@ export default function EntryStage({ onPasteSchedule, onUploadSchedule, onEntryM
         // Our own state only, as in QuickQuote's writeQuoteHistory. A results/basket hash left
         // behind by "start over" is reused, or back would land on that stale step.
         const stale = hash === "#matched-products" || hash === "#quote-request";
-        window.history[stale ? "replaceState" : "pushState"]({ boqQuoteStage: "entry" }, "", url);
+        setStep(stale ? "replaceState" : "pushState", { boqQuoteStage: "entry" }, url);
     };
     const closeWorkflow = () => {
         setActiveTab(null);
@@ -118,7 +119,7 @@ export default function EntryStage({ onPasteSchedule, onUploadSchedule, onEntryM
         // Drop the dialog's step too. Closing hides the dialog straight away, so a second
         // Escape/click can't step back again past the page.
         if (window.location.hash === DIALOG_HASH)
-            window.history.back();
+            stepBack();
     };
     // Like the close button, but not mid-match, where the modal is showing progress.
     useEscapeKey(Boolean(activeTab) && !matching, closeWorkflow);