@metron-labs/quote-react 0.1.19 → 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 = () => {

package/dist/app/stages/BasketStage.js

@@ -11,6 +11,7 @@ import { clientHeaders, getBoqClientId, readJson } from "../../lib/api/boqClient
 // ponytail: flat UK VAT rate, matching fmtCurrency's GBP-only assumption elsewhere in this app.
 const VAT_RATE = 0.2;
 const PAGE_SIZE = 10;
+const INVALID_EMAIL_MESSAGE = "Enter a valid email address so we can send your quote.";
 const orderSummary = (item, pricing) => {
     const requested = `${pricing.requestedAmount} ${unitDisplayText(pricing.requestedUnit, pricing.requestedAmount)}`;
     const order = `${pricing.requiredSellUnits} ${unitDisplayText(pricing.sellUnit, pricing.requiredSellUnits ?? 0)}`;
@@ -145,7 +146,7 @@ export default function BasketStage({ cart, onUpdateQty, onUpdateSellUnits, onRe
     async function submitQuoteRequest() {
         const email = reference.trim();
         if (!/^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email)) {
-            setQuoteContactError("Enter a valid email address so we can send your better price.");
+            setQuoteContactError(INVALID_EMAIL_MESSAGE);
             return;
         }
         setQuoteContactError("");
@@ -175,7 +176,10 @@ export default function BasketStage({ cart, onUpdateQty, onUpdateSellUnits, onRe
             });
             if (!res.ok) {
                 const payload = await readJson(res);
-                setQuoteContactError(res.status === 429 ? "You've sent a few requests already. Please try again in a few minutes." : (payload?.message ?? "Your request couldn't be sent. Please try again."));
+                // The API's own message is written for developers (e.g. "items.0: Unrecognized key(s)"),
+                // so the customer gets a plain one and the console keeps the detail.
+                console.error("Quote request failed", res.status, payload?.message);
+                setQuoteContactError(res.status === 429 ? "You've sent a few requests already. Please try again in a few minutes." : "Your request couldn't be sent. Please try again, or contact us if it keeps happening.");
                 return;
             }
             setQuoteRequestSent(true);
@@ -232,7 +236,7 @@ export default function BasketStage({ cart, onUpdateQty, onUpdateSellUnits, onRe
                                                     setReference(e.target.value);
                                                     if (qzaBasketLayout)
                                                         setQuoteContactError("");
-                                                }, placeholder: qzaBasketLayout ? "you@example.com" : "PO number or job reference" }), qzaBasketLayout && quoteContactError && (_jsx("p", { className: "basket-quote-request-error", role: "alert", children: quoteContactError })), qzaBasketLayout ? (_jsx("button", { type: "button", className: "cta-btn", onClick: () => void submitQuoteRequest(), disabled: quoteRequestSending, "aria-busy": quoteRequestSending, children: _jsx("span", { children: quoteRequestSending ? "Sending…" : "Request our best quote" }) })) : (_jsx("button", { className: "cta-btn", onClick: () => void exportBasketExcel(items), "aria-label": internal ? "Download selection" : "Download basket", children: _jsx("span", { children: internal ? "Download Quote" : "Buy Now" }) })), _jsxs("p", { className: "basket-sidebar-disclaimer", children: [_jsx("span", { "aria-hidden": "true", children: "\u26A0\uFE0F" }), qzaBasketLayout
+                                                }, placeholder: qzaBasketLayout ? "you@example.com" : "PO number or job reference", "aria-invalid": qzaBasketLayout && quoteContactError === INVALID_EMAIL_MESSAGE, "aria-describedby": qzaBasketLayout && quoteContactError ? `${uid}-basket-reference-error` : undefined }), qzaBasketLayout && quoteContactError && (_jsx("p", { id: `${uid}-basket-reference-error`, className: "basket-quote-request-error", role: "alert", children: quoteContactError })), qzaBasketLayout ? (_jsx("button", { type: "button", className: "cta-btn", onClick: () => void submitQuoteRequest(), disabled: quoteRequestSending, "aria-busy": quoteRequestSending, children: _jsx("span", { children: quoteRequestSending ? "Sending…" : "Request our best quote" }) })) : (_jsx("button", { className: "cta-btn", onClick: () => void exportBasketExcel(items), "aria-label": internal ? "Download selection" : "Download basket", children: _jsx("span", { children: internal ? "Download Quote" : "Buy Now" }) })), _jsxs("p", { className: "basket-sidebar-disclaimer", children: [_jsx("span", { "aria-hidden": "true", children: "\u26A0\uFE0F" }), qzaBasketLayout
                                                         ? "This is a quote request, not an order. We'll confirm our best price, availability and delivery before you approve."
                                                         : "Prices and availability are estimates and should be confirmed before procurement."] })] })] }), _jsx("div", { className: "btn-row results-actions", children: _jsxs("button", { className: "cta-btn cta-btn-secondary", style: { flex: "0 1 30%", gap: 10, justifyContent: "center" }, onClick: onBack, "aria-label": "Back to results", children: [_jsx(BackArrow, {}), _jsx("span", { children: "Back to results" })] }) })] })) })] }) }));
 }