@wix/himalaya-cli 0.1145.0 → 0.1146.0

package/templates/branded-lite/dev/index.ts

@@ -28190,7 +28190,32 @@ const SCREENS = runtimeSetting({
                               }
                             },
                             {
-                              "id": "",
+                              "id": "feed_body_$item.id",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "RichContent",
+                                "props": {
+                                  "documentJsonPath": "$item.bodyJson",
+                                  "onLink": {
+                                    "actionId": "tier5.himiBrandedFeed.openLink"
+                                  },
+                                  "fallback": {
+                                    "id": "",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "Text",
+                                      "props": {
+                                        "text": "$item.text",
+                                        "style": "body",
+                                        "maxLines": 6
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            {
+                              "id": "feed_body_text_$item.id",
                               "body": {
                                 "package": "himalaya",
                                 "type": "Text",
@@ -28199,6 +28224,9 @@ const SCREENS = runtimeSetting({
                                   "style": "body",
                                   "maxLines": 6
                                 }
+                              },
+                              "modifiers": {
+                                "hiddenPath": "$item.hasBodyJson"
                               }
                             },
                             {
@@ -28392,7 +28420,8 @@ const SCREENS = runtimeSetting({
       "integrity": "",
       "contentType": "application/javascript+ts-bundle",
       "declaredCapabilities": [
-        "wix_api"
+        "wix_api",
+        "open_url"
       ],
       "minBinaryVersion": "0.1.0",
       "bundleVersion": "0.0.1"
@@ -48300,7 +48329,32 @@ const SCREENS = runtimeSetting({
                       }
                     },
                     {
-                      "id": "",
+                      "id": "forum_body",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "RichContent",
+                        "props": {
+                          "documentJsonPath": "$service:spacesForumPost.bodyJson",
+                          "onLink": {
+                            "actionId": "tier5.spacesForumPost.openLink"
+                          },
+                          "fallback": {
+                            "id": "",
+                            "body": {
+                              "package": "himalaya",
+                              "type": "Text",
+                              "props": {
+                                "text": "$service:spacesForumPost.body",
+                                "style": "body",
+                                "collapseWhenEmpty": true
+                              }
+                            }
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "id": "forum_body_text",
                       "body": {
                         "package": "himalaya",
                         "type": "Text",
@@ -48309,6 +48363,9 @@ const SCREENS = runtimeSetting({
                           "style": "body",
                           "collapseWhenEmpty": true
                         }
+                      },
+                      "modifiers": {
+                        "hiddenPath": "$service:spacesForumPost.hasBodyJson"
                       }
                     }
                   ]
@@ -48584,7 +48641,8 @@ const SCREENS = runtimeSetting({
       "integrity": "",
       "contentType": "application/javascript+ts-bundle",
       "declaredCapabilities": [
-        "wix_api"
+        "wix_api",
+        "open_url"
       ],
       "minBinaryVersion": "0.1.0",
       "bundleVersion": "0.0.1"
@@ -57815,7 +57873,32 @@ const SCREENS = runtimeSetting({
                                           "expandedPath": "$item.expanded",
                                           "content": [
                                             {
-                                              "id": "",
+                                              "id": "faq_answer_$item.id",
+                                              "body": {
+                                                "package": "himalaya",
+                                                "type": "RichContent",
+                                                "props": {
+                                                  "documentJsonPath": "$item.answerJson",
+                                                  "onLink": {
+                                                    "actionId": "tier5.himiBrandedFaq.openLink"
+                                                  },
+                                                  "fallback": {
+                                                    "id": "",
+                                                    "body": {
+                                                      "package": "himalaya",
+                                                      "type": "Text",
+                                                      "props": {
+                                                        "text": "$item.answer",
+                                                        "style": "body",
+                                                        "color": "textSecondary"
+                                                      }
+                                                    }
+                                                  }
+                                                }
+                                              }
+                                            },
+                                            {
+                                              "id": "faq_answer_text_$item.id",
                                               "body": {
                                                 "package": "himalaya",
                                                 "type": "Text",
@@ -57824,6 +57907,9 @@ const SCREENS = runtimeSetting({
                                                   "style": "body",
                                                   "color": "textSecondary"
                                                 }
+                                              },
+                                              "modifiers": {
+                                                "hiddenPath": "$item.hasAnswerJson"
                                               }
                                             }
                                           ],
@@ -58127,7 +58213,8 @@ const SCREENS = runtimeSetting({
       "integrity": "",
       "contentType": "application/javascript+ts-bundle",
       "declaredCapabilities": [
-        "wix_api"
+        "wix_api",
+        "open_url"
       ],
       "minBinaryVersion": "0.1.0",
       "bundleVersion": "0.0.1"
@@ -79110,6 +79197,48 @@ const SCREENS = runtimeSetting({
                                   ]
                                 }
                               }
+                            },
+                            {
+                              "id": "cms_body_$item.id",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "RichContent",
+                                "props": {
+                                  "documentJsonPath": "$item.bodyJson",
+                                  "onLink": {
+                                    "actionId": "tier5.himiBrandedCmsCollection.openLink"
+                                  },
+                                  "fallback": {
+                                    "id": "",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "Text",
+                                      "props": {
+                                        "text": "$item.bodyText",
+                                        "style": "body",
+                                        "color": "textSecondary",
+                                        "collapseWhenEmpty": true
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            {
+                              "id": "cms_body_text_$item.id",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$item.bodyText",
+                                  "style": "body",
+                                  "color": "textSecondary",
+                                  "collapseWhenEmpty": true
+                                }
+                              },
+                              "modifiers": {
+                                "hiddenPath": "$item.hasBodyJson"
+                              }
                             }
                           ]
                         }
@@ -79212,7 +79341,8 @@ const SCREENS = runtimeSetting({
       "contentType": "application/javascript+ts-bundle",
       "declaredCapabilities": [
         "wix_api",
-        "local_database"
+        "local_database",
+        "open_url"
       ],
       "minBinaryVersion": "0.1.0",
       "bundleVersion": "0.0.1"
@@ -80501,7 +80631,33 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                               }
                             },
                             {
-                              "id": "",
+                              "id": "product_body",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "RichContent",
+                                "props": {
+                                  "documentJsonPath": "$service:himiStoreProduct.descriptionJson",
+                                  "onLink": {
+                                    "actionId": "tier5.himiStoreProduct.openLink"
+                                  },
+                                  "fallback": {
+                                    "id": "",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "Text",
+                                      "props": {
+                                        "text": "$service:himiStoreProduct.description",
+                                        "style": "body",
+                                        "color": "textSecondary",
+                                        "collapseWhenEmpty": true
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            {
+                              "id": "product_body_text",
                               "body": {
                                 "package": "himalaya",
                                 "type": "Text",
@@ -80511,6 +80667,9 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                   "color": "textSecondary",
                                   "collapseWhenEmpty": true
                                 }
+                              },
+                              "modifiers": {
+                                "hiddenPath": "$service:himiStoreProduct.hasDescriptionJson"
                               }
                             }
                           ]
@@ -81005,7 +81164,8 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
       "declaredCapabilities": [
         "wix_api",
         "share",
-        "local_database"
+        "local_database",
+        "open_url"
       ],
       "minBinaryVersion": "0.1.0",
       "bundleVersion": "0.0.1"
@@ -84329,7 +84489,33 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                               }
                             },
                             {
-                              "id": "",
+                              "id": "event_body",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "RichContent",
+                                "props": {
+                                  "documentJsonPath": "$service:himiEventDetail.descriptionJson",
+                                  "onLink": {
+                                    "actionId": "tier5.himiEventDetail.openLink"
+                                  },
+                                  "fallback": {
+                                    "id": "",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "Text",
+                                      "props": {
+                                        "text": "$service:himiEventDetail.description",
+                                        "style": "body",
+                                        "color": "textSecondary",
+                                        "collapseWhenEmpty": true
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            {
+                              "id": "event_body_text",
                               "body": {
                                 "package": "himalaya",
                                 "type": "Text",
@@ -84339,6 +84525,9 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                   "color": "textSecondary",
                                   "collapseWhenEmpty": true
                                 }
+                              },
+                              "modifiers": {
+                                "hiddenPath": "$service:himiEventDetail.hasDescriptionJson"
                               }
                             }
                           ]
@@ -86233,7 +86422,33 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                       }
                                     },
                                     {
-                                      "id": "",
+                                      "id": "comment_body_$item.id",
+                                      "body": {
+                                        "package": "himalaya",
+                                        "type": "RichContent",
+                                        "props": {
+                                          "documentJsonPath": "$item.bodyJson",
+                                          "onLink": {
+                                            "actionId": "tier5.himiBlogPost.openLink"
+                                          },
+                                          "fallback": {
+                                            "id": "",
+                                            "body": {
+                                              "package": "himalaya",
+                                              "type": "Text",
+                                              "props": {
+                                                "text": "$item.text",
+                                                "style": "body",
+                                                "color": "textSecondary",
+                                                "collapseWhenEmpty": true
+                                              }
+                                            }
+                                          }
+                                        }
+                                      }
+                                    },
+                                    {
+                                      "id": "comment_body_text_$item.id",
                                       "body": {
                                         "package": "himalaya",
                                         "type": "Text",
@@ -86243,6 +86458,9 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                           "color": "textSecondary",
                                           "collapseWhenEmpty": true
                                         }
+                                      },
+                                      "modifiers": {
+                                        "hiddenPath": "$item.hasBodyJson"
                                       }
                                     }
                                   ]
@@ -87029,6 +87247,48 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                   ]
                                 }
                               }
+                            },
+                            {
+                              "id": "cms_body_$item.id",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "RichContent",
+                                "props": {
+                                  "documentJsonPath": "$item.bodyJson",
+                                  "onLink": {
+                                    "actionId": "tier5.himiBrandedCmsCollection.openLink"
+                                  },
+                                  "fallback": {
+                                    "id": "",
+                                    "body": {
+                                      "package": "himalaya",
+                                      "type": "Text",
+                                      "props": {
+                                        "text": "$item.bodyText",
+                                        "style": "body",
+                                        "color": "textSecondary",
+                                        "collapseWhenEmpty": true
+                                      }
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            {
+                              "id": "cms_body_text_$item.id",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Text",
+                                "props": {
+                                  "text": "$item.bodyText",
+                                  "style": "body",
+                                  "color": "textSecondary",
+                                  "collapseWhenEmpty": true
+                                }
+                              },
+                              "modifiers": {
+                                "hiddenPath": "$item.hasBodyJson"
+                              }
                             }
                           ]
                         }
@@ -87131,7 +87391,8 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
       "contentType": "application/javascript+ts-bundle",
       "declaredCapabilities": [
         "wix_api",
-        "local_database"
+        "local_database",
+        "open_url"
       ],
       "minBinaryVersion": "0.1.0",
       "bundleVersion": "0.0.1"

package/templates/branded-lite/tier5-src/_shared/rich-body.ts

@@ -14,15 +14,21 @@ export interface RichBody {
   bodyText: string;
 }
 
+/** [rico] #3372 — the media width for a document drawn in a LIST row (a feed post, a comment, a CMS item): the
+ *  list-image size (WIX_LIST_IMAGE), so a scrolling list never downloads every image at detail size. */
+export const ROW_IMAGE_WIDTH = 1000;
+
 /** Prepares `richContent` (a Ricos document, as a Wix API returns it, or its JSON string). No document, or one
  *  that is not a document, gives `{ bodyJson: "", bodyText: fallback }`. A document past the viewer's limits
  *  gives bodyJson "" and its plain text — except one rejected as too deep, which is not walked again (the
- *  plain-text walk has no depth limit), so `fallback` stands in for it. */
-export function richBody(richContent: unknown, fallback = ""): RichBody {
+ *  plain-text walk has no depth limit), so `fallback` stands in for it. `imageWidth` sizes its media (default
+ *  the 1400 px detail budget). */
+export function richBody(richContent: unknown, fallback = "", imageWidth = 1400): RichBody {
   const doc = parseRicosJson(richContent);
   if (!doc) return { bodyJson: "", bodyText: fallback };
-  // 1400 px — the detail-image budget, which is also the encoder's maximum.
-  const { json, rejected } = encodeRichContent(doc, { imageWidth: 1400 });
+  // 1400 px by default — the detail-image budget, which is also the encoder's maximum; list rows pass
+  // ROW_IMAGE_WIDTH.
+  const { json, rejected } = encodeRichContent(doc, { imageWidth });
   const text = rejected === "too_deep" ? "" : ricosToPlainText(doc);
   return { bodyJson: json, bodyText: text || fallback };
 }

package/templates/branded-lite/tier5-src/himi-blog-post/index.ts

@@ -8,7 +8,7 @@ import { isSavedId, toggleSavedId } from "../_shared/himi-blog-saved";
 import { stashCopy, copyParam, copyTemplate } from "../_shared/himi-copy.js";
 import { formatDateMedium, formatMonthDay } from "../_shared/engine-intl.js";
 import { openRichLink } from "../_shared/rich-content-link.js";
-import { richBody } from "../_shared/rich-body.js";
+import { richBody, ROW_IMAGE_WIDTH } from "../_shared/rich-body.js";
 
 // Offline-first (data-offline): the post body is a public read-through — when the
 // live fetch fails (offline) fall back to the last-synced row the feed cached under
@@ -23,8 +23,14 @@ async function readCachedPost(id: string): Promise<DbEntity | null> {
 interface CommentRow {
   id: string;
   authorName: string;
+  /** The comment's plain text: the row RichContent's fallback. */
   text: string;
   meta: string;
+  /** [rico] #3372 — the comment's Ricos document as ONE string for the row's RichContent; "" when it has none
+   *  or the encoder rejected it. */
+  bodyJson: string;
+  /** bodyJson !== "" — gates the row's plain text, because RichContent draws nothing for "". */
+  hasBodyJson: boolean;
 }
 
 interface S {
@@ -168,11 +174,15 @@ function commentMeta(row: WixBlogCommentRow): string {
 }
 
 function toCommentRow(row: WixBlogCommentRow): CommentRow {
+  // The plain text is the document's own (runs joined as written, not space-separated) when it has one.
+  const { bodyJson, bodyText } = richBody(row.richContent, row.text || "Comment", ROW_IMAGE_WIDTH);
   return {
     id: row.id,
     authorName: row.authorName || "Member",
-    text: row.text || "Comment",
+    text: bodyText,
     meta: commentMeta(row),
+    bodyJson,
+    hasBodyJson: bodyJson !== "",
   };
 }
 

package/templates/branded-lite/tier5-src/himi-branded-lite-cms-collection/index.ts

@@ -10,6 +10,8 @@ import {
 import { copyParam, copyTemplate, stashCopy } from "../_shared/himi-copy.js";
 import { getAll, upsert, type DbEntity } from "@himalaya/local-db";
 import { formatDateMedium } from "../_shared/engine-intl.js";
+import { openRichLink } from "../_shared/rich-content-link.js";
+import { richBody, ROW_IMAGE_WIDTH } from "../_shared/rich-body.js";
 
 // Offline-first (data-offline): a collection's items are a public read-through against
 // the on-device `cms_items` store. Rows are cached per collection (the persisted key is
@@ -23,9 +25,10 @@ async function readCached(collectionId: string): Promise<ItemRow[]> {
   try {
     const prefix = `${collectionId}::`;
     const rows = await getAll(ENTITY);
+    // A row cached before [rico] #3372 carries no document fields: it shows its plain text.
     return rows
       .filter((r) => typeof r.id === "string" && r.id.startsWith(prefix))
-      .map((r) => ({ ...(r as unknown as ItemRow), id: (r.id as string).slice(prefix.length) }));
+      .map((r) => ({ bodyJson: "", hasBodyJson: false, bodyText: "", ...(r as unknown as Partial<ItemRow>), id: (r.id as string).slice(prefix.length) }) as ItemRow);
   } catch { return []; }
 }
 async function writeCached(collectionId: string, rows: ItemRow[]): Promise<void> {
@@ -41,6 +44,13 @@ interface ItemRow {
   initial: string;
   hasImage: boolean;
   noImage: boolean;
+  /** [rico] #3372 — the item's first RICH_CONTENT field as ONE document string for the row's RichContent; ""
+   *  when the collection has none, the item left it empty, or the encoder rejected it. */
+  bodyJson: string;
+  /** bodyJson !== "" — gates the row's plain text, because RichContent draws nothing for "". */
+  hasBodyJson: boolean;
+  /** That field's plain text: the RichContent fallback. */
+  bodyText: string;
 }
 
 interface State {
@@ -86,10 +96,26 @@ function dateValue(value: unknown): string {
   return Number.isNaN(date.getTime()) ? raw : formatDateMedium(date);
 }
 
+/** [rico] #3372 — RICH_TEXT is HTML: its text, with the tags removed and the common entities decoded, so a
+ *  row never shows raw markup. A block or line-break tag separates words; an inline one (`W<i>ix</i>`) joins. */
+export function stripHtml(html: string): string {
+  return html
+    .replace(/<\/?(?:p|div|br|li|ul|ol|h[1-6]|tr|td|th|blockquote|section|article)\b[^>]*>/gi, " ")
+    .replace(/<[^>]+>/g, "")
+    .replace(/&nbsp;/g, " ")
+    .replace(/&lt;/g, "<")
+    .replace(/&gt;/g, ">")
+    .replace(/&quot;/g, "\"")
+    .replace(/&#39;/g, "'")
+    .replace(/&amp;/g, "&")
+    .replace(/\s+/g, " ")
+    .trim();
+}
+
 function displayValue(value: unknown, type = ""): string {
   if (value == null) return "";
   if (type.includes("DATE")) return dateValue(value);
-  if (typeof value === "string") return value.trim();
+  if (typeof value === "string") return type.includes("RICH_TEXT") ? stripHtml(value) : value.trim();
   if (typeof value === "number" || typeof value === "boolean") return String(value);
   if (Array.isArray(value)) return value.map((entry) => displayValue(entry)).filter(Boolean).slice(0, 3).join(", ");
   if (typeof value === "object") {
@@ -116,13 +142,16 @@ function imageValue(data: Record<string, unknown>, fields: CmsFieldDefinition[])
 function itemRow(item: WixDataItem, collection: CmsCollectionDefinition, index: number): ItemRow {
   const data = item.data ?? {};
   const primary = displayValue(data[collection.displayField], collection.fields.find((field) => field.key === collection.displayField)?.type);
+  // A RICH_CONTENT field renders as the row's document, never as a detail line.
   const details = collection.fields
-    .filter((field) => field.key !== collection.displayField && !field.type.includes("IMAGE"))
+    .filter((field) => field.key !== collection.displayField && !field.type.includes("IMAGE") && !field.type.includes("RICH_CONTENT"))
     .map((field) => ({ label: field.displayName, value: displayValue(data[field.key], field.type) }))
     .filter((entry) => entry.value)
     .slice(0, 2);
   const title = primary || copyTemplate("cmsCollection.itemFallbackTitle", "Item {n}", { n: index + 1 });
   const image = imageValue(data, collection.fields);
+  const rich = collection.fields.find((field) => field.type.includes("RICH_CONTENT"));
+  const { bodyJson, bodyText } = richBody(rich ? data[rich.key] : null, "", ROW_IMAGE_WIDTH);
   return {
     id: item.id || String(data._id ?? `${collection.id}-${index}`),
     title,
@@ -132,6 +161,9 @@ function itemRow(item: WixDataItem, collection: CmsCollectionDefinition, index:
     initial: (title[0] || "C").toUpperCase(),
     hasImage: Boolean(image),
     noImage: !image,
+    bodyJson,
+    hasBodyJson: bodyJson !== "",
+    bodyText,
   };
 }
 
@@ -202,6 +234,8 @@ let loadingCollectionId = "";
 const svc = defineService<State, {
   load: (state: State, arg?: unknown) => Promise<State>;
   search: (state: State, arg?: unknown) => State;
+  /** [rico] #3372 — a row RichContent's on_link: `{ url }` of the tapped link. */
+  openLink: (state: State, arg?: unknown) => Promise<State>;
 }>("himiBrandedCmsCollection", {
   state: initial,
   actions: {
@@ -255,6 +289,12 @@ const svc = defineService<State, {
         : state.all;
       return { ...state, rows, noRows: rows.length === 0, noEmpty: rows.length > 0, emptyText: query ? copyParam("cmsCollection.searchEmptyText", "No items match your search.") : copyParam("cmsCollection.emptyText", "This collection has no published items yet.") };
     },
+    // Only http(s), mailto and tel links reach open_url; the collection has no message line, so a refused
+    // link simply does nothing.
+    openLink: async (state, arg) => {
+      await openRichLink(arg);
+      return state;
+    },
   },
 });