@dxos/react-ui-list 0.8.2-main.12df754 → 0.8.2-main.2f9c567

package/src/components/List/List.stories.tsx

@@ -5,9 +5,9 @@
 import '@dxos-theme';
 
 import { type Meta, type StoryObj } from '@storybook/react';
+import { Schema } from 'effect';
 import React from 'react';
 
-import { S } from '@dxos/echo-schema';
 import { live } from '@dxos/live-object';
 import { ghostHover, mx } from '@dxos/react-ui-theme';
 import { withLayout, withTheme } from '@dxos/storybook-utils';
@@ -102,7 +102,7 @@ export const Default: StoryObj<ListRootProps<TestItemType>> = {
   render: DefaultStory,
   args: {
     items: list.items,
-    isItem: S.is(TestItemSchema),
+    isItem: Schema.is(TestItemSchema),
   },
 };
 
@@ -110,6 +110,6 @@ export const Simple: StoryObj<ListRootProps<TestItemType>> = {
   render: SimpleStory,
   args: {
     items: list.items,
-    isItem: S.is(TestItemSchema),
+    isItem: Schema.is(TestItemSchema),
   },
 };

package/src/components/List/testing.ts

@@ -2,21 +2,23 @@
 // Copyright 2024 DXOS.org
 //
 
-import { S } from '@dxos/echo-schema';
+import { Schema } from 'effect';
+
+import { ObjectId } from '@dxos/echo-schema';
 import { faker } from '@dxos/random';
 
-export const TestItemSchema = S.Struct({
-  id: S.String,
-  name: S.String,
+export const TestItemSchema = Schema.Struct({
+  id: ObjectId,
+  name: Schema.String,
 });
 
-export type TestItemType = S.Schema.Type<typeof TestItemSchema>;
+export type TestItemType = Schema.Schema.Type<typeof TestItemSchema>;
 
-export const TestList = S.Struct({
-  items: S.mutable(S.Array(TestItemSchema)),
+export const TestList = Schema.Struct({
+  items: Schema.mutable(Schema.Array(TestItemSchema)),
 });
 
-export type TestList = S.Schema.Type<typeof TestList>;
+export type TestList = Schema.Schema.Type<typeof TestList>;
 
 export const createList = (n = 10): TestList => ({
   items: faker.helpers.multiple(

package/src/components/Tree/TreeItem.tsx

@@ -10,9 +10,9 @@ import {
   type Instruction,
   type ItemMode,
 } from '@atlaskit/pragmatic-drag-and-drop-hitbox/tree-item';
+import { Schema } from 'effect';
 import React, { memo, useCallback, useEffect, useMemo, useRef, useState, type FC, type KeyboardEvent } from 'react';
 
-import { S } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { Treegrid, TreeItem as NaturalTreeItem } from '@dxos/react-ui';
 import {
@@ -33,15 +33,15 @@ type TreeItemState = 'idle' | 'dragging' | 'preview' | 'parent-of-instruction';
 const hoverableDescriptionIcons =
   '[--icons-color:inherit] hover-hover:[--icons-color:var(--description-text)] hover-hover:hover:[--icons-color:inherit] focus-within:[--icons-color:inherit]';
 
-export const TreeDataSchema = S.Struct({
-  id: S.String,
-  path: S.Array(S.String),
-  item: S.Any,
+export const TreeDataSchema = Schema.Struct({
+  id: Schema.String,
+  path: Schema.Array(Schema.String),
+  item: Schema.Any,
 });
 
-export type TreeData = S.Schema.Type<typeof TreeDataSchema>;
+export type TreeData = Schema.Schema.Type<typeof TreeDataSchema>;
 
-export const isTreeData = (data: unknown): data is TreeData => S.is(TreeDataSchema)(data);
+export const isTreeData = (data: unknown): data is TreeData => Schema.is(TreeDataSchema)(data);
 
 export type TreeItemProps<T = any> = {
   item: T;

package/src/components/Tree/testing.ts

@@ -3,8 +3,9 @@
 //
 
 import { type Instruction } from '@atlaskit/pragmatic-drag-and-drop-hitbox/tree-item';
+import { Schema } from 'effect';
 
-import { S } from '@dxos/echo-schema';
+import { ObjectId } from '@dxos/echo-schema';
 import { log } from '@dxos/log';
 import { faker } from '@dxos/random';
 
@@ -17,11 +18,11 @@ export type TestItem = {
   items: TestItem[];
 };
 
-export const TestItemSchema = S.Struct({
-  id: S.String,
-  name: S.String,
-  icon: S.optional(S.String),
-  items: S.mutable(S.Array(S.suspend((): S.Schema<TestItem> => TestItemSchema))),
+export const TestItemSchema = Schema.Struct({
+  id: ObjectId,
+  name: Schema.String,
+  icon: Schema.optional(Schema.String),
+  items: Schema.mutable(Schema.Array(Schema.suspend((): Schema.Schema<TestItem> => TestItemSchema))),
 });
 
 export const createTree = (n = 4, d = 4): TestItem => ({