@dxos/react-ui-form 0.8.4-main.dedc0f3 → 0.8.4-main.dfabb4ec29

package/src/components/Form/Input.tsx

@@ -1,54 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import React, { type FC } from 'react';
-
-import { type FormatEnum } from '@dxos/echo-schema';
-import { type SimpleType } from '@dxos/effect';
-import { Icon, Input, Tooltip } from '@dxos/react-ui';
-import { labelSpacing } from '@dxos/react-ui-stack';
-import { errorText, mx } from '@dxos/react-ui-theme';
-
-import { type FormInputStateProps } from './FormContext';
-
-/**
- * Props passed to input components.
- */
-export type InputProps = {
-  type: SimpleType;
-  format?: FormatEnum;
-  label: string;
-  placeholder?: string;
-  inputOnly?: boolean;
-  /**
-   * Specifies the readonly variant: either disabled inputs, elements indicating they are usually editable but currently are not; or `static`, a field’s representation as regular content without signifiers that it is ever editable.
-   */
-  readonly?: 'disabled-input' | 'static' | false;
-} & FormInputStateProps;
-
-/**
- * Form input component.
- */
-export type InputComponent = FC<InputProps>;
-
-export type InputHeaderProps = {
-  error?: string;
-  label: string;
-  readonly?: boolean;
-};
-
-export const InputHeader = ({ error, label, readonly }: InputHeaderProps) => {
-  const Label = readonly ? 'span' : Input.Label;
-  const labelProps = readonly ? {} : { classNames: '!mlb-0' };
-  return (
-    <div role='none' className={mx('flex justify-between items-center', labelSpacing)}>
-      <Label {...labelProps}>{label}</Label>
-      {error && (
-        <Tooltip.Trigger asChild content={error} side='bottom'>
-          <Icon icon='ph--warning--regular' size={4} classNames={errorText} />
-        </Tooltip.Trigger>
-      )}
-    </div>
-  );
-};

package/src/components/Form/RefField.tsx

