@wix/himalaya-cli 0.1478.0 → 0.1480.0

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

@@ -19504,14 +19504,15 @@ const SCREENS = runtimeSetting({
                 "package": "himalaya",
                 "type": "Button",
                 "props": {
-                  "title": "Go to Account",
+                  "title": "Sign in",
                   "style": "secondary",
                   "fullWidth": true,
                   "leadingIcon": "person",
                   "action": {
                     "actionId": "himi.open",
                     "params": {
-                      "screenId": "himi_account"
+                      "screenId": "himi_sign_in",
+                      "mode": "signin"
                     }
                   }
                 }
@@ -27836,233 +27837,6 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                         "props": {
                           "spacing": 12,
                           "children": [
-                            {
-                              "id": "himi_time.signin_card",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "VStack",
-                                "props": {
-                                  "spacing": 12,
-                                  "alignment": "leading",
-                                  "children": [
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "HStack",
-                                        "props": {
-                                          "spacing": 10,
-                                          "children": [
-                                            {
-                                              "id": "",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Icon",
-                                                "props": {
-                                                  "name": "person",
-                                                  "size": 18,
-                                                  "tint": "accentPrimary"
-                                                }
-                                              },
-                                              "modifiers": {
-                                                "accessibilityRole": "decorative"
-                                              }
-                                            },
-                                            {
-                                              "id": "",
-                                              "body": {
-                                                "package": "himalaya",
-                                                "type": "Text",
-                                                "props": {
-                                                  "text": "$service:himiBookingTime.authTitle",
-                                                  "style": "bodyEmphasis",
-                                                  "collapseWhenEmpty": true
-                                                }
-                                              }
-                                            }
-                                          ]
-                                        }
-                                      }
-                                    },
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Text",
-                                        "props": {
-                                          "text": "$service:himiBookingTime.authBody",
-                                          "style": "body",
-                                          "color": "textSecondary",
-                                          "collapseWhenEmpty": true
-                                        }
-                                      }
-                                    },
-                                    {
-                                      "id": "himi_time.signin.first_name",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "TextField",
-                                        "props": {
-                                          "placeholder": "First name",
-                                          "autoCapitalization": "words",
-                                          "onChange": {
-                                            "actionId": "tier5.himiBookingTime.setFirstName"
-                                          }
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "hiddenPath": "$service:himiBookingTime.notRegistering"
-                                      }
-                                    },
-                                    {
-                                      "id": "himi_time.signin.last_name",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "TextField",
-                                        "props": {
-                                          "placeholder": "Last name",
-                                          "autoCapitalization": "words",
-                                          "onChange": {
-                                            "actionId": "tier5.himiBookingTime.setLastName"
-                                          }
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "hiddenPath": "$service:himiBookingTime.notRegistering"
-                                      }
-                                    },
-                                    {
-                                      "id": "himi_time.signin.email",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "TextField",
-                                        "props": {
-                                          "placeholder": "Email",
-                                          "keyboard": "email",
-                                          "autoCapitalization": "none",
-                                          "onChange": {
-                                            "actionId": "tier5.himiBookingTime.setEmail"
-                                          }
-                                        }
-                                      }
-                                    },
-                                    {
-                                      "id": "himi_time.signin.password",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "TextField",
-                                        "props": {
-                                          "placeholder": "Password",
-                                          "valuePath": "$service:himiBookingTime.password",
-                                          "secure": true,
-                                          "autoCapitalization": "none",
-                                          "onChange": {
-                                            "actionId": "tier5.himiBookingTime.setPassword"
-                                          }
-                                        }
-                                      }
-                                    },
-                                    {
-                                      "id": "himi_time.signin",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Button",
-                                        "props": {
-                                          "title": "Sign in",
-                                          "style": "primary",
-                                          "fullWidth": true,
-                                          "action": {
-                                            "actionId": "tier5.himiBookingTime.signIn"
-                                          }
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "cornerRadius": 8,
-                                        "pressFeedback": "scale",
-                                        "haptic": "medium",
-                                        "hiddenPath": "$service:himiBookingTime.isRegistering"
-                                      }
-                                    },
-                                    {
-                                      "id": "himi_time.show_register",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Button",
-                                        "props": {
-                                          "title": "Create account",
-                                          "style": "secondary",
-                                          "fullWidth": true,
-                                          "action": {
-                                            "actionId": "tier5.himiBookingTime.showRegister"
-                                          }
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "hiddenPath": "$service:himiBookingTime.isRegistering"
-                                      }
-                                    },
-                                    {
-                                      "id": "himi_time.register",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Button",
-                                        "props": {
-                                          "title": "Create account",
-                                          "style": "primary",
-                                          "fullWidth": true,
-                                          "action": {
-                                            "actionId": "tier5.himiBookingTime.register"
-                                          }
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "cornerRadius": 8,
-                                        "pressFeedback": "scale",
-                                        "haptic": "medium",
-                                        "hiddenPath": "$service:himiBookingTime.notRegistering"
-                                      }
-                                    },
-                                    {
-                                      "id": "himi_time.show_signin",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Button",
-                                        "props": {
-                                          "title": "I already have an account",
-                                          "style": "secondary",
-                                          "fullWidth": true,
-                                          "action": {
-                                            "actionId": "tier5.himiBookingTime.showSignIn"
-                                          }
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "hiddenPath": "$service:himiBookingTime.notRegistering"
-                                      }
-                                    }
-                                  ]
-                                }
-                              },
-                              "modifiers": {
-                                "background": {
-                                  "token": "surfaceElevated"
-                                },
-                                "border": {
-                                  "width": 1,
-                                  "color": {
-                                    "token": "border"
-                                  }
-                                },
-                                "cornerRadius": 8,
-                                "padding": {
-                                  "leading": 14,
-                                  "trailing": 14,
-                                  "top": 14,
-                                  "bottom": 14
-                                },
-                                "hiddenPath": "$service:himiBookingTime.hideSignIn"
-                              }
-                            },
                             {
                               "id": "himi_time.member_card",
                               "body": {
@@ -28211,6 +27985,32 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                 "hiddenPath": "$service:himiBookingTime.notBooking"
                               }
                             },
