@noya-app/noya-multiplayer-react 0.1.26 → 0.1.28

package/.turbo/turbo-build.log

@@ -5,14 +5,14 @@
 CLI Target: esnext
 CJS Build start
 ESM Build start
-CJS dist/index.js     50.29 KB
-CJS dist/index.js.map 81.83 KB
-CJS ⚡️ Build success in 45ms
-ESM dist/index.mjs     44.76 KB
-ESM dist/index.mjs.map 82.05 KB
-ESM ⚡️ Build success in 45ms
+ESM dist/index.mjs     45.02 KB
+ESM dist/index.mjs.map 82.40 KB
+ESM ⚡️ Build success in 103ms
+CJS dist/index.js     50.60 KB
+CJS dist/index.js.map 82.18 KB
+CJS ⚡️ Build success in 104ms
 DTS Build start
 "ComponentPropsWithoutRef" is imported from external module "react" but never used in "src/components/UserPointersOverlay.tsx", "src/inspector/StateInspector.tsx" and "src/hooks.ts".
-DTS ⚡️ Build success in 2339ms
-DTS dist/index.d.ts  7.30 KB
-DTS dist/index.d.mts 7.30 KB
+DTS ⚡️ Build success in 4481ms
+DTS dist/index.d.ts  7.41 KB
+DTS dist/index.d.mts 7.41 KB

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @noya-app/state-manager
 
+## 0.1.28
+
+### Patch Changes
+
+- 8ff67bc: Improve group dnd
+- 9a73bc7: Improve getting default app data
+- Updated dependencies [8ff67bc]
+  - @noya-app/state-manager@0.1.26
+
+## 0.1.27
+
+### Patch Changes
+
+- Updated dependencies [b1903d5]
+  - @noya-app/state-manager@0.1.25
+
 ## 0.1.26
 
 ### Patch Changes

package/dist/index.d.mts

@@ -100,15 +100,16 @@ type AppData<State> = {
     inspector: boolean | StateInspectorOptions;
 };
 declare function createDefaultAppData<State>(initialState: State): AppData<State>;