@@ -1,299 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { type SchemaAST } from 'effect';
-import React, { useCallback, useMemo, useState } from 'react';
-
-import {
-  Expando,
-  Ref,
-  ReferenceAnnotationId,
-  type ReferenceAnnotationValue,
-  type TypeAnnotation,
-  getTypeAnnotation,
-} from '@dxos/echo-schema';
-import { findAnnotation } from '@dxos/effect';
-import { DXN } from '@dxos/keys';
-import { type DxTagPickerItemClick } from '@dxos/lit-ui';
-import { DxAnchor } from '@dxos/lit-ui/react';
-import { Button, Icon, Input, useTranslation } from '@dxos/react-ui';
-import { PopoverCombobox } from '@dxos/react-ui-searchlist';
-import { TagPickerItem } from '@dxos/react-ui-tag-picker';
-import { descriptionText, mx } from '@dxos/react-ui-theme';
-import { type MaybePromise, isNonNullable } from '@dxos/util';
-
-import { type QueryRefOptions, useQueryRefOptions } from '../../hooks';
-import { translationKey } from '../../translations';
-
-import { TextInput } from './Defaults';
-import { InputHeader, type InputProps } from './Input';
-
-export type RefFieldProps = InputProps & {
-  ast?: SchemaAST.AST;
-  array?: boolean;
-  onQueryRefOptions?: QueryRefOptions;
-  createOptionLabel?: [string, { ns: string }];
-  createOptionIcon?: string;
-  onCreateFromQuery?: (type: TypeAnnotation, query: string) => MaybePromise<void>;
-};
-
-// TODO(thure): Is this a standard that should be better canonized?
-const isRefSnapShot = (val: any): val is { '/': string } => {
-  return typeof val === 'object' && typeof (val as any)?.['/'] === 'string';
-};
-
-export const RefField = ({
-  type,
-  label,
-  readonly,
-  placeholder,
-  inputOnly,
-  array,
-  ast,
-  getValue,
-  onBlur,
-  onQueryRefOptions,
-  createOptionLabel,
-  createOptionIcon,
-  onCreateFromQuery,
-  onValueChange,
-  ...restInputProps
-}: RefFieldProps) => {
-  const { t } = useTranslation(translationKey);
-  const refTypeInfo = useMemo(
-    () => (ast ? findAnnotation<ReferenceAnnotationValue>(ast, ReferenceAnnotationId) : undefined),
-    [ast],
-  );
-  const { options: availableOptions, loading: _loading } = useQueryRefOptions({ refTypeInfo, onQueryRefOptions });
-
-  if ((refTypeInfo && refTypeInfo?.typename === getTypeAnnotation(Expando)?.typename) || !onQueryRefOptions) {
-    // If ref type is expando, fall back to taking a DXN in string format.
-    return (
-      <RefFieldFallback
-        {...{ type, label, placeholder, readonly, inputOnly, getValue, onBlur, onValueChange, ...restInputProps }}
-      />
-    );
-  }
-
-  const handleGetValue = useCallback(() => {
-    const formValue = getValue();
-
-    const unknownToRefOption = (val: unknown) => {
-      const isRef = Ref.isRef(val);
-      if (isRef || isRefSnapShot(val)) {
-        const dxnString = isRef ? val.dxn.toString() : val['/'];
-        const matchingOption = availableOptions.find((option) => option.id === dxnString);
-        if (matchingOption) {
-          return matchingOption;
-        }
-      }
-      return undefined;
-    };
-
-    if (array && Array.isArray(formValue)) {
-      return formValue.map(unknownToRefOption).filter(isNonNullable) ?? [];
-    }
-
-    const option = unknownToRefOption(formValue);
-    if (option) {
-      return [option];
-    }
-
-    return [];
-  }, [getValue, availableOptions, array]);
-
-  const handleUpdate = useCallback(
-    (ids: string[]) => {
-      if (ids.length === 0) {
-        onValueChange('object', undefined);
-        return;
-      }
-
-      const refs = ids
-        .map((id) => {
-          const item = availableOptions.find((option) => option.id === id);
-          if (item) {
-            const dxn = DXN.parse(item.id);
-            return Ref.fromDXN(dxn);
-          }
-          return null;
-        })
-        .filter(isNonNullable);
-
-      if (array) {
-        onValueChange('object', refs);
-      } else {
-        onValueChange('object', refs[0]);
-      }
-    },
-    [availableOptions, array, onValueChange],
-  );
-
-  if (!refTypeInfo) {
-    return null;
-  }
-
-  const { status, error } = restInputProps.getStatus();
-
-  const items = handleGetValue();
-  const selectedIds = useMemo(() => items.map((i: any) => i.id), [items]);
-  const labelById = useMemo(
-    () =>
-      availableOptions.reduce((acc: Record<string, string>, option) => {
-        acc[option.id.toLowerCase()] = option.label.toLowerCase();
-        return acc;
-      }, {}),
-    [availableOptions],
-  );
-  const [query, setQuery] = useState('');
-  const toggleSelect = useCallback(
-    (id: string) => {
-      if (array) {
-        const nextIds = selectedIds.includes(id) ? selectedIds.filter((x) => x !== id) : [...selectedIds, id];
-        handleUpdate(nextIds);
-      } else {
-        if (selectedIds[0] === id) {
-          handleUpdate([]);
-        } else {
-          handleUpdate([id]);
-        }
-      }
-    },
-    [array, selectedIds, handleUpdate],
-  );
-
-  // NOTE(thure): I left both predicates in-place in case we decide to add variants which do render readonly but empty values.
-  return readonly && items.length < 1 ? null : (
-    <Input.Root validationValence={status}>
-      {!inputOnly && <InputHeader error={error} label={label} />}
-      <div data-no-submit>
-        {readonly ? (
-          items.length < 1 ? (
-            <p className={mx(descriptionText, 'mbe-2')}>{t('empty readonly ref field label')}</p>
-          ) : (
-            items.map((item) => (
-              <DxAnchor key={item.id} refid={item.id} rootclassname='mie-1'>
-                {item.label}
-              </DxAnchor>
-            ))
-          )
-        ) : (
-          <PopoverCombobox.Root>
-            <PopoverCombobox.Trigger asChild>
-              <Button variant='ghost' classNames='is-full text-start gap-2'>
-                <div role='none' className='grow'>
-                  {items?.length ? (
-                    items?.map((item) => (
-                      <TagPickerItem
-                        key={item.id}
-                        itemId={item.id}
-                        label={item.label}
-                        {...(item.hue ? { hue: item.hue } : {})}
-                        removeLabel={t('remove item label')}
-                        onItemClick={(event: DxTagPickerItemClick) => {
-                          if (event.action === 'remove') {
-                            toggleSelect(item.id);
-                          }
-                        }}
-                      />
-                    ))
-                  ) : (
-                    <span className='text-description'>
-                      {placeholder ?? t('ref field placeholder', { count: array ? 99 : 1 })}
-                    </span>
-                  )}
-                </div>
-                <Icon size={3} icon='ph--caret-down--bold' />
-              </Button>
-            </PopoverCombobox.Trigger>
-            <PopoverCombobox.Content
-              filter={(value, search) =>
-                value === '__create__' || labelById[value]?.includes(search.toLowerCase()) ? 1 : 0
-              }
-            >
-              <PopoverCombobox.Input
-                placeholder={'Search...'}
-                value={query}
-                onValueChange={(v) => setQuery(v)}
-                autoFocus
-              />
-              <PopoverCombobox.List>
-                {availableOptions.map((option) => (
-                  <PopoverCombobox.Item
-                    key={option.id}
-                    value={option.id}
-                    onSelect={() => toggleSelect(option.id)}
-                    classNames='flex items-center gap-2'
-                  >
-                    <span className='grow'>{option.label}</span>
-                    {selectedIds.includes(option.id) && <Icon icon='ph--check--regular' />}
-                  </PopoverCombobox.Item>
-                ))}
-                {query.length > 0 && createOptionLabel && createOptionIcon && onCreateFromQuery && (
-                  <PopoverCombobox.Item
-                    value='__create__'
-                    onSelect={() => onCreateFromQuery?.(refTypeInfo, query)}
-                    classNames='flex items-center gap-2'
-                  >
-                    <Icon icon={createOptionIcon} />
-                    {t(createOptionLabel[0], { ns: createOptionLabel[1].ns, text: query })}
-                  </PopoverCombobox.Item>
-                )}
-              </PopoverCombobox.List>
-              <PopoverCombobox.Arrow />
-            </PopoverCombobox.Content>
-          </PopoverCombobox.Root>
-        )}
-      </div>
-      {inputOnly && <Input.DescriptionAndValidation>{error}</Input.DescriptionAndValidation>}
-    </Input.Root>
-  );
-};
-
-const RefFieldFallback = ({
-  type,
-  label,
-  readonly,
-  placeholder,
-  inputOnly,
-  getValue,
-  onValueChange,
-  ...restInputProps
-}: InputProps) => {
-  const handleOnValueChange = (_type: any, dxnString: string) => {
-    const dxn = DXN.tryParse(dxnString);
-    if (dxn) {
-      onValueChange?.('object', Ref.fromDXN(dxn));
-    } else if (dxnString === '') {
-      onValueChange?.('object', undefined);
-    } else {
-      onValueChange?.('string', dxnString);
-    }
-  };
-
-  const handleGetValue = () => {
-    const formValue = getValue();
-    if (typeof formValue === 'string') {
-      return formValue;
-    }
-    if (Ref.isRef(formValue)) {
-      return formValue.dxn.toString();
-    }
-
-    return undefined;
-  };
-
-  return (
-    <TextInput
-      type={type}
-      label={label}
-      readonly={readonly}
-      placeholder={placeholder}
-      inputOnly={inputOnly}
-      getValue={handleGetValue as <V>() => V | undefined}
-      onValueChange={handleOnValueChange}
-      {...restInputProps}
-    />
-  );
-};

