@depict-ai/ui 2.0.7 → 2.0.9

package/ES10/index.js

@@ -1,5 +1,5 @@
-import { add_to_version_info as $8tj43$add_to_version_info, catchify as $8tj43$catchify, slider_fractional_factory as $8tj43$slider_fractional_factory, make_random_classname as $8tj43$make_random_classname, n_col_styling_with_dist as $8tj43$n_col_styling_with_dist, layout_get_visible_recs_without_partial_rows as $8tj43$layout_get_visible_recs_without_partial_rows, layout_get_total_rec_amount_for_row as $8tj43$layout_get_total_rec_amount_for_row, layout_media_query_header as $8tj43$layout_media_query_header, report as $8tj43$report, Amazing_Slider as $8tj43$Amazing_Slider, slider_snap_css as $8tj43$slider_snap_css, slider_fading_factory as $8tj43$slider_fading_factory, observer as $8tj43$observer, is_safari as $8tj43$is_safari, useExpandingContainer as $8tj43$useExpandingContainer, standard_price_format as $8tj43$standard_price_format, dlog as $8tj43$dlog, hex_to_rgb as $8tj43$hex_to_rgb, relative_luminance_from_rgb as $8tj43$relative_luminance_from_rgb, javascript_media_query as $8tj43$javascript_media_query, fetch_recs as $8tj43$fetch_recs, snakeCasifyObject as $8tj43$snakeCasifyObject, instant_exec_on_suspect_history_change as $8tj43$instant_exec_on_suspect_history_change, base_url as $8tj43$base_url, get_depict_id as $8tj43$get_depict_id, get_user_id as $8tj43$get_user_id, get_session_id as $8tj43$get_session_id, make_url_with_query_params as $8tj43$make_url_with_query_params, fetch_retry as $8tj43$fetch_retry, add_version_query_params as $8tj43$add_version_query_params, dwarn as $8tj43$dwarn, sort_obj as $8tj43$sort_obj, edit_current_page_meta_tags as $8tj43$edit_current_page_meta_tags, use_href_accessor as $8tj43$use_href_accessor, base64_encode_unicode as $8tj43$base64_encode_unicode, base64_decode_unicode as $8tj43$base64_decode_unicode, queueMacroTask as $8tj43$queueMacroTask, is_debug as $8tj43$is_debug, make_asyncIterable_exiter as $8tj43$make_asyncIterable_exiter, href_change_ipns as $8tj43$href_change_ipns, ContainedImage as $8tj43$ContainedImage, buildThresholdList as $8tj43$buildThresholdList, deparallelize_no_drop as $8tj43$deparallelize_no_drop, ListenableSet as $8tj43$ListenableSet, insert_surfaces as $8tj43$insert_surfaces } from "@depict-ai/utilishared/ES10";
-import { createSignal as $8tj43$createSignal, onCleanup as $8tj43$onCleanup, createMemo as $8tj43$createMemo, createResource as $8tj43$createResource, Suspense as $8tj43$Suspense, Show as $8tj43$Show, createRenderEffect as $8tj43$createRenderEffect, createRoot as $8tj43$createRoot, For as $8tj43$For, getOwner as $8tj43$getOwner, runWithOwner as $8tj43$runWithOwner, createEffect as $8tj43$createEffect, untrack as $8tj43$untrack, createUniqueId as $8tj43$createUniqueId, createComputed as $8tj43$createComputed, ErrorBoundary as $8tj43$ErrorBoundary, Index as $8tj43$Index, on as $8tj43$on, batch as $8tj43$batch, createReaction as $8tj43$createReaction } from "solid-js";
+import { add_to_version_info as $8tj43$add_to_version_info, catchify as $8tj43$catchify, slider_fractional_factory as $8tj43$slider_fractional_factory, camelCasifyObject as $8tj43$camelCasifyObject, make_random_classname as $8tj43$make_random_classname, n_col_styling_with_dist as $8tj43$n_col_styling_with_dist, layout_get_visible_recs_without_partial_rows as $8tj43$layout_get_visible_recs_without_partial_rows, layout_get_total_rec_amount_for_row as $8tj43$layout_get_total_rec_amount_for_row, layout_media_query_header as $8tj43$layout_media_query_header, report as $8tj43$report, Amazing_Slider as $8tj43$Amazing_Slider, slider_snap_css as $8tj43$slider_snap_css, slider_fading_factory as $8tj43$slider_fading_factory, observer as $8tj43$observer, is_safari as $8tj43$is_safari, useExpandingContainer as $8tj43$useExpandingContainer, standard_price_format as $8tj43$standard_price_format, dlog as $8tj43$dlog, hex_to_rgb as $8tj43$hex_to_rgb, relative_luminance_from_rgb as $8tj43$relative_luminance_from_rgb, javascript_media_query as $8tj43$javascript_media_query, fetch_recs as $8tj43$fetch_recs, snakeCasifyObject as $8tj43$snakeCasifyObject, instant_exec_on_suspect_history_change as $8tj43$instant_exec_on_suspect_history_change, base_url as $8tj43$base_url, get_depict_id as $8tj43$get_depict_id, get_user_id as $8tj43$get_user_id, get_session_id as $8tj43$get_session_id, make_url_with_query_params as $8tj43$make_url_with_query_params, fetch_retry as $8tj43$fetch_retry, add_version_query_params as $8tj43$add_version_query_params, dwarn as $8tj43$dwarn, sort_obj as $8tj43$sort_obj, edit_current_page_meta_tags as $8tj43$edit_current_page_meta_tags, use_href_accessor as $8tj43$use_href_accessor, base64_encode_unicode as $8tj43$base64_encode_unicode, base64_decode_unicode as $8tj43$base64_decode_unicode, queueMacroTask as $8tj43$queueMacroTask, is_debug as $8tj43$is_debug, make_asyncIterable_exiter as $8tj43$make_asyncIterable_exiter, href_change_ipns as $8tj43$href_change_ipns, ContainedImage as $8tj43$ContainedImage, buildThresholdList as $8tj43$buildThresholdList, deparallelize_no_drop as $8tj43$deparallelize_no_drop, ListenableSet as $8tj43$ListenableSet, insert_surfaces as $8tj43$insert_surfaces } from "@depict-ai/utilishared/ES10";
+import { createSignal as $8tj43$createSignal, onCleanup as $8tj43$onCleanup, createMemo as $8tj43$createMemo, createResource as $8tj43$createResource, Suspense as $8tj43$Suspense, Show as $8tj43$Show, createRenderEffect as $8tj43$createRenderEffect, createRoot as $8tj43$createRoot, For as $8tj43$For, getOwner as $8tj43$getOwner, runWithOwner as $8tj43$runWithOwner, createEffect as $8tj43$createEffect, createUniqueId as $8tj43$createUniqueId, untrack as $8tj43$untrack, createComputed as $8tj43$createComputed, ErrorBoundary as $8tj43$ErrorBoundary, Index as $8tj43$Index, on as $8tj43$on, batch as $8tj43$batch, createReaction as $8tj43$createReaction } from "solid-js";
 import { template as $8tj43$template, getNextElement as $8tj43$getNextElement, insert as $8tj43$insert, createComponent as $8tj43$createComponent, mergeProps as $8tj43$mergeProps, isServer as $8tj43$isServer, spread as $8tj43$spread, runHydrationEvents as $8tj43$runHydrationEvents, addEventListener as $8tj43$addEventListener, className as $8tj43$className, memo as $8tj43$memo, delegateEvents as $8tj43$delegateEvents, effect as $8tj43$effect, classList as $8tj43$classList, setAttribute as $8tj43$setAttribute, getNextMarker as $8tj43$getNextMarker, style as $8tj43$style, Dynamic as $8tj43$Dynamic, use as $8tj43$use } from "solid-js/web";
 import $8tj43$babelruntimehelpersclassPrivateFieldSet from "@babel/runtime/helpers/classPrivateFieldSet";
 import $8tj43$babelruntimehelpersclassPrivateFieldGet from "@babel/runtime/helpers/classPrivateFieldGet";
