@depict-ai/ui 4.10.19 → 4.10.21

package/server/ES10/index.js

@@ -10,7 +10,7 @@ import $b8hua$babelruntimehelpersclassPrivateFieldGet from "@babel/runtime/helpe
 /*! Depict.ai search and product listing SDK */
 import { register_es_version } from "../../multi_import_deduplicator.mjs";
 register_es_version("ui", "ES10");
-const $8db9a15135765c11$export$83d89fbfd8236492 = "4.10.19";
+const $8db9a15135765c11$export$83d89fbfd8236492 = "4.10.21";
 function $00a5b94f0c11efbb$export$d9f36cf74e24d595(media_query) {
   const signal = $b8hua$createSignal(false);
   $b8hua$onCleanup($b8hua$javascript_media_query(media_query, _ref => {
@@ -2113,6 +2113,63 @@ function $4711a82d08d2021b$export$fecbb157621501bd(_ref) {
   }));
   return outmost_element;
 }
+
+/**
+ * `HTMLElement.focus()` is a **silent no-op** on an element that is not being rendered
+ * (`display: none`, `visibility: hidden`, a collapsed menu). Nothing throws, focus simply
+ * stays where it was, so a caller that does not check believes it restored focus when it
+ * left it on `<body>` — which puts the keyboard user back at the top of the document.
+ *
+ * That is reachable whenever the element which opened a modal stops being rendered while the
+ * modal is open, and the common way for that to happen is the responsive-duplicate header:
+ * a theme renders the same search trigger twice, once for desktop and once for mobile, and
+ * hides one at the current breakpoint. Open the modal from the desktop trigger, cross the
+ * breakpoint (rotate a tablet, resize a window), close the modal, and the remembered trigger
+ * is still `isConnected` but no longer rendered. Verified against a live merchant storefront
+ * on 4.10.19.
+ *
+ * So: verify that focus landed, and when it did not, look for a rendered twin of the same
+ * control — the other half of the responsive pair — and use that instead.
+ */ /**
+    * An element can only take focus if it is actually being rendered.
+    *
+    * Injectable because it is the one part of this module that needs a layout engine: jsdom
+    * reports no client rects for anything, so the specs pass their own predicate to exercise the
+    * matching rules. The real predicate is only exercised in a browser.
+    */
+const $1c5106dfe72d554c$export$e0652711c614c755 = element => !!element.getClientRects().length;
+/**
+ * `document.activeElement` is the outermost shadow host when focus is inside a shadow tree,
+ * so ask the element's own root rather than the document — matching how the rest of
+ * modal_opener treats shadow-mounted modals.
+ */
+const $1c5106dfe72d554c$var$has_focus = element => element.getRootNode().activeElement === element;
+/**
+ * The accessible-name-ish identity we match twins on. Deliberately narrow: an explicit label
+ * or the trimmed text. Two controls that share a tag and this string are the same control
+ * rendered twice, which is exactly the responsive-duplicate case.
+ */
+const $1c5106dfe72d554c$var$identity_of = element => (element.getAttribute("aria-label") || element.getAttribute("title") || element.textContent || "").trim().replace(/\s+/g, " ");
+function $1c5106dfe72d554c$export$5800d9d535a06e96(element) {
+  let rendered = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : $1c5106dfe72d554c$export$e0652711c614c755;
+  const identity = $1c5106dfe72d554c$var$identity_of(element);
+  if (!identity) return; // nothing to match on — an icon-only button with no label
+  const twins = [...element.ownerDocument.querySelectorAll(element.localName)].filter(candidate => candidate !== element && rendered(candidate) && $1c5106dfe72d554c$var$identity_of(candidate) === identity);
+  return twins.length === 1 ? twins[0] : undefined;
+}
+function $1c5106dfe72d554c$export$51461d633c351649(element) {
+  let rendered = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : $1c5106dfe72d554c$export$e0652711c614c755;
+  element.focus({
+    preventScroll: true
+  });
+  if ($1c5106dfe72d554c$var$has_focus(element)) return true;
+  const twin = $1c5106dfe72d554c$export$5800d9d535a06e96(element, rendered);
+  if (!twin) return false;
+  twin.focus({
+    preventScroll: true
+  });
+  return $1c5106dfe72d554c$var$has_focus(twin);
+}
 async function $d5f1e6a0f9117286$export$79b1565500412d9b(search_modal, modal_fn_opts, parent) {
   const body = parent || document.body || (await (0, $b8hua$observer).wait_for_element("body"));
   let dispose_and_remove;
@@ -2144,8 +2201,10 @@ async function $d5f1e6a0f9117286$export$79b1565500412d9b(search_modal, modal_fn_
     const modal_els = $b8hua$createRoot(dispose => {
       let closing_animation;
       let animation_started;
+      let focus_target_after_close;
       dispose_and_remove = () => {
         const actually_close = () => {
+          var _focus_target_after_c;
           dispose();
           on_dispose === null || on_dispose === void 0 || on_dispose();
           const {
@@ -2164,13 +2223,24 @@ async function $d5f1e6a0f9117286$export$79b1565500412d9b(search_modal, modal_fn_
             }
             el.remove();
           });
-          if (should_restore_focus && element_focused_before_open !== null && element_focused_before_open !== void 0 && element_focused_before_open.isConnected) {
+          const requested_focus_target = (_focus_target_after_c = focus_target_after_close) === null || _focus_target_after_c === void 0 ? void 0 : _focus_target_after_c();
+          if (should_restore_focus && (requested_focus_target !== null && requested_focus_target !== void 0 && requested_focus_target.isConnected || element_focused_before_open !== null && element_focused_before_open !== void 0 && element_focused_before_open.isConnected)) {
             restoring_focus = true;
             try {
               // preventScroll so this can't re-introduce the safari page-jump the blur() above works around
-              element_focused_before_open.focus({
-                preventScroll: true
-              });
+              let focused = false;
+              if (requested_focus_target !== null && requested_focus_target !== void 0 && requested_focus_target.isConnected) {
+                requested_focus_target.focus({
+                  preventScroll: true
+                });
+                focused = requested_focus_target.getRootNode().activeElement === requested_focus_target;
+              }
+              if (!focused && element_focused_before_open !== null && element_focused_before_open !== void 0 && element_focused_before_open.isConnected)
+                // restore_focus_to rather than a bare focus(): the remembered trigger can be
+                // connected but no longer rendered (a responsive-duplicate header whose other
+                // half is showing now), and focus() on an unrendered element silently does
+                // nothing, leaving the keyboard user at the top of the page.
+                $1c5106dfe72d554c$export$51461d633c351649(element_focused_before_open);
             } finally {
               // Cleared on a task instead of synchronously in case a browser delivers the focus event async
               setTimeout(() => restoring_focus = false, 0);
@@ -2190,7 +2260,8 @@ async function $d5f1e6a0f9117286$export$79b1565500412d9b(search_modal, modal_fn_
         ...extra_options_for_modal,
         close_modal_: close_modal_,
         open_modal_: open_modal_,
-        register_closing_animation_: animation => closing_animation = animation
+        register_closing_animation_: animation => closing_animation = animation,
+        set_focus_target_after_close_: get_target => focus_target_after_close = get_target
       });
     });
     body.append(...modal_els);
@@ -7928,20 +7999,28 @@ function $ac571292d606f30b$var$_classPrivateMethodGet(receiver, privateSet, fn)
 }
 var $ac571292d606f30b$var$_throwing_on_navigation = /*#__PURE__*/new WeakSet();
 var $ac571292d606f30b$var$_get_navigation_happened_promise = /*#__PURE__*/new WeakSet();
+var $ac571292d606f30b$var$_watch_for_navigation_to_same_href = /*#__PURE__*/new WeakSet();
 class $ac571292d606f30b$export$7e1297a3a19f10d8 {
   /**
   * Function that will be called when we want to navigate, or a string saying it's not an SPA. You can change this OTG
   */ /**
      * We store listing_id in history.state and do operate on this both here and in js-ui, this is the key to be used which js-ui provides
      */ /**
-        * Vue has async router that needs to be awaited (it navigates after a microtask)
-        * This standardises waiting for all kinds of routers
-        */
+        * Called when a go_to_ didn't change location.href, for example when following a link to the page one is already on. href_change_ipns stays silent then, so whoever waits for a href change to react to a navigation has to listen here too
+        */ /**
+           * Vue has async router that needs to be awaited (it navigates after a microtask)
+           * This standardises waiting for all kinds of routers
+           */ /**
+              * Calls navigation_to_same_href_listeners_ if the navigation we're about to request ends on the href we're already on
+              * @returns function to stop watching, call it when the navigation failed
+              */
   constructor(on_navigation, listing_query_state_key) {
+    $ac571292d606f30b$var$_classPrivateMethodInitSpec(this, $ac571292d606f30b$var$_watch_for_navigation_to_same_href);
     $ac571292d606f30b$var$_classPrivateMethodInitSpec(this, $ac571292d606f30b$var$_get_navigation_happened_promise);
     $ac571292d606f30b$var$_classPrivateMethodInitSpec(this, $ac571292d606f30b$var$_throwing_on_navigation);
     $b8hua$babelruntimehelpersdefineProperty(this, "on_navigation_", void 0);
     $b8hua$babelruntimehelpersdefineProperty(this, "listing_query_state_key", void 0);
+    $b8hua$babelruntimehelpersdefineProperty(this, "navigation_to_same_href_listeners_", new Set());
     $b8hua$babelruntimehelpersdefineProperty(this, "navigate_", {
       /**
       * Call this if you *just* want to replace the state object in history.state
@@ -7983,6 +8062,7 @@ class $ac571292d606f30b$export$7e1297a3a19f10d8 {
         }
         event_ === null || event_ === void 0 || event_.preventDefault();
         const promise = $ac571292d606f30b$var$_classPrivateMethodGet(this, $ac571292d606f30b$var$_get_navigation_happened_promise, $ac571292d606f30b$var$_get_navigation_happened_promise2).call(this, true);
+        const stop_watching_for_same_href = $ac571292d606f30b$var$_classPrivateMethodGet(this, $ac571292d606f30b$var$_watch_for_navigation_to_same_href, $ac571292d606f30b$var$_watch_for_navigation_to_same_href2).call(this, new_url_);
         if (force_spa_navigation_ && wants_hard_navigation) {
           // Don't allow hard navigation if we're forcing SPA navigation, which we do for things where PageReplacer can be used for performance
           const new_state = history.state;
@@ -7996,7 +8076,7 @@ class $ac571292d606f30b$export$7e1297a3a19f10d8 {
           is_replace: is_replace_,
           new_url: new_url_ instanceof URL ? new_url_ : new URL(new_url_, location.href),
           scroll: scroll
-        });
+        }, stop_watching_for_same_href);
         await promise;
       })
     });
@@ -8004,15 +8084,16 @@ class $ac571292d606f30b$export$7e1297a3a19f10d8 {
     this.on_navigation_ = on_navigation;
   }
 }
-function $ac571292d606f30b$var$_throwing_on_navigation2() {
+function $ac571292d606f30b$var$_throwing_on_navigation2(options, on_throw_) {
   const {
     on_navigation_: on_navigation_
   } = this;
   if (typeof on_navigation_ !== "function") throw new Error("on_navigation_ is not a function");
   // make sure that we don't accidentally catchify if the SDK consumer has fucked up
   try {
-    return on_navigation_(...arguments);
+    return on_navigation_(options);
   } catch (e) {
+    on_throw_ === null || on_throw_ === void 0 || on_throw_();
     queueMicrotask(() => {
       throw e;
     });
@@ -8029,6 +8110,24 @@ function $ac571292d606f30b$var$_get_navigation_happened_promise2(is_replace) {
     (0, $b8hua$instant_exec_on_suspect_history_change).add(handler);
   });
 }
+function $ac571292d606f30b$var$_watch_for_navigation_to_same_href2(target_url) {
+  const href_before = location.href;
+  const stop_watching = () => {
+    (0, $b8hua$instant_exec_on_suspect_history_change).delete(on_history_change);
+    clearTimeout(timeout);
+  };
+  const notify_if_href_unchanged = $b8hua$catchify1(() => {
+    stop_watching();
+    if (location.href !== href_before) return;
+    this.navigation_to_same_href_listeners_.forEach(listener => $b8hua$catchify1(listener)());
+  });
+  // The router has acted once it touches history, if the href is still the same then it took us to the page we're on
+  const on_history_change = () => notify_if_href_unchanged();
+  // A router asked to go to the exact href we're on might not touch history at all, so don't wait longer than 500ms for it. For any other target we can't tell a slow navigation from one that goes nowhere, so only stop listening after a while
+  const timeout = target_url.href === href_before ? setTimeout(notify_if_href_unchanged, 500) : setTimeout(stop_watching, 10000);
+  (0, $b8hua$instant_exec_on_suspect_history_change).add(on_history_change);
+  return stop_watching;
+}
 var $e3efeb558d952696$var$_tmpl$ = ["<button", ' class="show-more major" type="button">', "</button>"],
   $e3efeb558d952696$var$_tmpl$2 = ["<h2", ' class="recs-title">', "</h2>"],
   $e3efeb558d952696$var$_tmpl$3 = ["<div", ' class="recommendation-grid"><!--$-->', "<!--/--><!--$-->", "<!--/--></div>"];
@@ -9278,6 +9377,7 @@ function $83c36ed4520d0335$export$f7658c347b037c3f() {
 var $584c06c09cf4609d$var$_tmpl$ = ["<div", ' style="', '" class="spacer"></div>'],
   $584c06c09cf4609d$var$_tmpl$2 = ['<div class="field"><!--$-->', "<!--/-->", "<!--$-->", "<!--/--></div>"],
   $584c06c09cf4609d$var$_tmpl$3 = ["<button", ' class="submit major" type="button"', ">", "</button>"];
+const $584c06c09cf4609d$var$keys_not_opening_modal = new Set(["Tab", "Shift", "Control", "Alt", "AltGraph", "Meta", "CapsLock", "Escape", "ArrowUp", "ArrowDown", "ArrowLeft", "ArrowRight", "PageUp", "PageDown", "Home", "End", "Insert", "ContextMenu", "NumLock", "ScrollLock", "Pause", "PrintScreen"]);
 function $584c06c09cf4609d$export$b94867ecbd698f21(_ref) {
   let {
     search_field_value_: [searchFieldValue, setSearchFieldValue],
@@ -9400,11 +9500,17 @@ var $fac58b5610eec6a9$var$_tmpl$ = ["<svg", ' xmlns="http://www.w3.org/2000/svg"
 function $fac58b5610eec6a9$export$8d8893ffd8aca39a() {
   return $b8hua$ssr($fac58b5610eec6a9$var$_tmpl$, $b8hua$ssrHydrationKey());
 }
-function $a82a41ab7188eda2$export$93d9bfd0c9c1a5b8(close_modal, search_query_url_param_name_) {
+function $a82a41ab7188eda2$export$93d9bfd0c9c1a5b8(close_modal, search_query_url_param_name_, router_) {
   const [exit_iterable, exitable_iterable] = $b8hua$make_asyncIterable_exiter((0, $b8hua$href_change_ipns));
+  const {
+    navigation_to_same_href_listeners_: navigation_to_same_href_listeners_
+  } = router_;
   let set_initial_values = false;
   let old_pathname;
   let old_param_value;
+  // A card linking to the page one is already on doesn't change the href, close the modal anyway so the click does something
+  navigation_to_same_href_listeners_.add(close_modal);
+  $b8hua$onCleanup(() => navigation_to_same_href_listeners_.delete(close_modal));
   $b8hua$onCleanup($b8hua$catchify1(exit_iterable));
   $b8hua$catchify1(async () => {
     for await (const href of exitable_iterable) {
@@ -9423,6 +9529,33 @@ function $a82a41ab7188eda2$export$93d9bfd0c9c1a5b8(close_modal, search_query_url
     }
   })();
 }
+function $802b1d7ed155c277$export$9e9e2ae069cf2fe1(_ref) {
+  let {
+    props_search_field_value_: props_search_field_value_,
+    props_submit_query_: props_submit_query_,
+    dont_sync_search_field_value_except_on_submit_: dont_sync_search_field_value_except_on_submit_,
+    set_focus_target_after_close_: set_focus_target_after_close_,
+    get_search_page_input_element_: get_search_page_input_element_
+  } = _ref;
+  const search_field_value_ = dont_sync_search_field_value_except_on_submit_ ? $b8hua$createSignal("") : props_search_field_value_;
+  let submits_in_flight = 0;
+  const submit_query_ = async function () {
+    let new_query = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : $b8hua$untrack(search_field_value_[0]);
+    submits_in_flight++;
+    try {
+      return await props_submit_query_(new_query, () => set_focus_target_after_close_(get_search_page_input_element_));
+    } finally {
+      submits_in_flight--;
+    }
+  };
+  if (dont_sync_search_field_value_except_on_submit_) $b8hua$createEffect($b8hua$on(search_field_value_[0], value => submits_in_flight > 0 && props_search_field_value_[1](value), {
+    defer: true
+  }));
+  return {
+    search_field_value_: search_field_value_,
+    submit_query_: submit_query_
+  };
+}
 var $40411f2ec772c376$var$_tmpl$ = ["<div", ' class="discover-more"><button class="major" type="button">', "</button></div>"],
   $40411f2ec772c376$var$_tmpl$2 = ["<b", ">", "</b>"],
   $40411f2ec772c376$var$_tmpl$3 = ["<div", ' class="', '"><div class="', '" role="search" aria-label="Search modal with search field, query suggestions and result preview"><!--$-->', '<!--/--><div id="depict-suggestions-and-result-preview" class="padded"><!--$-->', "<!--/--><!--$-->", "<!--/--><!--$-->", "<!--/--></div><!--$-->", "<!--/--></div><!--$-->", "<!--/--></div>"],
@@ -9437,6 +9570,8 @@ function $40411f2ec772c376$var$RawClassicSearchModal(_ref) {
     search_query_url_param_name_: search_query_url_param_name_,
     previous_searches_: previous_searches_,
     close_modal_: close_modal_,
+    set_focus_target_after_close_: set_focus_target_after_close_,
+    get_search_page_input_element_: get_search_page_input_element_,
     depict_api_: depict_api_,
     merchant_: merchant_,
     market_: market_,
@@ -9461,15 +9596,16 @@ function $40411f2ec772c376$var$RawClassicSearchModal(_ref) {
   // As per feedback from stronger we sometimes want a modal with the search field value disconnected from the one in the rest of the UI, see https://depictaiworkspace.slack.com/archives/C02J16R9XEH/p1679065878487709.
   // This is desired for when the modal is opened from a UI element that visually does not look connected with the search page or current query
   // Basically the UI signals that the button that opens the modal starts a new search.
-  const search_field_value_ = dont_sync_search_field_value_except_on_submit_ ? $b8hua$createSignal("") : props_search_field_value;
-  const propagate_search_field_value_back = dont_sync_search_field_value_except_on_submit_ ? () => props_search_field_value[1]($b8hua$untrack(search_field_value_[0])) // Set actual search field value to the throwaway internal one before submitting
-  : undefined;
-  const submit_query_ = function () {
-    // submit_query expects to read the current search field value which is why we have to write the current one to the signal before calling it
-    // It will write the old one back and then write the new one after submit
-    propagate_search_field_value_back === null || propagate_search_field_value_back === void 0 || propagate_search_field_value_back();
-    return props_submit_query(...arguments);
-  };
+  const {
+    search_field_value_: search_field_value_,
+    submit_query_: submit_query_
+  } = $802b1d7ed155c277$export$9e9e2ae069cf2fe1({
+    props_search_field_value_: props_search_field_value,
+    props_submit_query_: props_submit_query,
+    dont_sync_search_field_value_except_on_submit_: dont_sync_search_field_value_except_on_submit_,
+    set_focus_target_after_close_: set_focus_target_after_close_,
+    get_search_page_input_element_: get_search_page_input_element_
+  });
   const [input_field, set_input_field] = $b8hua$createSignal();
   const [get_search_field_value_] = search_field_value_;
   // Search field alignment unused in ClassicSearchModal since the search field spans the whole modal
@@ -9524,7 +9660,7 @@ function $40411f2ec772c376$var$RawClassicSearchModal(_ref) {
     }
   })));
   if (disable_scrolling_) $e56d241d0f33d459$export$fe334901e8bebd57();
-  $a82a41ab7188eda2$export$93d9bfd0c9c1a5b8(close_modal_, search_query_url_param_name_);
+  $a82a41ab7188eda2$export$93d9bfd0c9c1a5b8(close_modal_, search_query_url_param_name_, router_);
   window.addEventListener("keydown", close_on_escape_handler);
   $b8hua$onCleanup($b8hua$catchify1(() => window.removeEventListener("keydown", close_on_escape_handler)));
   if (closing_animation_) register_closing_animation_(closing_animation_);
@@ -10102,6 +10238,8 @@ function $06fcd2a345efd24d$var$RawSearchModalV2(_ref) {
     search_query_url_param_name_: search_query_url_param_name_,
     previous_searches_: previous_searches_,
     close_modal_: close_modal_,
+    set_focus_target_after_close_: set_focus_target_after_close_,
+    get_search_page_input_element_: get_search_page_input_element_,
     alignmentSignals_: alignmentSignals_,
     depict_api_: depict_api_,
     merchant_: merchant_,
@@ -10132,15 +10270,16 @@ function $06fcd2a345efd24d$var$RawSearchModalV2(_ref) {
   // As per feedback from stronger we sometimes want a modal with the search field value disconnected from the one in the rest of the UI, see https://depictaiworkspace.slack.com/archives/C02J16R9XEH/p1679065878487709.
   // This is desired for when the modal is opened from a UI element that visually does not look connected with the search page or current query
   // Basically the UI signals that the button that opens the modal starts a new search.
-  const search_field_value_ = dont_sync_search_field_value_except_on_submit_ ? $b8hua$createSignal("") : props_search_field_value;
-  const propagate_search_field_value_back = dont_sync_search_field_value_except_on_submit_ ? () => props_search_field_value[1]($b8hua$untrack(search_field_value_[0])) // Set actual search field value to the throwaway internal one before submitting
-  : undefined;
-  const submit_query_ = function () {
-    // submit_query expects to read the current search field value which is why we have to write the current one to the signal before calling it
-    // It will write the old one back and then write the new one after submit
-    propagate_search_field_value_back === null || propagate_search_field_value_back === void 0 || propagate_search_field_value_back();
-    return props_submit_query(...arguments);
-  };
+  const {
+    search_field_value_: search_field_value_,
+    submit_query_: submit_query_
+  } = $802b1d7ed155c277$export$9e9e2ae069cf2fe1({
+    props_search_field_value_: props_search_field_value,
+    props_submit_query_: props_submit_query,
+    dont_sync_search_field_value_except_on_submit_: dont_sync_search_field_value_except_on_submit_,
+    set_focus_target_after_close_: set_focus_target_after_close_,
+    get_search_page_input_element_: get_search_page_input_element_
+  });
   const [input_field, set_input_field] = $b8hua$createSignal();
   const [searching_for_value_, set_searching_for_value_] = $b8hua$createSignal();
   const [show_stale_content_results_, set_show_stale_content_results_] = $b8hua$createSignal(false);
@@ -10254,7 +10393,7 @@ function $06fcd2a345efd24d$var$RawSearchModalV2(_ref) {
     return (((_get_modal_search_res5 = get_modal_search_results_()) === null || _get_modal_search_res5 === void 0 ? void 0 : _get_modal_search_res5.loading) === false && !suggestions_response_.loading || !!prev) && totalNumberResults() === 0 && previous_searches_matching_query().length === 0;
   });
   if (disable_scrolling_) $e56d241d0f33d459$export$fe334901e8bebd57();
-  $a82a41ab7188eda2$export$93d9bfd0c9c1a5b8(close_modal_, search_query_url_param_name_);
+  $a82a41ab7188eda2$export$93d9bfd0c9c1a5b8(close_modal_, search_query_url_param_name_, router_);
   addEventListener("keydown", close_on_escape_handler);
   $b8hua$onCleanup(() => removeEventListener("keydown", close_on_escape_handler));
   $b8hua$createEffect($b8hua$on(get_search_field_value_, () => {
@@ -12149,11 +12288,12 @@ async function $86b0ff0c85e5fc6c$export$e16630ecb9644a1c(_ref) {
   let {
     on_submit_with_unchanged_value_: on_submit_with_unchanged_value_,
     search_param_name_: search_param_name_,
-    set_search_field_value_: set_search_field_value_,
+    search_field_value_: search_field_value_,
     get_search_query_: get_search_query_,
     url_transformer_: url_transformer_,
     router_: router_,
     after_submit_: after_submit_,
+    before_navigate_: before_navigate_,
     get_new_query: get_new_query
   } = _ref;
   const new_search_query = get_new_query();
@@ -12161,21 +12301,92 @@ async function $86b0ff0c85e5fc6c$export$e16630ecb9644a1c(_ref) {
   if (previous_query === new_search_query && new URLSearchParams(location.search).has(search_param_name_)) {
     // don't push a history entry / re-search if someone submits a search again
     // do close the modal though
+    search_field_value_.settle_(new_search_query);
     on_submit_with_unchanged_value_ === null || on_submit_with_unchanged_value_ === void 0 || on_submit_with_unchanged_value_();
-    return;
+    return false;
   }
-  set_search_field_value_(previous_query); // restore the value to the previous query since this one goes to the new history entry
   const target_url = new URL(location.href);
   url_transformer_ === null || url_transformer_ === void 0 || url_transformer_(target_url);
   target_url.searchParams.set(search_param_name_, new_search_query);
-  await router_.navigate_.go_to_({
-    new_url_: target_url,
-    is_replace_: false,
-    force_spa_navigation_: true
-  });
-  set_search_field_value_(new_search_query);
+  const end_submit = search_field_value_.begin_submit_(new_search_query, previous_query);
+  before_navigate_ === null || before_navigate_ === void 0 || before_navigate_();
+  let landed;
+  try {
+    await router_.navigate_.go_to_({
+      new_url_: target_url,
+      is_replace_: false,
+      force_spa_navigation_: true
+    });
+  } finally {
+    landed = end_submit();
+  }
+  if (!landed) return false;
   scrollTo(0, 0);
   after_submit_ === null || after_submit_ === void 0 || after_submit_();
+  return true;
+}
+function $8a9827cc2842b300$export$d13a185c53aa5edf(persisted_, get_search_query_) {
+  const [get_persisted, set_persisted] = persisted_;
+  const [get_submitting, set_submitting] = $b8hua$createSignal();
+  const get_value = $b8hua$createMemo(() => {
+    var _get_submitting;
+    return (_get_submitting = get_submitting()) !== null && _get_submitting !== void 0 ? _get_submitting : get_persisted();
+  });
+  const set_value = value => {
+    const new_value = typeof value === "function" ? value($b8hua$untrack(get_value)) : value;
+    if ($b8hua$untrack(get_submitting) === undefined) set_persisted(new_value);else set_submitting(new_value);
+    return new_value;
+  };
+  let current_submit;
+  const end_submit = landed => {
+    current_submit.landed_ = landed;
+    current_submit = undefined;
+    $b8hua$batch(() => {
+      const submitting = $b8hua$untrack(get_submitting);
+      set_submitting(undefined);
+      if (landed && submitting !== undefined) set_persisted(submitting);
+    });
+  };
+  const abort_on_popstate = what_happened => {
+    if (what_happened === "popstate" && current_submit) end_submit(false);
+  };
+  (0, $b8hua$instant_exec_on_suspect_history_change).add(abort_on_popstate);
+  $b8hua$onCleanup(() => (0, $b8hua$instant_exec_on_suspect_history_change).delete(abort_on_popstate));
+  $b8hua$createEffect($b8hua$on(get_search_query_, query => {
+    const token = current_submit;
+    if (!token || query !== token.query_) return;
+    queueMicrotask(() => {
+      if (current_submit === token) end_submit(true);
+    });
+  }, {
+    defer: true
+  }));
+  const begin_submit_ = (submitted_query, query_of_current_history_entry) => {
+    const token = current_submit = {
+      query_: submitted_query,
+      landed_: false
+    };
+    $b8hua$batch(() => {
+      set_submitting(submitted_query);
+      set_persisted(query_of_current_history_entry);
+    });
+    return () => {
+      if (current_submit === token) end_submit(true);
+      return token.landed_;
+    };
+  };
+  const settle_ = query => {
+    if (current_submit) return;
+    $b8hua$batch(() => {
+      set_submitting(undefined);
+      set_persisted(query);
+    });
+  };
+  return {
+    value_: [get_value, set_value],
+    begin_submit_: begin_submit_,
+    settle_: settle_
+  };
 }
 function $96d57a48e7bce64f$export$181cceed5c91919e(callback, alsoRaF, passiveListener) {
   let aligned_this_microtask = false;
@@ -12849,6 +13060,7 @@ function $da279c5a540c6846$export$a54ec244c8863715(_ref) {
     scroll_restoration_data_: scroll_restoration_data_,
     product_card_template_: product_card_template_,
     modalAlignmentSignalsRef_: modalAlignmentSignalsRef_,
+    inputFieldRef_: inputFieldRef_,
     router_: router_,
     content_results_rows_: content_results_rows_,
     content_layout_options_: content_layout_options_,
@@ -13044,6 +13256,8 @@ function $da279c5a540c6846$export$a54ec244c8863715(_ref) {
       if (!search_field) break add_input_field;
       setModalBodyStyle({});
       modalAlignmentSignalsRef_ === null || modalAlignmentSignalsRef_ === void 0 || modalAlignmentSignalsRef_(alignmentSignals_);
+      inputFieldRef_ === null || inputFieldRef_ === void 0 || inputFieldRef_(input_element);
+      $b8hua$onCleanup(() => inputFieldRef_ === null || inputFieldRef_ === void 0 ? void 0 : inputFieldRef_(undefined));
       const [pollAlignment, setPollAlignment_] = $b8hua$createSignal(false);
       const align_position = $b8hua$catchify1((0, $1308a7816c3d4f2d$export$b3ad617e9036868))(alignmentSignals_, search_field, (0, $1308a7816c3d4f2d$export$3f238c96c45e6cc6) | (0, $1308a7816c3d4f2d$export$7895aadd1956b1c7) | (modalVersionUsed_ === 1 ? (0, $1308a7816c3d4f2d$export$902f8b4a7dae5d78) : (0, $1308a7816c3d4f2d$export$6060bc6bee850eb6) | (0, $1308a7816c3d4f2d$export$5097308c5200105a)), true, pollAlignment);
       div_with_field_class.addEventListener("click", $b8hua$catchify1(e => {
@@ -13412,14 +13626,16 @@ class $eb064bc3350276c1$export$ac6237957a15b3f0 {
         set_search_content_results_rows((0, $d53ebed6f63304e4$export$70ceae36059a1036));
       }; // do this every time after we have submitted a new query - otherwise there might already be a saved number of rows in the state
       const on_submit_with_unchanged_value_ = () => this.modal_open = false;
-      const [get_search_field_value_, set_search_field_value_] = state_.field_value;
-      const configured_submit_query_ = new_query => $86b0ff0c85e5fc6c$export$e16630ecb9644a1c({
+      const search_field_value_ = $8a9827cc2842b300$export$d13a185c53aa5edf(state_.field_value, get_search_query_);
+      const [get_search_field_value_] = search_field_value_.value_;
+      const configured_submit_query_ = (new_query, before_navigate_) => $86b0ff0c85e5fc6c$export$e16630ecb9644a1c({
         on_submit_with_unchanged_value_: on_submit_with_unchanged_value_,
-        set_search_field_value_: set_search_field_value_,
+        search_field_value_: search_field_value_,
         get_search_query_: get_search_query_,
         search_param_name_: search_query_url_param_name_,
         after_submit_: after_submit_,
-        get_new_query: () => new_query || $b8hua$untrack(get_search_field_value_),
+        before_navigate_: before_navigate_,
+        get_new_query: () => new_query !== null && new_query !== void 0 ? new_query : $b8hua$untrack(get_search_field_value_),
         url_transformer_: url_transformer,
         router_: $b8hua$babelruntimehelpersclassPrivateFieldGet(this, $eb064bc3350276c1$var$_router)
       });
@@ -13438,6 +13654,7 @@ class $eb064bc3350276c1$export$ac6237957a15b3f0 {
         search_query_url_param_name_: search_query_url_param_name_,
         reset_history_state_: reset_history_state_,
         state_: state_,
+        search_field_value_: search_field_value_.value_,
         router_: $b8hua$babelruntimehelpersclassPrivateFieldGet(this, $eb064bc3350276c1$var$_router),
         url_transformer_: url_transformer,
         depict_api_: depict_api_,
@@ -13461,7 +13678,11 @@ class $eb064bc3350276c1$export$ac6237957a15b3f0 {
           $b8hua$onCleanup(() => _this.modal_open = false);
           return searchModalComponent(...arguments);
         }, {
-          search_field_value_: state_.field_value,
+          search_field_value_: search_field_value_.value_,
+          get_search_page_input_element_: () => {
+            var _privately_shared_pro2;
+            return (_privately_shared_pro2 = $eb064bc3350276c1$export$dde08b2dca8cc1ce.get(this)) === null || _privately_shared_pro2 === void 0 ? void 0 : _privately_shared_pro2.search_page_input_element_;
+          },
           get_search_query_: get_search_query_,
           search_query_url_param_name_: search_query_url_param_name_,
           previous_searches_: previous_searches,
@@ -13626,6 +13847,7 @@ function $eb064bc3350276c1$export$f2dc7e4e4aa11abb(props) {
     const {
       state_: state_
     } = shared_properties;
+    let registered_input_element;
     const grid_spacing_override = $b8hua$createMemo(() => {
       const {
         grid_spacing: grid_spacing
@@ -13657,7 +13879,7 @@ function $eb064bc3350276c1$export$f2dc7e4e4aa11abb(props) {
         var _depict_search$enable;
         return (_depict_search$enable = depict_search.enable_content_search) !== null && _depict_search$enable !== void 0 ? _depict_search$enable : $eb064bc3350276c1$var$content_search_default;
       },
-      search_field_value_: state_.field_value,
+      search_field_value_: shared_properties.search_field_value_,
       get_search_query_: shared_properties.get_search_query_,
       clear_filters_on_next_submit_: shared_properties.clear_filters_on_next_submit_,
       open_modal_: function () {
@@ -13668,6 +13890,16 @@ function $eb064bc3350276c1$export$f2dc7e4e4aa11abb(props) {
       modalVersionUsed_: shared_properties.modalVersionUsed_,
       showSliderArrow_: () => props.showSliderArrow_,
       i18n_: shared_properties.i18n_,
+      inputFieldRef_: input_element => {
+        const shared_info_right_now = $eb064bc3350276c1$export$dde08b2dca8cc1ce.get(depict_search);
+        if (!shared_info_right_now) return;
+        if (input_element === undefined && shared_info_right_now.search_page_input_element_ !== registered_input_element) return;
+        registered_input_element = input_element;
+        $eb064bc3350276c1$export$dde08b2dca8cc1ce.set(depict_search, {
+          ...shared_info_right_now,
+          search_page_input_element_: input_element
+        });
+      },
       modalAlignmentSignalsRef_: style => {
         const shared_info_right_now = $eb064bc3350276c1$export$dde08b2dca8cc1ce.get(depict_search);
         if (!shared_info_right_now) return;
@@ -14114,7 +14346,7 @@ function $a3026fb727bc7550$export$316f6f283ae64765(props) {
         return shared_properties.BackIcon_;
       },
       get search_field_value_() {
-        return shared_properties.state_.field_value;
+        return shared_properties.search_field_value_;
       },
       get submit_query_() {
         return shared_properties.configured_submit_query_;
@@ -14157,7 +14389,7 @@ function $a3026fb727bc7550$export$316f6f283ae64765(props) {
                   return shared_properties.BackIcon_;
                 },
                 get search_field_value_() {
-                  return shared_properties.state_.field_value;
+                  return shared_properties.search_field_value_;
                 },
                 get submit_query_() {
                   return shared_properties.configured_submit_query_;