@dxos/react-ui-attention 0.9.1-main.c7dcc2e112 → 0.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-attention",
-  "version": "0.9.1-main.c7dcc2e112",
+  "version": "0.10.0",
   "description": "Signifier components and providers for attention system.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -46,33 +46,33 @@
     "@radix-ui/react-primitive": "2.0.2",
     "@radix-ui/react-slot": "1.1.2",
     "@radix-ui/react-use-controllable-state": "1.1.0",
-    "effect": "3.21.3",
-    "@dxos/echo": "0.9.1-main.c7dcc2e112",
-    "@dxos/util": "0.9.1-main.c7dcc2e112",
-    "@dxos/log": "0.9.1-main.c7dcc2e112",
-    "@dxos/keyboard": "0.9.1-main.c7dcc2e112",
-    "@dxos/invariant": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-hooks": "0.9.1-main.c7dcc2e112"
+    "effect": "3.21.4",
+    "@dxos/echo": "0.10.0",
+    "@dxos/invariant": "0.10.0",
+    "@dxos/log": "0.10.0",
+    "@dxos/keyboard": "0.10.0",
+    "@dxos/react-hooks": "0.10.0",
+    "@dxos/util": "0.10.0"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.9.1",
-    "@testing-library/react": "^16.3.0",
-    "@types/react": "~19.2.7",
+    "@testing-library/react": "^16.3.2",
+    "@types/react": "~19.2.17",
     "@types/react-dom": "~19.2.3",
-    "react": "~19.2.3",
-    "react-dom": "~19.2.3",
+    "react": "~19.2.7",
+    "react-dom": "~19.2.7",
     "vite": "^8.0.16",
-    "@dxos/random": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui": "0.9.1-main.c7dcc2e112",
-    "@dxos/storybook-utils": "0.9.1-main.c7dcc2e112",
-    "@dxos/ui-theme": "0.9.1-main.c7dcc2e112"
+    "@dxos/random": "0.10.0",
+    "@dxos/react-ui": "0.10.0",
+    "@dxos/ui-theme": "0.10.0",
+    "@dxos/storybook-utils": "0.10.0"
   },
   "peerDependencies": {
-    "effect": "3.21.3",
-    "react": "~19.2.3",
-    "react-dom": "~19.2.3",
-    "@dxos/ui-theme": "0.9.1-main.c7dcc2e112",
-    "@dxos/react-ui": "0.9.1-main.c7dcc2e112"
+    "effect": "3.21.4",
+    "react": "~19.2.7",
+    "react-dom": "~19.2.7",
+    "@dxos/react-ui": "0.10.0",
+    "@dxos/ui-theme": "0.10.0"
   },
   "publishConfig": {
     "access": "public"

package/src/components/AttentionGlyph/AttentionGlyph.tsx

@@ -3,7 +3,7 @@
 //
 
 import { type Primitive } from '@radix-ui/react-primitive';
-import React, { type CSSProperties, type ComponentPropsWithRef, forwardRef, useMemo } from 'react';
+import React, { type ComponentPropsWithRef, type CSSProperties, forwardRef, useMemo } from 'react';
 
 import { Icon, type ThemedClassName } from '@dxos/react-ui';
 import { mx } from '@dxos/ui-theme';

package/src/components/AttentionProvider/AttentionProvider.tsx

@@ -167,10 +167,10 @@ const AttendableContainer = forwardRef<HTMLDivElement, AttendableContainerProps>
 );
 
 export {
-  RootAttentionProvider,
   AttendableContainer,
-  useAttentionContext,
-  useAttention,
+  RootAttentionProvider,
   useAttended,
+  useAttention,
   useAttentionAttributes,
+  useAttentionContext,
 };

package/src/components/ViewStateProvider/ViewStateProvider.tsx

@@ -48,6 +48,12 @@ export const useViewStateManager = (): ViewStateManager => {
   return manager;
 };
 
+/** Access the ViewStateManager if a provider is present; `undefined` otherwise (e.g. isolated stories/tests). */
+export const useViewStateManagerOptional = (): ViewStateManager | undefined => {
+  const { manager } = useViewStateContext(VIEW_STATE_NAME);
+  return manager;
+};
+
 /** Reactive read of an aspect value for a context; yields the aspect default when unset or unprovided. */
 export const useViewState = <T,>(aspect: AspectDef<T>, contextId?: string): T => {
   const { manager } = useViewStateContext(VIEW_STATE_NAME);

package/src/useArticleKeyboardNavigation.ts

@@ -4,7 +4,7 @@
 
 import { useEffect, useMemo } from 'react';
 
-import { Keyboard } from '@dxos/keyboard';
+import { Keyboard, nestKeyboardContext } from '@dxos/keyboard';
 
 import { useAttention } from './components';
 
@@ -74,9 +74,10 @@ export const useArticleKeyboardNavigation: {
       return;
     }
 
-    const context = Keyboard.singleton.getContext(articleId);
+    const contextPath = nestKeyboardContext(articleId);
+    const context = Keyboard.singleton.getContext(contextPath);
     const prevContext = Keyboard.singleton.getCurrentContext();
-    Keyboard.singleton.setCurrentContext(articleId);
+    Keyboard.singleton.setCurrentContext(contextPath);
 
     const nextBinding = {
       shortcut: 'j',
@@ -108,7 +109,7 @@ export const useArticleKeyboardNavigation: {
       context.unbind('j');
       context.unbind('k');
       // Restore the prior context if we were the ones who set it.
-      if (Keyboard.singleton.getCurrentContext() === articleId) {
+      if (Keyboard.singleton.getCurrentContext() === contextPath) {
         Keyboard.singleton.setCurrentContext(prevContext);
       }
     };