package/src/components/Form/custom/GeoPointInput.tsx

@@ -1,80 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import React, { type ChangeEvent, useCallback, useEffect, useMemo, useState } from 'react';
-
-import { GeoLocation, type GeoPoint } from '@dxos/echo-schema';
-import { Input, useTranslation } from '@dxos/react-ui';
-import { safeParseFloat } from '@dxos/util';
-
-import { translationKey } from '../../../translations';
-import { InputHeader, type InputProps } from '../Input';
-
-export const GeoPointInput = ({ type, label, readonly, getStatus, getValue, onValueChange, onBlur }: InputProps) => {
-  const { t } = useTranslation(translationKey);
-  const { status, error } = getStatus();
-  const geoPoint = useMemo<GeoPoint>(() => getValue<GeoPoint>() ?? [0, 0], [getValue]);
-  const geoLocation = useMemo(() => GeoLocation.fromGeoPoint(geoPoint), [geoPoint]);
-
-  const [longitudeText, setLongitudeText] = useState(geoLocation.longitude?.toString());
-  const [latitudeText, setLatitudeText] = useState(geoLocation.latitude?.toString());
-
-  useEffect(() => {
-    const location = GeoLocation.fromGeoPoint(geoPoint);
-    setLongitudeText(location.longitude.toString());
-    setLatitudeText(location.latitude.toString());
-  }, [geoPoint]);
-
-  const handleCoordinateChange = useCallback(
-    (coordinateType: keyof Pick<GeoLocation, 'longitude' | 'latitude'>, setText: (text: string) => void) =>
-      (event: ChangeEvent<HTMLInputElement>) => {
-        const inputText = event.target.value;
-        setText(inputText);
-        if (inputText !== '' && inputText !== '-') {
-          const coord = safeParseFloat(inputText);
-          if (coord !== undefined && !isNaN(coord)) {
-            const currentLocation = GeoLocation.fromGeoPoint(getValue<GeoPoint>() ?? [0, 0]);
-            const newLocation = { ...currentLocation, [coordinateType]: coord };
-            const newValue = GeoLocation.toGeoPoint(newLocation);
-            onValueChange(type, newValue);
-          }
-        }
-      },
-    [getValue, onValueChange, type],
-  );
-
-  return (
-    <Input.Root validationValence={status}>
-      <InputHeader error={error} label={label} />
-      <div role='none' className='grid grid-cols-2 gap-2'>
-        <div role='none'>
-          <Input.Label>{t('latitude label')}</Input.Label>
-          <Input.TextInput
-            type='number'
-            step='0.00001'
-            min='-90'
-            max='90'
-            disabled={!!readonly}
-            value={latitudeText}
-            onChange={handleCoordinateChange('latitude', setLatitudeText)}
-            onBlur={onBlur}
-          />
-        </div>
-        <div role='none'>
-          <Input.Label>{t('longitude label')}</Input.Label>
-          <Input.TextInput
-            type='number'
-            step='0.00001'
-            min='-180'
-            max='180'
-            disabled={!!readonly}
-            value={longitudeText}
-            onChange={handleCoordinateChange('longitude', setLongitudeText)}
-            onBlur={onBlur}
-          />
-        </div>
-      </div>
-    </Input.Root>
-  );
-};

