@wix/himalaya-cli 0.1616.0 → 0.1618.0

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

@@ -14,6 +14,7 @@ import { dispatch } from "@himalaya/dispatch";
 import { getCurrentCart, searchOrders, type WixOrder } from "@himalaya/wix-ecom";
 import { guestProfile, loadMemberProfile, signedInEmail, strOf, fmtDate, titleCase, type AccountActivityRow } from "../_shared/himi-account";
 import { stashCopy, copyParam, copyTemplate } from "../_shared/himi-copy.js";
+import { signInPageStyle, signInSheetStyle } from "../_shared/sign-in-sheet.js";
 import { memberAccountRoutes } from "../_shared/member-account-routes.js";
 import { createIapCommerce, onlineProgramOrders, pricingPlanOrders, storesAppleSalesEnabled, storesProductOrders } from "@himalaya/iap-checkout";
 import { IAP_RESTORE_KEYS, NO_IAP_RESTORE, createIapRestore, resetUnhydratedKeysOnOlderRuntime, type IapRestoreFields } from "../_shared/iap-worker.js";
@@ -143,7 +144,7 @@ function openSignIn(next: S, args: Record<string, string>, after: { screenId: st
     if (after.args?.channelId) back.returnChannelId = after.args.channelId;
   }
   if (!presentation) return navigate(next, { screenId, args: { ...args, ...back } });
-  const modalArgs: Record<string, string> = { ...args, modal: "1" };
+  const modalArgs: Record<string, string> = { ...args, modal: "1", ...signInSheetStyle(presentation, signInStyleRequested) };
   // 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 });
@@ -231,6 +232,8 @@ let appliedSeq = 0;
 let signInScreenRequested = "";
 /** Account only: how it opens the standalone sign-in screen ("" = push). */
 let signInPresentationRequested: "" | "sheet" | "full_screen" = "";
+/** Account only: `signInSheetStyle`, "page" when the app opens that sheet as a full page. */
+let signInStyleRequested: "page" | "" = "";
 /** Account only: its tab, where a member screen opens after a modal sign-in. */
 let signInReturnTabRequested = "";
 let standaloneRequested = false;
@@ -268,7 +271,10 @@ function appearConfig(s: S, arg: unknown): AppearConfig {
   }
   signInScreenRequested ||= strField(arg, "signInScreen") || s.signInScreen;
   const presentation = strField(arg, "signInPresentation");
-  if (presentation === "sheet" || presentation === "full_screen") signInPresentationRequested = presentation;
+  if (presentation === "sheet" || presentation === "full_screen") {
+    signInPresentationRequested = presentation;
+    signInStyleRequested = signInPageStyle(strField(arg, "signInSheetStyle"));
+  }
   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);

package/templates/retail-store/dev/index.ts