-declare function getAppData<State>(): AppData<State> | undefined;
-declare function getAppData<State>(initialState: State): AppData<State>;
-type AppDataOptions = {
-    schema?: TSchema;
+type GetAppDataOptions = {
+    window?: {
+        location: {
+            hash: string;
+        };
+    };
 };
-/**
- * Get data from host app. Fall back to default data.
- */
-declare function useAppData<S>(initialState: S, { schema }?: AppDataOptions): AppData<S>;
+declare function enforceSchema<State>(initialState: State, schema?: TSchema): State;
+declare function parseAppDataParameter(options?: GetAppDataOptions): any;
+declare function getAppData<State>(initialState: State | (() => State), schema?: TSchema, options?: GetAppDataOptions): AppData<State>;
 type IframeToHostMessage = {
     type: "application.setMenuItems";
     payload: {
@@ -145,4 +146,4 @@ declare function useNoyaAppState<S, M = void, E = void>(initialState: S | (() =>
 declare function useObservable<T>(observable: Observable<T>): T;
 declare function useObservable<T, P extends PathKey[]>(observable: Observable<T>, path: P): GetWithPath<T, P>;
 
-export { type AppData, type AppTheme, type AppViewType, type HostToIframeMessage, type IframeToHostMessage, StateInspector, type StateInspectorAnchor, type StateInspectorOptions, type UseMultiplayerStateOptions, UserNameTag, UserPointer, UserPointerContainer, type UserPointerData, UserPointerIcon, type UserPointerProps, UserPointersOverlay, type UserPointersOverlayProps, createDefaultAppData, getAppData, getAvatarInitials, getAvatarStyle, isEmbeddedApp, useAppData, useBroadcastConnectedUsers, useBroadcastMenuItems, useEphemeralUserData, useManagedHistory, useManagedState, useMultiplayerState, useNoyaAppState, useObservable, useSyncMultiplayerStateManager, useSyncStateManager };
+export { type AppData, type AppTheme, type AppViewType, type GetAppDataOptions, type HostToIframeMessage, type IframeToHostMessage, StateInspector, type StateInspectorAnchor, type StateInspectorOptions, type UseMultiplayerStateOptions, UserNameTag, UserPointer, UserPointerContainer, type UserPointerData, UserPointerIcon, type UserPointerProps, UserPointersOverlay, type UserPointersOverlayProps, createDefaultAppData, enforceSchema, getAppData, getAvatarInitials, getAvatarStyle, isEmbeddedApp, parseAppDataParameter, useBroadcastConnectedUsers, useBroadcastMenuItems, useEphemeralUserData, useManagedHistory, useManagedState, useMultiplayerState, useNoyaAppState, useObservable, useSyncMultiplayerStateManager, useSyncStateManager };

package/dist/index.d.ts

@@ -100,15 +100,16 @@ type AppData<State> = {
     inspector: boolean | StateInspectorOptions;
 };
 declare function createDefaultAppData<State>(initialState: State): AppData<State>;
-declare function getAppData<State>(): AppData<State> | undefined;
-declare function getAppData<State>(initialState: State): AppData<State>;
-type AppDataOptions = {
-    schema?: TSchema;
+type GetAppDataOptions = {
+    window?: {
+        location: {
+            hash: string;
+        };
+    };
 };
-/**
- * Get data from host app. Fall back to default data.
- */
-declare function useAppData<S>(initialState: S, { schema }?: AppDataOptions): AppData<S>;
+declare function enforceSchema<State>(initialState: State, schema?: TSchema): State;
+declare function parseAppDataParameter(options?: GetAppDataOptions): any;
+declare function getAppData<State>(initialState: State | (() => State), schema?: TSchema, options?: GetAppDataOptions): AppData<State>;
 type IframeToHostMessage = {
     type: "application.setMenuItems";
     payload: {
@@ -145,4 +146,4 @@ declare function useNoyaAppState<S, M = void, E = void>(initialState: S | (() =>
 declare function useObservable<T>(observable: Observable<T>): T;
 declare function useObservable<T, P extends PathKey[]>(observable: Observable<T>, path: P): GetWithPath<T, P>;
 
-export { type AppData, type AppTheme, type AppViewType, type HostToIframeMessage, type IframeToHostMessage, StateInspector, type StateInspectorAnchor, type StateInspectorOptions, type UseMultiplayerStateOptions, UserNameTag, UserPointer, UserPointerContainer, type UserPointerData, UserPointerIcon, type UserPointerProps, UserPointersOverlay, type UserPointersOverlayProps, createDefaultAppData, getAppData, getAvatarInitials, getAvatarStyle, isEmbeddedApp, useAppData, useBroadcastConnectedUsers, useBroadcastMenuItems, useEphemeralUserData, useManagedHistory, useManagedState, useMultiplayerState, useNoyaAppState, useObservable, useSyncMultiplayerStateManager, useSyncStateManager };
+export { type AppData, type AppTheme, type AppViewType, type GetAppDataOptions, type HostToIframeMessage, type IframeToHostMessage, StateInspector, type StateInspectorAnchor, type StateInspectorOptions, type UseMultiplayerStateOptions, UserNameTag, UserPointer, UserPointerContainer, type UserPointerData, UserPointerIcon, type UserPointerProps, UserPointersOverlay, type UserPointersOverlayProps, createDefaultAppData, enforceSchema, getAppData, getAvatarInitials, getAvatarStyle, isEmbeddedApp, parseAppDataParameter, useBroadcastConnectedUsers, useBroadcastMenuItems, useEphemeralUserData, useManagedHistory, useManagedState, useMultiplayerState, useNoyaAppState, useObservable, useSyncMultiplayerStateManager, useSyncStateManager };

package/dist/index.js

@@ -38,11 +38,12 @@ __export(src_exports, {
   UserPointerIcon: () => UserPointerIcon,
   UserPointersOverlay: () => UserPointersOverlay,
   createDefaultAppData: () => createDefaultAppData,
+  enforceSchema: () => enforceSchema,
   getAppData: () => getAppData,
   getAvatarInitials: () => getAvatarInitials,
   getAvatarStyle: () => getAvatarStyle,
   isEmbeddedApp: () => isEmbeddedApp,
-  useAppData: () => useAppData,
+  parseAppDataParameter: () => parseAppDataParameter,
   useBroadcastConnectedUsers: () => useBroadcastConnectedUsers,
   useBroadcastMenuItems: () => useBroadcastMenuItems,
   useEphemeralUserData: () => useEphemeralUserData,
@@ -1431,30 +1432,37 @@ function createDefaultAppData(initialState) {
     inspector: false
   };
 }
-function getAppData(initialState) {
+function enforceSchema(initialState, schema) {
+  return schema ? (0, import_state_manager2.createOrCastValue)({
+    schema,
+    value: initialState,
+    defs: (0, import_state_manager2.findAllDefs)(schema)
+  }) : initialState;
+}
+function parseAppDataParameter(options) {
+  const window2 = options?.window ?? globalThis;
+  const urlHash = (window2.location.hash || "").replace(/^#/, "");
+  const params = new URLSearchParams(urlHash);
+  const data = params.get("data");
+  if (!data)
+    return null;
   try {
-    const urlHash = (window.location.hash || "").replace(/^#/, "");
-    const params = new URLSearchParams(urlHash);
-    const data = params.get("data");
-    if (!data) {
-      return initialState ? createDefaultAppData(initialState) : void 0;
-    }
-    const parsed = JSON.parse(data);
-    if (!parsed.initialState) {
-      parsed.initialState = initialState;
-    }
-    return parsed;
+    return JSON.parse(data);
   } catch (e) {
-    return initialState ? createDefaultAppData(initialState) : void 0;
+    return null;
   }
 }
-function useAppData(initialState, { schema } = {}) {
-  const appData = (0, import_react8.useMemo)(() => {
-    return getAppData(
-      schema ? (0, import_state_manager2.createOrCastValue)(schema, initialState) : initialState
-    );
-  }, [initialState, schema]);
-  return appData;
+function getAppData(initialState, schema, options) {
+  const resolvedInitialState = initialState instanceof Function ? initialState() : initialState;
+  try {
+    const appData = parseAppDataParameter(options) ?? createDefaultAppData(resolvedInitialState);
+    return {
+      ...appData,
+      initialState: enforceSchema(appData.initialState, schema)
+    };
+  } catch (e) {
+    return createDefaultAppData(enforceSchema(resolvedInitialState, schema));
+  }
 }
 function useBroadcastConnectedUsers(connectedUsers) {
   (0, import_react8.useEffect)(() => {
@@ -1491,15 +1499,16 @@ function isEmbeddedApp() {
   return window.self !== window.top;
 }
 function useNoyaAppState(initialState, options) {
-  const [state] = (0, import_react8.useState)(initialState);
-  const {
-    multiplayerUrl,
-    inspector,
-    initialState: noyaAppInitialState,
-    theme,
-    viewType
-  } = useAppData(state, {
-    schema: options.schema
+  const [
+    {
+      multiplayerUrl,
+      inspector,
+      initialState: noyaAppInitialState,
+      theme,
+      viewType
+    }
+  ] = (0, import_react8.useState)(() => {
+    return getAppData(initialState, options.schema);
   });
   const sync = (0, import_react8.useMemo)(() => {
     return multiplayerUrl ? (0, import_state_manager2.webSocketSync)(multiplayerUrl) : (0, import_state_manager2.localStorageSync)({ key: options.localStorageKey || "noya-app" });
@@ -1525,11 +1534,12 @@ function useNoyaAppState(initialState, options) {
   UserPointerIcon,
   UserPointersOverlay,
   createDefaultAppData,
+  enforceSchema,
   getAppData,
   getAvatarInitials,
   getAvatarStyle,
   isEmbeddedApp,
-  useAppData,
+  parseAppDataParameter,
   useBroadcastConnectedUsers,
   useBroadcastMenuItems,
   useEphemeralUserData,