@noya-app/noya-multiplayer-react 0.1.70 → 0.1.71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@noya-app/noya-multiplayer-react",
-  "version": "0.1.70",
+  "version": "0.1.71",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
@@ -12,7 +12,7 @@
     "dev": "npm run build -- --watch"
   },
   "dependencies": {
-    "@noya-app/state-manager": "0.1.56",
+    "@noya-app/state-manager": "0.1.57",
     "@noya-app/emitter": "0.1.0",
     "@noya-app/observable": "0.1.12",
     "@noya-app/task-runner": "0.1.6",

package/src/NoyaStateContext.tsx

@@ -327,20 +327,20 @@ export function usePipelineManager() {
   return noyaManager.pipelineManager;
 }
 
-export function useConnectedUsersManager() {
+export function useUserManager() {
   const { noyaManager } = useAnyNoyaStateContext();
-  return noyaManager.connectedUsersManager;
+  return noyaManager.userManager;
 }
 
 export function useConnectedUsers() {
-  const connectedUsersManager = useConnectedUsersManager();
-  return useObservable(connectedUsersManager?.connectedUsers$);
+  const userManager = useUserManager();
+  return useObservable(userManager?.connectedUsers$);
 }
 
 export function useConnectedUser(userId?: string | null) {
-  const connectedUsersManager = useConnectedUsersManager();
+  const userManager = useUserManager();
   return useObservable(
-    connectedUsersManager?.connectedUsers$,
+    userManager?.connectedUsers$,
     useCallback(
       (users) => {
         return users.find((user) => {
@@ -359,8 +359,8 @@ export function useAnyEphemeralUserData() {
 }
 
 export function useCurrentUserId() {
-  const connectedUsersManager = useConnectedUsersManager();
-  return useObservable(connectedUsersManager?.currentUserId$);
+  const userManager = useUserManager();
+  return useObservable(userManager?.currentUserId$);
 }
 
 export function useIsProcessing() {

package/src/__tests__/noyaApp.test.ts

@@ -13,6 +13,7 @@ it("gets AppData with no data", () => {
     viewType: "editable",
     initialState,
     inspector: false,
+    isDemo: false,
   });
 });
 
@@ -37,6 +38,7 @@ it("gets AppData with data param", () => {
     viewType: "editable",
     initialState: { foo: "bar" },
     inspector: false,
+    isDemo: false,
   });
 });
 
@@ -50,6 +52,7 @@ it("uses initial state if data doesn't parse", () => {
     viewType: "editable",
     initialState: { foo: "bar" },
     inspector: false,
+    isDemo: false,
   });
 });
 
@@ -67,9 +70,32 @@ it("gets AppData with schema", () => {
     viewType: "editable",
     initialState: { foo: "bar" },
     inspector: false,
+    isDemo: false,
   });
 });
 
+it("preserves userId from data param", () => {
+  const existing = {
+    theme: "light",
+    viewType: "editable",
+    initialState: { foo: "bar" },
+    inspector: false,
+    userId: "user-123",
+    isDemo: true,
+  };
+
+  const data = getAppData(null as unknown, undefined, {
+    window: {
+      location: {
+        hash: `#data=${encodeURIComponent(JSON.stringify(existing))}`,
+      },
+    },
+  });
+
+  expect(data.userId).toBe("user-123");
+  expect(data.isDemo).toBe(true);
+});
+
 // it("enforces schema on data param", () => {
 //   const schema = Type.Object({
 //     foo: Type.String({ default: "bar" }),
@@ -103,6 +129,7 @@ it("gets AppData with function initial state", () => {
     viewType: "editable",
     initialState: { foo: "bar" },
     inspector: false,
+    isDemo: false,
   });
 });
 
@@ -130,6 +157,7 @@ it("even if initial state does not match schema, make sure we use multiplayer ur
     initialState: { foo: "" },
     inspector: false,
     multiplayerUrl: "https://example.com",
+    isDemo: false,
   });
 });
 

package/src/components/UserPointersOverlay.tsx

@@ -3,9 +3,9 @@
 import { Observable } from "@noya-app/observable";
 import { memoGeneric } from "@noya-app/react-utils";
 import {
-  ConnectedUsersManager,
   EphemeralUserDataManager,
   MultiplayerUser,
+  UserManager,
 } from "@noya-app/state-manager";
 import React, { useEffect, useMemo, useState } from "react";
 import { useObservable } from "../useObservable";
@@ -83,19 +83,19 @@ const UserPointerInternal = memoGeneric(function UserPointerInternal<
 });
 
 export type UserPointersOverlayProps<E extends UserPointerData> = {
-  connectedUsersManager: ConnectedUsersManager;
+  userManager: UserManager;
   ephemeralUserDataManager: EphemeralUserDataManager<E>;
 } & RenderUserPointer;
 
 export const UserPointersOverlay = memoGeneric(function UserPointers<
   E extends UserPointerData,
 >({
-  connectedUsersManager,
+  userManager,
   ephemeralUserDataManager,
   renderUserPointer,
 }: UserPointersOverlayProps<E>) {
   const currentUserId = useObservable(ephemeralUserDataManager.currentUserId$);
-  const connectedUsers = useObservable(connectedUsersManager.connectedUsers$);
+  const connectedUsers = useObservable(userManager.connectedUsers$);
 
   return (
     <>

package/src/hooks.ts

@@ -135,7 +135,7 @@ export function useBindNoyaManager<
     noyaManager: typeof noyaManager;
     taskManager: typeof noyaManager.taskManager;
     connectionEventManager: typeof noyaManager.connectionEventManager;
-    connectedUsersManager: typeof noyaManager.connectedUsersManager;
+    userManager: typeof noyaManager.userManager;
     ephemeralUserDataManager: typeof noyaManager.ephemeralUserDataManager;
     multiplayerStateManager: typeof noyaManager.multiplayerStateManager;
     assetManager: typeof noyaManager.assetManager;
@@ -154,7 +154,7 @@ export function useBindNoyaManager<
       noyaManager,
       taskManager: noyaManager.taskManager,
       connectionEventManager: noyaManager.connectionEventManager,
-      connectedUsersManager: noyaManager.connectedUsersManager,
+      userManager: noyaManager.userManager,
       ephemeralUserDataManager: noyaManager.ephemeralUserDataManager,
       multiplayerStateManager: noyaManager.multiplayerStateManager,
       assetManager: noyaManager.assetManager,
@@ -182,6 +182,7 @@ export function useBindNoyaManager<
   useStateInspector<S, M, E, MenuT>({
     noyaManager,
     disabled: !options?.inspector,
+    advanced: true,
     ...(typeof options?.inspector === "object" && options?.inspector),
   });