@depict-ai/ui 2.1.1 → 2.1.3

package/server/latest/index.cjs

@@ -70,7 +70,7 @@ $parcel$export(module.exports, "defaultColsAtSize", () => $a3280f0aad997933$expo
 $parcel$export(module.exports, "defaultCategoryTitlePlugin", () => $a3280f0aad997933$export$7bf543b9d9be2c22);
 $parcel$export(module.exports, "version", () => $b757f75811f3261f$export$83d89fbfd8236492);
 /*! Depict.ai search and product listing SDK */
-const $b757f75811f3261f$export$83d89fbfd8236492 = "2.1.1";
+const $b757f75811f3261f$export$83d89fbfd8236492 = "2.1.3";
 const $1ab22f2cd39b3061$var$fallback_operator = "in";
 const $1ab22f2cd39b3061$var$fallback_token = "";
 const $1ab22f2cd39b3061$var$legacy_filter_prefix = "filter_";
@@ -3755,8 +3755,7 @@ function $ac167f6af6a48fc3$export$a1fd619a4743ca08({
   query_base_: query_base_,
   depict_api_: depict_api_,
   is_loading_: is_loading_,
-  content_blocks_: content_blocks_,
-  set_number_loaded_displays_: set_number_loaded_displays_
+  content_blocks_: content_blocks_
 }) {
   // The following sets up an intersection observer to determine which results are in the viewport, used for the ScrollStatus indicator and knowing when to load more
   const target_to_index_map = new Map();
@@ -3800,7 +3799,6 @@ function $ac167f6af6a48fc3$export$a1fd619a4743ca08({
     query_base_: query_base_,
     depict_api_: depict_api_
   });
-  $5vyXB$solidjs.createComputed(() => set_number_loaded_displays_(displays_by_key_().size));
   return $a73063cc642f3e5f$export$43f0fb951fcb0c54({
     displays_by_key_: displays_by_key_,
     merchant_: merchant_,
@@ -3876,25 +3874,26 @@ function $75777da1687ba3f6$var$generate_media_queried_declarations({
 }) {
   return cols_at_size_.map(options => {
     const [n_cols, min, max, grid_spacing_for_size] = options;
-    const spacing_to_use = grid_spacing_for_size || default_grid_spacing_text;
+    const main_spacing_to_use = grid_spacing_for_size || default_grid_spacing_text;
     // See comment in else block below
-    const can_use_gap = $75777da1687ba3f6$var$can_use_gap_for_unit(spacing_to_use) && (!override_vertical_spacing_ || $75777da1687ba3f6$var$can_use_gap_for_unit(override_vertical_spacing_));
+    const can_use_gap = override_vertical_spacing_ ? $75777da1687ba3f6$var$can_use_gap_for_unit(override_vertical_spacing_) : $75777da1687ba3f6$var$can_use_gap_for_unit(main_spacing_to_use);
     let spacing_styling;
     let additional_styling = ""; // outside the media query
-    if (can_use_gap) spacing_styling = `gap:${spacing_to_use};${override_vertical_spacing_ ? `row-gap:${override_vertical_spacing_};` : ``}`;else {
+    if (can_use_gap) spacing_styling = `gap:${main_spacing_to_use};${override_vertical_spacing_ ? `row-gap:${override_vertical_spacing_};` : ``}`;else {
       // When using percent units, which our default styling does (because convenient) and our interface relies on (hard to specify different gaps for different screen sizes)
       // row gaps in grids are relative to the whole height of the grid, maybe see also https://stackoverflow.com/a/53563865. The issue with that is that as we load more products, the gap grows. Also, it breaks existing integrations.
       // Logical thought: use margins for the vertical spacing. But margins in grids are apparently relative to the size of the individual items in grids.
       // Given that, and that content blocks can be of different width, we have to do some complicated calculations to convert the provided gap, which is in gap of the total container width, to a margin of the individual items.
+      const vertical_spacing_to_use = override_vertical_spacing_ ?? main_spacing_to_use;
       const width_multiplier = `var(${$75777da1687ba3f6$export$c500183c31c2b22e}, 1)`; // How many cards wide the current item is (needed because content blocks)
-      const one_item_width_exclusing_gaps = `calc(calc(100 / ${n_cols}) - calc(calc(${n_cols * 2 - 2} * calc(${$75777da1687ba3f6$var$strip_percent_unit(spacing_to_use)} / 2)) / ${n_cols}))`; // Width of one item in percent of the whole
+      const one_item_width_exclusing_gaps = `calc(calc(100 / ${n_cols}) - calc(calc(${n_cols * 2 - 2} * calc(${$75777da1687ba3f6$var$strip_percent_unit(vertical_spacing_to_use)} / 2)) / ${n_cols}))`; // Width of one item in percent of the whole
       // Equation from layout.tsx, also used in CheckboxGrid. Needs half spacing for some reason
       const this_item_width_meat = `calc(${one_item_width_exclusing_gaps} * ${width_multiplier})`; // Width of just the card
-      const this_item_width_gaps = `calc(calc(${width_multiplier} - 1) * ${$75777da1687ba3f6$var$strip_percent_unit(spacing_to_use)})`; // Width of the gaps
+      const this_item_width_gaps = `calc(calc(${width_multiplier} - 1) * ${$75777da1687ba3f6$var$strip_percent_unit(vertical_spacing_to_use)})`; // Width of the gaps
       const this_item_width = `calc(${this_item_width_meat} + ${this_item_width_gaps})`; // Width of this item including gaps
       // this_item_width needs to be unitless, and since plain css can't do calc(40% / 5%) which would become unitless we need to strip all units in the calculations before
       const convert_top_spacing_to_item_width_percentage = spacing => `calc(calc(100 / ${this_item_width}) * ${spacing})`; // Now finally we can convert the desired spacing to a percentage of this individual item's width (including gaps that would be there but aren't because content blocks span them)
-      spacing_styling = `column-gap:${spacing_to_use};`; // Still use gaps in the horizontal direction because that works flawlessly
+      spacing_styling = `column-gap:${main_spacing_to_use};`; // Still use gaps in the horizontal direction because that works flawlessly
       // Re-use old layout code to get the correct :nth-child declarations for the top margins
       additional_styling = $5vyXB$depictaiutilishared.n_col_styling_with_dist(container_selector_ + ">", convert_top_spacing_to_item_width_percentage(default_grid_spacing_text), [[n_cols, min, max, grid_spacing_for_size ? convert_top_spacing_to_item_width_percentage(grid_spacing_for_size) : null]], "grid", override_vertical_spacing_ ? convert_top_spacing_to_item_width_percentage(override_vertical_spacing_) : override_vertical_spacing_, top_row_shortened_by_);
     }
@@ -3983,26 +3982,18 @@ const $d92f338ba8f9da9b$var$_tmpl$ = ["<div", ' class="content-block-wrapper" st
 function $d92f338ba8f9da9b$export$791ef57e62e21c3f({
   content_blocks_: incoming_content_blocks,
   cols_at_size_: cols_at_size_,
-  number_of_items_shown_: number_of_items_shown_,
   set_top_row_shortened_by_: set_top_row_shortened_by_
 }) {
   // these are by row
   const [content_blocks, set_content_blocks] = $5vyXB$solidjsstore.createStore([]);
   const n_cols_currently_showing_ = $055384b985678603$export$a79e666719b3647c(cols_at_size_);
-  const products_to_rows = products => {
-    const cols_currently_showing = n_cols_currently_showing_();
-    if (cols_currently_showing === null) return 0;
-    return Math.ceil(products / cols_currently_showing);
-  };
-  const showing_rows = $5vyXB$solidjs.createMemo(() => products_to_rows(number_of_items_shown_()));
   $5vyXB$solidjs.createEffect(() => {
     const incoming_value = incoming_content_blocks();
     if (!incoming_value) {
       set_content_blocks([]);
       return;
     }
-    const capped_value = incoming_value.slice(0, showing_rows()); // Don't show more content blocks than we have rows
-    set_content_blocks($5vyXB$solidjsstore.reconcile(capped_value, {
+    set_content_blocks($5vyXB$solidjsstore.reconcile(incoming_value, {
       key: "content"
     })); // key: Make moving blocks faster, see https://github.com/solidjs/solid/issues/1925#issuecomment-1769671596
   });
@@ -4059,12 +4050,12 @@ function $d92f338ba8f9da9b$var$remap_blocks_to_index({
       for (let j = 0; j < i; j++) {
         const row = displaced_products[j];
         if (row === undefined) continue; // there were no blocks in this row
-        let items_in_row;
-        if (typeof row === "number") items_in_row = row;else {
-          items_in_row = row.filter(item => item).length;
-          displaced_products[j] = items_in_row;
+        let displaced_items_in_row;
+        if (typeof row === "number") displaced_items_in_row = row;else {
+          displaced_items_in_row = row.filter(item => item).length;
+          displaced_products[j] = displaced_items_in_row;
         }
-        displacement_by_added_blocks += items_in_row;
+        displacement_by_added_blocks += displaced_items_in_row;
       }
       const index_of_us_in_row = target_index - index_of_first_item_in_row;
       for (let j = 0; j < index_of_us_in_row; j++) if (displaced_products[i]?.[j])
@@ -4102,13 +4093,27 @@ function $d92f338ba8f9da9b$var$wrap_blocks_in_div(rendered_content_blocks, max_s
   const get_wrapped_blocks = $5vyXB$solidjs.mapArray(() => rendered_content_blocks, block => {
     if (!block) return;
     const get_span_columns = () => Math.min(block.span_columns, max_span_columns() ?? Infinity);
+    const [rendering_delayed, set_rendering_delayed_] = $5vyXB$solidjs.createSignal(true);
+    const content = $5vyXB$solidjsweb.createComponent((0, $5vyXB$solidjs.Show), {
+      get when() {
+        return !rendering_delayed();
+      },
+      get children() {
+        return $5vyXB$solidjsweb.ssr($d92f338ba8f9da9b$var$_tmpl$, $5vyXB$solidjsweb.ssrHydrationKey(), "grid-column:" + `span ${$5vyXB$solidjsweb.escape(get_span_columns(), true)}` + (";grid-row:" + `span ${$5vyXB$solidjsweb.escape(block.span_rows, true)}`) + (";spans_columns_variable_name:" + $5vyXB$solidjsweb.escape(get_span_columns(), true)), $5vyXB$solidjsweb.escape($5vyXB$solidjsweb.createComponent($d92f338ba8f9da9b$var$RenderContent, {
+          get content() {
+            return block.content;
+          }
+        })));
+      }
+    });
     return $5vyXB$solidjs.mergeProps(block, {
       // Create content divs for the blocks with as much fine-grained diffing as possible?
-      content: $5vyXB$solidjsweb.ssr($d92f338ba8f9da9b$var$_tmpl$, $5vyXB$solidjsweb.ssrHydrationKey(), "grid-column:" + `span ${$5vyXB$solidjsweb.escape(get_span_columns(), true)}` + (";grid-row:" + `span ${$5vyXB$solidjsweb.escape(block.span_rows, true)}`) + (";spans_columns_variable_name:" + $5vyXB$solidjsweb.escape(get_span_columns(), true)), $5vyXB$solidjsweb.escape($5vyXB$solidjsweb.createComponent($d92f338ba8f9da9b$var$RenderContent, {
-        get content() {
-          return block.content;
-        }
-      }))),
+      content: () => {
+        // Sneaky on-demand rendering, so we don't render more blocks than we can show: we have the rendered value here and don't return a function that renders because if our block would be moved around we'd be guaranteed to re-render
+        // However, no need to count products to know if we should render: the <For> loops in Placeholders and render_displays will only call this function if there's actually a product here that wants to display this block
+        set_rendering_delayed_(false);
+        return content;
+      },
       get span_columns() {
         // Cap max width of block to the number of columns available, for everyone downstream
         return get_span_columns();
@@ -4196,8 +4201,7 @@ function $fe76fb463cc60b89$export$3925f87b1545cfc6({
           let fallback_is_alive = false;
           const [get_should_have_placeholders_rendered, set_should_have_placeholders_rendered] = $5vyXB$solidjs.createSignal(true);
           const [top_row_shortened_by_, set_top_row_shortened_by_] = $5vyXB$solidjs.createSignal(0);
-          const [product_card_suspense_is_in_fallback, set_product_card_suspense_is_in_fallback] = $5vyXB$solidjs.createSignal(false);
-          const [number_loaded_displays, set_number_loaded_displays_] = $5vyXB$solidjs.createSignal(0);
+          $5vyXB$solidjs.createSignal(false);
           const modified_cols_at_size = $738c3a81fc46a340$export$cb5808ba002cdeed({
             layout_options_: layout_options_,
             sort_or_filter_open_: sort_or_filter_open_
@@ -4208,12 +4212,10 @@ function $fe76fb463cc60b89$export$3925f87b1545cfc6({
               for_id: for_id
             }) => for_id === id_currently_querying_for_())?.min_results_loaded ?? min_products_to_fetch_);
           });
-          const number_of_items_shown_ = $5vyXB$solidjs.createMemo(() => is_loading_() || product_card_suspense_is_in_fallback() ? num_placeholders_() : number_loaded_displays());
           const doesnt_have_content_blocks = $5vyXB$solidjs.createMemo(() => !content_blocks_by_row_());
           const content_blocks_ = $5vyXB$solidjs.createMemo(() => doesnt_have_content_blocks() ? () => [] : $d92f338ba8f9da9b$export$791ef57e62e21c3f({
             content_blocks_: content_blocks_by_row_,
             cols_at_size_: modified_cols_at_size,
-            number_of_items_shown_: number_of_items_shown_,
             set_top_row_shortened_by_: set_top_row_shortened_by_
           }));
           const rendered_placeholders = $5vyXB$solidjs.createMemo(() => get_should_have_placeholders_rendered() ? $0caf87eaa19079da$export$f33414a4df0afd3f({
@@ -4253,8 +4255,6 @@ function $fe76fb463cc60b89$export$3925f87b1545cfc6({
             get fallback() {
               fallback_is_alive = true;
               $5vyXB$solidjs.onCleanup(block_suspense_if_needed); // Block suspense after initial run every time after we fetch
-              set_product_card_suspense_is_in_fallback(true); // Here for the content block code that needs to know how many items we're displaying
-              $5vyXB$solidjs.onCleanup(() => set_product_card_suspense_is_in_fallback(false));
               return $5vyXB$solidjs.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
@@ -4279,8 +4279,7 @@ function $fe76fb463cc60b89$export$3925f87b1545cfc6({
                   query_base_: query_base_,
                   depict_api_: depict_api_,
                   is_loading_: is_loading_,
-                  content_blocks_: content_blocks_,
-                  set_number_loaded_displays_: set_number_loaded_displays_
+                  content_blocks_: content_blocks_
                 });
                 $5vyXB$solidjs.onCleanup(() => suspense_contents = undefined);
                 return suspense_contents;

package/server/latest/index.d.ts

@@ -6,8 +6,8 @@ import { BaseCategoryDisplay, ProductListingResponse } from "@depict-ai/types/ap
 import { CategorySuggestion, SearchSuggestionsResponse } from "@depict-ai/types/api/SearchSuggestionsResponse";
 import { BaseSearchRequest } from "@depict-ai/types/api/BaseSearchRequest";
 import { SearchSuggestionsRequest } from "@depict-ai/types/api/SearchSuggestionsRequest";
-import { ProductListingRequest } from "@depict-ai/types/api/ProductListingRequest";
-export const version = "2.1.1";
+import { ProductListingRequestV2 } from "@depict-ai/types/api/ProductListingRequestV2";
+export const version = "2.1.3";
 /**
  * Use `javascript_media_query` but return a reactive accessor instead of taking a callback function
  */
@@ -55,7 +55,7 @@ export function ImagePlaceholder(props: ImagePlaceholderBaseOptions & (ImagePlac
  * The interface for a content block.
  * Please make sure that you don't have content blocks overlap as that will cause undefined behavior.
  * The height of the content block will be the height of the tallest item in a row, so if there are no products in a row the content block needs to "bring its own height".
- * If you need to load any data in the content block, please make sure to return a placeholder while you're doing so, to avoid layout shifts and ensure scroll restoration works correctly.
+ * If you need to load any data in the content block, please make sure to return a placeholder while you're doing so (see `ImagePlaceholder`), to avoid layout shifts and ensure scroll restoration works correctly.
  *
  * - `span_columns`: How many columns the block should span. This will be capped to the number of columns available.
  * - `span_rows`: How many rows the block should span.
@@ -670,7 +670,7 @@ export class DepictAPI<InputDisplay extends Display, OutputDisplay extends Moder
   query(input_req: SearchRequest): Promise<SearchResponseAfterURLCreator & {
     failed?: true;
   }>;
-  list(input_req: ProductListingRequest): Promise<ProductListingResponseAfterURLCreator & {
+  list(input_req: ProductListingRequestV2): Promise<ProductListingResponseAfterURLCreator & {
     failed?: true;
   }>;
   get_recommended<T extends Display>(input_req: BaseSearchRequest): Promise<{

package/server/latest/index.js

@@ -6,7 +6,7 @@ import { createStore as $i7OB2$createStore, reconcile as $i7OB2$reconcile } from
 /*! Depict.ai search and product listing SDK */
 import { register_es_version } from "../../multi_import_deduplicator.mjs";
 register_es_version("ui", "latest");
-const $ec291e0010116877$export$83d89fbfd8236492 = "2.1.1";
+const $ec291e0010116877$export$83d89fbfd8236492 = "2.1.3";
 const $4147651646da990a$var$fallback_operator = "in";
 const $4147651646da990a$var$fallback_token = "";
 const $4147651646da990a$var$legacy_filter_prefix = "filter_";
@@ -3691,8 +3691,7 @@ function $0449e7d49398c077$export$a1fd619a4743ca08({
   query_base_: query_base_,
   depict_api_: depict_api_,
   is_loading_: is_loading_,
-  content_blocks_: content_blocks_,
-  set_number_loaded_displays_: set_number_loaded_displays_
+  content_blocks_: content_blocks_
 }) {
   // The following sets up an intersection observer to determine which results are in the viewport, used for the ScrollStatus indicator and knowing when to load more
   const target_to_index_map = new Map();
@@ -3736,7 +3735,6 @@ function $0449e7d49398c077$export$a1fd619a4743ca08({
     query_base_: query_base_,
     depict_api_: depict_api_
   });
-  $i7OB2$createComputed(() => set_number_loaded_displays_(displays_by_key_().size));
   return $29ec7cddbe1d3484$export$43f0fb951fcb0c54({
     displays_by_key_: displays_by_key_,
     merchant_: merchant_,
@@ -3812,25 +3810,26 @@ function $6dee9211e57ac31a$var$generate_media_queried_declarations({
 }) {
   return cols_at_size_.map(options => {
     const [n_cols, min, max, grid_spacing_for_size] = options;
-    const spacing_to_use = grid_spacing_for_size || default_grid_spacing_text;
+    const main_spacing_to_use = grid_spacing_for_size || default_grid_spacing_text;
     // See comment in else block below
-    const can_use_gap = $6dee9211e57ac31a$var$can_use_gap_for_unit(spacing_to_use) && (!override_vertical_spacing_ || $6dee9211e57ac31a$var$can_use_gap_for_unit(override_vertical_spacing_));
+    const can_use_gap = override_vertical_spacing_ ? $6dee9211e57ac31a$var$can_use_gap_for_unit(override_vertical_spacing_) : $6dee9211e57ac31a$var$can_use_gap_for_unit(main_spacing_to_use);
     let spacing_styling;
     let additional_styling = ""; // outside the media query
-    if (can_use_gap) spacing_styling = `gap:${spacing_to_use};${override_vertical_spacing_ ? `row-gap:${override_vertical_spacing_};` : ``}`;else {
+    if (can_use_gap) spacing_styling = `gap:${main_spacing_to_use};${override_vertical_spacing_ ? `row-gap:${override_vertical_spacing_};` : ``}`;else {
       // When using percent units, which our default styling does (because convenient) and our interface relies on (hard to specify different gaps for different screen sizes)
       // row gaps in grids are relative to the whole height of the grid, maybe see also https://stackoverflow.com/a/53563865. The issue with that is that as we load more products, the gap grows. Also, it breaks existing integrations.
       // Logical thought: use margins for the vertical spacing. But margins in grids are apparently relative to the size of the individual items in grids.
       // Given that, and that content blocks can be of different width, we have to do some complicated calculations to convert the provided gap, which is in gap of the total container width, to a margin of the individual items.
+      const vertical_spacing_to_use = override_vertical_spacing_ ?? main_spacing_to_use;
       const width_multiplier = `var(${$6dee9211e57ac31a$export$c500183c31c2b22e}, 1)`; // How many cards wide the current item is (needed because content blocks)
-      const one_item_width_exclusing_gaps = `calc(calc(100 / ${n_cols}) - calc(calc(${n_cols * 2 - 2} * calc(${$6dee9211e57ac31a$var$strip_percent_unit(spacing_to_use)} / 2)) / ${n_cols}))`; // Width of one item in percent of the whole
+      const one_item_width_exclusing_gaps = `calc(calc(100 / ${n_cols}) - calc(calc(${n_cols * 2 - 2} * calc(${$6dee9211e57ac31a$var$strip_percent_unit(vertical_spacing_to_use)} / 2)) / ${n_cols}))`; // Width of one item in percent of the whole
       // Equation from layout.tsx, also used in CheckboxGrid. Needs half spacing for some reason
       const this_item_width_meat = `calc(${one_item_width_exclusing_gaps} * ${width_multiplier})`; // Width of just the card
-      const this_item_width_gaps = `calc(calc(${width_multiplier} - 1) * ${$6dee9211e57ac31a$var$strip_percent_unit(spacing_to_use)})`; // Width of the gaps
+      const this_item_width_gaps = `calc(calc(${width_multiplier} - 1) * ${$6dee9211e57ac31a$var$strip_percent_unit(vertical_spacing_to_use)})`; // Width of the gaps
       const this_item_width = `calc(${this_item_width_meat} + ${this_item_width_gaps})`; // Width of this item including gaps
       // this_item_width needs to be unitless, and since plain css can't do calc(40% / 5%) which would become unitless we need to strip all units in the calculations before
       const convert_top_spacing_to_item_width_percentage = spacing => `calc(calc(100 / ${this_item_width}) * ${spacing})`; // Now finally we can convert the desired spacing to a percentage of this individual item's width (including gaps that would be there but aren't because content blocks span them)
-      spacing_styling = `column-gap:${spacing_to_use};`; // Still use gaps in the horizontal direction because that works flawlessly
+      spacing_styling = `column-gap:${main_spacing_to_use};`; // Still use gaps in the horizontal direction because that works flawlessly
       // Re-use old layout code to get the correct :nth-child declarations for the top margins
       additional_styling = $i7OB2$n_col_styling_with_dist(container_selector_ + ">", convert_top_spacing_to_item_width_percentage(default_grid_spacing_text), [[n_cols, min, max, grid_spacing_for_size ? convert_top_spacing_to_item_width_percentage(grid_spacing_for_size) : null]], "grid", override_vertical_spacing_ ? convert_top_spacing_to_item_width_percentage(override_vertical_spacing_) : override_vertical_spacing_, top_row_shortened_by_);
     }
@@ -3919,26 +3918,18 @@ const $e7a7eb102ddc0c79$var$_tmpl$ = ["<div", ' class="content-block-wrapper" st
 function $e7a7eb102ddc0c79$export$791ef57e62e21c3f({
   content_blocks_: incoming_content_blocks,
   cols_at_size_: cols_at_size_,
-  number_of_items_shown_: number_of_items_shown_,
   set_top_row_shortened_by_: set_top_row_shortened_by_
 }) {
   // these are by row
   const [content_blocks, set_content_blocks] = $i7OB2$createStore([]);
   const n_cols_currently_showing_ = $bed740eef1769419$export$a79e666719b3647c(cols_at_size_);
-  const products_to_rows = products => {
-    const cols_currently_showing = n_cols_currently_showing_();
-    if (cols_currently_showing === null) return 0;
-    return Math.ceil(products / cols_currently_showing);
-  };
-  const showing_rows = $i7OB2$createMemo(() => products_to_rows(number_of_items_shown_()));
   $i7OB2$createEffect(() => {
     const incoming_value = incoming_content_blocks();
     if (!incoming_value) {
       set_content_blocks([]);
       return;
     }
-    const capped_value = incoming_value.slice(0, showing_rows()); // Don't show more content blocks than we have rows
-    set_content_blocks($i7OB2$reconcile(capped_value, {
+    set_content_blocks($i7OB2$reconcile(incoming_value, {
       key: "content"
     })); // key: Make moving blocks faster, see https://github.com/solidjs/solid/issues/1925#issuecomment-1769671596
   });
@@ -3995,12 +3986,12 @@ function $e7a7eb102ddc0c79$var$remap_blocks_to_index({
       for (let j = 0; j < i; j++) {
         const row = displaced_products[j];
         if (row === undefined) continue; // there were no blocks in this row
-        let items_in_row;
-        if (typeof row === "number") items_in_row = row;else {
-          items_in_row = row.filter(item => item).length;
-          displaced_products[j] = items_in_row;
+        let displaced_items_in_row;
+        if (typeof row === "number") displaced_items_in_row = row;else {
+          displaced_items_in_row = row.filter(item => item).length;
+          displaced_products[j] = displaced_items_in_row;
         }
-        displacement_by_added_blocks += items_in_row;
+        displacement_by_added_blocks += displaced_items_in_row;
       }
       const index_of_us_in_row = target_index - index_of_first_item_in_row;
       for (let j = 0; j < index_of_us_in_row; j++) if (displaced_products[i]?.[j])
@@ -4038,13 +4029,27 @@ function $e7a7eb102ddc0c79$var$wrap_blocks_in_div(rendered_content_blocks, max_s
   const get_wrapped_blocks = $i7OB2$mapArray(() => rendered_content_blocks, block => {
     if (!block) return;
     const get_span_columns = () => Math.min(block.span_columns, max_span_columns() ?? Infinity);
+    const [rendering_delayed, set_rendering_delayed_] = $i7OB2$createSignal(true);
+    const content = $i7OB2$createComponent((0, $i7OB2$Show), {
+      get when() {
+        return !rendering_delayed();
+      },
+      get children() {
+        return $i7OB2$ssr($e7a7eb102ddc0c79$var$_tmpl$, $i7OB2$ssrHydrationKey(), "grid-column:" + `span ${$i7OB2$escape(get_span_columns(), true)}` + (";grid-row:" + `span ${$i7OB2$escape(block.span_rows, true)}`) + (";spans_columns_variable_name:" + $i7OB2$escape(get_span_columns(), true)), $i7OB2$escape($i7OB2$createComponent($e7a7eb102ddc0c79$var$RenderContent, {
+          get content() {
+            return block.content;
+          }
+        })));
+      }
+    });
     return $i7OB2$mergeProps1(block, {
       // Create content divs for the blocks with as much fine-grained diffing as possible?
-      content: $i7OB2$ssr($e7a7eb102ddc0c79$var$_tmpl$, $i7OB2$ssrHydrationKey(), "grid-column:" + `span ${$i7OB2$escape(get_span_columns(), true)}` + (";grid-row:" + `span ${$i7OB2$escape(block.span_rows, true)}`) + (";spans_columns_variable_name:" + $i7OB2$escape(get_span_columns(), true)), $i7OB2$escape($i7OB2$createComponent($e7a7eb102ddc0c79$var$RenderContent, {
-        get content() {
-          return block.content;
-        }
-      }))),
+      content: () => {
+        // Sneaky on-demand rendering, so we don't render more blocks than we can show: we have the rendered value here and don't return a function that renders because if our block would be moved around we'd be guaranteed to re-render
+        // However, no need to count products to know if we should render: the <For> loops in Placeholders and render_displays will only call this function if there's actually a product here that wants to display this block
+        set_rendering_delayed_(false);
+        return content;
+      },
       get span_columns() {
         // Cap max width of block to the number of columns available, for everyone downstream
         return get_span_columns();
@@ -4132,8 +4137,7 @@ function $2d25e42846eac370$export$3925f87b1545cfc6({
           let fallback_is_alive = false;
           const [get_should_have_placeholders_rendered, set_should_have_placeholders_rendered] = $i7OB2$createSignal(true);
           const [top_row_shortened_by_, set_top_row_shortened_by_] = $i7OB2$createSignal(0);
-          const [product_card_suspense_is_in_fallback, set_product_card_suspense_is_in_fallback] = $i7OB2$createSignal(false);
-          const [number_loaded_displays, set_number_loaded_displays_] = $i7OB2$createSignal(0);
+          $i7OB2$createSignal(false);
           const modified_cols_at_size = $15aa76e6da02e5c2$export$cb5808ba002cdeed({
             layout_options_: layout_options_,
             sort_or_filter_open_: sort_or_filter_open_
@@ -4144,12 +4148,10 @@ function $2d25e42846eac370$export$3925f87b1545cfc6({
               for_id: for_id
             }) => for_id === id_currently_querying_for_())?.min_results_loaded ?? min_products_to_fetch_);
           });
-          const number_of_items_shown_ = $i7OB2$createMemo(() => is_loading_() || product_card_suspense_is_in_fallback() ? num_placeholders_() : number_loaded_displays());
           const doesnt_have_content_blocks = $i7OB2$createMemo(() => !content_blocks_by_row_());
           const content_blocks_ = $i7OB2$createMemo(() => doesnt_have_content_blocks() ? () => [] : $e7a7eb102ddc0c79$export$791ef57e62e21c3f({
             content_blocks_: content_blocks_by_row_,
             cols_at_size_: modified_cols_at_size,
-            number_of_items_shown_: number_of_items_shown_,
             set_top_row_shortened_by_: set_top_row_shortened_by_
           }));
           const rendered_placeholders = $i7OB2$createMemo(() => get_should_have_placeholders_rendered() ? $6e41f1fde994db72$export$f33414a4df0afd3f({
@@ -4189,8 +4191,6 @@ function $2d25e42846eac370$export$3925f87b1545cfc6({
             get fallback() {
               fallback_is_alive = true;
               $i7OB2$onCleanup(block_suspense_if_needed); // Block suspense after initial run every time after we fetch
-              set_product_card_suspense_is_in_fallback(true); // Here for the content block code that needs to know how many items we're displaying
-              $i7OB2$onCleanup(() => set_product_card_suspense_is_in_fallback(false));
               return $i7OB2$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
@@ -4215,8 +4215,7 @@ function $2d25e42846eac370$export$3925f87b1545cfc6({
                   query_base_: query_base_,
                   depict_api_: depict_api_,
                   is_loading_: is_loading_,
-                  content_blocks_: content_blocks_,
-                  set_number_loaded_displays_: set_number_loaded_displays_
+                  content_blocks_: content_blocks_
                 });
                 $i7OB2$onCleanup(() => suspense_contents = undefined);
                 return suspense_contents;