@wix/himalaya-cli 0.1524.0 → 0.1526.0

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

@@ -2707,8 +2707,10 @@ const SCREENS = runtimeSetting({
                                     "actionId": "himi.open",
                                     "params": {
                                       "screenId": "himi_sign_in",
-                                      "mode": "signin"
-                                    }
+                                      "mode": "signin",
+                                      "modal": "1"
+                                    },
+                                    "presentation": "sheet"
                                   }
                                 }
                               }
@@ -2726,8 +2728,10 @@ const SCREENS = runtimeSetting({
                                     "actionId": "himi.open",
                                     "params": {
                                       "screenId": "himi_sign_in",
-                                      "mode": "register"
-                                    }
+                                      "mode": "register",
+                                      "modal": "1"
+                                    },
+                                    "presentation": "sheet"
                                   }
                                 }
                               }
@@ -4091,6 +4095,8 @@ const SCREENS = runtimeSetting({
             "memberAccountLinks": "1",
             "restorePurchases": "1",
             "signInScreen": "himi_sign_in",
+            "signInPresentation": "sheet",
+            "signInReturnTab": "profile",
             "pollIdentity": "1",
             "cartCount": "1",
             "copy": "{\"account.subtitle\":\"Orders, bookings, RSVPs, memberships and saved content in one place.\",\"storeAccount.authBody\":\"Sign in to continue — cart, bookings, RSVPs and memberships stay with you.\",\"storeAccount.authBodyRegister\":\"Create a member account to continue — cart, bookings, RSVPs and memberships stay with you.\"}"
@@ -4366,8 +4372,10 @@ const SCREENS = runtimeSetting({
                             "params": {
                               "screenId": "himi_sign_in",
                               "mode": "signin",
-                              "returnScreenId": "himi_account_settings"
-                            }
+                              "returnScreenId": "himi_account_settings",
+                              "modal": "1"
+                            },
+                            "presentation": "sheet"
                           }
                         }
                       },
@@ -6277,8 +6285,7 @@ const SCREENS = runtimeSetting({
                           "style": "primary",
                           "fullWidth": true,
                           "action": {
-                            "actionId": "nav.back",
-                            "presentation": "back"
+                            "actionId": "tier5.himiStoreAccount.leave"
                           }
                         }
                       }
@@ -6319,7 +6326,7 @@ const SCREENS = runtimeSetting({
       "declaredCapabilities": [
         "wix_api"
       ],
-      "minBinaryVersion": "0.2.0",
+      "minBinaryVersion": "1.7.0",
       "bundleVersion": "0.0.1"
     }
   },
@@ -7186,8 +7193,10 @@ const SCREENS = runtimeSetting({
                               "screenId": "himi_sign_in",
                               "mode": "signin",
                               "intent": "profile",
-                              "returnScreenId": "himi_view_profile"
-                            }
+                              "returnScreenId": "himi_view_profile",
+                              "modal": "1"
+                            },
+                            "presentation": "sheet"
                           }
                         }
                       }
@@ -16013,8 +16022,10 @@ const SCREENS = runtimeSetting({
                               "screenId": "himi_sign_in",
                               "mode": "signin",
                               "intent": "orders",
-                              "returnScreenId": "himi_orders"
-                            }
+                              "returnScreenId": "himi_orders",
+                              "modal": "1"
+                            },
+                            "presentation": "sheet"
                           }
                         }
                       }
@@ -16647,8 +16658,10 @@ const SCREENS = runtimeSetting({
                               "screenId": "himi_sign_in",
                               "mode": "signin",
                               "intent": "addresses",
-                              "returnScreenId": "himi_addresses"
-                            }
+                              "returnScreenId": "himi_addresses",
+                              "modal": "1"
+                            },
+                            "presentation": "sheet"
                           }
                         }
                       }
@@ -17704,8 +17717,10 @@ const SCREENS = runtimeSetting({
                               "screenId": "himi_sign_in",
                               "mode": "signin",
                               "intent": "addresses",
-                              "returnScreenId": "himi_address"
-                            }
+                              "returnScreenId": "himi_address",
+                              "modal": "1"
+                            },
+                            "presentation": "sheet"
                           }
                         }
                       }
@@ -18375,8 +18390,10 @@ const SCREENS = runtimeSetting({
                               "screenId": "himi_sign_in",
                               "mode": "signin",
                               "intent": "wallet",
-                              "returnScreenId": "himi_wallet"
-                            }
+                              "returnScreenId": "himi_wallet",
+                              "modal": "1"
+                            },
+                            "presentation": "sheet"
                           }
                         }
                       }
