@wix/himalaya-cli 0.1024.0 → 0.1026.0

package/templates/branded-lite/tier5-src/wix-spaces-view-profile/index.ts

@@ -3,10 +3,15 @@
 // paint the seeded "apptestercoowner" demo identity when the session is a real
 // member (or a guest — show honesty instead).
 import { defineService } from "@himalaya/state";
-import { dispatch } from "@himalaya/dispatch";
+import { memberAccess } from "../_shared/member-access.js";
 import { getMyData, displayName } from "@himalaya/wix-users";
 
-interface S { status: "loading" | "ready"; name: string; handle: string; about: string; initial: string; photo: string }
+// `needsSignIn` / `noSignIn` drive the shared member gate: a guest gets the
+// gate with a Sign in button and no placeholder profile. `profileHidden` stays true until
+// `load` has resolved a member, so a guest never glimpses the placeholder avatar while
+// the membership check is still running; `hideLoading` is false for exactly that moment,
+// so the screen shows a loading line instead of going blank.
+interface S { status: "loading" | "ready"; name: string; handle: string; about: string; initial: string; photo: string; needsSignIn: boolean; noSignIn: boolean; profileHidden: boolean; hideLoading: boolean }
 
 const EMPTY: S = {
   status: "loading",
@@ -15,18 +20,17 @@ const EMPTY: S = {
   about: "No info to display.",
   initial: "?",
   photo: "",
+  needsSignIn: false,
+  noSignIn: true,
+  profileHidden: true,
+  hideLoading: false,
 };
 
+// The SAME member check create-post and orders use (`memberAccess`: the host's
+// memberIdentity, falling back to wix-users only on hosts that predate that action), so
+// one shared gate never gives two answers in one app.
 async function sessionEmail(): Promise<string> {
-  try {
-    const identity = await dispatch("himi.wix.memberIdentity") as unknown;
-    const direct = identity as { email?: unknown } | null;
-    const wrapped = identity as { payload?: { email?: unknown } } | null;
-    const email = direct?.email ?? wrapped?.payload?.email;
-    return typeof email === "string" ? email.trim() : "";
-  } catch {
-    return "";
-  }
+  return (await memberAccess()).email;
 }
 
 function wixApi() {
@@ -37,7 +41,7 @@ function fromParts(name: string, handleRaw: string, about: string, photo = ""):
   const clean = name.trim();
   const handle = "@" + (handleRaw || clean || "member").replace(/\s+/g, "").replace(/^@+/, "").toLowerCase();
   const initial = (clean.split(/\s+/).filter(Boolean).map((w) => w[0]).join("").slice(0, 2) || "?").toUpperCase();
-  return { status: "ready", name: clean || "Member", handle, about: about || "No info to display.", initial, photo };
+  return { status: "ready", name: clean || "Member", handle, about: about || "No info to display.", initial, photo, needsSignIn: false, noSignIn: true, profileHidden: false, hideLoading: true };
 }
 
 const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesViewProfile", {
@@ -48,11 +52,17 @@ const svc = defineService<S, { load: (s: S) => Promise<S> }>("spacesViewProfile"
       if (!email) {
         return {
           status: "ready",
+          // Kept for hosts without the shared member gate (the Spaces clone renders these
+          // fields directly); branded-lite hides the profile block behind `profileHidden`.
           name: "Sign in to view your profile",
           handle: "",
           about: "Your public profile is available after you sign in from Account.",
           initial: "?",
           photo: "",
+          needsSignIn: true,
+          noSignIn: false,
+          profileHidden: true,
+          hideLoading: true,
         };
       }
       try {

package/templates/community-club/dev/index.ts

@@ -14,7 +14,7 @@ const SCREENS = runtimeSetting({
   "himi_branded_home": {
     "screenId": "himi_branded_home",
     "renderer": "sdui_intent",
-    "title": "",
+    "title": "__HIMI_APP_NAME__",
     "schemaVersion": 1,
     "cacheControl": {
       "maxAge": 0,
@@ -3993,74 +3993,196 @@ const SCREENS = runtimeSetting({
           "alignment": "center",
           "children": [
             {
-              "id": "himi_view_profile.avatar",
+              "id": "himi_view_profile.loading",
               "body": {
                 "package": "himalaya",
-                "type": "ZStack",
+                "type": "Text",
                 "props": {
+                  "text": "Loading…",
+                  "style": "body",
+                  "color": "textSecondary"
+                }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:spacesViewProfile.hideLoading"
+              }
+            },
+            {
+              "id": "",
+              "body": {
+                "package": "himalaya",
+                "type": "VStack",
+                "props": {
+                  "spacing": 8,
                   "alignment": "center",
                   "children": [
                     {
-                      "id": "",
+                      "id": "himi_view_profile.avatar",
                       "body": {
                         "package": "himalaya",
-                        "type": "Icon",
+                        "type": "ZStack",
                         "props": {
-                          "name": "photo",
-                          "size": 28,
-                          "tint": "accentPrimary"
+                          "alignment": "center",
+                          "children": [
+                            {
+                              "id": "",
+                              "body": {
+                                "package": "himalaya",
+                                "type": "Icon",
+                                "props": {
+                                  "name": "photo",
+                                  "size": 28,
+                                  "tint": "accentPrimary"
+                                }
+                              },
+                              "modifiers": {
+                                "accessibilityRole": "decorative"
+                              }
+                            }
+                          ]
                         }
                       },
                       "modifiers": {
-                        "accessibilityRole": "decorative"
+                        "width": 96,
+                        "height": 96,
+                        "background": {
+                          "token": "accentSurface"
+                        },
+                        "cornerRadius": 16
+                      }
+                    },
+                    {
+                      "id": "himi_view_profile.name",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:spacesViewProfile.name",
+                          "style": "title1"
+                        }
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:spacesViewProfile.handle",
+                          "style": "footnote",
+                          "color": "textSecondary",
+                          "collapseWhenEmpty": true
+                        }
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:spacesViewProfile.about",
+                          "style": "body",
+                          "collapseWhenEmpty": true
+                        }
                       }
                     }
                   ]
                 }
               },
               "modifiers": {
-                "width": 96,
-                "height": 96,
-                "background": {
-                  "token": "accentSurface"
-                },
-                "cornerRadius": 16
-              }
-            },
-            {
-              "id": "himi_view_profile.name",
-              "body": {
-                "package": "himalaya",
-                "type": "Text",
-                "props": {
-                  "text": "$service:spacesViewProfile.name",
-                  "style": "title1"
-                }
+                "hiddenPath": "$service:spacesViewProfile.profileHidden"
               }
             },
             {
-              "id": "",
+              "id": "himi_view_profile.member_gate",
               "body": {
                 "package": "himalaya",
-                "type": "Text",
-                "props": {
-                  "text": "$service:spacesViewProfile.handle",
-                  "style": "footnote",
-                  "color": "textSecondary",
-                  "collapseWhenEmpty": true
-                }
-              }
-            },
-            {
-              "id": "",
-              "body": {
-                "package": "himalaya",
-                "type": "Text",
+                "type": "VStack",
                 "props": {
-                  "text": "$service:spacesViewProfile.about",
-                  "style": "body",
-                  "collapseWhenEmpty": true
+                  "spacing": 10,
+                  "alignment": "center",
+                  "children": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Icon",
+                        "props": {
+                          "name": "person",
+                          "size": 28,
+                          "tint": "accentPrimary"
+                        }
+                      },
+                      "modifiers": {
+                        "accessibilityRole": "decorative"
+                      }
+                    },
+                    {
+                      "id": "himi_view_profile.member_gate_title",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "Sign in to view your profile",
+                          "style": "bodyEmphasis"
+                        }
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "Your public profile appears here after you sign in.",
+                          "style": "footnote",
+                          "color": "textSecondary"
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_view_profile.member_gate_signin",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Sign in",
+                          "style": "primary",
+                          "fullWidth": true,
+                          "action": {
+                            "actionId": "himi.open",
+                            "params": {
+                              "screenId": "himi_account",
+                              "intent": "profile",
+                              "returnScreenId": "himi_view_profile"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  ]
                 }
+              },
+              "modifiers": {
+                "background": {
+                  "token": "surfaceElevated"
+                },
+                "border": {
+                  "width": 1,
+                  "color": {
+                    "token": "border"
+                  }
+                },
+                "cornerRadius": 16,
+                "padding": {
+                  "leading": 16,
+                  "trailing": 16,
+                  "top": 20,
+                  "bottom": 20
+                },
+                "fillMaxWidth": true,
+                "hiddenPath": "$service:spacesViewProfile.noSignIn"
               }
             }
           ]
@@ -4682,16 +4804,31 @@ const SCREENS = runtimeSetting({
               }
             },
             {
-              "id": "himi_feed.signin_card",
+              "id": "himi_feed.member_gate",
               "body": {
                 "package": "himalaya",
                 "type": "VStack",
                 "props": {
-                  "spacing": 8,
-                  "alignment": "leading",
+                  "spacing": 10,
+                  "alignment": "center",
                   "children": [
                     {
                       "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Icon",
+                        "props": {
+                          "name": "person",
+                          "size": 28,
+                          "tint": "accentPrimary"
+                        }
+                      },
+                      "modifiers": {
+                        "accessibilityRole": "decorative"
+                      }
+                    },
+                    {
+                      "id": "himi_feed.member_gate_title",
                       "body": {
                         "package": "himalaya",
                         "type": "Text",
@@ -4714,7 +4851,7 @@ const SCREENS = runtimeSetting({
                       }
                     },
                     {
-                      "id": "himi_feed.signin",
+                      "id": "himi_feed.member_gate_signin",
                       "body": {
                         "package": "himalaya",
                         "type": "Button",
@@ -4750,9 +4887,10 @@ const SCREENS = runtimeSetting({
                 "padding": {
                   "leading": 16,
                   "trailing": 16,
-                  "top": 16,
-                  "bottom": 16
+                  "top": 20,
+                  "bottom": 20
                 },
+                "fillMaxWidth": true,
                 "hiddenPath": "$service:himiBrandedFeed.noSignIn"
               }
             },
@@ -5254,65 +5392,172 @@ const SCREENS = runtimeSetting({
               }
             },
             {
-              "id": "",
-              "body": {
-                "package": "himalaya",
-                "type": "Text",
-                "props": {
-                  "text": "$service:spacesCreatePost.hint",
-                  "style": "footnote",
-                  "color": "textSecondary",
-                  "collapseWhenEmpty": true
-                }
-              }
-            },
-            {
-              "id": "himi_create_post.title_field",
+              "id": "himi_create_post.member_gate",
               "body": {
                 "package": "himalaya",
-                "type": "TextField",
+                "type": "VStack",
                 "props": {
-                  "placeholder": "Title",
-                  "value": "",
-                  "submitLabel": "next",
-                  "onSubmit": {
-                    "actionId": "tier5.spacesCreatePost.focusBody"
-                  },
-                  "onChange": {
-                    "actionId": "tier5.spacesCreatePost.setTitle"
-                  }
+                  "spacing": 10,
+                  "alignment": "center",
+                  "children": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Icon",
+                        "props": {
+                          "name": "person",
+                          "size": 28,
+                          "tint": "accentPrimary"
+                        }
+                      },
+                      "modifiers": {
+                        "accessibilityRole": "decorative"
+                      }
+                    },
+                    {
+                      "id": "himi_create_post.member_gate_title",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "Sign in to post",
+                          "style": "bodyEmphasis"
+                        }
+                      }
+                    },
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "Sign in to share something with the community.",
+                          "style": "footnote",
+                          "color": "textSecondary"
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_create_post.member_gate_signin",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Sign in",
+                          "style": "primary",
+                          "fullWidth": true,
+                          "action": {
+                            "actionId": "himi.open",
+                            "params": {
+                              "screenId": "himi_account",
+                              "intent": "post",
+                              "returnScreenId": "himi_create_post"
+                            }
+                          }
+                        }
+                      }
+                    }
+                  ]
                 }
-              }
-            },
-            {
-              "id": "himi_create_post.body_field",
-              "body": {
-                "package": "himalaya",
-                "type": "TextField",
-                "props": {
-                  "placeholder": "Write something…",
-                  "value": "",
-                  "multilineMaxLines": 6,
-                  "focusPath": "$service:spacesCreatePost.bodyFocus",
-                  "onChange": {
-                    "actionId": "tier5.spacesCreatePost.setBody"
+              },
+              "modifiers": {
+                "background": {
+                  "token": "surfaceElevated"
+                },
+                "border": {
+                  "width": 1,
+                  "color": {
+                    "token": "border"
                   }
-                }
+                },
+                "cornerRadius": 16,
+                "padding": {
+                  "leading": 16,
+                  "trailing": 16,
+                  "top": 20,
+                  "bottom": 20
+                },
+                "fillMaxWidth": true,
+                "hiddenPath": "$service:spacesCreatePost.noSignIn"
               }
             },
             {
-              "id": "himi_create_post.submit",
+              "id": "",
               "body": {
                 "package": "himalaya",
-                "type": "Button",
+                "type": "VStack",
                 "props": {
-                  "title": "Post",
-                  "style": "primary",
-                  "fullWidth": true,
-                  "action": {
-                    "actionId": "tier5.spacesCreatePost.submit"
-                  }
+                  "spacing": 16,
+                  "alignment": "leading",
+                  "children": [
+                    {
+                      "id": "",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Text",
+                        "props": {
+                          "text": "$service:spacesCreatePost.hint",
+                          "style": "footnote",
+                          "color": "textSecondary",
+                          "collapseWhenEmpty": true
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_create_post.title_field",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "TextField",
+                        "props": {
+                          "placeholder": "Title",
+                          "value": "",
+                          "submitLabel": "next",
+                          "onSubmit": {
+                            "actionId": "tier5.spacesCreatePost.focusBody"
+                          },
+                          "onChange": {
+                            "actionId": "tier5.spacesCreatePost.setTitle"
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_create_post.body_field",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "TextField",
+                        "props": {
+                          "placeholder": "Write something…",
+                          "value": "",
+                          "multilineMaxLines": 6,
+                          "focusPath": "$service:spacesCreatePost.bodyFocus",
+                          "onChange": {
+                            "actionId": "tier5.spacesCreatePost.setBody"
+                          }
+                        }
+                      }
+                    },
+                    {
+                      "id": "himi_create_post.submit",
+                      "body": {
+                        "package": "himalaya",
+                        "type": "Button",
+                        "props": {
+                          "title": "Post",
+                          "style": "primary",
+                          "fullWidth": true,
+                          "action": {
+                            "actionId": "tier5.spacesCreatePost.submit"
+                          }
+                        }
+                      }
+                    }
+                  ]
                 }
+              },
+              "modifiers": {
+                "hiddenPath": "$service:spacesCreatePost.hideForm"
               }
             }
           ]
@@ -5327,6 +5572,9 @@ const SCREENS = runtimeSetting({
           "trailing": 16,
           "top": 18,
           "bottom": 28
+        },
+        "onAppear": {
+          "actionId": "tier5.spacesCreatePost.load"
         }
       }
     },

package/templates/community-club/tier5-src/wix-spaces-create-post/index.ts

@@ -4,6 +4,7 @@
 // create endpoint in the SDK; blog is the available authored-content write.)
 import { defineService } from "@himalaya/state";
 import { createDraftPost, publishDraftPost } from "@himalaya/wix-blog";
+import { memberAccess } from "../_shared/member-access.js";
 
 // `bodyFocus` is a focus TOKEN, not a flag: the body field focuses whenever this
 // becomes a new non-empty value (`TextFieldProps.focus_path`). A monotonic counter
@@ -14,7 +15,11 @@ import { createDraftPost, publishDraftPost } from "@himalaya/wix-blog";
 // the new state), so there is no way to observe an intermediate value while `submit`
 // is awaiting the network. A type that promises a state nobody can ever see reads as
 // an in-flight guard that exists — see `posting` below for the one that works.
-interface S { status: "ready"; title: string; body: string; hint: string; bodyFocus: string }
+// `needsSignIn` / `noSignIn` / `hideForm` drive the member gate: a guest sees the
+// gate and NO form, a member sees the form, and until `load` has asked the
+// host who is signed in, neither shows — so a guest can never start typing a post
+// that would only fail on submit.
+interface S { status: "ready"; title: string; body: string; hint: string; bodyFocus: string; needsSignIn: boolean; noSignIn: boolean; hideForm: boolean }
 
 // The real double-press guard, module-local because it must live OUTSIDE published
 // state for the reason above. One worker instance owns one composer, so a module flag
@@ -33,15 +38,20 @@ function val(arg?: unknown): string {
   return typeof arg === "string" ? arg : ((arg as { value?: string; text?: string })?.value ?? (arg as { text?: string })?.text ?? "");
 }
 
-const svc = defineService<S, { setTitle: (s: S, a?: unknown) => S; setBody: (s: S, a?: unknown) => S; focusBody: (s: S) => S; submit: (s: S) => Promise<S> }>("spacesCreatePost", {
-  state: { status: "ready", title: "", body: "", hint: "Share something with the community.", bodyFocus: "" },
+const svc = defineService<S, { load: (s: S) => Promise<S>; setTitle: (s: S, a?: unknown) => S; setBody: (s: S, a?: unknown) => S; focusBody: (s: S) => S; submit: (s: S) => Promise<S> }>("spacesCreatePost", {
+  state: { status: "ready", title: "", body: "", hint: "Share something with the community.", bodyFocus: "", needsSignIn: false, noSignIn: true, hideForm: true },
   actions: {
+    load: async (s) => {
+      const { email } = await memberAccess();
+      return { ...s, needsSignIn: !email, noSignIn: !!email, hideForm: !email };
+    },
     setTitle: (s, a) => ({ ...s, title: val(a) }),
     setBody: (s, a) => ({ ...s, body: val(a) }),
     // Title's Next key lands here. The keyboard stays up (that is the "next"
     // contract) and the body field takes focus.
     focusBody: (s) => ({ ...s, bodyFocus: bumpToken(s.bodyFocus) }),
     submit: async (s) => {
+      if (s.needsSignIn) return { ...s, hint: "Sign in to post." };
       const title = s.title.trim();
       if (!title) return { ...s, hint: "Please enter a title." };
       // A second press while the first is still in flight is a NO-OP, not a second
@@ -63,7 +73,7 @@ const svc = defineService<S, { setTitle: (s: S, a?: unknown) => S; setBody: (s:
         // steals focus, so those transitions must clear it (see himi-store-account's
         // NO_FOCUS on its mode switches). Same token, opposite fix; the deciding
         // question is always whether the field stays mounted.
-        return { status: "ready", title: "", body: "", bodyFocus: s.bodyFocus, hint: `Posted “${title}” ✓ — it now appears in Blog.` };
+        return { ...s, status: "ready", title: "", body: "", bodyFocus: s.bodyFocus, hint: `Posted “${title}” ✓ — it now appears in Blog.` };
       } catch {
         return { ...s, status: "ready", hint: "Couldn't post — check your connection and try again." };
       } finally {