@wix/himalaya-cli 0.1397.0 → 0.1399.0

package/templates/nonprofit-cause-owner/dev/index.ts

@@ -57330,6 +57330,7 @@ const SCREENS = runtimeSetting({
                                                           "title": "$item.buttonLabel",
                                                           "style": "secondary",
                                                           "size": "sm",
+                                                          "fullWidth": false,
                                                           "action": {
                                                             "actionId": "tier5.himiOwnerLiteAria.widgetRespond",
                                                             "params": {
@@ -58525,15 +58526,95 @@ const SCREENS = runtimeSetting({
                                                                 }
                                                               },
                                                               {
-                                                                "id": "",
+                                                                "id": "himi_owner_lite_aria.widget.PLANS.benefits_$item.id",
                                                                 "body": {
                                                                   "package": "himalaya",
-                                                                  "type": "Text",
+                                                                  "type": "LazyList",
                                                                   "props": {
-                                                                    "text": "$item.listText",
-                                                                    "style": "footnote",
-                                                                    "color": "textSecondary",
-                                                                    "maxLines": 8
+                                                                    "itemsPath": "$item.benefits",
+                                                                    "spacing": 4,
+                                                                    "items": [
+                                                                      {
+                                                                        "id": "",
+                                                                        "body": {
+                                                                          "package": "himalaya",
+                                                                          "type": "HStack",
+                                                                          "props": {
+                                                                            "spacing": 8,
+                                                                            "children": [
+                                                                              {
+                                                                                "id": "",
+                                                                                "body": {
+                                                                                  "package": "himalaya",
+                                                                                  "type": "Icon",
+                                                                                  "props": {
+                                                                                    "name": "$item.icon",
+                                                                                    "size": 12,
+                                                                                    "tint": "success"
+                                                                                  }
+                                                                                },
+                                                                                "modifiers": {
+                                                                                  "accessibilityRole": "decorative",
+                                                                                  "hiddenPath": "$item.successHidden"
+                                                                                }
+                                                                              },
+                                                                              {
+                                                                                "id": "",
+                                                                                "body": {
+                                                                                  "package": "himalaya",
+                                                                                  "type": "Icon",
+                                                                                  "props": {
+                                                                                    "name": "$item.icon",
+                                                                                    "size": 12,
+                                                                                    "tint": "textPrimary"
+                                                                                  }
+                                                                                },
+                                                                                "modifiers": {
+                                                                                  "accessibilityRole": "decorative",
+                                                                                  "hiddenPath": "$item.plainHidden"
+                                                                                }
+                                                                              },
+                                                                              {
+                                                                                "id": "",
+                                                                                "body": {
+                                                                                  "package": "himalaya",
+                                                                                  "type": "Icon",
+                                                                                  "props": {
+                                                                                    "name": "$item.icon",
+                                                                                    "size": 12,
+                                                                                    "tint": "accentPrimary"
+                                                                                  }
+                                                                                },
+                                                                                "modifiers": {
+                                                                                  "accessibilityRole": "decorative",
+                                                                                  "theme": {
+                                                                                    "colors": {
+                                                                                      "accentPrimary": "$item.colorHex"
+                                                                                    }
+                                                                                  },
+                                                                                  "hiddenPath": "$item.customHidden"
+                                                                                }
+                                                                              },
+                                                                              {
+                                                                                "id": "",
+                                                                                "body": {
+                                                                                  "package": "himalaya",
+                                                                                  "type": "Text",
+                                                                                  "props": {
+                                                                                    "text": "$item.text",
+                                                                                    "style": "footnote",
+                                                                                    "maxLines": 8
+                                                                                  }
+                                                                                },
+                                                                                "modifiers": {
+                                                                                  "weight": 1
+                                                                                }
+                                                                              }
+                                                                            ]
+                                                                          }
+                                                                        }
+                                                                      }
+                                                                    ]
                                                                   }
                                                                 },
                                                                 "modifiers": {
@@ -58933,6 +59014,181 @@ const SCREENS = runtimeSetting({
                                           }
                                         }
                                       },
+                                      {
+                                        "id": "himi_owner_lite_aria.widget.VISUAL_DISPLAY.variants",
+                                        "body": {
+                                          "package": "himalaya",
+                                          "type": "LazyList",
+                                          "props": {
+                                            "itemsPath": "$service:himiOwnerLiteAria.widget.options",
+                                            "spacing": 6,
+                                            "items": [
+                                              {
+                                                "id": "himi_owner_lite_aria.widget.VISUAL_DISPLAY.variant_$item.id",
+                                                "body": {
+                                                  "package": "himalaya",
+                                                  "type": "Card",
+                                                  "props": {
+                                                    "children": [
+                                                      {
+                                                        "id": "",
+                                                        "body": {
+                                                          "package": "himalaya",
+                                                          "type": "VStack",
+                                                          "props": {
+                                                            "spacing": 8,
+                                                            "children": [
+                                                              {
+                                                                "id": "",
+                                                                "body": {
+                                                                  "package": "himalaya",
+                                                                  "type": "Image",
+                                                                  "props": {
+                                                                    "url": "$item.pictureUrl",
+                                                                    "fillWidth": true,
+                                                                    "aspectRatio": 1.5,
+                                                                    "contentMode": "fill",
+                                                                    "contentDescription": "$item.title"
+                                                                  }
+                                                                },
+                                                                "modifiers": {
+                                                                  "hiddenPath": "$item.pictureHidden"
+                                                                }
+                                                              },
+                                                              {
+                                                                "id": "",
+                                                                "body": {
+                                                                  "package": "himalaya",
+                                                                  "type": "HStack",
+                                                                  "props": {
+                                                                    "spacing": 0,
+                                                                    "children": [
+                                                                      {
+                                                                        "id": "",
+                                                                        "body": {
+                                                                          "package": "himalaya",
+                                                                          "type": "Text",
+                                                                          "props": {
+                                                                            "text": "$item.badge",
+                                                                            "style": "footnote",
+                                                                            "color": "surfacePrimary"
+                                                                          }
+                                                                        },
+                                                                        "modifiers": {
+                                                                          "background": {
+                                                                            "token": "textSecondary"
+                                                                          },
+                                                                          "cornerRadius": 4,
+                                                                          "padding": {
+                                                                            "leading": 8,
+                                                                            "trailing": 8,
+                                                                            "top": 2,
+                                                                            "bottom": 2
+                                                                          }
+                                                                        }
+                                                                      },
+                                                                      {
+                                                                        "id": "",
+                                                                        "body": {
+                                                                          "package": "himalaya",
+                                                                          "type": "Spacer",
+                                                                          "props": {}
+                                                                        }
+                                                                      }
+                                                                    ]
+                                                                  }
+                                                                },
+                                                                "modifiers": {
+                                                                  "hiddenPath": "$item.badgeHidden"
+                                                                }
+                                                              },
+                                                              {
+                                                                "id": "",
+                                                                "body": {
+                                                                  "package": "himalaya",
+                                                                  "type": "Text",
+                                                                  "props": {
+                                                                    "text": "$item.title",
+                                                                    "style": "bodyEmphasis"
+                                                                  }
+                                                                }
+                                                              },
+                                                              {
+                                                                "id": "",
+                                                                "body": {
+                                                                  "package": "himalaya",
+                                                                  "type": "Text",
+                                                                  "props": {
+                                                                    "text": "$item.subtitle",
+                                                                    "style": "body",
+                                                                    "color": "textSecondary"
+                                                                  }
+                                                                },
+                                                                "modifiers": {
+                                                                  "hiddenPath": "$item.subtitleHidden"
+                                                                }
+                                                              },
+                                                              {
+                                                                "id": "",
+                                                                "body": {
+                                                                  "package": "himalaya",
+                                                                  "type": "Text",
+                                                                  "props": {
+                                                                    "text": "$item.text",
+                                                                    "style": "body"
+                                                                  }
+                                                                },
+                                                                "modifiers": {
+                                                                  "hiddenPath": "$item.textHidden"
+                                                                }
+                                                              },
+                                                              {
+                                                                "id": "",
+                                                                "body": {
+                                                                  "package": "himalaya",
+                                                                  "type": "Text",
+                                                                  "props": {
+                                                                    "text": "$item.listText",
+                                                                    "style": "body"
+                                                                  }
+                                                                },
+                                                                "modifiers": {
+                                                                  "hiddenPath": "$item.listHidden"
+                                                                }
+                                                              },
+                                                              {
+                                                                "id": "himi_owner_lite_aria.widget.VISUAL_DISPLAY.variant_$item.id.button",
+                                                                "body": {
+                                                                  "package": "himalaya",
+                                                                  "type": "Button",
+                                                                  "props": {
+                                                                    "title": "$item.buttonLabel",
+                                                                    "style": "secondary",
+                                                                    "size": "sm",
+                                                                    "action": {
+                                                                      "actionId": "tier5.himiOwnerLiteAria.widgetRespond",
+                                                                      "params": {
+                                                                        "value": "$item.id"
+                                                                      }
+                                                                    }
+                                                                  }
+                                                                },
+                                                                "modifiers": {
+                                                                  "hiddenPath": "$item.buttonHidden"
+                                                                }
+                                                              }
+                                                            ]
+                                                          }
+                                                        }
+                                                      }
+                                                    ]
+                                                  }
+                                                }
+                                              }
+                                            ]
+                                          }
+                                        }
+                                      },
                                       {
                                         "id": "",
                                         "body": {
@@ -60164,7 +60420,23 @@ const SCREENS = runtimeSetting({
                                         },
                                         "modifiers": {
                                           "accessibilityLabel": "$service:himiOwnerLiteAria.widget.text",
-                                          "hiddenPath": "$service:himiOwnerLiteAria.widget.chartPieHidden"
+                                          "hiddenPath": "$service:himiOwnerLiteAria.widget.chartPlainPieHidden"
+                                        }
+                                      },
+                                      {
+                                        "id": "himi_owner_lite_aria.widget.CHART.doughnut",
+                                        "body": {
+                                          "package": "himalaya",
+                                          "type": "DonutChart",
+                                          "props": {
+                                            "slicesPath": "$service:himiOwnerLiteAria.widget.slices",
+                                            "thickness": 18,
+                                            "size": 160
+                                          }
+                                        },
+                                        "modifiers": {
+                                          "accessibilityLabel": "$service:himiOwnerLiteAria.widget.text",
+                                          "hiddenPath": "$service:himiOwnerLiteAria.widget.chartRingHidden"
                                         }
                                       },
                                       {
@@ -60183,6 +60455,21 @@ const SCREENS = runtimeSetting({
                                           "hiddenPath": "$service:himiOwnerLiteAria.widget.chartSeriesHidden"
                                         }
                                       },
+                                      {
+                                        "id": "himi_owner_lite_aria.widget.CHART.legend",
+                                        "body": {
+                                          "package": "himalaya",
+                                          "type": "Legend",
+                                          "props": {
+                                            "itemsPath": "$service:himiOwnerLiteAria.widget.chartLegend",
+                                            "orientation": "vertical"
+                                          }
+                                        },
+                                        "modifiers": {
+                                          "accessibilityLabel": "$service:himiOwnerLiteAria.widget.text",
+                                          "hiddenPath": "$service:himiOwnerLiteAria.widget.chartPieHidden"
+                                        }
+                                      },
                                       {
                                         "id": "",
                                         "body": {
@@ -60275,6 +60562,16 @@ const SCREENS = runtimeSetting({
                               }
                             ]
                           }
+                        },
+                        "modifiers": {
+                          "theme": {
+                            "colors": {
+                              "ariaChartBlue": "#126EFF",
+                              "ariaChartGreen": "#26A659",
+                              "ariaChartPurple": "#9926D6",
+                              "ariaChartGray": "#878AA6"
+                            }
+                          }
                         }
                       },
                       "accessibilityAnnouncement": "$service:himiOwnerLiteAria.widget.text"

package/templates/nonprofit-cause-owner/tier5-src/_shared/aria-chat.ts

@@ -2570,6 +2570,14 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
   const duplicate = (s: AriaChatState, content: string): boolean =>
     isDuplicateSend(s, content) || inFlightSend === content;
 
+  const withWidgetQuery = (w: WidgetView, query: string): WidgetView => {
+    const needle = query.toLowerCase();
+    const suggestions = !needle ? w.options : w.options.filter((option) =>
+      `${option.title} ${option.subtitle} ${option.text}`.toLowerCase().includes(needle));
+    return { ...w, query, suggestions, suggestionsEmpty: suggestions.length === 0,
+      noMatches: !!needle && suggestions.length === 0 };
+  };
+
   /** Fold a freshly read server transcript into the observed-count marks.
    *  Takes the RAW messages, not the bubbles — see `countTurns`. */
   /** Carry the owner's SELECTIONS across a rebuild.
@@ -2625,7 +2633,10 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
     }
     // The line explaining an option that could not open is the answer to a
     // tap, and a poll is not a reason to take it back.
-    const kept = prev.notice ? { ...next, notice: prev.notice, noticeHidden: prev.noticeHidden } : next;
+    const withNotice = prev.notice ? { ...next, notice: prev.notice, noticeHidden: prev.noticeHidden } : next;
+    // The same ask retains the owner's search, just as it retains selection.
+    // Derive suggestions from the new canonical rows, never stale old objects.
+    const kept = next.kind === "AUTOCOMPLETE" ? withWidgetQuery(withNotice, prev.query) : withNotice;
     if (!prev.options.some((o, i) => o.selected !== next.options[i].selected)) return kept;
     const options = next.options.map((o, i) => ({ ...o, selected: prev.options[i].selected }));
     return reselect({ ...kept, options }, options);
@@ -2683,9 +2694,9 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
           const pictureUrl = isWixMediaHost(hostOf(item.imageUrl)) ? item.imageUrl : "";
           return {
             id: `o${i}`, value: item.id, title: item.title, subtitle: item.subtitle,
-            subtitleHidden: !item.subtitle, text: "", textHidden: true,
+            subtitleHidden: !item.subtitle, text: "", textHidden: true, badge: "", badgeHidden: true,
             pictureUrl, pictureHidden: !pictureUrl, buttonLabel: "", buttonHidden: true,
-            listText: "", listHidden: true, selected: false, respondText: "",
+            listText: "", benefits: [], listHidden: true, selected: false, respondText: "",
             actionUrl: "", actionScreenId: "", notSupportedText: "",
           };
         });
@@ -3499,7 +3510,7 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
     // explains the refusal.
     const limitText = limitReached ? limitReachedText(w.maxSelected) : "";
     const disabled = w.submitting || (w.requiresSelection && chosen === 0);
-    return {
+    const selected = {
       ...w,
       options,
       limitReached,
@@ -3508,6 +3519,7 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
       primaryDisabled: disabled,
       primaryEnabled: !disabled,
     };
+    return w.kind === "AUTOCOMPLETE" ? withWidgetQuery(selected, w.query) : selected;
   };
 
   const impl: AriaChatCore = {
@@ -3713,6 +3725,10 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
       const wasFast = s.status === "sending";
       // Read BEFORE the await, compared after: see `turnSeq`.
       const seq = turnSeq;
+      // Empty and failed reads retain the last good widget. Edits may have
+      // committed while this request was pending, so retain its current query.
+      const retainWidgetEdits = (): AriaChatState => s.widget.kind === "AUTOCOMPLETE" && committed
+        ? { ...s, widget: committed.widget } : s;
       try {
         const gm = await getConversationMessages(s._convId);
         const raw = messagesOf(gm);
@@ -3746,9 +3762,9 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
         if (!raw.length) {
           if (slowed && live.takeActivity() === 0) {
             slowed = false;
-            return cadence(s, o.poll.fastMs, o.poll.streamMs ?? null);
+            return cadence(retainWidgetEdits(), o.poll.fastMs, o.poll.streamMs ?? null);
           }
-          return s;
+          return retainWidgetEdits();
         }
         const { messages, pending } = reconcile(server, s._pending, s._pendingAfter, you(), s._pendingId, s._pendingAttach ?? [], s._pendingRefs);
         // …but still never PAINT nothing over something. `messages` is only
@@ -3789,9 +3805,15 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
         const withItems = await withWidgetItems(withJob);
         if (turnSeq !== seq || abortingEpochs.has(seq)) return undefined;
         // Slow the ladder the moment the turn is over; leave it alone otherwise.
+        // A query or selection may land while this transcript read is parked.
+        // Retain those latest edits only when the canonical widget is still the
+        // same ask; carrySelection resets them for new rows/kinds/options.
+        const withCurrentQuery = withItems.widget.kind === "AUTOCOMPLETE" && committed
+          ? { ...withItems, widget: carrySelection(withItems.widget, committed.widget) }
+          : withItems;
         if (ended && wasFast) {
           slowed = false;
-          return cadence(withItems, o.poll.idleMs, o.poll.fastMs);
+          return cadence(withCurrentQuery, o.poll.idleMs, o.poll.fastMs);
         }
         // The ladder runs slow only while the stream proves it is delivering.
         // A whole slow interval in which no frame changed anything is a stalled
@@ -3800,10 +3822,9 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
         // rate. No clock needed: this tick IS the interval.
         if (slowed && live.takeActivity() === 0) {
           slowed = false;
-          return cadence(withItems, o.poll.fastMs, o.poll.streamMs ?? null);
+          return cadence(withCurrentQuery, o.poll.fastMs, o.poll.streamMs ?? null);
         }
-        return withItems;
-
+        return withCurrentQuery;
       } catch {
         // A read that THREW is exactly as stale as one that resolved: if a turn
         // boundary moved on while it was in flight, returning `s` merges the
@@ -3811,7 +3832,7 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
         // guard above prevents on the success path. Only a still-current tick
         // may hold the ladder up by keeping the state as it is.
         if (turnSeq !== seq || abortingEpochs.has(seq)) return undefined;
-        return s;
+        return retainWidgetEdits();
       }
     },
 
@@ -3823,27 +3844,8 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
 
     widgetQuery: (s, arg) => {
       const q = typeof arg === "string" ? arg.trim() : firstString(arg?.value, arg?.text);
-      const w = s.widget;
-      const needle = q.toLowerCase();
-      // Match on everything the owner can SEE. Matching only `title` makes a
-      // subtitle that says "Downtown branch" unsearchable, which reads as the
-      // filter being broken rather than as a deliberate scope.
-      const suggestions = !needle
-        ? w.options
-        : w.options.filter((o) =>
-            `${o.title} ${o.subtitle} ${o.text}`.toLowerCase().includes(needle));
-      return {
-        ...s,
-        widget: {
-          ...w,
-          query: q,
-          suggestions,
-          suggestionsEmpty: suggestions.length === 0,
-          // Typed something and got nothing is a different state from having
-          // typed nothing at all, and says something different to the owner.
-          noMatches: !!needle && suggestions.length === 0,
-        },
-      };
+      // Match title, subtitle and text with the same semantics after a poll.
+      return { ...s, widget: withWidgetQuery(s.widget, q) };
     },
 
     widgetAnswer: (s, arg) => {
@@ -4026,7 +4028,11 @@ export function createAriaChat(o: AriaChatOptions): AriaChatCore {
       // to answer for it. The clone's positional form can only say `value`, so
       // a row id there is tried only once no option has claimed it.
       const sectionId = typeof arg === "object" ? firstString(arg?.section) : "";
-      const option = sectionId ? undefined : w.options.find((o) => o.value === which);
+      // Display cards may have no wire selection value. Their descriptor names
+      // them by stable row id; selectable kinds retain the wire-value contract.
+      const option = sectionId ? undefined : w.kind === "VISUAL_DISPLAY"
+        ? w.options.find((o) => o.id === which) ?? w.options.find((o) => o.value === which)
+        : w.options.find((o) => o.value === which);
       const section = sectionId
         ? w.rows.find((r) => r.id === sectionId)
         : (option ? undefined : w.rows.find((r) => r.id === which));

package/templates/nonprofit-cause-owner/tier5-src/_shared/aria-widget-model.ts

@@ -59,14 +59,24 @@ export const WIDGET_KINDS: readonly WidgetKind[] = [
 
 /** One selectable row.
  *
- *  Every field is present and scalar, always — never optional, never null. That
- *  is not tidiness, it is a hard requirement of the renderer: `$item.`
- *  substitutes WHOLE prop values only, a missing field fails substitution for
- *  the entire row, and a non-scalar stringifies to `""`. The existing transcript
+ *  Display fields are scalar because ordinary `$item.` substitutions consume
+ *  whole scalar prop values. Benefit arrays instead use a nested repeater's
+ *  `itemsPath: "$item.benefits"`, which expands each benefit in its own scope. The existing transcript
  *  bubbles already carry fixed `link1..3Label/Url/Hidden` slots for exactly this
  *  reason (`aria-chat.ts`). A row that omits `subtitle` renders nothing at all
  *  rather than rendering without a subtitle. */
+/** One PLANS benefit. `color` is the semantic tint; the three `*Hidden` flags pick which of the
+ *  descriptor's statically tinted icons shows it, because a token prop cannot be `$item.`-bound
+ *  and still pass static token validation. */
+export interface WidgetBenefit {
+  text: string; icon: string; color: string; colorHex: string;
+  successHidden: boolean; plainHidden: boolean; customHidden: boolean;
+}
+
 export interface WidgetOption {
+  benefits?: WidgetBenefit[];
+  /** A visual variant card badge, absent on ordinary selectable rows. */
+  badge?: string;
   title: string;
   subtitle: string;
   text: string;
@@ -294,6 +304,7 @@ export function optionsOf(o: Record<string, unknown> | null): WidgetOption[] {
     const sections = objectsAt(opt, "sections");
     const first = sections[0] ?? null;
     return {
+      ...(badgeTextOf(opt) ? {badge: badgeTextOf(opt)} : {}),
       title: textAt(opt, "title") || textAt(first, "title"),
       subtitle: textAt(opt, "subtitle") || textAt(first, "subtitle"),
       text: textAt(opt, "text"),
@@ -306,6 +317,17 @@ export function optionsOf(o: Record<string, unknown> | null): WidgetOption[] {
       actionScreenId: stringAt(objectAt(action?.screen), "id"),
       notSupportedText: textAt(objectAt(action?.notSupported), "description"),
       listText: objectsAt(opt, "list").map((x) => textOf(x)).filter(Boolean).join("\n"),
+      ...(objectsAt(opt, "list").length ? { benefits: objectsAt(opt, "list").map((entry) => {
+        const spec = objectAt(entry.icon);
+        const name = stringAt(spec, "name");
+        const color = stringAt(spec, "color");
+        const hex = /^#[0-9a-f]{6}$/i.test(color);
+        const tint = hex ? "accentPrimary" : !name || name === "Confirm" ? "success" : "textPrimary";
+        return { text: stripMarkdown(textOf(entry)),
+          icon: name === "Gift" ? "gift" : name === "Send" ? "paper_plane" : "check",
+          color: tint, colorHex: hex ? color : "",
+          successHidden: tint !== "success", plainHidden: tint !== "textPrimary", customHidden: tint !== "accentPrimary" };
+      }) } : {}),
     };
   });
 }