@@ -18844,11 +18861,7 @@ const SCREENS = runtimeSetting({
                   "size": "sm",
                   "fullWidth": true,
                   "action": {
-                    "actionId": "himi.open",
-                    "params": {
-                      "screenId": "$service:himiPlaceSummary.ctaScreenId",
-                      "mode": "$service:himiPlaceSummary.ctaMode"
-                    }
+                    "actionId": "tier5.himiPlaceSummary.openCta"
                   }
                 }
               },
@@ -18889,7 +18902,8 @@ const SCREENS = runtimeSetting({
         "onAppear": {
           "actionId": "tier5.himiPlaceSummary.load",
           "params": {
-            "verticals": "[\"store\",\"bookings\",\"plans\",\"events\",\"blog\"]"
+            "verticals": "[\"store\",\"bookings\",\"plans\",\"events\",\"blog\"]",
+            "signInPresentation": "sheet"
           }
         }
       }
@@ -22162,8 +22176,10 @@ const SCREENS = runtimeSetting({
                                     "params": {
                                       "screenId": "himi_sign_in",
                                       "mode": "signin",
-                                      "returnScreenId": "himi_bookings"
-                                    }
+                                      "returnScreenId": "himi_bookings",
+                                      "modal": "1"
+                                    },
+                                    "presentation": "sheet"
                                   }
                                 }
                               }
@@ -25550,7 +25566,8 @@ const SCREENS = runtimeSetting({
         "onAppear": {
           "actionId": "tier5.himiBrandedAgenda.load",
           "params": {
-            "firstWeekday": "0"
+            "firstWeekday": "0",
+            "signInPresentation": "sheet"
           }
         }
       }
@@ -28607,8 +28624,10 @@ const SCREENS = runtimeSetting({
                     "actionId": "himi.open",
                     "params": {
                       "screenId": "himi_sign_in",
-                      "mode": "signin"
-                    }
+                      "mode": "signin",
+                      "modal": "1"
+                    },
+                    "presentation": "sheet"
                   }
                 }
               },
@@ -28993,8 +29012,10 @@ const SCREENS = runtimeSetting({
                               "screenId": "himi_sign_in",
                               "mode": "signin",
                               "intent": "post",
-                              "returnScreenId": "himi_create_post"
-                            }
+                              "returnScreenId": "himi_create_post",
+                              "modal": "1"
+                            },
+                            "presentation": "sheet"
                           }
                         }
                       }
@@ -37579,8 +37600,10 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                     "params": {
                       "screenId": "himi_sign_in",
                       "returnScreenId": "himi_order",
-                      "returnId": "$service:himiBrandedOrder.id"
-                    }
+                      "returnId": "$service:himiBrandedOrder.id",
+                      "modal": "1"
+                    },
+                    "presentation": "sheet"
                   }
                 }
               },
@@ -43007,8 +43030,10 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                     "params": {
                                       "screenId": "himi_sign_in",
                                       "mode": "signin",
-                                      "intent": "book"
-                                    }
+                                      "intent": "book",
+                                      "modal": "1"
+                                    },
+                                    "presentation": "sheet"
                                   }
                                 }
                               },
@@ -43033,8 +43058,10 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                     "params": {
                                       "screenId": "himi_sign_in",
                                       "mode": "signin",
-                                      "intent": "book"
-                                    }
+                                      "intent": "book",
+                                      "modal": "1"
+                                    },
+                                    "presentation": "sheet"
                                   }
                                 }
                               },
@@ -43059,8 +43086,10 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                     "params": {
                                       "screenId": "himi_sign_in",
                                       "mode": "signin",
-                                      "intent": "book"
-                                    }
+                                      "intent": "book",
+                                      "modal": "1"
+                                    },
+                                    "presentation": "sheet"
                                   }
                                 }
                               },
@@ -45076,8 +45105,10 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                             "params": {
                               "screenId": "himi_sign_in",
                               "mode": "signin",
-                              "intent": "rsvp"
-                            }
+                              "intent": "rsvp",
+                              "modal": "1"
+                            },
+                            "presentation": "sheet"
                           }
                         }
                       },

package/templates/gym-fitness/tier5-src/himi-branded-lite-agenda/index.ts

@@ -598,6 +598,9 @@ function initial(): S {
   };
 }
 