@@ -8,7 +8,7 @@ import $8tj43$babelruntimehelpersdefineProperty from "@babel/runtime/helpers/def
 /*! 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 = "2.0.7";
+const $8db9a15135765c11$export$83d89fbfd8236492 = "2.0.9";
 
 /** @jsxImportSource solid-js */
 
@@ -65,7 +65,7 @@ const $a9c7ba6087881ac2$export$6daf8749b65a1b77 = cols_at_size => {
   return $a9c7ba6087881ac2$var$transform_elements(sorted_cols_at_size);
 };
 function $ca55612a53dbbdd2$export$a2cc176055f8f08() {
-  const text = "Please try setting `colsAtSize` on the `SearchPage`/`CategoryPage` components to change the grid before setting it with CSS. If you do with CSS, set `ColsAtSize` to an empty array to ensure no declarations created by the SDK leak through.";
+  const text = "Please try setting `columnsAtSize` on the `SearchPage`/`CategoryPage` components to change the grid before setting it with CSS. If you do with CSS, set `ColsAtSize` to an empty array to ensure no declarations created by the SDK leak through.";
   return (0, $8tj43$isServer) ? {
     t: "<!-- ".concat(text, " -->")
   } : document.createComment(text);
@@ -196,6 +196,7 @@ function $2d7bad8684bc7f44$export$7f8bd308237ab5a5(get_displays_) {
   });
   return displays_by_key_;
 }