@@ -1946,7 +1946,8 @@ const SCREENS = runtimeSetting({
                                     "params": {
                                       "screenId": "himi_sign_in",
                                       "mode": "signin",
-                                      "modal": "1"
+                                      "modal": "1",
+                                      "sheetStyle": "page"
                                     },
                                     "presentation": "sheet"
                                   }
@@ -1967,7 +1968,8 @@ const SCREENS = runtimeSetting({
                                     "params": {
                                       "screenId": "himi_sign_in",
                                       "mode": "register",
-                                      "modal": "1"
+                                      "modal": "1",
+                                      "sheetStyle": "page"
                                     },
                                     "presentation": "sheet"
                                   }
@@ -3172,6 +3174,7 @@ const SCREENS = runtimeSetting({
             "restorePurchases": "1",
             "signInScreen": "himi_sign_in",
             "signInPresentation": "sheet",
+            "signInSheetStyle": "page",
             "signInReturnTab": "profile",
             "pollIdentity": "1",
             "cartCount": "1",
@@ -3449,7 +3452,8 @@ const SCREENS = runtimeSetting({
                               "screenId": "himi_sign_in",
                               "mode": "signin",
                               "returnScreenId": "himi_account_settings",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -6469,7 +6473,8 @@ const SCREENS = runtimeSetting({
                             "params": {
                               "screenId": "himi_sign_in",
                               "returnScreenId": "himi_notif_settings",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -6864,7 +6869,8 @@ const SCREENS = runtimeSetting({
                               "mode": "signin",
                               "intent": "profile",
                               "returnScreenId": "himi_view_profile",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -16375,7 +16381,8 @@ const SCREENS = runtimeSetting({
                               "mode": "signin",
                               "intent": "orders",
                               "returnScreenId": "himi_orders",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -17112,7 +17119,8 @@ const SCREENS = runtimeSetting({
                               "mode": "signin",
                               "intent": "addresses",
                               "returnScreenId": "himi_addresses",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -18171,7 +18179,8 @@ const SCREENS = runtimeSetting({
                               "mode": "signin",
                               "intent": "addresses",
                               "returnScreenId": "himi_address",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -18844,7 +18853,8 @@ const SCREENS = runtimeSetting({
                               "mode": "signin",
                               "intent": "wallet",
                               "returnScreenId": "himi_wallet",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -19068,7 +19078,8 @@ const SCREENS = runtimeSetting({
                               "mode": "signin",
                               "intent": "post",
                               "returnScreenId": "himi_create_post",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -23398,7 +23409,8 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                       "screenId": "himi_sign_in",
                       "returnScreenId": "himi_order",
                       "returnId": "$service:himiBrandedOrder.id",
-                      "modal": "1"
+                      "modal": "1",
+                      "sheetStyle": "page"
                     },
                     "presentation": "sheet"
                   }
@@ -25337,7 +25349,8 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                             "params": {
                               "screenId": "himi_sign_in",
                               "mode": "signin",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }

package/templates/retail-store/tier5-src/_shared/sign-in-sheet.ts

@@ -0,0 +1,18 @@
+// A sign-in sheet can be a form page rather than a drawer. `sheetStyle: "page"` keeps the iOS sheet
+// and opens a full-screen modal on Android and web, whose sheet is a bottom drawer. A host older
+// than the param ignores it and draws its own sheet.
+//
+// Opt-in per app: the app passes `signInSheetStyle: "page"` beside `signInPresentation`. These
+// workers are shared (Salon & Spa runs them too), and an app that opens its other sign-ins as a
+// plain sheet must not get a page from some of them and a drawer from the rest.
+
+/** The app's `signInSheetStyle` param, read beside `signInPresentation`: "page", else "". */
+export function signInPageStyle(value: unknown): "page" | "" {
+  return value === "page" ? "page" : "";
+}
+
+/** The nav args a sign-in opened with `presentation` adds: `sheetStyle` on a sheet the app asked
+ *  to open as a page, else none. */
+export function signInSheetStyle(presentation: string | undefined, style: "page" | ""): { sheetStyle?: "page" } {
+  return presentation === "sheet" && style === "page" ? { sheetStyle: "page" } : {};
+}

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

@@ -14,6 +14,7 @@ import { dispatch } from "@himalaya/dispatch";
 import { getCurrentCart, searchOrders, type WixOrder } from "@himalaya/wix-ecom";
 import { guestProfile, loadMemberProfile, signedInEmail, strOf, fmtDate, titleCase, type AccountActivityRow } from "../_shared/himi-account";
 import { stashCopy, copyParam, copyTemplate } from "../_shared/himi-copy.js";
+import { signInPageStyle, signInSheetStyle } from "../_shared/sign-in-sheet.js";
 import { memberAccountRoutes } from "../_shared/member-account-routes.js";
 import { createIapCommerce, onlineProgramOrders, pricingPlanOrders, storesAppleSalesEnabled, storesProductOrders } from "@himalaya/iap-checkout";
 import { IAP_RESTORE_KEYS, NO_IAP_RESTORE, createIapRestore, resetUnhydratedKeysOnOlderRuntime, type IapRestoreFields } from "../_shared/iap-worker.js";
@@ -143,7 +144,7 @@ function openSignIn(next: S, args: Record<string, string>, after: { screenId: st
     if (after.args?.channelId) back.returnChannelId = after.args.channelId;
   }
   if (!presentation) return navigate(next, { screenId, args: { ...args, ...back } });
-  const modalArgs: Record<string, string> = { ...args, modal: "1" };
+  const modalArgs: Record<string, string> = { ...args, modal: "1", ...signInSheetStyle(presentation, signInStyleRequested) };
   // 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 });
@@ -231,6 +232,8 @@ let appliedSeq = 0;
 let signInScreenRequested = "";
 /** Account only: how it opens the standalone sign-in screen ("" = push). */
 let signInPresentationRequested: "" | "sheet" | "full_screen" = "";
+/** Account only: `signInSheetStyle`, "page" when the app opens that sheet as a full page. */
+let signInStyleRequested: "page" | "" = "";
 /** Account only: its tab, where a member screen opens after a modal sign-in. */
 let signInReturnTabRequested = "";
 let standaloneRequested = false;
@@ -268,7 +271,10 @@ function appearConfig(s: S, arg: unknown): AppearConfig {
   }
   signInScreenRequested ||= strField(arg, "signInScreen") || s.signInScreen;
   const presentation = strField(arg, "signInPresentation");
-  if (presentation === "sheet" || presentation === "full_screen") signInPresentationRequested = presentation;
+  if (presentation === "sheet" || presentation === "full_screen") {
+    signInPresentationRequested = presentation;
+    signInStyleRequested = signInPageStyle(strField(arg, "signInSheetStyle"));
+  }
   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);

package/templates/salon-spa/tier5-src/_shared/sign-in-sheet.ts

@@ -0,0 +1,18 @@
+// A sign-in sheet can be a form page rather than a drawer. `sheetStyle: "page"` keeps the iOS sheet
+// and opens a full-screen modal on Android and web, whose sheet is a bottom drawer. A host older
+// than the param ignores it and draws its own sheet.
+//
+// Opt-in per app: the app passes `signInSheetStyle: "page"` beside `signInPresentation`. These
+// workers are shared (Salon & Spa runs them too), and an app that opens its other sign-ins as a
+// plain sheet must not get a page from some of them and a drawer from the rest.
+
+/** The app's `signInSheetStyle` param, read beside `signInPresentation`: "page", else "". */
+export function signInPageStyle(value: unknown): "page" | "" {
+  return value === "page" ? "page" : "";
+}
+
+/** The nav args a sign-in opened with `presentation` adds: `sheetStyle` on a sheet the app asked
+ *  to open as a page, else none. */
+export function signInSheetStyle(presentation: string | undefined, style: "page" | ""): { sheetStyle?: "page" } {
+  return presentation === "sheet" && style === "page" ? { sheetStyle: "page" } : {};
+}

package/templates/salon-spa/tier5-src/himi-booking-service/index.ts

@@ -13,6 +13,7 @@ import { addDays, dayKey, dayLabel, timeLabel } from "@himalaya/time";
 import { getService, queryServiceAvailability, registerToWaitlist, type WixAvailabilityEntry, type WixService, type WixServiceAddress, type WixServiceBookingPolicy } from "@himalaya/wix-bookings";
 import { getMyMember } from "@himalaya/wix-members";
 import { memberAccess, type MemberAccess } from "../_shared/member-access.js";
+import { signInPageStyle, signInSheetStyle } from "../_shared/sign-in-sheet.js";
 import { placesIn, sessionControl, sessionOf, type MemberPlace, type Session, type SessionControl } from "../_shared/booking-session.js";
 import { categoryName, courseDatesText, courseReadWindows, courseSessionsAvailability, courseWindowOpen, serviceDurationText, servicePriceLine, slotStartInstant, type BookingLabel, type ServicePriceLine } from "../_shared/himi-bookings.js";
 import { formatServiceMoney, serviceCurrency } from "../_shared/wix-service-price.js";
@@ -723,10 +724,14 @@ const sameMember = (a: MemberAccess | undefined, b: MemberAccess | undefined): b
  *  appear (or tap) params — Branded Lite passes `himi_sign_in` as a sheet. */
 let signInScreenId = "";
 let signInPresentation: "" | "sheet" | "full_screen" = "";
+let signInStyle: "page" | "" = "";
 function rememberSignIn(arg: unknown): void {
-  const a = (arg ?? {}) as { signInScreenId?: unknown; signInPresentation?: unknown };
+  const a = (arg ?? {}) as { signInScreenId?: unknown; signInPresentation?: unknown; signInSheetStyle?: unknown };
   if (typeof a.signInScreenId === "string" && a.signInScreenId.trim()) signInScreenId = a.signInScreenId.trim();
-  if (a.signInPresentation === "sheet" || a.signInPresentation === "full_screen") signInPresentation = a.signInPresentation;
+  if (a.signInPresentation === "sheet" || a.signInPresentation === "full_screen") {
+    signInPresentation = a.signInPresentation;
+    signInStyle = signInPageStyle(a.signInSheetStyle);
+  }
 }
 
 // ---- State -----------------------------------------------------------------------
@@ -1130,7 +1135,7 @@ const svc = defineService<S, {
           // joins the waitlist itself. A sign-in sheet only closes, and this screen loads again.
           if (!signInScreenId) return navigate(s, { screenId: "himi_time", args: { id: s.id, start: s.sessionStart, sessionId: s.sessionId } });
           return navigate(s, signInPresentation
-            ? { screenId: signInScreenId, presentation: signInPresentation, args: { mode: "signin", modal: "1" } }
+            ? { screenId: signInScreenId, presentation: signInPresentation, args: { mode: "signin", modal: "1", ...signInSheetStyle(signInPresentation, signInStyle) } }
             : { screenId: signInScreenId, args: { mode: "signin" } });
         }
         const name = await memberName();

package/templates/salon-spa/tier5-src/himi-branded-lite-agenda/index.ts

@@ -28,6 +28,7 @@ import {
   queryServices, registerToWaitlist, type WixAvailabilityEntry, type WixBooking, type WixService,
 } from "@himalaya/wix-bookings";
 import { getMyMember } from "@himalaya/wix-members";
+import { signInPageStyle, signInSheetStyle } from "../_shared/sign-in-sheet.js";
 import { LOADING, loadFailed, type LoadFlags } from "../_shared/branded-load-state.js";
 import { copyParam, copyTemplate, stashCopy } from "../_shared/himi-copy.js";
 import { slotStartInstant } from "../_shared/himi-bookings.js";
@@ -650,6 +651,7 @@ async function settled(next: S | undefined): Promise<S | undefined> {
 
 /** How the app opens its sign-in screen, from the appear params ("" = push). */
 let signInPresentation: "" | "sheet" | "full_screen" = "";
+let signInStyle: "page" | "" = "";
 /** The app's sign-in screen (`signInScreenId` appear param): Branded Lite's `himi_sign_in` by
  *  default; an app with no such screen names its own (salon-spa: the Profile tab, `himi_account`). */
 let signInScreenId = "himi_sign_in";
@@ -680,7 +682,10 @@ const svc = defineService<S, {
     load: async (s, p) => {
       stashCopy(p);
       const presentation = argOf(p, "signInPresentation");
-      if (presentation === "sheet" || presentation === "full_screen") signInPresentation = presentation;
+      if (presentation === "sheet" || presentation === "full_screen") {
+        signInPresentation = presentation;
+        signInStyle = signInPageStyle(argOf(p, "signInSheetStyle"));
+      }
       const signInScreen = argOf(p, "signInScreenId");
       if (/^[a-z][a-z0-9_]{0,63}$/.test(signInScreen)) signInScreenId = signInScreen;
       const fw = Number(argOf(p, "firstWeekday") || s.firstWeekday);
@@ -883,7 +888,7 @@ const svc = defineService<S, {
           busy = false;
           // As a modal it only closes, and this screen loads again (its re-appearance reload).
           return navigate(s, signInPresentation
-            ? { screenId: signInScreenId, presentation: signInPresentation, args: { mode: "signin", modal: "1" } }
+            ? { screenId: signInScreenId, presentation: signInPresentation, args: { mode: "signin", modal: "1", ...signInSheetStyle(signInPresentation, signInStyle) } }
             : { screenId: signInScreenId, args: { mode: "signin", returnScreenId: "himi_agenda" } });
         }
         const name = await memberName();

package/templates/salon-spa/tier5-src/himi-store-account/index.ts

@@ -14,6 +14,7 @@ import { dispatch } from "@himalaya/dispatch";
 import { getCurrentCart, searchOrders, type WixOrder } from "@himalaya/wix-ecom";
 import { guestProfile, loadMemberProfile, signedInEmail, strOf, fmtDate, titleCase, type AccountActivityRow } from "../_shared/himi-account";
 import { stashCopy, copyParam, copyTemplate } from "../_shared/himi-copy.js";
+import { signInPageStyle, signInSheetStyle } from "../_shared/sign-in-sheet.js";
 import { memberAccountRoutes } from "../_shared/member-account-routes.js";
 import { createIapCommerce, onlineProgramOrders, pricingPlanOrders, storesAppleSalesEnabled, storesProductOrders } from "@himalaya/iap-checkout";
 import { IAP_RESTORE_KEYS, NO_IAP_RESTORE, createIapRestore, resetUnhydratedKeysOnOlderRuntime, type IapRestoreFields } from "../_shared/iap-worker.js";
@@ -143,7 +144,7 @@ function openSignIn(next: S, args: Record<string, string>, after: { screenId: st
     if (after.args?.channelId) back.returnChannelId = after.args.channelId;
   }
   if (!presentation) return navigate(next, { screenId, args: { ...args, ...back } });
-  const modalArgs: Record<string, string> = { ...args, modal: "1" };
+  const modalArgs: Record<string, string> = { ...args, modal: "1", ...signInSheetStyle(presentation, signInStyleRequested) };
   // 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 });
@@ -231,6 +232,8 @@ let appliedSeq = 0;
 let signInScreenRequested = "";
 /** Account only: how it opens the standalone sign-in screen ("" = push). */
 let signInPresentationRequested: "" | "sheet" | "full_screen" = "";
+/** Account only: `signInSheetStyle`, "page" when the app opens that sheet as a full page. */
+let signInStyleRequested: "page" | "" = "";
 /** Account only: its tab, where a member screen opens after a modal sign-in. */
 let signInReturnTabRequested = "";
 let standaloneRequested = false;
@@ -268,7 +271,10 @@ function appearConfig(s: S, arg: unknown): AppearConfig {
   }
   signInScreenRequested ||= strField(arg, "signInScreen") || s.signInScreen;
   const presentation = strField(arg, "signInPresentation");
-  if (presentation === "sheet" || presentation === "full_screen") signInPresentationRequested = presentation;
+  if (presentation === "sheet" || presentation === "full_screen") {
+    signInPresentationRequested = presentation;
+    signInStyleRequested = signInPageStyle(strField(arg, "signInSheetStyle"));
+  }
   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);

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

@@ -2904,7 +2904,8 @@ const SCREENS = runtimeSetting({
                                     "params": {
                                       "screenId": "himi_sign_in",
                                       "mode": "signin",
-                                      "modal": "1"
+                                      "modal": "1",
+                                      "sheetStyle": "page"
                                     },
                                     "presentation": "sheet"
                                   }
@@ -2925,7 +2926,8 @@ const SCREENS = runtimeSetting({
                                     "params": {
                                       "screenId": "himi_sign_in",
                                       "mode": "register",
-                                      "modal": "1"
+                                      "modal": "1",
+                                      "sheetStyle": "page"
                                     },
                                     "presentation": "sheet"
                                   }
@@ -4210,6 +4212,7 @@ const SCREENS = runtimeSetting({
             "restorePurchases": "1",
             "signInScreen": "himi_sign_in",
             "signInPresentation": "sheet",
+            "signInSheetStyle": "page",
             "signInReturnTab": "profile",
             "pollIdentity": "1",
             "copy": "{\"account.subtitle\":\"Bookings, RSVPs, memberships, programs and saved content in one place.\",\"storeAccount.authBody\":\"Sign in to continue — bookings, RSVPs, memberships and programs stay with you.\",\"storeAccount.authBodyRegister\":\"Create a member account to continue — bookings, RSVPs, memberships and programs stay with you.\"}"
@@ -4467,7 +4470,8 @@ const SCREENS = runtimeSetting({
                               "screenId": "himi_sign_in",
                               "mode": "signin",
                               "returnScreenId": "himi_account_settings",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -7487,7 +7491,8 @@ const SCREENS = runtimeSetting({
                             "params": {
                               "screenId": "himi_sign_in",
                               "returnScreenId": "himi_notif_settings",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -7882,7 +7887,8 @@ const SCREENS = runtimeSetting({
                               "mode": "signin",
                               "intent": "profile",
                               "returnScreenId": "himi_view_profile",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -8950,7 +8956,8 @@ const SCREENS = runtimeSetting({
                               "mode": "signin",
                               "intent": "wallet",
                               "returnScreenId": "himi_wallet",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -9462,7 +9469,8 @@ const SCREENS = runtimeSetting({
           "actionId": "tier5.himiPlaceSummary.load",
           "params": {
             "verticals": "[\"bookings\",\"programs\",\"plans\",\"events\",\"blog\"]",
-            "signInPresentation": "sheet"
+            "signInPresentation": "sheet",
+            "signInSheetStyle": "page"
           }
         }
       }
@@ -12366,7 +12374,8 @@ const SCREENS = runtimeSetting({
                       "screenId": "himi_sign_in",
                       "mode": "signin",
                       "returnScreenId": "himi_bookings",
-                      "modal": "1"
+                      "modal": "1",
+                      "sheetStyle": "page"
                     },
                     "presentation": "sheet"
                   },
@@ -15479,7 +15488,8 @@ const SCREENS = runtimeSetting({
           "actionId": "tier5.himiBrandedAgenda.load",
           "params": {
             "firstWeekday": "0",
-            "signInPresentation": "sheet"
+            "signInPresentation": "sheet",
+            "signInSheetStyle": "page"
           }
         }
       }
@@ -19074,7 +19084,8 @@ const SCREENS = runtimeSetting({
                               "mode": "signin",
                               "intent": "programs",
                               "returnScreenId": "himi_member_programs",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -22067,7 +22078,8 @@ const SCREENS = runtimeSetting({
                     "params": {
                       "screenId": "himi_sign_in",
                       "mode": "signin",
-                      "modal": "1"
+                      "modal": "1",
+                      "sheetStyle": "page"
                     },
                     "presentation": "sheet"
                   }
@@ -22455,7 +22467,8 @@ const SCREENS = runtimeSetting({
                               "mode": "signin",
                               "intent": "post",
                               "returnScreenId": "himi_create_post",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -26234,7 +26247,8 @@ const SCREENS = runtimeSetting({
                             "params": {
                               "screenId": "himi_sign_in",
                               "mode": "signin",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -32241,7 +32255,8 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
           "actionId": "tier5.himiBookingService.load",
           "params": {
             "signInScreenId": "himi_sign_in",
-            "signInPresentation": "sheet"
+            "signInPresentation": "sheet",
+            "signInSheetStyle": "page"
           }
         }
       }
@@ -35469,7 +35484,8 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                                       "screenId": "himi_sign_in",
                                       "mode": "signin",
                                       "intent": "book",
-                                      "modal": "1"
+                                      "modal": "1",
+                                      "sheetStyle": "page"
                                     },
                                     "presentation": "sheet"
                                   }
@@ -36222,7 +36238,8 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
         "onAppear": {
           "actionId": "tier5.himiBrandedProgram.load",
           "params": {
-            "signInPresentation": "sheet"
+            "signInPresentation": "sheet",
+            "signInSheetStyle": "page"
           }
         }
       }
@@ -39503,7 +39520,8 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                               "screenId": "himi_sign_in",
                               "mode": "signin",
                               "intent": "rsvp",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -39819,7 +39837,8 @@ const TEMPLATED: { pattern: string; display: string; liveSeed?: LiveSeed; static
                             "params": {
                               "screenId": "himi_sign_in",
                               "mode": "signin",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }

package/templates/yoga-studio/tier5-src/_shared/sign-in-sheet.ts

@@ -0,0 +1,18 @@
+// A sign-in sheet can be a form page rather than a drawer. `sheetStyle: "page"` keeps the iOS sheet
+// and opens a full-screen modal on Android and web, whose sheet is a bottom drawer. A host older
+// than the param ignores it and draws its own sheet.
+//
+// Opt-in per app: the app passes `signInSheetStyle: "page"` beside `signInPresentation`. These
+// workers are shared (Salon & Spa runs them too), and an app that opens its other sign-ins as a
+// plain sheet must not get a page from some of them and a drawer from the rest.
+
+/** The app's `signInSheetStyle` param, read beside `signInPresentation`: "page", else "". */
+export function signInPageStyle(value: unknown): "page" | "" {
+  return value === "page" ? "page" : "";
+}
+
+/** The nav args a sign-in opened with `presentation` adds: `sheetStyle` on a sheet the app asked
+ *  to open as a page, else none. */
+export function signInSheetStyle(presentation: string | undefined, style: "page" | ""): { sheetStyle?: "page" } {
+  return presentation === "sheet" && style === "page" ? { sheetStyle: "page" } : {};
+}

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

@@ -13,6 +13,7 @@ import { addDays, dayKey, dayLabel, timeLabel } from "@himalaya/time";
 import { getService, queryServiceAvailability, registerToWaitlist, type WixAvailabilityEntry, type WixService, type WixServiceAddress, type WixServiceBookingPolicy } from "@himalaya/wix-bookings";
 import { getMyMember } from "@himalaya/wix-members";
 import { memberAccess, type MemberAccess } from "../_shared/member-access.js";
+import { signInPageStyle, signInSheetStyle } from "../_shared/sign-in-sheet.js";
 import { placesIn, sessionControl, sessionOf, type MemberPlace, type Session, type SessionControl } from "../_shared/booking-session.js";
 import { categoryName, courseDatesText, courseReadWindows, courseSessionsAvailability, courseWindowOpen, serviceDurationText, servicePriceLine, slotStartInstant, type BookingLabel, type ServicePriceLine } from "../_shared/himi-bookings.js";
 import { formatServiceMoney, serviceCurrency } from "../_shared/wix-service-price.js";
@@ -723,10 +724,14 @@ const sameMember = (a: MemberAccess | undefined, b: MemberAccess | undefined): b
  *  appear (or tap) params — Branded Lite passes `himi_sign_in` as a sheet. */
 let signInScreenId = "";
 let signInPresentation: "" | "sheet" | "full_screen" = "";
+let signInStyle: "page" | "" = "";
 function rememberSignIn(arg: unknown): void {
-  const a = (arg ?? {}) as { signInScreenId?: unknown; signInPresentation?: unknown };
+  const a = (arg ?? {}) as { signInScreenId?: unknown; signInPresentation?: unknown; signInSheetStyle?: unknown };
   if (typeof a.signInScreenId === "string" && a.signInScreenId.trim()) signInScreenId = a.signInScreenId.trim();
-  if (a.signInPresentation === "sheet" || a.signInPresentation === "full_screen") signInPresentation = a.signInPresentation;
+  if (a.signInPresentation === "sheet" || a.signInPresentation === "full_screen") {
+    signInPresentation = a.signInPresentation;
+    signInStyle = signInPageStyle(a.signInSheetStyle);
+  }
 }
 
 // ---- State -----------------------------------------------------------------------
@@ -1130,7 +1135,7 @@ const svc = defineService<S, {
           // joins the waitlist itself. A sign-in sheet only closes, and this screen loads again.
           if (!signInScreenId) return navigate(s, { screenId: "himi_time", args: { id: s.id, start: s.sessionStart, sessionId: s.sessionId } });
           return navigate(s, signInPresentation
-            ? { screenId: signInScreenId, presentation: signInPresentation, args: { mode: "signin", modal: "1" } }
+            ? { screenId: signInScreenId, presentation: signInPresentation, args: { mode: "signin", modal: "1", ...signInSheetStyle(signInPresentation, signInStyle) } }
             : { screenId: signInScreenId, args: { mode: "signin" } });
         }
         const name = await memberName();

package/templates/yoga-studio/tier5-src/himi-branded-lite-agenda/index.ts

@@ -28,6 +28,7 @@ import {
   queryServices, registerToWaitlist, type WixAvailabilityEntry, type WixBooking, type WixService,
 } from "@himalaya/wix-bookings";
 import { getMyMember } from "@himalaya/wix-members";
+import { signInPageStyle, signInSheetStyle } from "../_shared/sign-in-sheet.js";
 import { LOADING, loadFailed, type LoadFlags } from "../_shared/branded-load-state.js";
 import { copyParam, copyTemplate, stashCopy } from "../_shared/himi-copy.js";
 import { slotStartInstant } from "../_shared/himi-bookings.js";
@@ -650,6 +651,7 @@ async function settled(next: S | undefined): Promise<S | undefined> {
 
 /** How the app opens its sign-in screen, from the appear params ("" = push). */
 let signInPresentation: "" | "sheet" | "full_screen" = "";
+let signInStyle: "page" | "" = "";
 /** The app's sign-in screen (`signInScreenId` appear param): Branded Lite's `himi_sign_in` by
  *  default; an app with no such screen names its own (salon-spa: the Profile tab, `himi_account`). */
 let signInScreenId = "himi_sign_in";
@@ -680,7 +682,10 @@ const svc = defineService<S, {
     load: async (s, p) => {
       stashCopy(p);
       const presentation = argOf(p, "signInPresentation");
-      if (presentation === "sheet" || presentation === "full_screen") signInPresentation = presentation;
+      if (presentation === "sheet" || presentation === "full_screen") {
+        signInPresentation = presentation;
+        signInStyle = signInPageStyle(argOf(p, "signInSheetStyle"));
+      }
       const signInScreen = argOf(p, "signInScreenId");
       if (/^[a-z][a-z0-9_]{0,63}$/.test(signInScreen)) signInScreenId = signInScreen;
       const fw = Number(argOf(p, "firstWeekday") || s.firstWeekday);
@@ -883,7 +888,7 @@ const svc = defineService<S, {
           busy = false;
           // As a modal it only closes, and this screen loads again (its re-appearance reload).
           return navigate(s, signInPresentation
-            ? { screenId: signInScreenId, presentation: signInPresentation, args: { mode: "signin", modal: "1" } }
+            ? { screenId: signInScreenId, presentation: signInPresentation, args: { mode: "signin", modal: "1", ...signInSheetStyle(signInPresentation, signInStyle) } }
             : { screenId: signInScreenId, args: { mode: "signin", returnScreenId: "himi_agenda" } });
         }
         const name = await memberName();