npm - @wix/himalaya-cli - Versions diffs - 0.1615.0 → 0.1617.0 - Mend

@wix/himalaya-cli 0.1615.0 → 0.1617.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (57) hide show

package/templates/podcast-creator/tier5-src/himi-store-account/index.ts CHANGED Viewed

@@ -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/portfolio-creative/dev/index.ts CHANGED Viewed

@@ -2396,7 +2396,8 @@ const SCREENS = runtimeSetting({
                                     "params": {
                                       "screenId": "himi_sign_in",
                                       "mode": "signin",
-                                      "modal": "1"
+                                      "modal": "1",
+                                      "sheetStyle": "page"
                                     },
                                     "presentation": "sheet"
                                   }
@@ -2417,7 +2418,8 @@ const SCREENS = runtimeSetting({
                                     "params": {
                                       "screenId": "himi_sign_in",
                                       "mode": "register",
-                                      "modal": "1"
+                                      "modal": "1",
+                                      "sheetStyle": "page"
                                     },
                                     "presentation": "sheet"
                                   }
@@ -3703,6 +3705,7 @@ const SCREENS = runtimeSetting({
             "restorePurchases": "1",
             "signInScreen": "himi_sign_in",
             "signInPresentation": "sheet",
+            "signInSheetStyle": "page",
             "signInReturnTab": "profile",
             "pollIdentity": "1",
             "cartCount": "1",
@@ -3980,7 +3983,8 @@ const SCREENS = runtimeSetting({
                               "screenId": "himi_sign_in",
                               "mode": "signin",
                               "returnScreenId": "himi_account_settings",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -7000,7 +7004,8 @@ const SCREENS = runtimeSetting({
                             "params": {
                               "screenId": "himi_sign_in",
                               "returnScreenId": "himi_notif_settings",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -7395,7 +7400,8 @@ const SCREENS = runtimeSetting({
                               "mode": "signin",
                               "intent": "profile",
                               "returnScreenId": "himi_view_profile",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -16895,7 +16901,8 @@ const SCREENS = runtimeSetting({
                               "mode": "signin",
                               "intent": "orders",
                               "returnScreenId": "himi_orders",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -17632,7 +17639,8 @@ const SCREENS = runtimeSetting({
                               "mode": "signin",
                               "intent": "addresses",
                               "returnScreenId": "himi_addresses",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -18691,7 +18699,8 @@ const SCREENS = runtimeSetting({
                               "mode": "signin",
                               "intent": "addresses",
                               "returnScreenId": "himi_address",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -19364,7 +19373,8 @@ const SCREENS = runtimeSetting({
                               "mode": "signin",
                               "intent": "wallet",
                               "returnScreenId": "himi_wallet",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -19864,7 +19874,8 @@ const SCREENS = runtimeSetting({
                                     "actionId": "himi.open",
                                     "params": {
                                       "screenId": "himi_sign_in",
-                                      "modal": "1"
+                                      "modal": "1",
+                                      "sheetStyle": "page"
                                     },
                                     "presentation": "sheet"
                                   }
@@ -22469,7 +22480,8 @@ const SCREENS = runtimeSetting({
                               "mode": "signin",
                               "intent": "post",
                               "returnScreenId": "himi_create_post",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -26248,7 +26260,8 @@ const SCREENS = runtimeSetting({
                             "params": {
                               "screenId": "himi_sign_in",
                               "mode": "signin",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -30875,7 +30888,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"
                   }
@@ -35944,7 +35958,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"
                           }
@@ -36260,7 +36275,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/portfolio-creative/tier5-src/_shared/sign-in-sheet.ts ADDED Viewed

@@ -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/portfolio-creative/tier5-src/himi-store-account/index.ts CHANGED Viewed

@@ -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/restaurant/dev/index.ts CHANGED Viewed

@@ -2308,7 +2308,8 @@ const SCREENS = runtimeSetting({
                                     "params": {
                                       "screenId": "himi_sign_in",
                                       "mode": "signin",
-                                      "modal": "1"
+                                      "modal": "1",
+                                      "sheetStyle": "page"
                                     },
                                     "presentation": "sheet"
                                   }
@@ -2329,7 +2330,8 @@ const SCREENS = runtimeSetting({
                                     "params": {
                                       "screenId": "himi_sign_in",
                                       "mode": "register",
-                                      "modal": "1"
+                                      "modal": "1",
+                                      "sheetStyle": "page"
                                     },
                                     "presentation": "sheet"
                                   }
@@ -3615,6 +3617,7 @@ const SCREENS = runtimeSetting({
             "restorePurchases": "1",
             "signInScreen": "himi_sign_in",
             "signInPresentation": "sheet",
+            "signInSheetStyle": "page",
             "signInReturnTab": "profile",
             "pollIdentity": "1",
             "copy": "{\"account.subtitle\":\"Reservations, RSVPs and saved content in one place.\",\"storeAccount.authBody\":\"Sign in to continue — reservations and RSVPs stay with you.\",\"storeAccount.authBodyRegister\":\"Create a member account to continue — reservations and RSVPs stay with you.\"}"
@@ -3872,7 +3875,8 @@ const SCREENS = runtimeSetting({
                               "screenId": "himi_sign_in",
                               "mode": "signin",
                               "returnScreenId": "himi_account_settings",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -6892,7 +6896,8 @@ const SCREENS = runtimeSetting({
                             "params": {
                               "screenId": "himi_sign_in",
                               "returnScreenId": "himi_notif_settings",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -7287,7 +7292,8 @@ const SCREENS = runtimeSetting({
                               "mode": "signin",
                               "intent": "profile",
                               "returnScreenId": "himi_view_profile",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -8396,7 +8402,8 @@ const SCREENS = runtimeSetting({
                               "mode": "signin",
                               "intent": "addresses",
                               "returnScreenId": "himi_addresses",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -9455,7 +9462,8 @@ const SCREENS = runtimeSetting({
                               "mode": "signin",
                               "intent": "addresses",
                               "returnScreenId": "himi_address",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -10128,7 +10136,8 @@ const SCREENS = runtimeSetting({
                               "mode": "signin",
                               "intent": "wallet",
                               "returnScreenId": "himi_wallet",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -13472,7 +13481,8 @@ const SCREENS = runtimeSetting({
                               "mode": "signin",
                               "intent": "post",
                               "returnScreenId": "himi_create_post",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -17251,7 +17261,8 @@ const SCREENS = runtimeSetting({
                             "params": {
                               "screenId": "himi_sign_in",
                               "mode": "signin",
-                              "modal": "1"
+                              "modal": "1",
+                              "sheetStyle": "page"
                             },
                             "presentation": "sheet"
                           }
@@ -22144,7 +22155,8 @@ const SCREENS = runtimeSetting({
                                       "screenId": "himi_sign_in",
                                       "intent": "food-orders",
                                       "returnScreenId": "himi_food_orders",
-                                      "modal": "1"
+                                      "modal": "1",
+                                      "sheetStyle": "page"
                                     },
                                     "presentation": "sheet"
                                   }
@@ -26611,7 +26623,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"
                           }
@@ -26927,7 +26940,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/restaurant/tier5-src/_shared/sign-in-sheet.ts ADDED Viewed

@@ -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/restaurant/tier5-src/himi-store-account/index.ts CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 ADDED Viewed

@@ -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 CHANGED Viewed

@@ -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);