+const $2d7bad8684bc7f44$var$result_ids = ["search_result_id", "product_listing_result_id", "recommendation_id"];
 function $2d7bad8684bc7f44$export$43f0fb951fcb0c54(_ref) {
   let {
     displays_by_key_: displays_by_key_,
@@ -210,17 +211,25 @@ function $2d7bad8684bc7f44$export$43f0fb951fcb0c54(_ref) {
     },
     children: (product_id, index) => {
       const owner = $8tj43$getOwner();
-      const display_accessor = $8tj43$createMemo(() => displays_by_key_().get(product_id));
-      const [product_card_resource] = $8tj43$createResource(display_accessor,
-      // re-render when the reference to the display object changes
-      // this should only be the case when the merchant or market changes and the new request has completed
-      display => {
+      const display_accessor = $8tj43$createMemo(prev => {
+        const new_display = displays_by_key_().get(product_id);
+        if (prev && $2d7bad8684bc7f44$var$deep_equal(prev, new_display))
+          // If displays are identical, they haven't changed due to merchant/market changing OR we made a new query and the displays are the same. Return the old display (same object reference) to avoid re-rendering.
+          // This doesn't work if people mutate the displays from within the template but we hope they don't
+          // (We can't know if the display changing is due to merchant/market changing or a new query otherwise and don't want to run into https://gitlab.com/depict-ai/depict.ai/-/merge_requests/6890/diffs)
+          return prev;
+        return new_display;
+      });
+      const [product_card_resource] = $8tj43$createResource(() => [merchant_(), market_(), display_accessor()],
+      // re-render when the reference to the display object changes or the merchant or market changes
+      // (We don't want to re-render if nothing has changed)
+      _ref2 => {
+        let [merchant, market, display] = _ref2;
         // get display in the function that re-runs when merchant or market have changed, since the display may have changed but product_id not
         return product_card_template_(display, {
           set_on_index_change: fn => $8tj43$runWithOwner(owner, () => $8tj43$createEffect(() => fn(index()))),
-          merchant: $8tj43$untrack(merchant_),
-          // this means that the merchant and market provided to the template is wrong while we do another fetch, but I don't see how anyone would need to know the correct market there
-          market: $8tj43$untrack(market_) // recommendation_grid can provide a sneaky undefined here just FYI
+          merchant: merchant,
+          market: market // recommendation_grid can provide a sneaky undefined here just FYI
         });
       });
 
@@ -235,15 +244,13 @@ function $2d7bad8684bc7f44$export$43f0fb951fcb0c54(_ref) {
           elements.push(element);
           // Add tracking ids
           if (!(element instanceof HTMLElement)) continue; // Apparently only HTMLElements have dataset
-          const {
-            dataset: dataset
-          } = element;
-          const {
-            search_result_id: search_result_id,
-            product_listing_result_id: product_listing_result_id,
-            recommendation_id: recommendation_id
-          } = display;
-          if (search_result_id) dataset.searchResultId = search_result_id;else if (product_listing_result_id) dataset.productListingResultId = product_listing_result_id;else if (recommendation_id) dataset.recommendationId = recommendation_id;
+          for (let i = 0; i < $2d7bad8684bc7f44$var$result_ids.length; i++) {
+            const id = $2d7bad8684bc7f44$var$result_ids[i];
+            const value = display[id];
+            if (value) Object.assign(element.dataset, $8tj43$camelCasifyObject({
+              [id]: value
+            }));
+          }
         }
         do_per_elements_ === null || do_per_elements_ === void 0 || do_per_elements_(elements, index);
       });
@@ -251,6 +258,23 @@ function $2d7bad8684bc7f44$export$43f0fb951fcb0c54(_ref) {
     }
   });
 }
