@wix/himalaya-cli 0.1173.0 → 0.1175.0

package/templates/events-meetups-owner/tier5-src/himi-owner-lite-event-form/index.ts

@@ -10,9 +10,9 @@ import { defineService } from "@himalaya/state";
 import { getEvent, updateEvent, type WixEvent } from "@himalaya/wix-events";
 import { normalizeEvent } from "../_shared/himi-events.js";
 import { postBodyText, plainPostBody } from "../_shared/owner-post-content.js";
-// Events v3 sends default paragraphData on EVERY paragraph and an empty documentStyle; ricosIsPlain
-// reads both as plain.
-import { ricosIsPlain } from "../_shared/owner-rich-guard.js";
+import { editorSubmitValue, queuedDocument, editorChanged, cachedRichVerdict, resetHydratedEditor } from "../_shared/owner-editor-value.js";
+import { parseRicosJson } from "@himalaya/wix-rich-content";
+import { ricosUploadService } from "@himalaya/wix-rich-content-editor";
 import { ownerLoadError, isBridgeUnavailable, isOwnerPreviewDemo, shouldQueueOwnerWrite } from "../_shared/owner-load-error.js";
 import { DEMO_EVENTS, DEMO_NOTE, DEMO_SAVE_NOTE, demoRefusalPatch } from "../_shared/owner-preview-demo.js";
 import { stashCopy, copyParam } from "../_shared/himi-copy.js";
