@wix/himalaya-cli 0.1616.0 → 0.1618.0

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

@@ -13,6 +13,7 @@ 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";
+import { signInPageStyle, signInSheetStyle } from "../_shared/sign-in-sheet.js";
 import { hostSiteFromInput } from "../_shared/branded-lite-hosted.js";
 import { formatDateMedium } from "../_shared/engine-intl.js";
 import { copyParam, copyTemplate, stashCopy } from "../_shared/himi-copy.js";
@@ -53,6 +54,7 @@ const SIGN_IN_SCREEN = "himi_sign_in";
 
 let stashedVerticals: string[] | null = null;
 let signInPresentation: "sheet" | "full_screen" | undefined;
+let signInStyle: "page" | "" = "";
 let generation = 0;
 
 function appearVerticals(arg: unknown): string[] {
@@ -192,7 +194,10 @@ async function read(arg: unknown, again = true): Promise<PlaceSummaryState> {
 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;
+  if (presentation === "sheet" || presentation === "full_screen") {
+    signInPresentation = presentation;
+    signInStyle = signInPageStyle((arg as Record<string, unknown>).signInSheetStyle);
+  }
   const mine = ++generation;
   const next = await read(arg);
   return mine === generation ? next : undefined;
@@ -211,7 +216,7 @@ const svc = defineService<PlaceSummaryState, {
       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: SIGN_IN_SCREEN, presentation: signInPresentation, args: { mode: "signin", modal: "1", ...signInSheetStyle(signInPresentation, signInStyle) } }
         : { screenId: s.ctaScreenId, args: { mode: s.ctaMode } });
     },
   },

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

@@ -1,6 +1,7 @@
 import { paymentSetupMessage } from "../_shared/payment-setup.js";
 import { dispatch } from "@himalaya/dispatch";
 import { memberAccess, assertMemberAccess } from "../_shared/member-access.js";
+import { signInPageStyle, signInSheetStyle } from "../_shared/sign-in-sheet.js";
 import { offlineWriteMessage, withOnlineWrites } from "../_shared/online-actions.js";
 // Tier-5 bundle: himi-branded-lite — single online-program detail (design §3.5
 // `programs` vertical, screen full-potential pass).
@@ -292,6 +293,7 @@ let enrollmentInFlight = false;
 // Presentation dedupe only. The host remains the sole authority to resume a join.
 let openedAuthToken = "";
 let signInPresentation: "sheet" | "full_screen" = "sheet";
+let signInStyle: "page" | "" = "";
 const continuationTarget = (id: string) => `program_enrol:${id}`;
 
 async function continuation(operation: "begin" | "check" | "consume" | "cancel", id: string, token = "") {
@@ -309,7 +311,10 @@ const programReference = () => onlineProgramItem({ id: inputId() })?.reference;
 async function load(state: State, arg?: unknown): Promise<undefined> {
   stashCopy(arg);
   const presentation = (arg as { signInPresentation?: unknown } | undefined)?.signInPresentation;
-  if (presentation === "sheet" || presentation === "full_screen") signInPresentation = presentation;
+  if (presentation === "sheet" || presentation === "full_screen") {
+    signInPresentation = presentation;
+    signInStyle = signInPageStyle((arg as { signInSheetStyle?: unknown }).signInSheetStyle);
+  }
   const id = inputId();
   const seq = ++loadSeq;
   const [found, locale] = await Promise.all([
@@ -386,7 +391,7 @@ async function enroll(afterAuthAccount = ""): Promise<undefined> {
       openedAuthToken = request.token;
       actionMessage = "";
       try {
-        await dispatch("himi.open", { screenId: "himi_sign_in", mode: "signin", presentation: signInPresentation, modal: "1", authContinuation: request.token });
+        await dispatch("himi.open", { screenId: "himi_sign_in", mode: "signin", presentation: signInPresentation, modal: "1", ...signInSheetStyle(signInPresentation, signInStyle), authContinuation: request.token });
       } catch (error) {
         openedAuthToken = "";
         await continuation("cancel", id, request.token);

package/templates/yoga-studio/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);