@dxos/react-ui-attention 0.8.4-main.84f28bd → 0.8.4-main.c1de068

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/react-ui-attention",
-  "version": "0.8.4-main.84f28bd",
+  "version": "0.8.4-main.c1de068",
   "description": "Signifier components and providers for attention system.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -42,12 +42,12 @@
     "@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.16.13",
-    "@dxos/echo-schema": "0.8.4-main.84f28bd",
-    "@dxos/invariant": "0.8.4-main.84f28bd",
-    "@dxos/live-object": "0.8.4-main.84f28bd",
-    "@dxos/log": "0.8.4-main.84f28bd",
-    "@dxos/util": "0.8.4-main.84f28bd"
+    "effect": "3.17.0",
+    "@dxos/echo-schema": "0.8.4-main.c1de068",
+    "@dxos/invariant": "0.8.4-main.c1de068",
+    "@dxos/log": "0.8.4-main.c1de068",
+    "@dxos/util": "0.8.4-main.c1de068",
+    "@dxos/live-object": "0.8.4-main.c1de068"
   },
   "devDependencies": {
     "@types/react": "~18.2.0",
@@ -55,17 +55,17 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/random": "0.8.4-main.84f28bd",
-    "@dxos/react-ui": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-theme": "0.8.4-main.84f28bd",
-    "@dxos/storybook-utils": "0.8.4-main.84f28bd"
+    "@dxos/random": "0.8.4-main.c1de068",
+    "@dxos/react-ui": "0.8.4-main.c1de068",
+    "@dxos/react-ui-theme": "0.8.4-main.c1de068",
+    "@dxos/storybook-utils": "0.8.4-main.c1de068"
   },
   "peerDependencies": {
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-theme": "0.8.4-main.84f28bd"
+    "@dxos/react-ui": "0.8.4-main.c1de068",
+    "@dxos/react-ui-theme": "0.8.4-main.c1de068"
   },
   "publishConfig": {
     "access": "public"

package/src/selection.ts

@@ -3,7 +3,7 @@
 //
 
 import { untracked } from '@preact/signals-core';
-import { Match } from 'effect';
+import { Match, Schema } from 'effect';
 
 import { invariant } from '@dxos/invariant';
 import { live, type Live } from '@dxos/live-object';
@@ -12,17 +12,30 @@ import { live, type Live } from '@dxos/live-object';
 
 export type SelectionMode = 'single' | 'multi' | 'range' | 'multi-range';
 
-export type Selection =
-  | { mode: 'single'; id?: string }
-  | { mode: 'multi'; ids: string[] }
-  | { mode: 'range'; from?: string; to?: string }
-  | { mode: 'multi-range'; ranges: { from: string; to: string }[] };
+export const SelectionSchema = Schema.Union(
+  Schema.Struct({ mode: Schema.Literal('single'), id: Schema.optional(Schema.String) }).pipe(Schema.mutable),
+  Schema.Struct({ mode: Schema.Literal('multi'), ids: Schema.Array(Schema.String).pipe(Schema.mutable) }).pipe(
+    Schema.mutable,
+  ),
+  Schema.Struct({
+    mode: Schema.Literal('range'),
+    from: Schema.optional(Schema.String),
+    to: Schema.optional(Schema.String),
+  }).pipe(Schema.mutable),
+  Schema.Struct({
+    mode: Schema.Literal('multi-range'),
+    ranges: Schema.Array(Schema.Struct({ from: Schema.String, to: Schema.String })).pipe(Schema.mutable),
+  }).pipe(Schema.mutable),
+).pipe(Schema.mutable);
+
+export type Selection = Schema.Schema.Type<typeof SelectionSchema>;
 
 export const defaultSelection = Match.type<SelectionMode>().pipe(
-  Match.when('single', () => ({ mode: 'single' }) as Selection),
-  Match.when('multi', () => ({ mode: 'multi', ids: [] }) as Selection),
-  Match.when('range', () => ({ mode: 'range' }) as Selection),
-  Match.when('multi-range', () => ({ mode: 'multi-range', ranges: [] }) as Selection),
+  Match.withReturnType<Selection>(),
+  Match.when('single', () => ({ mode: 'single' })),
+  Match.when('multi', () => ({ mode: 'multi', ids: [] })),
+  Match.when('range', () => ({ mode: 'range' })),
+  Match.when('multi-range', () => ({ mode: 'multi-range', ranges: [] })),
   Match.exhaustive,
 );
 
@@ -110,7 +123,7 @@ export class SelectionManager {
     untracked(() => {
       const selection = this.getSelection(contextId, 'multi');
       invariant(selection?.mode === 'multi', 'Selection mode is not multi');
-      selection.ids = ids;
+      selection.ids.splice(0, selection.ids.length, ...ids);
     });
   }
 
@@ -127,16 +140,32 @@ export class SelectionManager {
     untracked(() => {
       const selection = this.getSelection(contextId, 'multi-range');
       invariant(selection?.mode === 'multi-range', 'Selection mode is not multi-range');
-      selection.ranges = ranges;
+      selection.ranges.splice(0, selection.ranges.length, ...ranges);
     });
   }
 
   clearSelection(contextId: string): void {
     untracked(() => {
       const selection = this.getSelection(contextId);
-      if (selection) {
-        this._state.selections[contextId] = defaultSelection(selection.mode);
-      }
+      Match.type<Selection | undefined>().pipe(
+        Match.when(undefined, () => {
+          // No-op.
+        }),
+        Match.when({ mode: 'single' }, (s) => {
+          s.id = undefined;
+        }),
+        Match.when({ mode: 'multi' }, (s) => {
+          s.ids.splice(0, s.ids.length);
+        }),
+        Match.when({ mode: 'range' }, (s) => {
+          s.from = undefined;
+          s.to = undefined;
+        }),
+        Match.when({ mode: 'multi-range' }, (s) => {
+          s.ranges.splice(0, s.ranges.length);
+        }),
+        Match.exhaustive,
+      )(selection);
     });
   }
 

package/src/testing/decorators/withAttention.ts

@@ -8,5 +8,5 @@ import { createElement } from 'react';
 import { RootAttentionProvider } from '../../components';
 
 export const withAttention: Decorator = (Story) => {
-  return createElement(RootAttentionProvider, { children: createElement(Story) });
+  return createElement(RootAttentionProvider, {}, createElement(Story));
 };