+// Source: https://dmitripavlutin.com/how-to-compare-objects-in-javascript/
+function $2d7bad8684bc7f44$var$deep_equal(object1, object2) {
+  const keys1 = Object.keys(object1);
+  const keys2 = Object.keys(object2);
+  if (keys1.length !== keys2.length) return false;
+  for (const key of keys1) {
+    if ($2d7bad8684bc7f44$var$result_ids.includes(key)) continue; // ignore result ids that change per response
+    const val1 = object1[key];
+    const val2 = object2[key];
+    const areObjects = $2d7bad8684bc7f44$var$is_object(val1) && $2d7bad8684bc7f44$var$is_object(val2);
+    if (areObjects && !$2d7bad8684bc7f44$var$deep_equal(val1, val2) || !areObjects && val1 !== val2) return false;
+  }
+  return true;
+}
+function $2d7bad8684bc7f44$var$is_object(object) {
+  return object != null && typeof object === "object";
+}
 
 // Errors caused by SDK consuming code interfacing with the SDK, not the SDK itself or other Depict packages
 class $f3b7124b76123e44$export$e1d52e4f0c7557a1 extends Error {}
@@ -581,7 +605,14 @@ function $83e8cf2c0b87a58a$export$23fca46f3143581f(component, error_message) {
     return component_in_error_boundary(elements => {
       const have_multiple = Array.isArray(elements);
       if (have_multiple ? !(elements !== null && elements !== void 0 && elements.length) : !elements) return;
-      (0, $8tj43$observer).onremoved(have_multiple ? elements[0] : elements, dispose);
+      (0, $8tj43$observer).onremoved(have_multiple ? elements[0] : elements, _ref => {
+        let {
+          element: element
+        } = _ref;
+        if (document.documentElement.contains(element)) return; // If element has instantly been re-inserted, don't dispose
+        // See https://depictaiworkspace.slack.com/archives/C050GHEPBTR/p1695809102791259?thread_ts=1695106805.459729&cid=C050GHEPBTR
+        dispose();
+      });
     });
   });else
     // we're already in a root so cleanups are handled
@@ -635,51 +666,52 @@ function $e3efeb558d952696$export$7da560f849543dff(_ref) {
     return recommendations_resource_.loading || ((_recommendations_reso = recommendations_resource_()) === null || _recommendations_reso === void 0 ? void 0 : _recommendations_reso.length);
   });
   const num_placeholders_ = () => 20;
