@wix/himalaya-cli 0.1033.0 → 0.1034.0

package/templates/retail-store-owner/tier5-src/_shared/collection-contract.ts

@@ -30,6 +30,9 @@ export interface CollectionConfig {
    * `screenId` opens that screen with the row id; without it the verb reuses the
    * row's own tap action (the detail screen that owns the verb). */
   primaryVerb?: { label: string; screenId?: string };
+  /** A state field the DOMAIN narrows `rows` by (e.g. a category picker). While it is set,
+   *  zero rows is a filtered result, not an empty source. */
+  narrowedBy?: string;
 }
 /** At or below this many records, with no query/filter narrowing them and no further
  * page, the list/grid toggle, Refine, chips, search and count are noise. */
@@ -41,7 +44,7 @@ export const COLLECTIONS: Record<string, CollectionConfig> = {
     defaultFilter: 'value:Upcoming', searchPlaceholder: 'Exact booking ID', filterValues: ['Upcoming', 'Past', 'Cancelled'],
     sortLabels: { default: 'Soonest', az: 'Oldest', za: 'Latest' } },
   himiEvents: { rows: 'results', title: 'title', subtitle: 'dateLine', image: 'image', view: 'grid', backendQuery: true, searchPlaceholder: 'Exact event title', filterValues: ['Upcoming', 'Past'], sortLabels: { default: 'Date', az: 'Title A–Z', za: 'Title Z–A' }, primaryVerb: { label: 'Register' } },
-  himiBlogFeed: { rows: 'posts', title: 'title', subtitle: 'excerpt', image: 'image', filter: 'category', filterValuesFrom: 'categories', view: 'grid' },
+  himiBlogFeed: { rows: 'posts', title: 'title', subtitle: 'excerpt', image: 'image', filter: 'category', filterValuesFrom: 'categories', view: 'grid', narrowedBy: 'selectedCategoryId' },
   himiOwnerLiteProducts: { rows: 'products', title: 'name', subtitle: 'price', image: 'image', view: 'grid', backendQuery: true },
   himiOwnerModules: { instanceInput: 'module', rows: 'rows', title: 'title', subtitle: 'subtitle', image: 'image', filter: 'statusLabel', view: 'list', paged: true, reviewAction: 'prepareRecord', reviewSelectedAction: 'prepareSelected' },
   himiOwnerLiteServices: { rows: 'services', title: 'name', subtitle: 'subtitle', view: 'list', backendQuery: true, searchPlaceholder: 'Service name starts with…' },

package/templates/retail-store-owner/tier5-src/_shared/collection-service.ts