+/** How the app opens its sign-in screen, from the appear params ("" = push). */
+let signInPresentation: "" | "sheet" | "full_screen" = "";
+
 const svc = defineService<S, {
   load: (s: S, p?: unknown) => Promise<S | undefined>;
   retry: (s: S) => Promise<S | undefined>;
@@ -614,6 +617,8 @@ const svc = defineService<S, {
   actions: {
     load: async (s, p) => {
       stashCopy(p);
+      const presentation = argOf(p, "signInPresentation");
+      if (presentation === "sheet" || presentation === "full_screen") signInPresentation = presentation;
       const fw = Number(argOf(p, "firstWeekday") || s.firstWeekday);
       const today = dayKey(new Date());
       // First appearance: open on this week. A re-appearance keeps the member's place and
@@ -739,7 +744,10 @@ const svc = defineService<S, {
         const before = await memberAccess().catch(() => undefined);
         if (!before?.email) {
           busy = false;
-          return navigate(s, { screenId: "himi_sign_in", args: { mode: "signin", returnScreenId: "himi_agenda" } });
+          // As a modal it only closes, and this screen loads again (its re-appearance reload).
+          return navigate(s, signInPresentation
+            ? { screenId: "himi_sign_in", presentation: signInPresentation, args: { mode: "signin", modal: "1" } }
+            : { screenId: "himi_sign_in", args: { mode: "signin", returnScreenId: "himi_agenda" } });
         }
         const name = await memberName();
         const current = await memberAccess().catch(() => undefined);

package/templates/gym-fitness/tier5-src/himi-branded-lite-place-summary/index.ts

@@ -9,7 +9,7 @@
 // `load` is both the onAppear action and what an embed controller's `refresh()` runs (arg-less:
 // the stashed appear params keep the verticals and the copy pack), so a host that hears
 // `booking.created` / `booking.cancelled` re-reads the summary without a remount.
-import { defineService } from "@himalaya/state";
+import { defineService, navigate } from "@himalaya/state";
 import { listMyPlanOrders, type WixPlanOrder } from "@himalaya/wix-pricing-plans";
 import { fetchMemberBookings, type MemberBookingRow } from "../_shared/member-bookings.js";
 import { memberAccess, assertMemberAccess, memberAccessDenied, type MemberAccess } from "../_shared/member-access.js";
@@ -52,6 +52,7 @@ const PLANS_SCREEN = "himi_plans";
 const SIGN_IN_SCREEN = "himi_sign_in";
 
 let stashedVerticals: string[] | null = null;
+let signInPresentation: "sheet" | "full_screen" | undefined;
 let generation = 0;
 
 function appearVerticals(arg: unknown): string[] {
@@ -190,6 +191,8 @@ async function read(arg: unknown, again = true): Promise<PlaceSummaryState> {
  *  write back over the newer result. */
 async function load(_s: PlaceSummaryState, arg?: unknown): Promise<PlaceSummaryState | undefined> {
   stashCopy(arg);
+  const presentation = arg && typeof arg === "object" ? (arg as Record<string, unknown>).signInPresentation : undefined;
+  if (presentation === "sheet" || presentation === "full_screen") signInPresentation = presentation;
   const mine = ++generation;
   const next = await read(arg);
   return mine === generation ? next : undefined;
@@ -198,11 +201,19 @@ async function load(_s: PlaceSummaryState, arg?: unknown): Promise<PlaceSummaryS
 const svc = defineService<PlaceSummaryState, {
   load: (s: PlaceSummaryState, arg?: unknown) => Promise<PlaceSummaryState | undefined>;
   retry: (s: PlaceSummaryState) => Promise<PlaceSummaryState | undefined>;
+  openCta: (s: PlaceSummaryState) => PlaceSummaryState;
 }>("himiPlaceSummary", {
   state: BLANK,
   actions: {
     load,
     retry: (s) => load(s),
+    openCta: (s) => {
+      if (s.hideCta || !s.ctaScreenId) return s;
+      // No return path: the tile is embedded, so the form closes over its host.
+      return navigate(s, s.ctaScreenId === SIGN_IN_SCREEN && signInPresentation
+        ? { screenId: SIGN_IN_SCREEN, presentation: signInPresentation, args: { mode: "signin", modal: "1" } }
+        : { screenId: s.ctaScreenId, args: { mode: s.ctaMode } });
+    },
   },
 });
 export { svc };

package/templates/gym-fitness/tier5-src/himi-store-account/index.ts

@@ -26,6 +26,10 @@ interface AuthRouteInput {
   returnScreenId?: string;
   returnId?: string;
   returnChannelId?: string;
+  /** Standalone sign-in only: "1" when it was opened as a modal (sheet / cover). */
+  modal?: string;
+  /** Modal only: the tab whose stack the return screen opens on once the modal closes. */
+  returnTab?: string;
 }
 
 // The screen's boot input survives refresh; consuming it must survive too.
@@ -61,6 +65,12 @@ function authIntentFromArg(arg: unknown, prev: Pick<S, "authIntent" | "authConte
   };
 }
 
+/** How the standalone form leaves. A modal is closed: on web `back` pops the tab's stack,
+ *  not the modal. A pushed form goes back. */
+function leaveNav(): "dismiss" | "back" {
+  return routeInput().modal === "1" ? "dismiss" : "back";
+}
+
 /** Where a successful sign-in returns to, or null. Never Account itself — that would
  *  only push a second copy of the screen the member is already on. */
 function resumeTarget(s: Pick<S, "returnScreenId" | "returnId" | "returnChannelId">): { screenId: string; args?: Record<string, string> } | null {
@@ -78,11 +88,26 @@ function resumeTarget(s: Pick<S, "returnScreenId" | "returnId" | "returnChannelI
  *  On the standalone sign-in screen the target is pushed, not a `replace`: on iOS and
  *  Android `replace` resets the stack to its root, which would drop the screens the
  *  visitor came through. Back from the target shows the form again, and the form sends a
- *  member back on appear (settle). With no target the form goes back. */
+ *  member back on appear (settle). With no target the form goes back.
+ *
+ *  A modal form closes. A target pushed from here would open inside the modal (iOS, Android)
+ *  or under it (web), so a modal that names a `returnTab` hands the target to that tab: the
+ *  host closes the modal, then pushes it on that tab's stack (Account's member rows). A host
+ *  showing no such tab (a drawer, a narrow Mac window) drops that request whole, modal and
+ *  all, so the modal is also dismissed directly: it always closes, and the row opens where
+ *  the tab exists. With no `returnTab` it only closes, and the screen under it loads again —
+ *  the screen that opened the modal is the return target. */
 function resumeAfterAuth(next: S): S {
   const target = resumeTarget(next);
   if (!next.isMember) return next;
-  if (!target) return next.standalone ? navigate(next, { presentation: "back" }) : next;
+  const tab = routeInput().modal === "1" ? routeInput().returnTab ?? "" : "";
+  if (target && tab && next.standalone) {
+    routeInputConsumed = true;
+    void dispatch("himi.open", { presentation: "dismiss" });
+    const cleared = derive({ ...next, authIntent: "", authContextName: "", returnScreenId: "", returnId: "", returnChannelId: "" });
+    return navigate(cleared, target.args ? { tab, screenId: target.screenId, args: target.args } : { tab, screenId: target.screenId });
+  }
+  if (!target || routeInput().modal === "1") return next.standalone ? navigate(next, { presentation: leaveNav() }) : next;
   routeInputConsumed = true;
   const cleared = derive({ ...next, authIntent: "", authContextName: "", returnScreenId: "", returnId: "", returnChannelId: "" });
   return navigate(cleared, target);
@@ -96,11 +121,31 @@ function forwardToSignIn(next: S): S {
   if (!next.authIntent && !next.returnScreenId) return next;
   routeInputConsumed = true;
   const args: Record<string, string> = { mode: "signin" };
-  for (const key of ["authIntent", "authContextName", "returnScreenId", "returnId", "returnChannelId"] as const) {
-    if (next[key]) args[key === "authIntent" ? "intent" : key === "authContextName" ? "contextName" : key] = next[key];
+  for (const key of ["authIntent", "authContextName"] as const) {
+    if (next[key]) args[key === "authIntent" ? "intent" : "contextName"] = next[key];
+  }
+  return openSignIn(derive({ ...next, authIntent: "", authContextName: "", returnScreenId: "", returnId: "", returnChannelId: "" }),
+    args, resumeTarget(next));
+}
+
+/** Account sends a guest to the standalone sign-in screen, with `after`, the member screen to
+ *  open once signed in. With a `signInPresentation` appear param it opens as that modal, and
+ *  `after` goes on Account's own tab (`signInReturnTab`) when the modal closes; pushed, the form
+ *  pushes `after` itself (resumeAfterAuth). */
+function openSignIn(next: S, args: Record<string, string>, after: { screenId: string; args?: Record<string, string> } | null): S {
+  const screenId = next.signInScreen || "himi_sign_in";
+  const presentation = signInPresentationRequested;
+  const back: Record<string, string> = {};
+  if (after) {
+    back.returnScreenId = after.screenId;
+    if (after.args?.id) back.returnId = after.args.id;
+    if (after.args?.channelId) back.returnChannelId = after.args.channelId;
   }
-  return navigate(derive({ ...next, authIntent: "", authContextName: "", returnScreenId: "", returnId: "", returnChannelId: "" }),
-    { screenId: next.signInScreen, args });
+  if (!presentation) return navigate(next, { screenId, args: { ...args, ...back } });
+  const modalArgs: Record<string, string> = { ...args, modal: "1" };
+  // With no tab to open it on, a modal has no way to the member screen: it only closes.
+  if (after && signInReturnTabRequested) Object.assign(modalArgs, back, { returnTab: signInReturnTabRequested });
+  return navigate(next, { screenId, presentation, args: modalArgs });
 }
 
 /** After a load: the standalone sign-in screen sends a member back (a stale link, or a
@@ -128,8 +173,11 @@ function settle(next: S, arg: unknown, latest = true): S {
     // The appear refresh returns `_nav`, which every host applies — binaries from before
     // worker nav dispatch included. Only an arg-less load, whose result iOS
     // discards, dispatches.
-    if (strField(arg, "standalone") === "1") return navigate(cleared, { presentation: "back" });
-    void dispatch("himi.open", { presentation: "back" });
+    if (strField(arg, "standalone") === "1") return navigate(cleared, { presentation: leaveNav() });
+    // Not from a modal: nothing pushed over it comes back to it, and on iOS the closing modal's
+    // own screen reloads here once, after it has asked to close — a late dismiss would close
+    // whatever modal is open by then.
+    if (routeInput().modal !== "1") void dispatch("himi.open", { presentation: leaveNav() });
     return cleared;
   }
   // Account forwards only on an appear refresh: the boot `load()` has no params and its
@@ -180,6 +228,10 @@ let appliedSeq = 0;
 // The appear params belong to the worker session too, like the two flags above: a probe
 // dropped because the visitor typed must not take them with it.
 let signInScreenRequested = "";
+/** Account only: how it opens the standalone sign-in screen ("" = push). */
+let signInPresentationRequested: "" | "sheet" | "full_screen" = "";
+/** Account only: its tab, where a member screen opens after a modal sign-in. */
+let signInReturnTabRequested = "";
 let standaloneRequested = false;
 let pollIdentityRequested = false;
 // Bumped by every mode switch, so a dropped probe never puts back a mode the visitor left.
@@ -210,6 +262,9 @@ function appearConfig(s: S, arg: unknown): AppearConfig {
     passwordDraft = "";
   }
   signInScreenRequested ||= strField(arg, "signInScreen") || s.signInScreen;
+  const presentation = strField(arg, "signInPresentation");
+  if (presentation === "sheet" || presentation === "full_screen") signInPresentationRequested = presentation;
+  signInReturnTabRequested ||= strField(arg, "signInReturnTab");
   // Only the sign-in screen's route carries `mode`, so it marks the form from the boot load on.
   standaloneRequested ||= s.standalone || appearing || (!routeInputConsumed && !!routeInput().mode);
   pollIdentityRequested ||= s.pollIdentity || strField(arg, "pollIdentity") === "1";
@@ -676,6 +731,7 @@ const svc = defineService<S, {
   signOut: (s: S) => Promise<S>;
   sync: (s: S) => Promise<S | undefined>;
   openMember: (s: S, arg?: unknown) => Promise<S>;
+  leave: (s: S) => S;
   restorePublish: (s: S) => S;
   iapRestore: (s: S) => Promise<undefined>;
 }>("himiStoreAccount", {
@@ -756,7 +812,8 @@ const svc = defineService<S, {
       return "next" in r ? r.next : undefined;
     },
     // A row to a member-only screen shows to a guest too. A member opens it; a guest signs
-    // in first and the sign-in screen replaces itself with it, so Back returns here.
+    // in first, and the sign-in screen then opens the row's screen — as a modal, by closing
+    // and pushing it on this tab (openSignIn) — so Back returns here either way.
     openMember: async (s, arg): Promise<S> => {
       const screenId = strField(arg, "screenId");
       if (!screenId) return s;
@@ -764,8 +821,10 @@ const svc = defineService<S, {
       // From the state as it is now: a probe may have landed during the identity read.
       const now = svc.getState();
       if (member) return navigate(now, { screenId });
-      return navigate(now, { screenId: now.signInScreen || "himi_sign_in", args: { mode: "signin", returnScreenId: screenId } });
+      return openSignIn(now, { mode: "signin" }, { screenId });
     },
+    // The standalone form's Continue: leaves the form the way it was opened.
+    leave: (s) => navigate(s, { presentation: leaveNav() }),
     // Typing means any focus request was delivered: clear the tokens (safe while mounted, since
     // bumpToken never repeats), so a visit rarely ends — and a pooled form rarely reopens —
     // holding one.