@dxos/react-ui-canvas-compute 0.8.4-main.937b3ca → 0.8.4-main.9be5663bfe

package/src/shapes/Gpt.tsx

@@ -6,10 +6,10 @@ import * as Schema from 'effect/Schema';
 import React, { useEffect, useState } from 'react';
 
 import { GptInput, GptOutput } from '@dxos/conductor';
+import { ScrollArea } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 
 import { useComputeNodeState } from '../hooks';
-
 import { FunctionBody, createFunctionAnchors, getHeight } from './common';
 import { ComputeShape, type CreateShapeProps, createShape } from './defs';
 
@@ -74,7 +74,11 @@ export const GptComponent = ({ shape }: ShapeComponentProps<GptShape>) => {
   return (
     <FunctionBody
       shape={shape}
-      content={<div className='pli-2 plb-1 overflow-y-auto'>{text}</div>}
+      content={
+        <ScrollArea.Root orientation='vertical' thin>
+          <ScrollArea.Viewport>{text}</ScrollArea.Viewport>
+        </ScrollArea.Root>
+      }
       status={`${tokens} tokens`}
       inputSchema={meta.input}
       outputSchema={meta.output}

package/src/shapes/GptRealtime.tsx

@@ -143,7 +143,7 @@ export const GptRealtimeComponent = ({ shape }: ShapeComponentProps<GptRealtimeS
   };
 
   return (
-    <div className='flex is-full justify-center items-center'>
+    <div className='flex w-full justify-center items-center'>
       <Icon
         icon={isReady ? 'ph--waveform--regular' : isLive ? 'ph--pulse--regular' : 'ph--play--regular'}
         size={16}

package/src/shapes/Json.tsx

@@ -8,10 +8,9 @@ import React from 'react';
 import { DEFAULT_INPUT, DefaultOutput, JsonTransformInput } from '@dxos/conductor';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 import { createAnchorMap } from '@dxos/react-ui-canvas-editor';
-import { JsonFilter } from '@dxos/react-ui-syntax-highlighter';
+import { Json } from '@dxos/react-ui-syntax-highlighter';
 
 import { useComputeNodeState } from '../hooks';
-
 import { Box, createFunctionAnchors, getHeight } from './common';
 import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
 
@@ -50,7 +49,12 @@ export const JsonComponent = ({ shape, ...props }: JsonComponentProps) => {
 
   return (
     <Box shape={shape}>
-      <JsonFilter data={value} classNames='text-xs' />
+      <Json.Root data={value}>
+        <Json.Content>
+          <Json.Filter />
+          <Json.Data classNames='text-xs' />
+        </Json.Content>
+      </Json.Root>
     </Box>
   );
 };

package/src/shapes/RNG.tsx

@@ -10,7 +10,6 @@ import { Icon, type IconProps } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef, createAnchorMap } from '@dxos/react-ui-canvas-editor';
 
 import { useComputeNodeState } from '../hooks';
-
 import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
 
 export const RandomShape = Schema.extend(

package/src/shapes/Scope.tsx

@@ -10,7 +10,6 @@ import { type ShapeComponentProps, type ShapeDef, createAnchorMap } from '@dxos/
 import { Chaos, shaderPresets, useAudioStream } from '@dxos/react-ui-sfx';
 
 import { useComputeNodeState } from '../hooks';
-
 import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
 
 export const ScopeShape = Schema.extend(
@@ -39,7 +38,7 @@ export const ScopeComponent = ({ shape }: ShapeComponentProps<ScopeShape>) => {
   const { getAverage } = useAudioStream(active);
 
   return (
-    <div className='flex is-full justify-center items-center bg-black'>
+    <div className='flex w-full justify-center items-center bg-black'>
       <Chaos active={active} getValue={getAverage} options={{ ...shaderPresets.heptapod, zoom: 1.2 }} />
     </div>
   );

package/src/shapes/Surface.tsx

@@ -5,13 +5,13 @@
 import * as Schema from 'effect/Schema';
 import React from 'react';
 
-import { Surface } from '@dxos/app-framework/react';
+import { Surface } from '@dxos/app-framework/ui';
 import { DEFAULT_INPUT } from '@dxos/conductor';
+import { Card } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 import { createAnchorMap } from '@dxos/react-ui-canvas-editor';
 
 import { useComputeNodeState } from '../hooks';
-
 import { Box, type BoxActionHandler } from './common';
 import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
 
@@ -44,9 +44,10 @@ export const SurfaceComponent = ({ shape }: ShapeComponentProps<SurfaceShape>) =
     }
   };
 
+  // TODO(burdon): Subject property?
   return (
     <Box shape={shape} onAction={handleAction}>
-      {value !== null && <Surface role='card--extrinsic' data={{ value }} limit={1} />}
+      <Card.Root>{value !== null && <Surface.Surface role='card--content' data={{ value }} limit={1} />}</Card.Root>
     </Box>
   );
 };

package/src/shapes/Switch.tsx

@@ -10,7 +10,6 @@ import { Input } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef, createAnchorMap } from '@dxos/react-ui-canvas-editor';
 
 import { useComputeNodeState } from '../hooks';
-
 import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
 
 export const SwitchShape = Schema.extend(
@@ -36,7 +35,7 @@ export const SwitchComponent = ({ shape }: ShapeComponentProps<SwitchShape>) =>
   }, [value]);
 
   return (
-    <div className='flex is-full justify-center items-center' onClick={(ev) => ev.stopPropagation()}>
+    <div className='flex w-full justify-center items-center' onClick={(ev) => ev.stopPropagation()}>
       <Input.Root>
         <Input.Switch checked={value} onCheckedChange={(value) => setValue(value)} />
       </Input.Root>

package/src/shapes/Template.tsx

@@ -17,7 +17,6 @@ import {
 } from '@dxos/react-ui-canvas-editor';
 
 import { useComputeNodeState } from '../hooks';
-
 import { Box, TypeSelect, createFunctionAnchors } from './common';
 import { ComputeShape, type CreateShapeProps, createShape } from './defs';
 

package/src/shapes/Text.tsx

@@ -10,7 +10,6 @@ import { type ShapeComponentProps, type ShapeDef, TextBox } from '@dxos/react-ui
 import { createAnchorMap } from '@dxos/react-ui-canvas-editor';
 
 import { useComputeNodeState } from '../hooks';
-
 import { Box, type BoxActionHandler } from './common';
 import { ComputeShape, type CreateShapeProps, createAnchorId, createShape } from './defs';
 

package/src/shapes/Thread.tsx

@@ -6,7 +6,7 @@ import * as Schema from 'effect/Schema';
 import React, { useEffect, useRef } from 'react';
 
 import { createInputSchema, createOutputSchema } from '@dxos/conductor';
-import { type ThemedClassName } from '@dxos/react-ui';
+import { ScrollArea, type ThemedClassName } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 import { Message } from '@dxos/types';
 import { mx } from '@dxos/ui-theme';
@@ -42,18 +42,24 @@ export const ThreadComponent = ({ shape }: ShapeComponentProps<ThreadShape>) =>
 
   return (
     <Box shape={shape}>
-      <div ref={scrollRef} className='flex flex-col is-full overflow-y-auto gap-2 p-2'>
-        {[...items].map((item, i) => (
-          <ThreadItem key={i} item={item} />
-        ))}
-      </div>
+      <ScrollArea.Root orientation='vertical'>
+        <ScrollArea.Viewport classNames='gap-2 p-2' ref={scrollRef}>
+          {[...items].map((item, i) => (
+            <ThreadItem key={i} item={item} />
+          ))}
+        </ScrollArea.Viewport>
+      </ScrollArea.Root>
     </Box>
   );
 };
 
 export const ThreadItem = ({ classNames, item }: ThemedClassName<{ item: any }>) => {
   if (typeof item !== 'object') {
-    return <div className={mx(classNames)}>{item}</div>;
+    return (
+      <div role='none' className={mx(classNames)}>
+        {item}
+      </div>
+    );
   }
 
   // TODO(burdon): Hack; introspect type.
@@ -63,7 +69,7 @@ export const ThreadItem = ({ classNames, item }: ThemedClassName<{ item: any }>)
     <div className={mx('flex', classNames, role === 'user' && 'justify-end')}>
       <div
         className={mx(
-          'block rounded-md p-1 pli-2 text-sm',
+          'block rounded-md p-1 px-2 text-sm',
           role === 'user'
             ? 'bg-blue-100 dark:bg-blue-800'
             : role === 'system'

package/src/shapes/Trigger.tsx

@@ -6,11 +6,11 @@ import * as Schema from 'effect/Schema';
 import React, { useEffect } from 'react';
 
 import { VoidInput } from '@dxos/conductor';
-import { Filter, Obj, Query, Ref, Type } from '@dxos/echo';
+import { Filter, Obj, Query, Ref } from '@dxos/echo';
 import { type Mutable } from '@dxos/echo/internal';
 import { Trigger, TriggerEvent } from '@dxos/functions';
 import { DXN, SpaceId } from '@dxos/keys';
-import { useSpace } from '@dxos/react-client/echo';
+import { useSpaces } from '@dxos/react-client/echo';
 import { Select, type SelectRootProps } from '@dxos/react-ui';
 import { type ShapeComponentProps, type ShapeDef } from '@dxos/react-ui-canvas-editor';
 
@@ -21,7 +21,7 @@ export const TriggerShape = Schema.extend(
   ComputeShape,
   Schema.Struct({
     type: Schema.Literal('trigger'),
-    functionTrigger: Schema.optional(Type.Ref(Trigger.Trigger)),
+    functionTrigger: Schema.optional(Ref.Ref(Trigger.Trigger)),
   }),
 );
 
@@ -48,13 +48,13 @@ export const createTrigger = (props: CreateTriggerProps): TriggerShape => {
 export type TriggerComponentProps = ShapeComponentProps<TriggerShape>;
 
 export const TriggerComponent = ({ shape }: TriggerComponentProps) => {
-  const space = useSpace();
+  const [space] = useSpaces();
   const functionTrigger = shape.functionTrigger?.target;
 
   useEffect(() => {
     if (functionTrigger && !functionTrigger.spec) {
-      Obj.change(functionTrigger, (t) => {
-        t.spec = createTriggerSpec({ triggerKind: 'email', spaceId: space?.id }) as Mutable<Trigger.Spec>;
+      Obj.change(functionTrigger, (functionTrigger) => {
+        functionTrigger.spec = createTriggerSpec({ triggerKind: 'email', spaceId: space?.id }) as Mutable<Trigger.Spec>;
       });
     }
   }, [functionTrigger, functionTrigger?.spec]);
@@ -65,8 +65,8 @@ export const TriggerComponent = ({ shape }: TriggerComponentProps) => {
 
   const setKind = (kind: Trigger.Kind) => {
     if (functionTrigger?.spec?.kind !== kind) {
-      Obj.change(functionTrigger!, (t) => {
-        t.spec = createTriggerSpec({ triggerKind: kind, spaceId: space?.id }) as Mutable<Trigger.Spec>;
+      Obj.change(functionTrigger!, (obj) => {
+        obj.spec = createTriggerSpec({ triggerKind: kind, spaceId: space?.id }) as Mutable<Trigger.Spec>;
       });
     }
   };
@@ -91,7 +91,7 @@ export const TriggerComponent = ({ shape }: TriggerComponentProps) => {
 const TriggerKindSelect = ({ value, onValueChange }: Pick<SelectRootProps, 'value' | 'onValueChange'>) => {
   return (
     <Select.Root value={value} onValueChange={onValueChange}>
-      <Select.TriggerButton variant='ghost' classNames='is-full !pli-0' />
+      <Select.TriggerButton variant='ghost' classNames='w-full px-0!' />
       <Select.Portal>
         <Select.Content>
           <Select.ScrollUpButton />

package/src/shapes/common/Box.tsx

@@ -6,8 +6,7 @@ import React, { type PropsWithChildren, type ReactNode, forwardRef } from 'react
 
 import { invariant } from '@dxos/invariant';
 import { Icon, IconButton, type ThemedClassName } from '@dxos/react-ui';
-import { useEditorContext, useShapeDef } from '@dxos/react-ui-canvas-editor';
-import { type Shape } from '@dxos/react-ui-canvas-editor';
+import { type CanvasBoard, useEditorContext, useShapeDef } from '@dxos/react-ui-canvas-editor';
 import { mx } from '@dxos/ui-theme';
 
 export const headerHeight = 32;
@@ -17,7 +16,7 @@ export type BoxActionHandler = (action: 'run' | 'open' | 'close') => void;
 
 export type BoxProps = PropsWithChildren<
   ThemedClassName<{
-    shape: Shape;
+    shape: CanvasBoard.Shape;
     title?: string;
     status?: string | ReactNode;
     open?: boolean;
@@ -32,15 +31,14 @@ export const Box = forwardRef<HTMLDivElement, BoxProps>(
     const { debug } = useEditorContext();
 
     return (
-      <div ref={forwardedRef} className='flex flex-col bs-full is-full justify-between'>
-        <div className='flex shrink-0 is-full justify-between items-center bs-[32px] bg-hoverSurface'>
+      <div ref={forwardedRef} className='flex flex-col h-full w-full justify-between'>
+        <div className='flex shrink-0 w-full justify-between items-center h-[32px] bg-input-surface'>
           <Icon icon={icon} classNames='mx-2' />
           <div className='grow text-sm truncate'>{debug ? shape.type : (name ?? shape.text ?? title)}</div>
           <IconButton
             classNames='p-1 text-green-500'
             variant='ghost'
             icon='ph--play--regular'
-            size={4}
             label='run'
             iconOnly
             onDoubleClick={(ev) => ev.stopPropagation()}
@@ -50,15 +48,14 @@ export const Box = forwardRef<HTMLDivElement, BoxProps>(
             }}
           />
         </div>
-        <div className={mx('flex flex-col bs-full grow overflow-hidden', classNames)}>{children}</div>
-        <div className='flex shrink-0 is-full justify-between items-center bs-[32px] bg-hoverSurface'>
-          <div className='grow pli-2 text-sm truncate'>{debug ? shape.id : status}</div>
+        <div className={mx('flex flex-col h-full grow overflow-hidden', classNames)}>{children}</div>
+        <div className='flex shrink-0 w-full justify-between items-center h-[32px] bg-input-surface'>
+          <div className='grow px-2 text-sm truncate'>{debug ? shape.id : status}</div>
           {openable && (
             <IconButton
               classNames='p-1'
               variant='ghost'
               icon={open ? 'ph--caret-up--regular' : 'ph--caret-down--regular'}
-              size={4}
               label={open ? 'close' : 'open'}
               iconOnly
               onClick={(ev) => {

package/src/shapes/common/FunctionBody.tsx

@@ -8,7 +8,7 @@ import React, { type JSX, useRef, useState } from 'react';
 
 import { VoidInput, VoidOutput } from '@dxos/conductor';
 import { useCanvasContext } from '@dxos/react-ui-canvas';
-import { type Polygon, type Shape } from '@dxos/react-ui-canvas-editor';
+import { type CanvasBoard, type Polygon } from '@dxos/react-ui-canvas-editor';
 import { createAnchors, getParentShapeElement, rowHeight } from '@dxos/react-ui-canvas-editor';
 
 import { Box, type BoxProps, footerHeight, headerHeight } from '../common';
@@ -18,7 +18,7 @@ const bodyPadding = 8;
 const expandedHeight = 200;
 
 export type FunctionBodyProps = {
-  shape: Shape;
+  shape: CanvasBoard.Shape;
   name?: string;
   content?: JSX.Element;
   inputSchema?: Schema.Schema.Any;
@@ -82,7 +82,7 @@ export const FunctionBody = ({
         {(inputs?.length ?? 0) > 0 && (
           <div className='flex flex-col'>
             {inputs?.map(({ name }) => (
-              <div key={name} className='pli-2 truncate text-sm font-mono items-center' style={{ height: rowHeight }}>
+              <div key={name} className='px-2 truncate text-sm font-mono items-center' style={{ height: rowHeight }}>
                 {name}
               </div>
             ))}
@@ -93,7 +93,7 @@ export const FunctionBody = ({
             {outputs?.map(({ name }) => (
               <div
                 key={name}
-                className='pli-2 truncate text-sm font-mono items-center text-right'
+                className='px-2 truncate text-sm font-mono items-center text-right'
                 style={{ height: rowHeight }}
               >
                 {name}

package/src/shapes/common/TypeSelect.tsx

@@ -11,7 +11,7 @@ import { Select, type SelectRootProps } from '@dxos/react-ui';
 export const TypeSelect = ({ value, onValueChange }: Pick<SelectRootProps, 'value' | 'onValueChange'>) => {
   return (
     <Select.Root value={value} onValueChange={onValueChange}>
-      <Select.TriggerButton variant='ghost' classNames='is-full !pli-0' />
+      <Select.TriggerButton variant='ghost' classNames='w-full px-0!' />
       <Select.Portal>
         <Select.Content>
           <Select.ScrollUpButton />

package/src/shapes/index.ts

@@ -13,11 +13,12 @@ export * from './Boolean';
 export * from './Chat';
 export * from './Constant';
 export * from './Database';
+export * from './Feed';
 export * from './Function';
 export * from './Gpt';
+export * from './GptRealtime';
 export * from './Json';
 export * from './Logic';
-export * from './Queue';
 export * from './RNG';
 export * from './Scope';
 export * from './Surface';
@@ -28,4 +29,3 @@ export * from './Text';
 export * from './Thread';
 export * from './TextToImage';
 export * from './Trigger';
-export * from './GptRealtime';

package/src/testing/circuits.ts

@@ -24,7 +24,7 @@ import {
   createJsonTransform,
   createNot,
   createOr,
-  createQueue,
+  createFeed,
   createRandom,
   createScope,
   createSurface,
@@ -241,7 +241,7 @@ export const createGptCircuit = (options: {
         }),
       );
 
-      const thread = model.createNode(createQueue(position({ x: -3, y: 3, width: 14, height: 10 })));
+      const thread = model.createNode(createFeed(position({ x: -3, y: 3, width: 14, height: 10 })));
       const append = model.createNode(createAppend(position({ x: 10, y: 6 })));
 
       builder

package/dist/types/src/shapes/Queue.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Queue.d.ts","sourceRoot":"","sources":["../../../../src/shapes/Queue.tsx"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAC;AACxC,OAAO,KAAmB,MAAM,OAAO,CAAC;AAGxC,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,KAAK,mBAAmB,EAAE,KAAK,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAOvF,OAAO,EAAgB,KAAK,gBAAgB,EAAe,MAAM,QAAQ,CAAC;AAE1E,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;GAKtB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,UAAU,CAAC,CAAC;AAE/D,MAAM,MAAM,gBAAgB,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;AAE5D,eAAO,MAAM,WAAW,GAAI,OAAO,gBAAgB;;;;;;;;;;;;;;;;;;;CAK/C,CAAC;AAEL,eAAO,MAAM,cAAc,GAAI,WAAW,mBAAmB,CAAC,UAAU,CAAC,sBAmBxE,CAAC;AAEF,eAAO,MAAM,SAAS,GAAI,sBAAsB,eAAe,CAAC;IAAE,IAAI,EAAE,GAAG,CAAA;CAAE,CAAC,sBAe7E,CAAC;AAEF,eAAO,MAAM,UAAU,EAAE,QAAQ,CAAC,UAAU,CAQ3C,CAAC"}