@@ -122,14 +122,38 @@ export function decorateCollection(name: string, def: { state: State; actions?:
     const errored = s.status === 'error' || s.isErrored === true || s.errored === true || backendState?.status === 'error';
     const domainError = typeof s.error === 'string' ? s.error.trim() : '';
     const queryError = typeof backendState?.error === 'string' ? backendState.error.trim() : '';
-    const errorMessage = queryError || domainError || copyParam('collection.loadError', 'This collection could not load. Try again.');
+    // Some domains carry their failure sentence in `emptyText` (portfolio, podcasts);
+    // the screen folds that node into this block, so keep the domain's own words.
+    const domainEmptyError = errored && typeof s.emptyText === 'string' ? s.emptyText.trim() : '';
+    const errorMessage = queryError || domainError || domainEmptyError || copyParam('collection.loadError', 'This collection could not load. Try again.');
     const canRetry = !!backend || typeof def.actions?.refresh === 'function' || typeof def.actions?.load === 'function' || typeof def.actions?.collectionRetry === 'function';
+    // Wix refused the visitor: retrying cannot help, signing in can.
+    const signInRequired = errored && s.signInRequired === true;
+    // "the source has nothing" and "your filter matched nothing" are
+    // different states. Only the second may offer "Clear filters", and the list chrome
+    // (view, refine, chips, counter, search) means nothing over a source with no rows.
+    // Loaded-row collections hold the whole source in `rows`, so zero rows IS an empty
+    // source. A backend query returns only matches, so zero rows is source-empty only
+    // when nothing narrowed it.
+    // Anything the customer (or the domain) narrowed the result by. While narrowed, zero rows
+    // is "your filter matched nothing" and the controls that got them here must stay.
+    // The DOMAIN's own filter (config.narrowedBy, e.g. blog category) narrowed the rows: the
+    // domain owns that empty state and its clear action. The shared "Clear filters" block
+    // cannot reset a domain filter, so it never shows for one.
+    const domainNarrowed = !!config.narrowedBy && !!s[config.narrowedBy];
     // A default view is what the screen opens on; anything else is the member's own
     // narrowing, which keeps the chrome (and the Clear that undoes it) on screen.
     // "All" and the collection's own default (e.g. Upcoming) are both un-narrowed: Clear
     // resets to "All", so showing it on either would offer a reset that changes nothing.
-    const narrowed = !!prefs.query.trim() || (prefs.filter !== 'all' && prefs.filter !== initialCollection(config).filter);
-    const hideChrome = !narrowed && !s.nextCursor && projected.loaded < COLLECTION_CHROME_MIN_ITEMS;
+    const narrowed = !!prefs.query.trim() || (prefs.filter !== 'all' && prefs.filter !== initialCollection(config).filter) || domainNarrowed;
+    const sourceEmpty = !loading && !errored && rows.length === 0 &&
+      (!(backend && config.backendQuery) || !narrowed) && !domainNarrowed;
+    const emptySourceText = (typeof s.emptyText === 'string' && s.emptyText.trim()) || copyParam('collection.emptySource', 'Nothing here yet');
+    // Chrome is noise over a small un-narrowed list (fewer than COLLECTION_CHROME_MIN_ITEMS
+    // records, no further page), over an empty source, and before the FIRST load or an
+    // un-narrowed failure. A re-query while typing keeps it (and the search field's focus).
+    const hideChrome = (!narrowed && !s.nextCursor && projected.loaded < COLLECTION_CHROME_MIN_ITEMS)
+      || sourceEmpty || ((loading || errored) && rows.length === 0 && !narrowed);
     return { ...s, collection: { ...prefs, ...projected,
       hideChrome, noActiveCriteria: !narrowed,
       viewName, viewMessage, saveMessage, noSavedViews: prefs.savedViews.length === 0,
@@ -138,8 +162,15 @@ export function decorateCollection(name: string, def: { state: State; actions?:
       noPageError: s.pageError !== true,
       noOffline: s.fromCache !== true,
       noError: !errored,
-      noRetry: !canRetry,
+      noRetry: !canRetry || signInRequired,
+      noSignIn: !signInRequired,
+      errorTitle: signInRequired ? copyParam('collection.signInTitle', 'Sign in to see this') : copyParam('collection.loadErrorTitle', 'This collection could not load'),
       errorMessage,
+      noLoading: !loading,
+      // De-dup against a domain that paints its OWN empty block (screen-kit emptyBlock is
+      // gated on the domain's top-level `noEmpty`): only one empty state ever shows.
+      noEmptySource: !sourceEmpty || s.noEmpty === false,
+      emptySourceText,
       hideList: prefs.view !== 'list', hideGrid: prefs.view !== 'grid',
       hideComfortable: prefs.density !== 'comfortable', hideCompact: prefs.density !== 'compact',
       selectingLabel: prefs.selecting ? copyParam('collection.done', 'Done') : copyParam('collection.select', 'Select'),
@@ -147,7 +178,7 @@ export function decorateCollection(name: string, def: { state: State; actions?:
       cannotSaveSelected: !prefs.selectedIds.length || prefs.selectedIds.some(id => !rows.some(row => collectionId(row) === id)),
       filtersPresented, previewPresented: !!previewId, preview: projected.items.filter(row => row.collectionId === previewId),
       persistenceLabel: persisted.available ? copyParam('collection.onDevice', 'Saved on this device') : copyParam('collection.sessionOnly', 'Choices last for this session'),
-      noEmpty: loading || errored || projected.items.length > 0,
+      noEmpty: loading || errored || sourceEmpty || domainNarrowed || projected.items.length > 0,
       summary: backend && config.backendQuery
         ? (s.fromCache ? copyParam('collection.cached', 'Saved offline · may be outdated')
           : typeof s.total === 'number' ? `${projected.items.length} / ${s.total} ${copyParam('collection.results', 'results')}`

package/templates/yoga-studio/dev/index.ts

@@ -5223,7 +5223,8 @@ const SCREENS = runtimeSetting({
                 "props": {
                   "text": "$service:spacesDeleteAccount.message",
                   "style": "caption",
-                  "color": "textTertiary"
+                  "color": "textTertiary",
+                  "collapseWhenEmpty": true
                 }
               }
             },
@@ -5518,6 +5519,9 @@ const SCREENS = runtimeSetting({
                     }
                   ]
                 }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:spacesWhatsNew.noItems"
               }
             },
             {
@@ -5833,6 +5837,24 @@ const SCREENS = runtimeSetting({
                         "props": {
                           "spacing": 0,
                           "children": [
+                            {
+                              "id": "himi_services.list.collection.loading",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Skeleton",
+                                "props": {
+                                  "height": 72,
+                                  "cornerRadius": 12,
+                                  "count": 3
+                                }
+                              },
+                              "modifiers": {
+                                "hiddenPath": "$service:himiBookingServices.collection.noLoading",
+                                "padding": {
+                                  "bottom": 12
+                                }
+                              }
+                            },
                             {
                               "id": "",
                               "body": {
@@ -6094,6 +6116,52 @@ const SCREENS = runtimeSetting({
                                 }
                               }
                             },
+                            {
+                              "id": "himi_services.list.collection.empty-source",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "VStack",
+                                "props": {
+                                  "spacing": 8,
+                                  "alignment": "center",
+                                  "children": [
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Icon",
+                                        "props": {
+                                          "name": "inbox",
+                                          "size": 28,
+                                          "tint": "textTertiary"
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "accessibilityRole": "decorative"
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "$service:himiBookingServices.collection.emptySourceText",
+                                          "style": "body",
+                                          "color": "textSecondary"
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              },
+                              "modifiers": {
+                                "hiddenPath": "$service:himiBookingServices.collection.noEmptySource",
+                                "padding": {
+                                  "bottom": 12
+                                }
+                              }
+                            },
                             {
                               "id": "",
                               "body": {
@@ -8713,6 +8781,24 @@ const SCREENS = runtimeSetting({
                         "props": {
                           "spacing": 0,
                           "children": [
+                            {
+                              "id": "himi_bookings.list.collection.loading",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Skeleton",
+                                "props": {
+                                  "height": 72,
+                                  "cornerRadius": 12,
+                                  "count": 3
+                                }
+                              },
+                              "modifiers": {
+                                "hiddenPath": "$service:himiBookingBookings.collection.noLoading",
+                                "padding": {
+                                  "bottom": 12
+                                }
+                              }
+                            },
                             {
                               "id": "himi_bookings.list.collection.search",
                               "body": {
@@ -8995,6 +9081,52 @@ const SCREENS = runtimeSetting({
                                 }
                               }
                             },
+                            {
+                              "id": "himi_bookings.list.collection.empty-source",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "VStack",
+                                "props": {
+                                  "spacing": 8,
+                                  "alignment": "center",
+                                  "children": [
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Icon",
+                                        "props": {
+                                          "name": "inbox",
+                                          "size": 28,
+                                          "tint": "textTertiary"
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "accessibilityRole": "decorative"
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "$service:himiBookingBookings.collection.emptySourceText",
+                                          "style": "body",
+                                          "color": "textSecondary"
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              },
+                              "modifiers": {
+                                "hiddenPath": "$service:himiBookingBookings.collection.noEmptySource",
+                                "padding": {
+                                  "bottom": 12
+                                }
+                              }
+                            },
                             {
                               "id": "",
                               "body": {
@@ -11493,6 +11625,24 @@ const SCREENS = runtimeSetting({
                 "props": {
                   "spacing": 0,
                   "children": [
+                    {
+                      "id": "himi_programs.rows.collection.loading",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Skeleton",
+                        "props": {
+                          "height": 72,
+                          "cornerRadius": 12,
+                          "count": 3
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBrandedPrograms.collection.noLoading",
+                        "padding": {
+                          "bottom": 12
+                        }
+                      }
+                    },
                     {
                       "id": "himi_programs.rows.collection.search",
                       "body": {
@@ -11732,6 +11882,52 @@ const SCREENS = runtimeSetting({
                         }
                       }
                     },
+                    {
+                      "id": "himi_programs.rows.collection.empty-source",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "VStack",
+                        "props": {
+                          "spacing": 8,
+                          "alignment": "center",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Icon",
+                                "props": {
+                                  "name": "inbox",
+                                  "size": 28,
+                                  "tint": "textTertiary"
+                                }
+                              },
+                              "modifiers": {
+                                "accessibilityRole": "decorative"
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$service:himiBrandedPrograms.collection.emptySourceText",
+                                  "style": "body",
+                                  "color": "textSecondary"
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBrandedPrograms.collection.noEmptySource",
+                        "padding": {
+                          "bottom": 12
+                        }
+                      }
+                    },
                     {
                       "id": "",
                       "body": {
@@ -13963,6 +14159,24 @@ const SCREENS = runtimeSetting({
                 "props": {
                   "spacing": 0,
                   "children": [
+                    {
+                      "id": "himi_plans.rows.collection.loading",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Skeleton",
+                        "props": {
+                          "height": 72,
+                          "cornerRadius": 12,
+                          "count": 3
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBrandedPlans.collection.noLoading",
+                        "padding": {
+                          "bottom": 12
+                        }
+                      }
+                    },
                     {
                       "id": "himi_plans.rows.collection.search",
                       "body": {
@@ -14202,6 +14416,52 @@ const SCREENS = runtimeSetting({
                         }
                       }
                     },
+                    {
+                      "id": "himi_plans.rows.collection.empty-source",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "VStack",
+                        "props": {
+                          "spacing": 8,
+                          "alignment": "center",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Icon",
+                                "props": {
+                                  "name": "inbox",
+                                  "size": 28,
+                                  "tint": "textTertiary"
+                                }
+                              },
+                              "modifiers": {
+                                "accessibilityRole": "decorative"
+                              }
+                            },
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$service:himiBrandedPlans.collection.emptySourceText",
+                                  "style": "body",
+                                  "color": "textSecondary"
+                                }
+                              }
+                            }
+                          ]
+                        }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:himiBrandedPlans.collection.noEmptySource",
+                        "padding": {
+                          "bottom": 12
+                        }
+                      }
+                    },
                     {
                       "id": "",
                       "body": {
@@ -16557,6 +16817,9 @@ const SCREENS = runtimeSetting({
                     }
                   ]
                 }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:spacesMySubscriptions.noOrders"
               }
             },
             {
@@ -17387,6 +17650,24 @@ const SCREENS = runtimeSetting({
                         "props": {
                           "spacing": 0,
                           "children": [
+                            {
+                              "id": "himi_events.list.collection.loading",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Skeleton",
+                                "props": {
+                                  "height": 72,
+                                  "cornerRadius": 12,
+                                  "count": 3
+                                }
+                              },
+                              "modifiers": {
+                                "hiddenPath": "$service:himiEvents.collection.noLoading",
+                                "padding": {
+                                  "bottom": 12
+                                }
+                              }
+                            },
                             {
                               "id": "",
                               "body": {
@@ -17648,6 +17929,52 @@ const SCREENS = runtimeSetting({
                                 }
                               }
                             },
+                            {
+                              "id": "himi_events.list.collection.empty-source",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "VStack",
+                                "props": {
+                                  "spacing": 8,
+                                  "alignment": "center",
+                                  "children": [
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Icon",
+                                        "props": {
+                                          "name": "inbox",
+                                          "size": 28,
+                                          "tint": "textTertiary"
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "accessibilityRole": "decorative"
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "$service:himiEvents.collection.emptySourceText",
+                                          "style": "body",
+                                          "color": "textSecondary"
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              },
+                              "modifiers": {
+                                "hiddenPath": "$service:himiEvents.collection.noEmptySource",
+                                "padding": {
+                                  "bottom": 12
+                                }
+                              }
+                            },
                             {
                               "id": "",
                               "body": {
@@ -20691,6 +21018,24 @@ const SCREENS = runtimeSetting({
                         "props": {
                           "spacing": 0,
                           "children": [
+                            {
+                              "id": "himi_blog.list.collection.loading",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Skeleton",
+                                "props": {
+                                  "height": 72,
+                                  "cornerRadius": 12,
+                                  "count": 3
+                                }
+                              },
+                              "modifiers": {
+                                "hiddenPath": "$service:himiBlogFeed.collection.noLoading",
+                                "padding": {
+                                  "bottom": 12
+                                }
+                              }
+                            },
                             {
                               "id": "",
                               "body": {
@@ -20909,6 +21254,52 @@ const SCREENS = runtimeSetting({
                                 }
                               }
                             },
+                            {
+                              "id": "himi_blog.list.collection.empty-source",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "VStack",
+                                "props": {
+                                  "spacing": 8,
+                                  "alignment": "center",
+                                  "children": [
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Icon",
+                                        "props": {
+                                          "name": "inbox",
+                                          "size": 28,
+                                          "tint": "textTertiary"
+                                        }
+                                      },
+                                      "modifiers": {
+                                        "accessibilityRole": "decorative"
+                                      }
+                                    },
+                                    {
+                                      "id": "",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "Text",
+                                        "props": {
+                                          "text": "$service:himiBlogFeed.collection.emptySourceText",
+                                          "style": "body",
+                                          "color": "textSecondary"
+                                        }
+                                      }
+                                    }
+                                  ]
+                                }
+                              },
+                              "modifiers": {
+                                "hiddenPath": "$service:himiBlogFeed.collection.noEmptySource",
+                                "padding": {
+                                  "bottom": 12
+                                }
+                              }
+                            },
                             {
                               "id": "",
                               "body": {

package/templates/yoga-studio/tier5-src/_shared/collection-contract.ts

@@ -30,6 +30,9 @@ export interface CollectionConfig {
    * `screenId` opens that screen with the row id; without it the verb reuses the
    * row's own tap action (the detail screen that owns the verb). */
   primaryVerb?: { label: string; screenId?: string };
+  /** A state field the DOMAIN narrows `rows` by (e.g. a category picker). While it is set,
+   *  zero rows is a filtered result, not an empty source. */
+  narrowedBy?: string;
 }
 /** At or below this many records, with no query/filter narrowing them and no further
  * page, the list/grid toggle, Refine, chips, search and count are noise. */
@@ -41,7 +44,7 @@ export const COLLECTIONS: Record<string, CollectionConfig> = {
     defaultFilter: 'value:Upcoming', searchPlaceholder: 'Exact booking ID', filterValues: ['Upcoming', 'Past', 'Cancelled'],
     sortLabels: { default: 'Soonest', az: 'Oldest', za: 'Latest' } },
   himiEvents: { rows: 'results', title: 'title', subtitle: 'dateLine', image: 'image', view: 'grid', backendQuery: true, searchPlaceholder: 'Exact event title', filterValues: ['Upcoming', 'Past'], sortLabels: { default: 'Date', az: 'Title A–Z', za: 'Title Z–A' }, primaryVerb: { label: 'Register' } },
-  himiBlogFeed: { rows: 'posts', title: 'title', subtitle: 'excerpt', image: 'image', filter: 'category', filterValuesFrom: 'categories', view: 'grid' },
+  himiBlogFeed: { rows: 'posts', title: 'title', subtitle: 'excerpt', image: 'image', filter: 'category', filterValuesFrom: 'categories', view: 'grid', narrowedBy: 'selectedCategoryId' },
   himiOwnerLiteProducts: { rows: 'products', title: 'name', subtitle: 'price', image: 'image', view: 'grid', backendQuery: true },
   himiOwnerModules: { instanceInput: 'module', rows: 'rows', title: 'title', subtitle: 'subtitle', image: 'image', filter: 'statusLabel', view: 'list', paged: true, reviewAction: 'prepareRecord', reviewSelectedAction: 'prepareSelected' },
   himiOwnerLiteServices: { rows: 'services', title: 'name', subtitle: 'subtitle', view: 'list', backendQuery: true, searchPlaceholder: 'Service name starts with…' },