package/src/components/Form/custom/SelectOptionsInput.stories.tsx

@@ -1,62 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import '@dxos-theme';
-
-import { type Meta, type StoryObj } from '@storybook/react-vite';
-import { Schema } from 'effect';
-import React, { useState } from 'react';
-
-import { type SelectOption, SelectOptionSchema } from '@dxos/echo-schema';
-import { withLayout, withTheme } from '@dxos/storybook-utils';
-
-import { translations } from '../../../translations';
-import { TestLayout, TestPanel } from '../../testing';
-import { Form } from '../Form';
-
-import { SelectOptionInput } from './SelectOptionsInput';
-
-const schema = Schema.Struct({
-  options: Schema.Array(SelectOptionSchema).pipe(Schema.mutable),
-}).pipe(Schema.mutable);
-
-const DefaultStory = () => {
-  const [values, setValues] = useState<{ options: SelectOption[] }>({
-    // TODO(Zaymon): Pick colors from our limited set.
-    options: [
-      { id: 'opt_1', title: 'First option', color: 'amber' },
-      { id: 'opt_2', title: 'Second option', color: 'emerald' },
-      { id: 'opt_3', title: 'Third option', color: 'rose' },
-    ],
-  });
-
-  return (
-    <TestLayout>
-      <TestPanel>
-        <Form
-          schema={schema}
-          values={values}
-          onSave={(vals) => setValues(vals)}
-          Custom={{ options: SelectOptionInput }}
-        />
-      </TestPanel>
-    </TestLayout>
-  );
-};
-
-const meta = {
-  title: 'ui/react-ui-form/SelectOptionsInput',
-  component: SelectOptionInput as any,
-  render: DefaultStory,
-  decorators: [withTheme, withLayout({ fullscreen: true })],
-  parameters: {
-    translations,
-  },
-} satisfies Meta<typeof DefaultStory>;
-
-export default meta;
-
-type Story = StoryObj<typeof meta>;
-
-export const Default: Story = {};

package/src/components/Form/custom/index.ts

@@ -1,7 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-export * from './GeoPointInput';
-export * from './SelectOptionsInput';
-export * from './TupleInput';

package/src/components/Form/factory.tsx

@@ -1,31 +0,0 @@
-//
-// Copyright 2024 DXOS.org
-//
-
-import { FormatEnum } from '@dxos/echo-schema';
-import { type SimpleType } from '@dxos/effect';
-
-import { GeoPointInput } from './custom';
-import { BooleanInput, MarkdownInput, NumberInput, TextInput } from './Defaults';
-import { type InputComponent } from './Input';
-
-/**
- * Get property input component.
- */
-export const getInputComponent = (type: SimpleType, format?: FormatEnum | string): InputComponent | undefined => {
-  switch (format) {
-    case FormatEnum.GeoPoint:
-      return GeoPointInput;
-    case FormatEnum.Markdown:
-      return MarkdownInput;
-  }
-
-  switch (type) {
-    case 'string':
-      return TextInput;
-    case 'number':
-      return NumberInput;
-    case 'boolean':
-      return BooleanInput;
-  }
-};