+  const elements = (() => {
+    const _el$ = $8tj43$getNextElement($e3efeb558d952696$var$_tmpl$),
+      _el$2 = _el$.firstChild,
+      [_el$3, _co$] = $8tj43$getNextMarker(_el$2.nextSibling),
+      _el$4 = _el$3.nextSibling,
+      [_el$5, _co$2] = $8tj43$getNextMarker(_el$4.nextSibling);
+    $8tj43$insert(_el$, (0, $ca55612a53dbbdd2$export$a2cc176055f8f08), _el$3, _co$);
+    $8tj43$insert(_el$, $8tj43$createComponent((0, $63f1f8dbcd07d3b0$export$d21e32dfedac04be), $8tj43$mergeProps({
+      get rows() {
+        return rows_object_();
+      },
+      layout: "grid",
+      element_attributes: {
+        class: "cards"
+      }
+    }, layout_options_, {
+      get children() {
+        return $8tj43$createComponent((0, $8tj43$Suspense), {
+          get fallback() {
+            return $bdd80c7862246dc2$export$f33414a4df0afd3f({
+              num_placeholders_: num_placeholders_,
+              product_card_template_: product_card_template_
+            });
+          },
+          get children() {
+            return (() => {
+              // IIFE to make sure we access both the recommendations_resource and the resources containing the product card rendering results themselves within the Suspense boundary
+              const displays_by_key_ = $2d7bad8684bc7f44$export$7f8bd308237ab5a5($8tj43$createMemo(() => recommendations_resource_() || []));
+              return $2d7bad8684bc7f44$export$43f0fb951fcb0c54({
+                displays_by_key_: displays_by_key_,
+                merchant_: merchant_,
+                market_: market_,
+                product_card_template_: product_card_template_
+              });
+            })();
+          }
+        });
+      }
+    })), _el$5, _co$2);
+    return _el$;
+  })();
   return $8tj43$createComponent((0, $8tj43$Show), {
     get when() {
       return is_showing_something();
     },
-    get children() {
-      const _el$ = $8tj43$getNextElement($e3efeb558d952696$var$_tmpl$),
-        _el$2 = _el$.firstChild,
-        [_el$3, _co$] = $8tj43$getNextMarker(_el$2.nextSibling),
-        _el$4 = _el$3.nextSibling,
-        [_el$5, _co$2] = $8tj43$getNextMarker(_el$4.nextSibling);
-      $8tj43$insert(_el$, (0, $ca55612a53dbbdd2$export$a2cc176055f8f08), _el$3, _co$);
-      $8tj43$insert(_el$, $8tj43$createComponent((0, $63f1f8dbcd07d3b0$export$d21e32dfedac04be), $8tj43$mergeProps({
-        get rows() {
-          return rows_object_();
-        },
-        layout: "grid",
-        element_attributes: {
-          class: "cards"
-        }
-      }, layout_options_, {
-        get children() {
-          return $8tj43$createComponent((0, $8tj43$Suspense), {
-            get fallback() {
-              return $bdd80c7862246dc2$export$f33414a4df0afd3f({
-                num_placeholders_: num_placeholders_,
-                product_card_template_: product_card_template_
-              });
-            },
-            get children() {
-              return (() => {
-                // IIFE to make sure we access both the recommendations_resource and the resources containing the product card rendering results themselves within the Suspense boundary
-                const displays_by_key_ = $2d7bad8684bc7f44$export$7f8bd308237ab5a5($8tj43$createMemo(() => recommendations_resource_() || []));
-                return $2d7bad8684bc7f44$export$43f0fb951fcb0c54({
-                  displays_by_key_: displays_by_key_,
-                  merchant_: merchant_,
-                  market_: market_,
-                  product_card_template_: product_card_template_
-                });
-              })();
-            }
-          });
-        }
-      })), _el$5, _co$2);
-      return _el$;
-    }
+    children: elements
   });
 }
 const $b432b11321ad4c97$var$_tmpl$ = /*#__PURE__*/$8tj43$template(`<button class="show-more major" type="button"></button>`, 2),
