@dxos/plugin-space 0.7.5-main.9d26e3a → 0.7.5-main.b19bfc8

package/src/components/AwaitingObject.tsx

@@ -5,13 +5,7 @@
 import { CheckCircle, CircleDashed, CircleNotch } from '@phosphor-icons/react';
 import React, { useCallback, useEffect, useState } from 'react';
 
-import {
-  useResolvePlugin,
-  parseNavigationPlugin,
-  NavigationAction,
-  useIntentDispatcher,
-  createIntent,
-} from '@dxos/app-framework';
+import { createIntent, LayoutAction, useIntentDispatcher, useLayout } from '@dxos/app-framework';
 import { useClient } from '@dxos/react-client';
 import { Filter, fullyQualifiedId, useQuery } from '@dxos/react-client/echo';
 import { Button, Toast, useTranslation } from '@dxos/react-ui';
@@ -29,7 +23,7 @@ export const AwaitingObject = ({ id }: { id: string }) => {
   const [found, setFound] = useState(false);
   const { t } = useTranslation(SPACE_PLUGIN);
   const { dispatchPromise: dispatch } = useIntentDispatcher();
-  const navigationPlugin = useResolvePlugin(parseNavigationPlugin);
+  const layout = useLayout();
 
   const client = useClient();
   const objects = useQuery(client.spaces, Filter.all());
@@ -50,11 +44,11 @@ export const AwaitingObject = ({ id }: { id: string }) => {
     if (objects.findIndex((object) => fullyQualifiedId(object) === id) > -1) {
       setFound(true);
 
-      if (navigationPlugin?.provides.location.active.solo?.[0].id === id) {
+      if (layout.active.includes(id)) {
         setOpen(false);
       }
     }
-  }, [id, objects, navigationPlugin]);
+  }, [id, objects, layout]);
 
   const handleClose = useCallback(
     async () => dispatch(createIntent(SpaceAction.WaitForObject, { id: undefined })),
@@ -62,7 +56,7 @@ export const AwaitingObject = ({ id }: { id: string }) => {
   );
 
   const handleNavigate = useCallback(() => {
-    void dispatch(createIntent(NavigationAction.Open, { activeParts: { main: [id] } }));
+    void dispatch(createIntent(LayoutAction.Open, { part: 'main', subject: [id] }));
     void handleClose();
   }, [id, handleClose, dispatch]);
 

package/src/components/{DefaultObjectSettings.tsx → BaseObjectSettings.tsx}

@@ -9,23 +9,30 @@ import { Input, useTranslation } from '@dxos/react-ui';
 
 import { SPACE_PLUGIN } from '../meta';
 
-export type DefaultObjectSettingsProps = {
+export type BaseObjectSettingsProps = {
   object: ReactiveEchoObject<any>;
 };
 
-export const DefaultObjectSettings = ({ object }: DefaultObjectSettingsProps) => {
+export const BaseObjectSettings = ({ object }: BaseObjectSettingsProps) => {
   const { t } = useTranslation(SPACE_PLUGIN);
+  const inputRef = React.useRef<HTMLInputElement>(null);
   // TODO(burdon): Standardize forms.
   return (
     <div role='form' className='flex flex-col w-full p-2 gap-1'>
       <Input.Root>
         <Input.Label>{t('name label')}</Input.Label>
         <Input.TextInput
+          ref={inputRef}
           placeholder={t('name placeholder')}
           value={object.name ?? ''}
           onChange={(event) => {
             object.name = event.target.value;
           }}
+          onKeyDown={(event) => {
+            if (event.key === 'Enter') {
+              inputRef.current?.blur();
+            }
+          }}
         />
       </Input.Root>
     </div>

package/src/components/CreateDialog/CreateObjectDialog.stories.tsx

@@ -40,9 +40,7 @@ const meta: Meta<typeof CreateObjectDialog> = {
   parameters: {
     translations: [...translations, osTranslations],
   },
-  args: {
-    schemas: [CollectionType],
-  },
+  args: {},
 };
 
 export default meta;

package/src/components/CreateDialog/CreateObjectDialog.tsx

@@ -5,58 +5,65 @@
 import { pipe } from 'effect';
 import React, { useCallback, useRef } from 'react';
 
-import { chain, createIntent, type MetadataResolver, NavigationAction, useIntentDispatcher } from '@dxos/app-framework';
-import { useClient } from '@dxos/react-client';
 import {
-  getSpace,
-  isReactiveObject,
-  isSpace,
-  type ReactiveObject,
-  type TypedObject,
-  useSpaces,
-} from '@dxos/react-client/echo';
+  Capabilities,
+  chain,
+  createIntent,
+  LayoutAction,
+  useCapabilities,
+  useIntentDispatcher,
+  usePluginManager,
+} from '@dxos/app-framework';
+import { invariant } from '@dxos/invariant';
+import { useClient } from '@dxos/react-client';
+import { getSpace, isReactiveObject, isSpace, type ReactiveObject, useSpaces } from '@dxos/react-client/echo';
 import { Button, Dialog, Icon, useTranslation } from '@dxos/react-ui';
 
 import { CreateObjectPanel, type CreateObjectPanelProps } from './CreateObjectPanel';
+import { SpaceCapabilities } from '../../capabilities';
 import { SPACE_PLUGIN } from '../../meta';
-import { CollectionType, SpaceAction } from '../../types';
+import { CollectionType, type ObjectForm, SpaceAction } from '../../types';
 
 export const CREATE_OBJECT_DIALOG = `${SPACE_PLUGIN}/CreateObjectDialog`;
 
-export type CreateObjectDialogProps = Pick<CreateObjectPanelProps, 'schemas' | 'target' | 'typename' | 'name'> & {
-  resolve?: MetadataResolver;
+export type CreateObjectDialogProps = Pick<CreateObjectPanelProps, 'target' | 'typename' | 'name'> & {
   shouldNavigate?: (object: ReactiveObject<any>) => boolean;
 };
 
 export const CreateObjectDialog = ({
-  schemas,
   target,
   typename,
   name,
   shouldNavigate: _shouldNavigate,
-  resolve,
 }: CreateObjectDialogProps) => {
   const closeRef = useRef<HTMLButtonElement | null>(null);
+  const manager = usePluginManager();
   const { t } = useTranslation(SPACE_PLUGIN);
   const client = useClient();
   const spaces = useSpaces();
   const { dispatchPromise: dispatch } = useIntentDispatcher();
+  const forms = useCapabilities(SpaceCapabilities.ObjectForm);
+
+  const resolve = useCallback(
+    (typename: string) =>
+      manager.context.requestCapabilities(Capabilities.Metadata).find(({ id }) => id === typename)?.metadata ?? {},
+    [manager],
+  );
 
   const handleCreateObject = useCallback(
     async ({
-      schema,
+      form,
       target: _target,
-      name,
+      data = {},
     }: {
-      schema: TypedObject;
+      form: ObjectForm;
       target: CreateObjectPanelProps['target'];
-      name?: string;
+      data?: Record<string, any>;
     }) => {
       const target = isSpace(_target)
         ? (_target.properties[CollectionType.typename]?.target as CollectionType | undefined)
         : _target;
-      const createObjectIntent = resolve?.(schema.typename)?.createObject;
-      if (!createObjectIntent || !target) {
+      if (!target) {
         // TODO(wittjosiah): UI feedback.
         return;
       }
@@ -65,13 +72,14 @@ export const CreateObjectDialog = ({
       closeRef.current?.click();
 
       const space = isSpace(target) ? target : getSpace(target);
-      const result = await dispatch(createObjectIntent({ name, space }));
+      invariant(space, 'Missing space');
+      const result = await dispatch(form.getIntent(data, { space }));
       const object = result.data?.object;
       if (isReactiveObject(object)) {
         const addObjectIntent = createIntent(SpaceAction.AddObject, { target, object });
         const shouldNavigate = _shouldNavigate ?? (() => true);
         if (shouldNavigate(object)) {
-          await dispatch(pipe(addObjectIntent, chain(NavigationAction.Open, {})));
+          await dispatch(pipe(addObjectIntent, chain(LayoutAction.Open, { part: 'main' })));
         } else {
           await dispatch(addObjectIntent);
         }
@@ -83,7 +91,7 @@ export const CreateObjectDialog = ({
   return (
     // TODO(wittjosiah): The tablist dialog pattern is copied from @dxos/plugin-manager.
     //  Consider factoring it out to the tabs package.
-    <Dialog.Content classNames='p-0 bs-content min-bs-[15rem] max-bs-full md:max-is-[40rem] overflow-hidden'>
+    <Dialog.Content classNames='p-0 bs-content max-bs-full md:max-is-[40rem] overflow-hidden'>
       <div role='none' className='flex justify-between pbs-2 pis-2 pie-2 @md:pbs-4 @md:pis-4 @md:pie-4'>
         <Dialog.Title>{t('create object dialog title')}</Dialog.Title>
         <Dialog.Close asChild>
@@ -92,18 +100,18 @@ export const CreateObjectDialog = ({
           </Button>
         </Dialog.Close>
       </div>
-      <div className='p-4'>
-        <CreateObjectPanel
-          schemas={schemas}
-          spaces={spaces}
-          target={target}
-          typename={typename}
-          name={name}
-          defaultSpaceId={client.spaces.default.id}
-          resolve={resolve}
-          onCreateObject={handleCreateObject}
-        />
-      </div>
+
+      <CreateObjectPanel
+        classNames='p-4'
+        forms={forms}
+        spaces={spaces}
+        target={target}
+        typename={typename}
+        name={name}
+        defaultSpaceId={client.spaces.default.id}
+        resolve={resolve}
+        onCreateObject={handleCreateObject}
+      />
     </Dialog.Content>
   );
 };

package/src/components/CreateDialog/CreateObjectPanel.tsx

@@ -4,35 +4,60 @@
 
 import React, { useCallback, useState } from 'react';
 
-import { type MetadataResolver } from '@dxos/app-framework';
-import { type TypedObject, getObjectAnnotation, S } from '@dxos/echo-schema';
-import { type SpaceId, type Space, isSpace } from '@dxos/react-client/echo';
-import { Icon, IconButton, Input, toLocalizedString, useTranslation } from '@dxos/react-ui';
-import { Form, InputHeader } from '@dxos/react-ui-form';
+import { Surface, isSurfaceAvailable, usePluginManager } from '@dxos/app-framework';
+import { getObjectAnnotation, type ObjectAnnotation, type S } from '@dxos/echo-schema';
+import { invariant } from '@dxos/invariant';
+import { type SpaceId, type Space } from '@dxos/react-client/echo';
+import { Icon, type ThemedClassName, toLocalizedString, useTranslation } from '@dxos/react-ui';
+import { Form, type InputProps } from '@dxos/react-ui-form';
 import { SearchList } from '@dxos/react-ui-searchlist';
-import { nonNullable, type MaybePromise } from '@dxos/util';
+import { mx } from '@dxos/react-ui-theme';
+import { isNonNullable, type MaybePromise } from '@dxos/util';
 
 import { SPACE_PLUGIN } from '../../meta';
-import { type CollectionType } from '../../types';
+import { type ObjectForm, type CollectionType } from '../../types';
 import { getSpaceDisplayName } from '../../util';
 
-export type CreateObjectPanelProps = {
-  schemas: TypedObject[];
+// TODO(ZaymonFC): Move this if you find yourself needing it elsewhere.
+/**
+ * Creates a surface input component based on plugin context.
+ * @param baseData Additional data that will be merged with form data and passed to the surface.
+ * This allows providing more context to the surface than what's available from the form itself.
+ */
+const useInputSurfaceLookup = (baseData?: Record<string, any>) => {
+  const pluginManager = usePluginManager();
+
+  return useCallback(
+    ({ prop, schema, inputProps }: { prop: string; schema: S.Schema<any>; inputProps: InputProps }) => {
+      const composedData = { prop, schema, ...baseData };
+      if (!isSurfaceAvailable(pluginManager.context, { role: 'form-input', data: composedData })) {
+        return undefined;
+      }
+
+      return <Surface role='form-input' data={composedData} {...inputProps} />;
+    },
+    [pluginManager, baseData],
+  );
+};
+
+export type CreateObjectPanelProps = ThemedClassName<{
+  forms: ObjectForm[];
   spaces: Space[];
   typename?: string;
   target?: Space | CollectionType;
   name?: string;
   defaultSpaceId?: SpaceId;
-  resolve?: MetadataResolver;
+  resolve?: (typename: string) => Record<string, any>;
   onCreateObject?: (params: {
-    schema: TypedObject;
+    form: ObjectForm;
     target: Space | CollectionType;
-    name?: string;
+    data?: Record<string, any>;
   }) => MaybePromise<void>;
-};
+}>;
 
 export const CreateObjectPanel = ({
-  schemas,
+  classNames,
+  forms,
   spaces,
   typename: initialTypename,
   target: initialTarget,
@@ -44,126 +69,135 @@ export const CreateObjectPanel = ({
   const { t } = useTranslation(SPACE_PLUGIN);
   const [typename, setTypename] = useState<string | undefined>(initialTypename);
   const [target, setTarget] = useState<Space | CollectionType | undefined>(initialTarget);
-  const schema = schemas.find((schema) => getObjectAnnotation(schema)?.typename === typename);
-  const options = schemas.map(getObjectAnnotation).filter(nonNullable);
-
-  const handleClearSchema = useCallback(() => setTypename(undefined), []);
-  const handleClearTarget = useCallback(() => setTarget(undefined), []);
+  const form = forms.find((form) => getObjectAnnotation(form.objectSchema)?.typename === typename);
+  const options: ObjectAnnotation[] = forms
+    .map((form) => getObjectAnnotation(form.objectSchema))
+    .filter(isNonNullable)
+    .sort((a, b) => {
+      const nameA = t('typename label', { ns: a.typename, defaultValue: a.typename });
+      const nameB = t('typename label', { ns: b.typename, defaultValue: b.typename });
+      return nameA.localeCompare(nameB);
+    });
 
   const handleCreateObject = useCallback(
-    async ({ name }: { name?: string }) => {
-      if (!schema || !target) {
+    async (props: Record<string, any>) => {
+      if (!form || !target) {
         return;
       }
+      await onCreateObject?.({ form, target, data: props });
+    },
+    [onCreateObject, form, target],
+  );
 
-      await onCreateObject?.({ schema, target, name });
+  const handleSetTypename = useCallback(
+    async (typename: string) => {
+      invariant(target, 'target is required');
+      const form = forms.find((form) => getObjectAnnotation(form.objectSchema)?.typename === typename);
+      if (form && !form.formSchema) {
+        await onCreateObject?.({ form, target });
+      } else {
+        setTypename(typename);
+      }
     },
-    [onCreateObject, schema, target],
+    [forms, onCreateObject, target],
   );
 
-  // TODO(wittjosiah): All of these inputs should be rolled into a `Form` once it supports the necessary variants.
-  const schemaInput = (
-    <SearchList.Root label={t('schema input label')} classNames='flex flex-col grow overflow-hidden'>
+  const inputSurfaceLookup = useInputSurfaceLookup({ target });
+
+  // TODO(wittjosiah): These inputs should be rolled into a `Form` once it supports the necessary variants.
+  return (
+    <div role='form' className={mx('flex flex-col gap-2', classNames)}>
+      {!form ? (
+        <SelectSchema options={options} resolve={resolve} onChange={handleSetTypename} />
+      ) : !target ? (
+        <SelectSpace spaces={spaces} defaultSpaceId={defaultSpaceId} onChange={setTarget} />
+      ) : form.formSchema ? (
+        <Form
+          classNames='!p-0'
+          autoFocus
+          values={{ name: initialName }}
+          schema={form.formSchema}
+          testId='create-object-form'
+          onSave={handleCreateObject}
+          lookupComponent={inputSurfaceLookup}
+        />
+      ) : undefined}
+    </div>
+  );
+};
+
+const SelectSpace = ({
+  spaces,
+  defaultSpaceId,
+  onChange,
+}: { onChange: (space: Space) => void } & Pick<CreateObjectPanelProps, 'spaces' | 'defaultSpaceId'>) => {
+  const { t } = useTranslation(SPACE_PLUGIN);
+
+  return (
+    <SearchList.Root label={t('space input label')} classNames='flex flex-col grow overflow-hidden'>
       <SearchList.Input
         autoFocus
-        data-testid='create-object-form.schema-input'
-        placeholder={t('schema input placeholder')}
+        data-testid='create-object-form.space-input'
+        placeholder={t('space input placeholder')}
         classNames='px-1 my-2'
       />
       <SearchList.Content classNames='max-bs-[24rem] overflow-auto'>
-        {options.map((option) => (
-          <SearchList.Item
-            key={option.typename}
-            value={t('typename label', { ns: option.typename, defaultValue: option.typename })}
-            onSelect={() => setTypename(option.typename)}
-            classNames='flex items-center gap-2'
-          >
-            <span className='flex gap-2 items-center grow truncate'>
-              <Icon icon={resolve?.(option.typename).icon ?? 'ph--placeholder--regular'} size={5} />
-              {t('typename label', { ns: option.typename, defaultValue: option.typename })}
-            </span>
-          </SearchList.Item>
-        ))}
+        {spaces
+          .sort((a, b) => {
+            const aName = toLocalizedString(getSpaceDisplayName(a, { personal: a.id === defaultSpaceId }), t);
+            const bName = toLocalizedString(getSpaceDisplayName(b, { personal: b.id === defaultSpaceId }), t);
+            return aName.localeCompare(bName);
+          })
+          .map((space) => (
+            <SearchList.Item
+              key={space.id}
+              value={toLocalizedString(getSpaceDisplayName(space, { personal: space.id === defaultSpaceId }), t)}
+              onSelect={() => onChange(space)}
+              classNames='flex items-center gap-2'
+            >
+              <span className='grow truncate'>
+                {toLocalizedString(getSpaceDisplayName(space, { personal: space.id === defaultSpaceId }), t)}
+              </span>
+            </SearchList.Item>
+          ))}
       </SearchList.Content>
     </SearchList.Root>
   );
+};
 
-  const spaceInput = (
-    <SearchList.Root label={t('space input label')} classNames='flex flex-col grow overflow-hidden'>
+const SelectSchema = ({
+  options,
+  resolve,
+  onChange,
+}: {
+  options: ObjectAnnotation[];
+  onChange: (type: string) => void;
+} & Pick<CreateObjectPanelProps, 'resolve'>) => {
+  const { t } = useTranslation(SPACE_PLUGIN);
+
+  return (
+    <SearchList.Root label={t('schema input label')} classNames='flex flex-col grow overflow-hidden'>
       <SearchList.Input
         autoFocus
-        data-testid='create-object-form.space-input'
-        placeholder={t('space input placeholder')}
+        data-testid='create-object-form.schema-input'
+        placeholder={t('schema input placeholder')}
         classNames='px-1 my-2'
       />
       <SearchList.Content classNames='max-bs-[24rem] overflow-auto'>
-        {spaces.map((space) => (
+        {options.map((option) => (
           <SearchList.Item
-            key={space.id}
-            value={toLocalizedString(getSpaceDisplayName(space, { personal: space.id === defaultSpaceId }), t)}
-            onSelect={() => setTarget(space)}
+            key={option.typename}
+            value={t('typename label', { ns: option.typename, defaultValue: option.typename })}
+            onSelect={() => onChange(option.typename)}
             classNames='flex items-center gap-2'
           >
-            <span className='grow truncate'>
-              {toLocalizedString(getSpaceDisplayName(space, { personal: space.id === defaultSpaceId }), t)}
+            <span className='flex gap-2 items-center grow truncate'>
+              <Icon icon={resolve?.(option.typename).icon ?? 'ph--placeholder--regular'} size={5} />
+              {t('typename label', { ns: option.typename, defaultValue: option.typename })}
             </span>
           </SearchList.Item>
         ))}
       </SearchList.Content>
     </SearchList.Root>
   );
-
-  const form = (
-    <Form
-      autoFocus
-      values={{ name: initialName }}
-      schema={S.Struct({ name: S.optional(S.String) })}
-      testId='create-object-form'
-      onSave={handleCreateObject}
-    />
-  );
-
-  return (
-    <div role='form' className='flex flex-col gap-2'>
-      {target && (
-        <div role='none'>
-          <Input.Root>
-            <InputHeader>
-              <Input.Label>
-                {t(isSpace(target) ? 'creating in space label' : 'creating in collection label')}
-              </Input.Label>
-            </InputHeader>
-            <div role='none' className='flex gap-2'>
-              <Input.TextInput
-                disabled
-                value={
-                  isSpace(target)
-                    ? toLocalizedString(getSpaceDisplayName(target, { personal: target.id === defaultSpaceId }), t)
-                    : target.name || t('unnamed collection label')
-                }
-              />
-              <IconButton iconOnly icon='ph--x--regular' label={t('clear input label')} onClick={handleClearTarget} />
-            </div>
-          </Input.Root>
-        </div>
-      )}
-      {schema && (
-        <div role='none'>
-          <Input.Root>
-            <InputHeader>
-              <Input.Label>{t('creating object type label')}</Input.Label>
-            </InputHeader>
-            <div role='none' className='flex gap-2'>
-              <Input.TextInput
-                disabled
-                value={t('typename label', { ns: schema.typename, defaultValue: schema.typename })}
-              />
-              <IconButton iconOnly icon='ph--x--regular' label={t('clear input label')} onClick={handleClearSchema} />
-            </div>
-          </Input.Root>
-        </div>
-      )}
-      {!schema ? schemaInput : !target ? spaceInput : form}
-    </div>
-  );
 };

package/src/components/CreateDialog/CreateSpaceDialog.tsx

@@ -2,9 +2,10 @@
 // Copyright 2024 DXOS.org
 //
 
+import { Effect } from 'effect';
 import React, { useCallback, useRef } from 'react';
 
-import { createIntent, useIntentDispatcher } from '@dxos/app-framework';
+import { createIntent, LayoutAction, useIntentDispatcher } from '@dxos/app-framework';
 import { type S } from '@dxos/echo-schema';
 import { Button, Dialog, Icon, useTranslation } from '@dxos/react-ui';
 import { Form } from '@dxos/react-ui-form';
@@ -20,15 +21,16 @@ const initialValues: FormValues = { edgeReplication: true };
 export const CreateSpaceDialog = () => {
   const closeRef = useRef<HTMLButtonElement | null>(null);
   const { t } = useTranslation(SPACE_PLUGIN);
-  const { dispatchPromise: dispatch } = useIntentDispatcher();
+  const { dispatch } = useIntentDispatcher();
 
   const handleCreateSpace = useCallback(
     async (data: FormValues) => {
-      const result = await dispatch(createIntent(SpaceAction.Create, data));
-      const target = result.data?.space;
-      if (target) {
-        await dispatch(createIntent(SpaceAction.OpenCreateObject, { target }));
-      }
+      const program = Effect.gen(function* () {
+        const { space } = yield* dispatch(createIntent(SpaceAction.Create, data));
+        yield* dispatch(createIntent(LayoutAction.SwitchWorkspace, { part: 'workspace', subject: space.id }));
+        yield* dispatch(createIntent(SpaceAction.OpenCreateObject, { target: space }));
+      });
+      await Effect.runPromise(program);
     },
     [dispatch],
   );
@@ -36,7 +38,7 @@ export const CreateSpaceDialog = () => {
   return (
     // TODO(wittjosiah): The tablist dialog pattern is copied from @dxos/plugin-manager.
     //  Consider factoring it out to the tabs package.
-    <Dialog.Content classNames='p-0 bs-content min-bs-[15rem] max-bs-full md:max-is-[40rem] overflow-hidden'>
+    <Dialog.Content classNames='p-0 bs-content min-bs-[16rem] max-bs-full md:max-is-[32rem] overflow-hidden'>
       <div role='none' className='flex justify-between pbs-2 pis-2 pie-2 @md:pbs-4 @md:pis-4 @md:pie-4'>
         <Dialog.Title>{t('create space dialog title')}</Dialog.Title>
         <Dialog.Close asChild>
@@ -46,7 +48,14 @@ export const CreateSpaceDialog = () => {
         </Dialog.Close>
       </div>
       <div className='p-4'>
-        <Form testId='create-space-form' values={initialValues} schema={SpaceForm} onSave={handleCreateSpace} />
+        <Form
+          testId='create-space-form'
+          classNames='!p-0'
+          autoFocus
+          values={initialValues}
+          schema={SpaceForm}
+          onSave={handleCreateSpace}
+        />
       </div>
     </Dialog.Content>
   );