+                            {
+                              "id": "himi_time.book_sign_in",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Button",
+                                "props": {
+                                  "title": "Book selected time",
+                                  "style": "primary",
+                                  "fullWidth": true,
+                                  "action": {
+                                    "actionId": "himi.open",
+                                    "params": {
+                                      "screenId": "himi_sign_in",
+                                      "mode": "signin",
+                                      "intent": "book"
+                                    }
+                                  }
+                                }
+                              },
+                              "modifiers": {
+                                "cornerRadius": 8,
+                                "pressFeedback": "scale",
+                                "haptic": "medium",
+                                "hiddenPath": "$service:himiBookingTime.hideSignIn"
+                              }
+                            },
                             {
                               "id": "himi_time.book",
                               "body": {
@@ -30164,140 +29964,6 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                         }
                       }
                     },
-                    {
-                      "id": "himi_rsvp.signin_card",
-                      "body": {
-                        "package": "himalaya",
-                        "type": "VStack",
-                        "props": {
-                          "spacing": 12,
-                          "alignment": "leading",
-                          "children": [
-                            {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "HStack",
-                                "props": {
-                                  "spacing": 10,
-                                  "children": [
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Icon",
-                                        "props": {
-                                          "name": "person",
-                                          "size": 18,
-                                          "tint": "accentPrimary"
-                                        }
-                                      },
-                                      "modifiers": {
-                                        "accessibilityRole": "decorative"
-                                      }
-                                    },
-                                    {
-                                      "id": "",
-                                      "body": {
-                                        "package": "himalaya",
-                                        "type": "Text",
-                                        "props": {
-                                          "text": "Sign in to RSVP",
-                                          "style": "bodyEmphasis"
-                                        }
-                                      }
-                                    }
-                                  ]
-                                }
-                              }
-                            },
-                            {
-                              "id": "",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Text",
-                                "props": {
-                                  "text": "Events can be browsed as a guest. RSVP is saved to your member identity.",
-                                  "style": "body",
-                                  "color": "textSecondary"
-                                }
-                              }
-                            },
-                            {
-                              "id": "himi_rsvp.email",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "TextField",
-                                "props": {
-                                  "placeholder": "Email",
-                                  "value": "",
-                                  "keyboard": "email",
-                                  "autoCapitalization": "none",
-                                  "onChange": {
-                                    "actionId": "tier5.himiEventsRsvp.setEmail"
-                                  }
-                                }
-                              }
-                            },
-                            {
-                              "id": "himi_rsvp.password",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "TextField",
-                                "props": {
-                                  "placeholder": "Password",
-                                  "valuePath": "$service:himiEventsRsvp.password",
-                                  "secure": true,
-                                  "autoCapitalization": "none",
-                                  "onChange": {
-                                    "actionId": "tier5.himiEventsRsvp.setPassword"
-                                  }
-                                }
-                              }
-                            },
-                            {
-                              "id": "himi_rsvp.signin",
-                              "body": {
-                                "package": "himalaya",
-                                "type": "Button",
-                                "props": {
-                                  "title": "Sign in",
-                                  "style": "primary",
-                                  "fullWidth": true,
-                                  "action": {
-                                    "actionId": "tier5.himiEventsRsvp.signIn"
-                                  }
-                                }
-                              },
-                              "modifiers": {
-                                "cornerRadius": 8,
-                                "pressFeedback": "scale",
-                                "haptic": "medium"
-                              }
-                            }
-                          ]
-                        }
-                      },
-                      "modifiers": {
-                        "background": {
-                          "token": "surfaceElevated"
-                        },
-                        "border": {
-                          "width": 1,
-                          "color": {
-                            "token": "border"
-                          }
-                        },
-                        "cornerRadius": 8,
-                        "padding": {
-                          "leading": 14,
-                          "trailing": 14,
-                          "top": 14,
-                          "bottom": 14
-                        },
-                        "hiddenPath": "$service:himiEventsRsvp.isMember"
-                      }
-                    },
                     {
                       "id": "himi_rsvp.member_card",
                       "body": {
@@ -30413,6 +30079,32 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                         "hiddenPath": "$service:himiEventsRsvp.noSuccess"
                       }
                     },