@@ -39,14 +39,27 @@ interface EventFormState {
   id: string;
   heading: string;
   title: string;
-  /** [rico] #3363 — the Events v3 Ricos `description` as text (read with `fields=TEXTS`). While
-   *  `descriptionProtected`, it is a read-only preview. */
+  /** The Events v3 Ricos `description` as text (read with `fields=TEXTS`): the plain field's value,
+   *  the locked preview, and the cached row's mirror. */
   description: string;
-  /** The description as loaded (or last saved). A save writes `description` only when the
+  /** The description as loaded (or last saved). The plain field writes `description` only when the
    *  submitted value differs from it, so an untouched body is never re-written. */
   originalDescription: string;
-  /** A Ricos description with formatting or media the plain field would flatten: it loads locked,
-   *  the descriptor shows a preview + `descriptionNote`, and an edit is refused. */
+  /** How THIS record's description is edited:
+   *  "editor" — the RichContentEditor, seeded with `descriptionJson` (every live event; sample data);
+   *  "plain"  — the plain text field (an offline row cached as plain before the editor existed);
+   *  "locked" — neither (an offline row cached as rich, with no document to seed the editor). */
+  descriptionMode: "editor" | "plain" | "locked";
+  /** The Ricos description as a JSON string: the editor's seed ("" when the event has none, and until
+   *  this run's load lands — see the boot reset below). Re-based to the saved document after a save. */
+  descriptionJson: string;
+  descriptionFieldHidden: boolean;   // the plain text field (bag key `descriptionText`)
+  descriptionEditorHidden: boolean;  // the RichContentEditor (bag key `description`)
+  /** The editor gate (`EditorGate` in _shared/owner-editor-value.ts): edited since load/save, and
+   *  hidden until this run's load lands. */
+  descriptionDirty: boolean;
+  descriptionPending: boolean;
+  /** Derived from the mode: "locked" shows the preview + `descriptionNote`, and refuses an edit. */
   descriptionProtected: boolean;
   descriptionEditable: boolean;
   descriptionNote: string;
@@ -99,9 +112,14 @@ function navInputId(): string {
   return typeof input?.id === "string" ? input.id : "";
 }
 
+/** What every load that publishes a description resets: the editor may show it, nothing is edited yet. */
+const DESCRIPTION_LOADED = { descriptionPending: false, descriptionDirty: false } as const;
+const docJson = (doc: unknown): string => (doc ? JSON.stringify(doc) : "");
+
 function shape(s: Partial<EventFormState>): EventFormState {
   const id = typeof s.id === "string" ? s.id : "";
   const savedId = typeof s.savedId === "string" ? s.savedId : id;
+  const mode = s.descriptionMode ?? "editor";
   return {
     mode: "edit",
     id,
@@ -109,9 +127,15 @@ function shape(s: Partial<EventFormState>): EventFormState {
     title: s.title ?? "",
     description: s.description ?? "",
     originalDescription: s.originalDescription ?? s.description ?? "",
-    descriptionProtected: s.descriptionProtected ?? false,
-    descriptionEditable: !(s.descriptionProtected ?? false),
-    descriptionNote: s.descriptionProtected ? copyParam("ownerEventForm.richDescriptionNote", "This description has formatting or media. Edit it in your site dashboard to keep that content intact; the title can be changed here.") : "",
+    descriptionMode: mode,
+    descriptionJson: s.descriptionJson ?? "",
+    descriptionFieldHidden: mode !== "plain",
+    descriptionEditorHidden: mode !== "editor",
+    descriptionDirty: s.descriptionDirty ?? false,
+    descriptionPending: s.descriptionPending ?? false,
+    descriptionProtected: mode === "locked",
+    descriptionEditable: mode !== "locked",
+    descriptionNote: mode === "locked" ? copyParam("ownerEventForm.richDescriptionNote", "This description has formatting or media. Edit it in your site dashboard to keep that content intact; the title can be changed here.") : "",
     when: s.when ?? "—",
     location: s.location ?? "—",
     status: s.status ?? "idle",
@@ -137,11 +161,18 @@ function demoRefusal(s: Parameters<typeof shape>[0]): ReturnType<typeof shape> {
   return shape({ ...s, ...demoRefusalPatch(copyParam("ownerCommon.demoSaveNote", DEMO_SAVE_NOTE)) });
 }
 
+// The RichContentEditor's image tool (the editor's upload contract). The component picks and PUTs
+// the bytes; this service mints the signed Wix Media URL with the worker's own wixApi, so no token
+// reaches the page. Registered BEFORE the form's service on purpose: the worker test harnesses treat a
+// bundle's LAST defineService as its service.
+ricosUploadService("himiOwnerLiteEventFormUploads");
+
 const svc = defineService<EventFormState, {
   load: (s: EventFormState, arg?: unknown) => Promise<EventFormState>;
+  descriptionChanged: (s: EventFormState, arg?: unknown) => EventFormState;
   submit: (s: EventFormState, values?: Record<string, unknown>) => Promise<EventFormState>;
 }>("himiOwnerLiteEventForm", {
-  state: shape({ mode: startMode, id: initialInput.id ?? "" }),
+  state: shape({ mode: startMode, id: initialInput.id ?? "", descriptionPending: true }),
   actions: {
     load: async (s, arg) => {
       stashCopy(arg); // absorb the descriptor's onAppear copy-pack param
@@ -156,6 +187,7 @@ const svc = defineService<EventFormState, {
             return shape({
               ...s, mode, id, heading: copyParam("ownerEventForm.headingEdit", "Edit event"),
               title: d.title, description: d.description, when: d.dateLine, location: d.location,
+              ...DESCRIPTION_LOADED, descriptionMode: "editor", descriptionJson: docJson(plainPostBody(d.description)),
               status: "idle", error: "", savedMessage: "", demoNote: copyParam("ownerCommon.demoNote", DEMO_NOTE),
             });
           }
@@ -182,7 +214,10 @@ const svc = defineService<EventFormState, {
             const raw = (ev as unknown as { description?: unknown }).description;
             const doc = raw && typeof raw === "object" && Array.isArray((raw as { nodes?: unknown }).nodes) ? raw as Parameters<typeof postBodyText>[0] : null;
             const text = doc ? postBodyText(doc) : typeof raw === "string" ? raw.trim() : "";
-            return { description: text, originalDescription: text, descriptionProtected: doc ? !ricosIsPlain(doc as { nodes?: unknown; documentStyle?: unknown }) : false };
+            // Edited in the RichContentEditor, seeded with the event's own document byte for byte (never
+            // re-encoded); a legacy string seeds as paragraphs, and none seeds an empty editor.
+            return { ...DESCRIPTION_LOADED, description: text, originalDescription: text, descriptionMode: "editor" as const,
+              descriptionJson: doc ? JSON.stringify(raw) : text ? docJson(plainPostBody(text)) : "" };
           })(),
           when: row.dateLine || "—",
           location: row.location || "—",
@@ -198,8 +233,11 @@ const svc = defineService<EventFormState, {
             ...s, mode, id, heading: "Edit event",
             title: String(cached.title ?? cached.name ?? ""),
             description: String(cached.description ?? ""),
-            // An older cached row carries no verdict, so it stays locked: fail closed.
-            originalDescription: String(cached.description ?? ""), descriptionProtected: cached.descriptionProtected !== "false",
+            originalDescription: String(cached.description ?? ""), ...DESCRIPTION_LOADED,
+            // A row cached with its document reopens in the editor. An older row has none, so its verdict
+            // decides: plain when it was plain, else locked (it carries no verdict either: fail closed).
+            ...(cached.descriptionJson ? { descriptionMode: "editor" as const, descriptionJson: String(cached.descriptionJson) }
+              : { descriptionMode: cached.descriptionProtected === "false" ? "plain" as const : "locked" as const, descriptionJson: "" }),
             when: String(cached.when ?? cached.dateLine ?? "—"),
             location: String(cached.location ?? "—"),
             status: "idle", error: "", savedMessage: "",
@@ -211,6 +249,7 @@ const svc = defineService<EventFormState, {
             return shape({
               ...s, mode, id, heading: copyParam("ownerEventForm.headingEdit", "Edit event"),
               title: d.title, description: d.description, when: d.dateLine, location: d.location,
+              ...DESCRIPTION_LOADED, descriptionMode: "editor", descriptionJson: docJson(plainPostBody(d.description)),
               status: "idle", error: "", savedMessage: "", demoNote: copyParam("ownerCommon.demoNote", DEMO_NOTE),
             });
           }
@@ -218,59 +257,83 @@ const svc = defineService<EventFormState, {
         return shape({ ...s, mode, id, status: "error", error: ownerLoadError(e) });
       }
     },
+    // The editor's on_change carries `args.dirty` only; the document stays in the form bag.
+    descriptionChanged: (s) => shape({ ...s, descriptionDirty: true, ...editorChanged(s) }),
     submit: async (s, values) => {
       if (isOwnerPreviewDemo() || s.demoNote) return demoRefusal(s);
       const v = values ?? {};
       const title = String(v.title ?? s.title).trim();
-      const description = String(v.description ?? s.description).trim();
-      // A queue replay boots a FRESH worker (empty baseline), so it carries the original verdict.
-      const descriptionEdited = typeof v.descriptionEdited === "string" ? v.descriptionEdited === "true" : description !== s.originalDescription.trim();
-      if (descriptionEdited && s.descriptionProtected) return shape({ ...s, status: "error", savedMessage: "", error: copyParam("ownerEventForm.richDescriptionError", "This description has formatting or media. Edit it in your site dashboard to keep that content intact.") });
+      // The description, per record mode. A queue replay boots a FRESH worker and says so with
+      // `descriptionEdited`: this bundle's editor items add the document as `descriptionJson`; the
+      // plain items (and the pre-editor bundle's) carry plain text only.
+      const replay = typeof v.descriptionEdited === "string";
+      let doc: { nodes: unknown[] } | null = null;   // the Ricos description to WRITE; null leaves it as it is
+      let docRaw = "";                               // the editor's own string (queue item, re-seed, cache)
+      let tooLarge = false;
+      if (replay) {
+        const queued = queuedDocument(v.descriptionJson);
+        // A queued document that no longer reads (or is past the limits) writes NOTHING, and says so.
+        if (queued.kind === "invalid" || queued.kind === "too_large") return shape({ ...s, status: "error", savedMessage: "", error: copyParam("ownerEventForm.queuedDescriptionError", "The description saved offline could not be read, so nothing was written. Edit it again.") });
+        if (queued.kind === "doc") { doc = queued.doc as { nodes: unknown[] }; docRaw = queued.json; }
+        else if (v.descriptionEdited === "true") { const t = String(v.description ?? "").trim(); doc = t ? plainPostBody(t) as { nodes: unknown[] } : { nodes: [] }; }
+      } else if (s.descriptionMode === "editor") {
+        // Only an edit the editor reported counts (EditorGate). Absent (the editor never became ready):
+        // save the rest and leave the description as it is.
+        const ev = editorSubmitValue(v.description, s.descriptionJson, { pending: s.descriptionPending, dirty: s.descriptionDirty });
+        if (ev.kind === "invalid") return shape({ ...s, status: "error", savedMessage: "", error: copyParam("ownerEventForm.editorReadError", "Couldn’t read the description from the editor. Nothing was saved; try again.") });
+        if (ev.kind === "doc") { doc = ev.doc as { nodes: unknown[] }; docRaw = ev.json; }
+        tooLarge = ev.kind === "too_large";
+      } else {
+        // Plain or locked: the plain text field, under its own bag key.
+        const t = String(v.descriptionText ?? s.description).trim();
+        if (t !== s.originalDescription.trim()) {
+          if (s.descriptionMode === "locked") return shape({ ...s, status: "error", savedMessage: "", error: copyParam("ownerEventForm.richDescriptionError", "This description has formatting or media. Edit it in your site dashboard to keep that content intact.") });
+          doc = t ? plainPostBody(t) as { nodes: unknown[] } : { nodes: [] };
+        }
+      }
+      const description = doc ? postBodyText(doc as never) : s.description;   // the plain-text mirror
       if (!title) return shape({ ...s, status: "error", error: copyParam("ownerEventForm.titleRequired", "Title is required"), savedMessage: "" });
       if (!s.id) return shape({ ...s, status: "error", error: copyParam("ownerEventForm.errorNoEvent", "No event to edit."), savedMessage: "" });
 
-      // updateEvent(id, event) wraps the body as { event } internally, so pass the
-      // event fields directly. Only the text the form can safely edit is written: the
-      // description only when edited, and always as a Ricos document (never a string).
-      // A local structural type, not WixEventWrite: templates compile against the
+      // updateEvent(id, event) wraps the body as { event } internally, so pass the event fields
+      // directly. Only what the owner edited is written, the description always as a Ricos document
+      // (never a string). A local structural type, not WixEventWrite: templates compile against the
       // PUBLISHED SDK until its next release.
-      const event: { title: string; description?: { nodes: unknown[] } } = {
-        title, ...(descriptionEdited ? { description: description ? plainPostBody(description) as { nodes: unknown[] } : { nodes: [] } } : {}),
-      };
+      const event: { title: string; description?: { nodes: unknown[] } } = { title, ...(doc ? { description: doc } : {}) };
 
-      // Optimistic local write — the detail/list repaint from cache immediately.
-      const localRow: DbEntity = { id: s.id, name: title, title, description, descriptionProtected: String(s.descriptionProtected), when: s.when, location: s.location };
-      await cachePut(localRow);
+      // Optimistic local write — the detail/list repaint from cache immediately. The document the record
+      // now holds, when known, rides along so an offline reopen seeds the editor with it.
+      const loadedJson = s.descriptionMode === "editor" && !s.descriptionPending ? s.descriptionJson : "";
+      const heldJson = docRaw || (doc ? JSON.stringify(doc) : loadedJson);
+      const heldDoc = doc ?? (loadedJson ? parseRicosJson(loadedJson) : null);
+      // Plain only when KNOWN plain: a plain row, or a loaded event with no description. Before load
+      // lands nothing is known, so the row stays protected (fail closed).
+      const knownPlain = s.descriptionMode === "plain" || (s.descriptionMode === "editor" && !s.descriptionPending && s.descriptionJson === "");
+      await cachePut({ id: s.id, name: title, title, description, descriptionProtected: cachedRichVerdict(heldDoc as never, knownPlain), ...(heldJson ? { descriptionJson: heldJson } : {}), when: s.when, location: s.location });
+      const savedState = (savedMessage: string) => shape({
+        ...s, mode: "edit", id: s.id, heading: copyParam("ownerEventForm.headingEdit", "Edit event"),
+        title, description, originalDescription: doc ? description : s.originalDescription,
+        ...(docRaw ? { descriptionJson: docRaw } : {}),
+        descriptionDirty: doc ? false : s.descriptionDirty,
+        status: "saved", savedMessage, savedId: s.id,
+        error: tooLarge ? copyParam("ownerEventForm.descriptionTooLarge", "The description is too long to save, so it was left as it was. Your other changes were saved.") : "",
+      });
       try {
         await updateEvent(s.id, event);
-        return shape({
-          ...s,
-          mode: "edit",
-          id: s.id,
-          heading: copyParam("ownerEventForm.headingEdit", "Edit event"),
-          title,
-          description,
-          originalDescription: descriptionEdited ? description : s.originalDescription,
-          status: "saved",
-          error: "",
-          savedMessage: copyParam("ownerEventForm.savedMessage", "Event saved."),
-          savedId: s.id,
-        });
+        return savedState(copyParam("ownerEventForm.savedMessage", "Event saved."));
       } catch (e) {
         if (shouldQueueOwnerWrite(e)) {
           // Demo / web-preview (no owner bridge; the record came from demo sample
           // data, marked by demoNote): a queued write could never replay, so answer
           // with the demo save note instead of the real-offline write-behind.
           if (s.demoNote) return demoRefusal(s);
-          // Real device offline: the optimistic cache row already shows; queue the
-          // write to replay (WriteQueue, idempotent) when connectivity returns.
-          await queueWrite("tier5.himiOwnerLiteEventForm.submit", { id: s.id, title, description, descriptionEdited: String(descriptionEdited) });
-          return shape({
-            ...s, mode: "edit", id: s.id, heading: copyParam("ownerEventForm.headingEdit", "Edit event"),
-            title, description, originalDescription: descriptionEdited ? description : s.originalDescription, status: "saved", error: "",
-            savedMessage: copyParam("ownerEventForm.savedOffline", "Saved offline — will sync when you reconnect."),
-            savedId: s.id,
-          });
+          // Real device offline: the optimistic cache row already shows; queue the write to replay
+          // (WriteQueue, idempotent) when connectivity returns. A document rides as `descriptionJson`
+          // with descriptionEdited "false", so a bundle rolled back past this change leaves the
+          // description rather than flattening it to text.
+          await queueWrite("tier5.himiOwnerLiteEventForm.submit", { id: s.id, title, description,
+            ...(docRaw ? { descriptionJson: docRaw, descriptionEdited: "false" } : { descriptionEdited: String(doc !== null) }) });
+          return savedState(copyParam("ownerEventForm.savedOffline", "Saved offline — will sync when you reconnect."));
         }
         return shape({ ...s, status: "error", error: ownerLoadError(e), savedMessage: "" });
       }
@@ -278,4 +341,7 @@ const svc = defineService<EventFormState, {
   },
 });
 
+// Adopter contract: the editor seeds once, so a cold boot must not seed it with the last run's document.
+resetHydratedEditor(svc, { json: "descriptionJson", pending: "descriptionPending", dirty: "descriptionDirty" }, true);
+
 export { svc };

package/templates/events-meetups-owner/tier5-src/himi-owner-lite-post-form/index.ts

@@ -4,8 +4,7 @@
 // screen (himiOwnerLitePost.publish). Bound by buildForm ($service:himiOwnerLitePostForm.*).
 
 import { postBodyText, plainPostBody, postCoverUrl } from "../_shared/owner-post-content.js";
-import { editorValue } from "../_shared/owner-editor-value.js";
-import { parseRicosJson } from "@himalaya/wix-rich-content";
+import { editorSubmitValue, queuedDocument, editorChanged, resetHydratedEditor } from "../_shared/owner-editor-value.js";
 import { ricosUploadService } from "@himalaya/wix-rich-content-editor";
 import { wixCall } from "@himalaya/wix-site-media";
 import { wixMediaUrl, WIX_DETAIL_IMAGE } from "../_shared/himi-store.js";
@@ -43,15 +42,10 @@ interface PostFormState {
   bodyJson: string;
   /** The "Post details" sheet (excerpt + cover) is open. */
   detailsOpen: boolean;
-  /** The editor's on_change fired since the body was last loaded or saved. The bag ALWAYS holds a
-   *  document once the editor is ready — the engine's own serialization of the seed, which is not
-   *  byte-equal to it — so only this says the owner actually edited the body. */
+  /** The editor gate (`EditorGate` in _shared/owner-editor-value.ts): the editor's on_change fired since
+   *  the body was loaded or saved, and (edit mode) the editor is hidden until this run's load lands. */
   bodyDirty: boolean;
-  /** Edit mode, until `load` lands: the descriptor hides the editor, because a provisional editor
-   *  the owner typed into keeps that text when the real document arrives (the seed latch). */
   bodyPending: boolean;
-  /** When a save last wrote the body (ms), so its own trailing on_change does not undo "Post updated.". */
-  bodySavedAt: number;
   coverUrl: string;
   originalCoverUrl: string;
   coverPreview: string;
@@ -104,9 +98,7 @@ function boolString(value: unknown, fallback: string): string {
   return fallback;
 }
 /** What every load that publishes a document resets: the editor may show it, nothing is edited yet. */
-const BODY_LOADED = { bodyPending: false, bodyDirty: false, bodySavedAt: 0, detailsOpen: false } as const;
-/** How long after a body save its own debounced on_change may still arrive (the arm waits 500 ms). */
-const TRAILING_CHANGE_MS = 1500;
+const BODY_LOADED = { bodyPending: false, bodyDirty: false, detailsOpen: false } as const;
 const valueOf = (arg: unknown): string =>
   String(typeof arg === "string" ? arg : (arg as { value?: unknown; text?: unknown } | undefined)?.value ?? (arg as { text?: unknown } | undefined)?.text ?? "");
 const docJson = (doc: unknown): string => (doc ? JSON.stringify(doc) : "");
@@ -128,7 +120,6 @@ function shape(s: Partial<PostFormState>): PostFormState {
     detailsOpen: s.detailsOpen ?? false,
     bodyDirty: s.bodyDirty ?? false,
     bodyPending: s.bodyPending ?? false,
-    bodySavedAt: s.bodySavedAt ?? 0,
     coverUrl: s.coverUrl ?? "",
     originalCoverUrl: s.originalCoverUrl ?? "",
     coverPreview: wixMediaUrl(s.coverUrl ?? "", WIX_DETAIL_IMAGE),
@@ -244,13 +235,8 @@ const svc = defineService<PostFormState, {
     setExcerpt: (s, arg) => shape({ ...s, excerpt: valueOf(arg), error: "" }),
     detailsOpen: (s) => shape({ ...s, detailsOpen: true }),
     detailsClose: (s) => shape({ ...s, detailsOpen: false }),
-    // The editor's debounced `on_change` carries `args.dirty` only; the document stays in the form
-    // bag. A body edited after a save is no longer saved, so drop the stale confirmation — unless
-    // this is the trailing on_change of the very edit that save wrote.
-    bodyChanged: (s) => {
-      const trailing = s.status === "saved" && s.bodySavedAt > 0 && Date.now() - s.bodySavedAt < TRAILING_CHANGE_MS;
-      return shape({ ...s, bodyDirty: true, ...(trailing ? {} : { savedMessage: "", status: s.status === "saved" ? "idle" : s.status }) });
-    },
+    // The editor's `on_change` carries `args.dirty` only; the document stays in the form bag.
+    bodyChanged: (s) => shape({ ...s, bodyDirty: true, ...editorChanged(s) }),
     submit: async (s, values) => {
       if (isOwnerPreviewDemo() || s.demoNote) return demoRefusal(s);
       const v = values ?? {};
@@ -277,14 +263,15 @@ const svc = defineService<PostFormState, {
       let bodyRaw = "";
       let bodyTooLarge = false;
       if (replay) {
-        const queued = typeof v.richContentJson === "string" ? parseRicosJson(v.richContentJson) : null;
-        if (queued) { richContent = queued as unknown as WixRichContent; bodyRaw = String(v.richContentJson); }
+        const queued = queuedDocument(v.richContentJson);
+        // A queued body that no longer reads (or is past the limits) writes NOTHING, and says so.
+        if (queued.kind === "invalid" || queued.kind === "too_large") return shape({ ...s, status: "error", error: copyParam("ownerPostForm.queuedBodyError", "The post body saved offline could not be read, so nothing was written. Edit it again."), savedMessage: "" });
+        if (queued.kind === "doc") { richContent = queued.doc as unknown as WixRichContent; bodyRaw = queued.json; }
         else if (v.preserveBody === "false") { richContent = plainPostBody(String(v.body ?? "")); bodyRaw = docJson(richContent); }
       } else {
-        // Only an edit the editor reported counts: before load lands the editor is hidden (a body
-        // here was typed into the provisional empty editor), and an untouched bag holds the engine's
-        // re-serialization of the seed, which must not be written back.
-        const ev = s.bodyPending || !s.bodyDirty ? { kind: "absent" as const } : editorValue(v.body, s.bodyJson);
+        // Only an edit the editor reported counts (EditorGate): before load lands the editor is hidden,
+        // and an untouched bag holds the engine's re-serialization of the seed.
+        const ev = editorSubmitValue(v.body, s.bodyJson, { pending: s.bodyPending, dirty: s.bodyDirty });
         if (ev.kind === "invalid") return shape({ ...s, status: "error", error: copyParam("ownerPostForm.bodyInvalid", "Couldn’t read the post body from the editor. Nothing was saved; try again."), savedMessage: "" });
         if (ev.kind === "doc") { richContent = ev.doc as unknown as WixRichContent; bodyRaw = ev.json; }
         // A body past the rich-content limits is not written (every viewer would show its
@@ -308,7 +295,7 @@ const svc = defineService<PostFormState, {
       const savedState = (id: string, savedMessage: string) => shape({
         ...s, mode: "edit", id, heading: copyParam("ownerPostForm.headingEdit", "Edit post"),
         title, excerpt, body: postBodyText(kept), richContent: kept, bodyJson: bodyEdited ? bodyRaw : s.bodyJson,
-        bodyDirty: bodyEdited ? false : s.bodyDirty, bodySavedAt: bodyEdited ? Date.now() : 0,
+        bodyDirty: bodyEdited ? false : s.bodyDirty,
         coverUrl, originalCoverUrl: coverUrl, isFeatured: isFeatured ? "true" : "false",
         status: "saved", savedMessage, savedId: id,
         error: bodyTooLarge ? copyParam("ownerPostForm.bodyTooLarge", "The post body is too long to save, so it was left as it was. Your other changes were saved.") : "",
@@ -366,20 +353,8 @@ const svc = defineService<PostFormState, {
   },
 });
 
-// [rico] #3371 — adopter contract (#3368's review): the editor seeds ONCE, from the first
-// document `bodyJson` holds. A cold boot hydrates this service from its last persisted snapshot, so
-// that first value would be the document as it was when this screen last ran — and a Save after
-// typing would write it over whatever the post holds now. Blank the hydrated seed before anything
-// renders: the editor stays provisional (writes nothing) until `load` publishes the fresh document.
-// In place, at boot, because no action has run yet; the state object is the runtime's own merge.
-{
-  const booted = (svc as { getState?: () => Partial<PostFormState> | undefined }).getState?.();
-  if (booted && typeof booted === "object") {
-    if (booted.bodyJson) booted.bodyJson = "";
-    // Nor does it carry this run's UI over: the editor waits for this run's load, the sheet is shut.
-    booted.bodyPending = startMode === "edit";
-    booted.detailsOpen = false;
-  }
-}
+// [rico] #3371 — adopter contract: the editor seeds once, so a cold boot must not seed it with the last
+// run's document. Nor does it carry this run's UI over: the details sheet is shut.
+resetHydratedEditor(svc, { json: "bodyJson", pending: "bodyPending", dirty: "bodyDirty" }, startMode === "edit", { detailsOpen: false });
 
 export { svc };

package/templates/gym-fitness/dev/index.ts

@@ -21529,50 +21529,72 @@ const SCREENS = runtimeSetting({
                       }
                     },
                     {
-                      "id": "himi_create_post.title_field",
+                      "id": "himi_create_post.form",
                       "body": {
                         "package": "himalaya",
-                        "type": "TextField",
-                        "props": {
-                          "placeholder": "Title",
-                          "value": "",
-                          "submitLabel": "next",
-                          "onSubmit": {
-                            "actionId": "tier5.spacesCreatePost.focusBody"
-                          },
-                          "onChange": {
-                            "actionId": "tier5.spacesCreatePost.setTitle"
-                          }
-                        }
-                      }
-                    },
-                    {
-                      "id": "himi_create_post.body_field",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "TextField",
+                        "type": "Form",
                         "props": {
-                          "placeholder": "Write something…",
-                          "value": "",
-                          "multilineMaxLines": 6,
-                          "focusPath": "$service:spacesCreatePost.bodyFocus",
-                          "onChange": {
-                            "actionId": "tier5.spacesCreatePost.setBody"
-                          }
-                        }
-                      }
-                    },
-                    {
-                      "id": "himi_create_post.submit",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "Button",
-                        "props": {
-                          "title": "Post",
-                          "style": "primary",
-                          "fullWidth": true,
-                          "action": {
-                            "actionId": "tier5.spacesCreatePost.submit"
+                          "id": "himiCreatePostForm",
+                          "fields": [
+                            {
+                              "id": "himi_create_post.title_field",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "FormField",
+                                "props": {
+                                  "id": "title",
+                                  "label": "Title",
+                                  "kind": "text",
+                                  "text": {
+                                    "placeholder": "Add a title",
+                                    "value": "",
+                                    "submitLabel": "next",
+                                    "onSubmit": {
+                                      "actionId": "tier5.spacesCreatePost.focusBody"
+                                    },
+                                    "onChange": {
+                                      "actionId": "tier5.spacesCreatePost.setTitle"
+                                    }
+                                  }
+                                }
+                              }
+                            },
+                            {
+                              "id": "himi_create_post.body_field",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "FormField",
+                                "props": {
+                                  "id": "body",
+                                  "label": "Your post",
+                                  "kind": "text",
+                                  "text": {
+                                    "placeholder": "Write something…",
+                                    "value": "",
+                                    "multilineMaxLines": 6,
+                                    "focusPath": "$service:spacesCreatePost.bodyFocus",
+                                    "onChange": {
+                                      "actionId": "tier5.spacesCreatePost.setBody"
+                                    }
+                                  }
+                                }
+                              }
+                            }
+                          ],
+                          "submitButton": {
+                            "id": "himi_create_post.submit",
+                            "body": {
+                              "package": "himalaya",
+                              "type": "Button",
+                              "props": {
+                                "title": "Post",
+                                "style": "primary",
+                                "fullWidth": true,
+                                "action": {
+                                  "actionId": "tier5.spacesCreatePost.submit"
+                                }
+                              }
+                            }
                           }
                         }
                       }