@@ -4558,7 +4590,10 @@ function $45a8953d760b5e58$export$a1fd619a4743ca08(_ref) {
   const [get_extra_displays, set_extra_displays_] = $8tj43$createSignal([], {
     equals: false
   });
-  const displays_by_key_ = $2d7bad8684bc7f44$export$7f8bd308237ab5a5($8tj43$createMemo(() => [...plp_results_().displays, ...get_extra_displays()]));
+  const displays_by_key_ = $2d7bad8684bc7f44$export$7f8bd308237ab5a5($8tj43$createMemo(() => {
+    var _plp_results_;
+    return [...(((_plp_results_ = plp_results_()) === null || _plp_results_ === void 0 ? void 0 : _plp_results_.displays) || []), ...get_extra_displays()];
+  }));
   const percentage_in_view_ = $e6dd9dfff4603d8c$export$63dd0350f8559dda({
     get_last_result_in_viewport_: get_last_result_in_viewport_,
     displays_by_key_: displays_by_key_,
@@ -4684,18 +4719,18 @@ function $7faea0096f14b59b$export$3925f87b1545cfc6(_ref) {
               layout_options_: layout_options_,
               sort_or_filter_open_: sort_or_filter_open_
             });
-            $8tj43$createComputed(() => {
-              if (!is_loading_()) return;
-              set_should_have_placeholders_rendered(true);
-              set_suspense_is_blocked(false);
-              is_just_after_plp_results_update = true;
-            });
             const block_suspense_if_needed = () => {
               if (!is_just_after_plp_results_update) return;
               is_just_after_plp_results_update = false;
               fallback_is_alive = false;
               set_suspense_is_blocked(true);
             };
+            $8tj43$createComputed(() => {
+              if (!is_loading_()) return;
+              set_should_have_placeholders_rendered(true);
+              set_suspense_is_blocked(false);
+              is_just_after_plp_results_update = true;
+            });
             $8tj43$createEffect($8tj43$on(plp_results_, () => {
               if (!fallback_is_alive) {
                 // if all product card rendering functions after the initial rendering are synchronous the suspense boundary will never go into the fallback, so we don't know when they have finished rendering, and we can't block the suspense. Therefore, we're just doing it with this effect
@@ -4705,6 +4740,48 @@ function $7faea0096f14b59b$export$3925f87b1545cfc6(_ref) {
             }, {
               defer: true
             }));
+            /*
+            This suspense ensures that if someone has async templates, we still show placeholders until the product cards actually have finished rendering (automagically since they're createResource's)
+            We're creating it outside the <Show> so that we can benefit from <For>'s optimisation between changing results
+            (For the whole idea of the displays being cached to work we can't tear down and re-run ProductCards for every new result.
+            We have to keep ProductCards alive, but hidden, and feed them new data as soon as we had it)
+            */
+            const product_cards_when_data = $8tj43$createComponent((0, $8tj43$Suspense), {
+              get fallback() {
+                return (() => {
+                  fallback_is_alive = true;
+                  $8tj43$onCleanup(block_suspense_if_needed); // Block suspense after initial run every time after we fetch
+                  return $8tj43$createMemo(() => {
+                    // We need to be able to block the suspense since when async product cards are *rendering* we want to show the placeholders on initial load but not when loading more
+                    // In future we could have individual suspense's for each product card, but that's too much for now
+                    if (get_suspense_is_blocked()) return suspense_contents;
+                    set_should_have_placeholders_rendered(true); // just in case
+                    $8tj43$onCleanup(() => set_should_have_placeholders_rendered(false));
+                    return rendered_placeholders; // I lifted the placeholders into the memo since we don't want to re-render them when switching from <Show> to <Suspense>
+                  });
+                })();
+              },
+
+              get children() {
+                return (() => {
+                  suspense_contents = $45a8953d760b5e58$export$a1fd619a4743ca08({
+                    product_card_template_: product_card_template_,
+                    plp_results_: plp_results_,
+                    last_result_in_viewport_: last_result_in_viewport_,
+                    first_result_in_viewport_: first_result_in_viewport_,
+                    market_: market_,
+                    merchant_: merchant_,
+                    all_products_loaded_: all_products_loaded_,
+                    min_products_to_fetch_: min_products_to_fetch_,
+                    query_base_: query_base_,
+                    depict_api_: depict_api_,
+                    is_loading_: is_loading_
+                  });
+                  $8tj43$onCleanup(() => suspense_contents = undefined);
+                  return suspense_contents;
+                })();
+              }
+            });
             return [$8tj43$memo((0, $ca55612a53dbbdd2$export$a2cc176055f8f08)), $8tj43$createComponent((0, $63f1f8dbcd07d3b0$export$d21e32dfedac04be), {
               get cols_at_size() {
                 return modified_cols_at_size();
@@ -4728,44 +4805,7 @@ function $7faea0096f14b59b$export$3925f87b1545cfc6(_ref) {
                   get fallback() {
                     return rendered_placeholders();
                   },
-                  get children() {
-                    return $8tj43$createComponent((0, $8tj43$Suspense), {
-                      get fallback() {
-                        return (() => {
-                          fallback_is_alive = true;
-                          $8tj43$onCleanup(block_suspense_if_needed); // Block suspense after initial run every time after we fetch
-                          return $8tj43$createMemo(() => {
-                            // We need to be able to block the suspense since when async product cards are *rendering* we want to show the placeholders on initial load but not when loading more
-                            // In future we could have individual suspense's for each product card, but that's too much for now
-                            if (get_suspense_is_blocked()) return suspense_contents;
-                            set_should_have_placeholders_rendered(true); // just in case
-                            $8tj43$onCleanup(() => set_should_have_placeholders_rendered(false));
-                            return rendered_placeholders; // I lifted the placeholders into the memo since we don't want to re-render them when switching from <Show> to <Suspense>
-                          });
-                        })();
-                      },
-
-                      get children() {
-                        return (() => {
-                          suspense_contents = $45a8953d760b5e58$export$a1fd619a4743ca08({
-                            product_card_template_: product_card_template_,
-                            plp_results_: plp_results_,
-                            last_result_in_viewport_: last_result_in_viewport_,
-                            first_result_in_viewport_: first_result_in_viewport_,
-                            market_: market_,
-                            merchant_: merchant_,
-                            all_products_loaded_: all_products_loaded_,
-                            min_products_to_fetch_: min_products_to_fetch_,
-                            query_base_: query_base_,
-                            depict_api_: depict_api_,
-                            is_loading_: is_loading_
-                          });
-                          $8tj43$onCleanup(() => suspense_contents = undefined);
-                          return suspense_contents;
-                        })();
-                      }
-                    });
-                  }
+                  children: product_cards_when_data
                 });
               }
             })];
@@ -8040,7 +8080,8 @@ function $8ef6232475d44150$export$7de92c4c2205ebf3(_ref) {
     product_card_template_: product_card_template_,
     showing_recommendation_rows_: showing_recommendation_rows_,
     view_more_button_ = true,
-    layout_options_: layout_options_
+    layout_options_: layout_options_,
+    all_products_loaded_: all_products_loaded_
   } = _ref;
   const [get_showing_recommendation_rows] = showing_recommendation_rows_; // We reset this in after_submit in search.tsx FYI
   const rows_object = view_more_button_ ? $8ef6232475d44150$var$make_state_saved_rows(showing_recommendation_rows_, i18n_) : "all";
@@ -8053,51 +8094,53 @@ function $8ef6232475d44150$export$7de92c4c2205ebf3(_ref) {
     let [per_column] = _ref2;
     return per_column;
   })));