+                    {
+                      "id": "himi_rsvp.confirm_sign_in",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Confirm RSVP",
+                          "style": "primary",
+                          "fullWidth": true,
+                          "action": {
+                            "actionId": "himi.open",
+                            "params": {
+                              "screenId": "himi_sign_in",
+                              "mode": "signin",
+                              "intent": "rsvp"
+                            }
+                          }
+                        }
+                      },
+                      "modifiers": {
+                        "cornerRadius": 8,
+                        "pressFeedback": "scale",
+                        "haptic": "medium",
+                        "hiddenPath": "$service:himiEventsRsvp.hideGuestRsvp"
+                      }
+                    },
                     {
                       "id": "himi_rsvp.confirm",
                       "body": {

package/templates/yoga-studio/tier5-src/himi-booking-time/index.ts

@@ -160,6 +160,9 @@ function inputId(): string {
 /** The time a host opened this screen at (`himalaya.input.start`, ISO 8601), or "". Every load
  *  preselects that slot (or opens on its day) until the member picks a day or a time themselves —
  *  not just the first, because the boot load and the screen's own `load` can overlap. */
+/** Counts the customer's picks. A load that sees it move ran while they picked a time. */
+let selectionRevision = 0;
+
 let pendingStart = (() => {
   const start = (globalThis as { himalaya?: { input?: { start?: unknown } } }).himalaya?.input?.start;
   return typeof start === "string" && Number.isFinite(Date.parse(start)) ? start : "";
@@ -420,6 +423,48 @@ async function signedInEmail(): Promise<string> {
   }
 }
 
+// A guest's picked time, kept for the sign-in it needs. Hosts key workers by account, so
+// signing in can start a new worker for this screen, with no selection. `himalaya.storage`
+// is shared by every worker of the app on every host, so a member's load of the same
+// service with nothing selected takes the pick back. Reading never clears it: a new worker's
+// boot load and appear load can run at once, and both must restore the same time. It goes
+// when the member picks a time or books, or after 30 minutes.
+const PENDING_PICK_KEY = "himi.booking.pendingPick.v1";
+const PENDING_PICK_TTL_MS = 30 * 60 * 1000;
+type StorageLike = { getItem(key: string): string | null; setItem(key: string, value: string): void };
+
+function appStorage(): StorageLike | undefined {
+  return (globalThis as { himalaya?: { storage?: StorageLike } }).himalaya?.storage;
+}
+
+function writePick(value: string): void {
+  try {
+    appStorage()?.setItem(PENDING_PICK_KEY, value);
+  } catch {
+    // No storage on this host: the pick lives only as long as this worker.
+  }
+}
+
+function rememberPick(serviceId: string, slotId: string): void {
+  writePick(JSON.stringify({ serviceId, slotId, at: Date.now() }));
+}
+
+function clearPick(): void {
+  writePick("");
+}
+
+/** The slot a guest picked for `serviceId` in the last 30 minutes, or "". */
+function readPick(serviceId: string): string {
+  let pick: { serviceId?: unknown; slotId?: unknown; at?: unknown } | null = null;
+  try {
+    pick = JSON.parse(appStorage()?.getItem(PENDING_PICK_KEY) || "null");
+  } catch {
+    // No storage, or a damaged entry: there is no pick to restore.
+  }
+  const fresh = typeof pick?.at === "number" && Date.now() - pick.at < PENDING_PICK_TTL_MS;
+  return fresh && pick?.serviceId === serviceId && typeof pick?.slotId === "string" ? pick.slotId : "";
+}
+
 // Wix Bookings appDefId — the catalogReference.appId that wraps a booking as an
 // ecom checkout line item, and the payment appId the native cashier settles under.
 const WIX_BOOKINGS_APP_ID = "13d21c63-b5ec-5912-8397-c3a5ddb27a97";
@@ -507,7 +552,8 @@ const svc = defineService<S, {
     bookingsScreenId: "himi_bookings",
   }),
   actions: {
-    load: async (s, arg) => {
+    load: async (s, arg): Promise<S> => {
+      const revisionAtStart = selectionRevision;
       stashCopy(arg);
       if (!s.id) return derive({ ...s, status: "ready", errored: true });
       let next = derive({ ...s, status: "loading", errored: false, message: "", successMessage: "" });
@@ -544,22 +590,29 @@ const svc = defineService<S, {
         }
         allRows = rows;
         const days = daysOf(rows);
-        // Keep the customer's day across a reload when it still has times;
-        // otherwise open on the first day that has any.
+        // A reload runs in the background when the screen shows again. A time the customer
+        // picked while it ran wins over the selection this load started from.
+        const chosen: S = selectionRevision !== revisionAtStart ? (svc.getState?.() ?? next) : next;
         // A host's `start` (deep entry): that slot preselected, or — taken since — its day.
         const wantedStart = pendingStart;
         const startRow = wantedStart ? rows.find((r) => r.id === slotIdAt(slotsById, wantedStart)) : undefined;
         // The requested day even with no time left on it: "taken since" opens there, nothing selected.
         const startDay = wantedStart ? days.find((d) => d.id === dayKey(wantedStart)) : undefined;
-        const keep = days.find((d) => d.id === next.selectedDay && d.hasSlots);
-        const initialDay = startRow?.dayKey ?? startDay?.id ?? keep?.id ?? days.find((d) => d.hasSlots)?.id ?? days[0]?.id ?? "";
-        const selectionAlive = !!startRow || slotsById.has(next.selectedSlotId);
+        const selectionAlive = !!startRow || slotsById.has(chosen.selectedSlotId);
+        // A member with no live selection, and no host start, gets back the time they picked as a guest.
+        const picked = selectionAlive || wantedStart || !next.isMember ? undefined : rows.find((row) => row.id === readPick(s.id));
+        // Keep the customer's day across a reload when it still has times;
+        // otherwise open on the first day that has any.
+        const keep = days.find((d) => d.id === chosen.selectedDay && d.hasSlots);
+        const initialDay = startRow?.dayKey ?? startDay?.id ?? picked?.dayKey ?? keep?.id ?? days.find((d) => d.hasSlots)?.id ?? days[0]?.id ?? "";
         const header = serviceHeaderFields(serviceRes.service);
         return derive(withDay({
           ...next,
           days,
-          selectedSlotId: startRow ? startRow.id : selectionAlive ? next.selectedSlotId : "",
-          selectedLine: startRow ? [startRow.day, startRow.title, startRow.subtitle].filter(Boolean).join(" · ") : selectionAlive ? next.selectedLine : "",
+          selectedSlotId: startRow ? startRow.id : selectionAlive ? chosen.selectedSlotId : picked?.id ?? "",
+          selectedLine: startRow ? [startRow.day, startRow.title, startRow.subtitle].filter(Boolean).join(" · ")
+            : selectionAlive ? chosen.selectedLine
+              : picked ? [picked.day, picked.title, picked.subtitle].filter(Boolean).join(" · ") : "",
           status: "ready",
           errored: false,
           serviceName: serviceRes.service?.name || copyParam("time.serviceNameFallback", "Choose a time"),
@@ -593,7 +646,12 @@ const svc = defineService<S, {
         ? arg
         : ((arg as { id?: string; slotId?: string })?.slotId ?? (arg as { id?: string })?.id ?? "");
       const selected = allRows.find((slot) => slot.id === slotId);
-      if (selected) pendingStart = "";
+      if (selected) {
+        selectionRevision++;
+        pendingStart = "";
+        if (s.isMember) clearPick();
+        else rememberPick(s.id, slotId);
+      }
       return derive({
         ...s,
         selectedSlotId: selected ? slotId : s.selectedSlotId,
@@ -666,6 +724,8 @@ const svc = defineService<S, {
         start: hostEventInstant(booking?.startDate) || slot.startDate,
         end: hostEventInstant(booking?.endDate) || slot.endDate,
       });
+      // The member acts on the pick now; a later visit must not restore it.
+      clearPick();
       // PAID service — FULLY NATIVE in-app payment (mirrors Wix's RN apps): NO
       // hosted-checkout WebView / browser redirect. The chain is
       //   createBooking → ecom.createCheckout(booking line item) → ecom.createOrder

package/templates/yoga-studio/tier5-src/himi-events-rsvp/index.ts

@@ -35,6 +35,9 @@ interface S {
   noSuccess: boolean;
   canRsvp: boolean;
   cannotRsvp: boolean;
+  /** Hides a guest's RSVP button, which opens a sign-in screen: shown only for a guest with
+   *  an event to RSVP to, as `cannotRsvp` requires an event for a member's. */
+  hideGuestRsvp: boolean;
   errored: boolean;
   notErrored: boolean;
   isLoading: boolean;
@@ -74,6 +77,7 @@ function derive(s: S): S {
     notMember: !s.isMember,
     canRsvp,
     cannotRsvp: !canRsvp,
+    hideGuestRsvp: s.isMember || !hasEvent,
     noSuccess: !hasSuccess,
     notErrored: !s.errored,
     noEmpty: s.status === "loading" || s.errored || hasEvent,
@@ -144,6 +148,7 @@ const svc = defineService<S, {
     noSuccess: true,
     canRsvp: false,
     cannotRsvp: true,
+    hideGuestRsvp: true,
     errored: false,
     notErrored: true,
     isLoading: true,

package/templates/yoga-studio/tier5-src/himi-store-account/index.ts

@@ -365,6 +365,11 @@ function authHeadline(s: S, isRegistering: boolean, isRecovering: boolean): { au
         authTitle: copyParam("storeAccount.authTitleRsvp", "Sign in to RSVP"),
         authBody: copyParam("storeAccount.authBodyRsvp", "Sign in to RSVP, then we’ll bring you back."),
       };
+    case "book":
+      return {
+        authTitle: copyParam("storeAccount.authTitleBook", "Sign in to book"),
+        authBody: copyParam("storeAccount.authBodyBook", "Sign in to book this time, then we’ll bring you back."),
+      };
     case "post":
       return {
         authTitle: copyParam("storeAccount.authTitlePost", "Sign in to post"),
@@ -392,7 +397,7 @@ interface S extends IapRestoreFields {
   noMemberImage: boolean;
   authTitle: string;
   authBody: string;
-  /** Mid-flow gate intent (`join_group` | `rsvp` | `post` | ""). */
+  /** Mid-flow gate intent (`join_group` | `rsvp` | `book` | `post` | ""). */
   authIntent: string;
   authContextName: string;
   returnScreenId: string;

package/templates/yoga-studio/tier5-src/wix-spaces-my-subscriptions/index.ts

@@ -9,7 +9,7 @@ interface S {
   status: "loading" | "ready";
   orders: Row[];
   emptyText: string;
-  /** When true, descriptor hides the guest-only "Go to Account" CTA (hiddenWhen). */
+  /** When true, descriptor hides the guest-only "Sign in" CTA (hiddenWhen). */
   hideAccountCta: boolean;
 }
 
@@ -19,7 +19,7 @@ function norm(o: WixPlanOrder): Row {
 }
 
 const EMPTY_MEMBER = "No subscriptions yet";
-const EMPTY_GUEST = "Sign in from Account to see subscriptions you’ve joined — we don’t invent sample memberships.";
+const EMPTY_GUEST = "Sign in to see the subscriptions you’ve joined — we don’t invent sample memberships.";
 const EMPTY_FORBIDDEN = "No subscriptions for this member yet.";
 
 /** The signed-in member's email, or "" for anyone else. A visitor's identity is