+  // Don't tear down elements every time one updates the page - don't put them within <Show>
+  const elements = (() => {
+    const _el$ = $8tj43$getNextElement($8ef6232475d44150$var$_tmpl$),
+      _el$2 = _el$.firstChild,
+      _el$3 = _el$2.nextSibling,
+      [_el$4, _co$] = $8tj43$getNextMarker(_el$3.nextSibling),
+      _el$5 = _el$4.nextSibling,
+      [_el$6, _co$2] = $8tj43$getNextMarker(_el$5.nextSibling);
+    $8tj43$insert(_el$2, () => i18n_.search_recs_title_());
+    $8tj43$insert(_el$, (0, $ca55612a53dbbdd2$export$a2cc176055f8f08), _el$4, _co$);
+    $8tj43$insert(_el$, $8tj43$createComponent((0, $63f1f8dbcd07d3b0$export$d21e32dfedac04be), $8tj43$mergeProps({
+      rows: rows_object,
+      layout: "grid",
+      element_attributes: {
+        class: "cards"
+      }
+    }, layout_options_, {
+      get children() {
+        return $8tj43$createComponent((0, $8tj43$Suspense), {
+          get fallback() {
+            return $bdd80c7862246dc2$export$f33414a4df0afd3f({
+              num_placeholders_: num_placeholders_,
+              product_card_template_: product_card_template_
+            });
+          },
+          get children() {
+            return (() => {
+              // IIFE to make sure we access both the recommendations_resource and the resources containing the product card rendering results themselves within the Suspense boundary
+              const displays_by_key_ = $2d7bad8684bc7f44$export$7f8bd308237ab5a5($8tj43$createMemo(() => recommendations_resource() || []));
+              return $2d7bad8684bc7f44$export$43f0fb951fcb0c54({
+                displays_by_key_: displays_by_key_,
+                merchant_: $8tj43$createMemo(() => search_query_base_().tenant),
+                market_: $8tj43$createMemo(() => search_query_base_().market),
+                product_card_template_: product_card_template_
+              });
+            })();
+          }
+        });
+      }
+    })), _el$6, _co$2);
+    return _el$;
+  })();
   return $8tj43$createComponent((0, $8tj43$Show), {
     get when() {
-      return is_showing_something();
+      return $8tj43$memo(() => !!is_showing_something())() && all_products_loaded_();
     },
-    get children() {
-      const _el$ = $8tj43$getNextElement($8ef6232475d44150$var$_tmpl$),
-        _el$2 = _el$.firstChild,
-        _el$3 = _el$2.nextSibling,
-        [_el$4, _co$] = $8tj43$getNextMarker(_el$3.nextSibling),
-        _el$5 = _el$4.nextSibling,
-        [_el$6, _co$2] = $8tj43$getNextMarker(_el$5.nextSibling);
-      $8tj43$insert(_el$2, () => i18n_.search_recs_title_());
-      $8tj43$insert(_el$, (0, $ca55612a53dbbdd2$export$a2cc176055f8f08), _el$4, _co$);
-      $8tj43$insert(_el$, $8tj43$createComponent((0, $63f1f8dbcd07d3b0$export$d21e32dfedac04be), $8tj43$mergeProps({
-        rows: rows_object,
-        layout: "grid",
-        element_attributes: {
-          class: "cards"
-        }
-      }, layout_options_, {
-        get children() {
-          return $8tj43$createComponent((0, $8tj43$Suspense), {
-            get fallback() {
-              return $bdd80c7862246dc2$export$f33414a4df0afd3f({
-                num_placeholders_: num_placeholders_,
-                product_card_template_: product_card_template_
-              });
-            },
-            get children() {
-              return (() => {
-                // IIFE to make sure we access both the recommendations_resource and the resources containing the product card rendering results themselves within the Suspense boundary
-                const displays_by_key_ = $2d7bad8684bc7f44$export$7f8bd308237ab5a5($8tj43$createMemo(() => recommendations_resource() || []));
-                return $2d7bad8684bc7f44$export$43f0fb951fcb0c54({
-                  displays_by_key_: displays_by_key_,
-                  merchant_: $8tj43$createMemo(() => search_query_base_().tenant),
-                  market_: $8tj43$createMemo(() => search_query_base_().market),
-                  product_card_template_: product_card_template_
-                });
-              })();
-            }
-          });
-        }
-      })), _el$6, _co$2);
-      return _el$;
-    }
+    children: elements
   });
 }
 function $8ef6232475d44150$var$make_state_saved_rows(_ref3, i18n_) {
@@ -10670,9 +10713,7 @@ function $da279c5a540c6846$export$a54ec244c8863715(_ref) {
       }
     }), _el$19, _co$8);
     $8tj43$insert(_el$7, $8tj43$createComponent((0, $8tj43$Show), {
-      get when() {
-        return get_all_products_loaded() && !disable_search_recommendations_;
-      },
+      when: !disable_search_recommendations_,
       keyed: false,
       get children() {
         return $8tj43$createComponent((0, $74777e8fe65b3dcb$export$b69d0d92862de18b), {
@@ -10691,7 +10732,8 @@ function $da279c5a540c6846$export$a54ec244c8863715(_ref) {
               },
               showing_recommendation_rows_: showing_recommendation_rows_,
               view_more_button_: search_recs_view_more_,
-              product_card_template_: product_card_template_
+              product_card_template_: product_card_template_,
+              all_products_loaded_: get_all_products_loaded
             });
           }
         });