@dxos/react-ui-table 0.8.2-main.f081794 → 0.8.2-main.f11618f

package/dist/lib/browser/index.mjs

@@ -36,13 +36,13 @@ var translations_default = [
 ];
 
 // packages/ui/react-ui-table/src/components/Table/Table.tsx
-import React7, { forwardRef, useCallback as useCallback4, useImperativeHandle, useState as useState2, useMemo as useMemo4, useEffect as useEffect2 } from "react";
+import React6, { forwardRef, useCallback as useCallback4, useImperativeHandle, useState as useState2, useMemo as useMemo4, useEffect as useEffect2 } from "react";
 import { getValue as getValue4 } from "@dxos/echo-schema";
 import { invariant as invariant3 } from "@dxos/invariant";
 import { Filter } from "@dxos/react-client/echo";
 import { useTranslation as useTranslation3 } from "@dxos/react-ui";
 import { useAttention } from "@dxos/react-ui-attention";
-import { closestCell, Grid } from "@dxos/react-ui-grid";
+import { closestCell, Grid, gridSeparatorInlineEnd, gridSeparatorBlockEnd } from "@dxos/react-ui-grid";
 import { mx as mx2 } from "@dxos/react-ui-theme";
 import { isNotFalsy, safeParseInt } from "@dxos/util";
 
@@ -223,46 +223,8 @@ var CreateRefPanel = ({ model, modals, __gridScope }) => {
   }), /* @__PURE__ */ React3.createElement(Popover.Arrow, null))));
 };
 
-// packages/ui/react-ui-table/src/components/Table/RefPanel.tsx
-import React4 from "react";
-import { Popover as Popover2 } from "@dxos/react-ui";
-import { Form as Form2 } from "@dxos/react-ui-form";
-var getRefTargetObj = (space, id) => {
-  if (space && id) {
-    return space?.db.getObjectById(id);
-  } else {
-    return void 0;
-  }
-};
-var RefPanel = ({ model, modals }) => {
-  const state = modals.state.value;
-  const space = model?.space;
-  const targetObj = getRefTargetObj(space, state?.type === "refPanel" ? state.targetId : void 0);
-  const schema = space && state?.type === "refPanel" ? space.db.schemaRegistry.getSchema(state.typename) : void 0;
-  if (!model.view || !model.projection) {
-    return null;
-  }
-  return /* @__PURE__ */ React4.createElement(Popover2.Root, {
-    modal: false,
-    open: state?.type === "refPanel" && !!targetObj && !!schema,
-    onOpenChange: (nextOpen) => {
-      if (!nextOpen) {
-        return modals.close();
-      }
-    }
-  }, /* @__PURE__ */ React4.createElement(Popover2.VirtualTrigger, {
-    virtualRef: modals.trigger
-  }), /* @__PURE__ */ React4.createElement(Popover2.Portal, null, /* @__PURE__ */ React4.createElement(Popover2.Content, {
-    classNames: "md:is-64"
-  }, targetObj && schema && /* @__PURE__ */ React4.createElement(Form2, {
-    readonly: true,
-    values: targetObj,
-    schema
-  }), /* @__PURE__ */ React4.createElement(Popover2.Arrow, null))));
-};
-
 // packages/ui/react-ui-table/src/components/Table/RowActionsMenu.tsx
-import React5 from "react";
+import React4 from "react";
 import { DropdownMenu as DropdownMenu3, useTranslation as useTranslation2 } from "@dxos/react-ui";
 var RowActionsMenu = ({ model, modals }) => {
   const { t } = useTranslation2(translationKey);
@@ -271,23 +233,23 @@ var RowActionsMenu = ({ model, modals }) => {
   if (state?.type !== "row") {
     return null;
   }
-  return /* @__PURE__ */ React5.createElement(DropdownMenu3.Root, {
+  return /* @__PURE__ */ React4.createElement(DropdownMenu3.Root, {
     modal: false,
     open: true,
     onOpenChange: modals.close
-  }, /* @__PURE__ */ React5.createElement(DropdownMenu3.VirtualTrigger, {
+  }, /* @__PURE__ */ React4.createElement(DropdownMenu3.VirtualTrigger, {
     virtualRef: modals.trigger
-  }), /* @__PURE__ */ React5.createElement(DropdownMenu3.Content, null, /* @__PURE__ */ React5.createElement(DropdownMenu3.Viewport, null, model.features.dataEditable !== false && /* @__PURE__ */ React5.createElement(DropdownMenu3.Item, {
+  }), /* @__PURE__ */ React4.createElement(DropdownMenu3.Content, null, /* @__PURE__ */ React4.createElement(DropdownMenu3.Viewport, null, model.features.dataEditable !== false && /* @__PURE__ */ React4.createElement(DropdownMenu3.Item, {
     "data-testid": "row-menu-delete",
     onClick: () => model.deleteRow(state.rowIndex)
-  }, t(hasSelection ? "bulk delete row label" : "delete row label")), model.rowActions?.map((action) => /* @__PURE__ */ React5.createElement(DropdownMenu3.Item, {
+  }, t(hasSelection ? "bulk delete row label" : "delete row label")), model.rowActions?.map((action) => /* @__PURE__ */ React4.createElement(DropdownMenu3.Item, {
     key: action.id,
     "data-testid": `row-action-${action.id}`,
     onClick: () => {
       modals.close();
       model.handleRowAction(action.id, state.rowIndex);
     }
-  }, t(action.translationKey)))), /* @__PURE__ */ React5.createElement(DropdownMenu3.Arrow, null)));
+  }, t(action.translationKey)))), /* @__PURE__ */ React4.createElement(DropdownMenu3.Arrow, null)));
 };
 
 // packages/ui/react-ui-table/src/model/table-model.ts
@@ -392,7 +354,7 @@ var initializeTable = async ({ client, space, table, typename, initialRow = true
     if (!schema) {
       throw new Error(`Schema not found: ${typename}`);
     }
-    const fields = getSchemaProperties(schema.ast).filter((prop) => prop.format !== FormatEnum.Ref).map((prop) => prop.name);
+    const fields = getSchemaProperties(schema.ast).map((prop) => prop.name);
     table.view = makeRef2(createView2({
       // TODO(ZaymonFC): Don't hardcode name?
       name: "View",
@@ -518,26 +480,6 @@ var columnSettingsButton = {
     fieldId: el.getAttribute("data-field-id")
   })
 };
-var referencedCellButton = {
-  attr: BUTTON_IDENTIFIERS.referencedCell,
-  icon: "ph--link-simple-horizontal--regular",
-  render: ({ targetId, schemaId }) => {
-    return createButton({
-      attr: BUTTON_IDENTIFIERS.referencedCell,
-      icon: referencedCellButton.icon,
-      data: {
-        "data-target-id": targetId,
-        "data-schema-id": schemaId
-      },
-      testId: "table-ref-cell-button"
-    });
-  },
-  getData: (el) => ({
-    type: "referencedCell",
-    targetId: el.getAttribute("data-target-id"),
-    schemaId: el.getAttribute("data-schema-id")
-  })
-};
 var rowMenuButton = {
   attr: BUTTON_IDENTIFIERS.rowMenu,
   icon: "ph--dots-three--regular",
@@ -582,7 +524,6 @@ var sortButton = {
 var tableButtons = {
   addColumn: addColumnButton,
   columnSettings: columnSettingsButton,
-  referencedCell: referencedCellButton,
   rowMenu: rowMenuButton,
   sort: sortButton
 };
@@ -893,6 +834,22 @@ var TableSorting = class {
   }
 };
 
+// packages/ui/react-ui-table/src/util/tag.ts
+var TAG_PATTERN_REGEX = /\[([^\]]+)\]\(([^)]+)\)/g;
+var extractTagIds = (value) => {
+  if (typeof value !== "string") {
+    return void 0;
+  }
+  const ids = [];
+  let match;
+  while ((match = TAG_PATTERN_REGEX.exec(value)) !== null) {
+    if (match[2]) {
+      ids.push(match[2]);
+    }
+  }
+  return ids.length > 0 ? ids : void 0;
+};
+
 // packages/ui/react-ui-table/src/model/table-model.ts
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/ui/react-ui-table/src/model/table-model.ts";
 var defaultFeatures = {
@@ -997,6 +954,20 @@ var TableModel = class extends Resource2 {
           }
           break;
         }
+        case FormatEnum3.SingleSelect: {
+          const ids = extractTagIds(value);
+          if (ids && ids.length > 0) {
+            setValue(this._rows.value[rowIdx], field.path, ids[0]);
+          }
+          break;
+        }
+        case FormatEnum3.MultiSelect: {
+          const ids = extractTagIds(value);
+          if (ids) {
+            setValue(this._rows.value[rowIdx], field.path, ids);
+          }
+          break;
+        }
         default: {
           setValue(this._rows.value[rowIdx], field.path, parseValue({
             type: props.type,
@@ -1017,7 +988,7 @@ var TableModel = class extends Resource2 {
     };
     invariant(!(this._features.dataEditable && this._features.selection.enabled && this._features.selection.mode === "single"), "Single selection is not compatible with editable tables.", {
       F: __dxlog_file,
-      L: 114,
+      L: 115,
       S: this,
       A: [
         "!(this._features.dataEditable && this._features.selection.enabled && this._features.selection.mode === 'single')",
@@ -1077,7 +1048,7 @@ var TableModel = class extends Resource2 {
   get columnMeta() {
     invariant(this._columnMeta, void 0, {
       F: __dxlog_file,
-      L: 183,
+      L: 184,
       S: this,
       A: [
         "this._columnMeta",
@@ -1303,7 +1274,7 @@ var ModalController = class {
 
 // packages/ui/react-ui-table/src/model/table-presentation.ts
 import { signal as signal5 } from "@preact/signals-core";
-import { FormatEnum as FormatEnum4, getValue as getValue3 } from "@dxos/echo-schema";
+import { FormatEnum as FormatEnum4, getDXN, getValue as getValue3 } from "@dxos/echo-schema";
 import { cellClassesForFieldType, formatForDisplay as formatForDisplay2 } from "@dxos/react-ui-form";
 import { toPlaneCellIndex } from "@dxos/react-ui-grid";
 import { mx } from "@dxos/react-ui-theme";
@@ -1405,10 +1376,8 @@ var TablePresentation = class {
       if (props.format === FormatEnum4.Ref && props.referenceSchema) {
         const targetObj = getValue3(obj, field.path)?.target;
         if (targetObj) {
-          cell.accessoryHtml = tableButtons.referencedCell.render({
-            targetId: targetObj.id,
-            schemaId: props.referenceSchema
-          });
+          const dxn = getDXN(targetObj)?.toString();
+          cell.accessoryHtml = `<dx-ref-tag ref=${dxn} class="dx-button block is-6 pli-[3px] plb-[3px] pbe-[2px] min-bs-0 absolute inline-end-1"><dx-icon icon="ph--link-simple--regular"/></dx-ref-tag>`;
         }
       }
       if (props.format === FormatEnum4.Boolean) {
@@ -1600,7 +1569,7 @@ var cellClassesForRowSelection = (selected, selectionMode) => {
 };
 
 // packages/ui/react-ui-table/src/components/TableCellEditor/TableCellEditor.tsx
-import React6, { useCallback as useCallback3, useMemo as useMemo3, useRef } from "react";
+import React5, { useCallback as useCallback3, useMemo as useMemo3, useRef } from "react";
 import { FormatEnum as FormatEnum5 } from "@dxos/echo-schema";
 import { invariant as invariant2 } from "@dxos/invariant";
 import { useThemeContext } from "@dxos/react-ui";
@@ -1855,7 +1824,7 @@ var TableCellEditor = ({ model, modals, onEnter, onFocus, onQuery, __gridScope }
     model,
     editing
   ]);
-  return /* @__PURE__ */ React6.createElement(GridCellEditor, {
+  return /* @__PURE__ */ React5.createElement(GridCellEditor, {
     extension,
     getCellContent,
     onBlur: handleBlur
@@ -1888,10 +1857,8 @@ var determineNavigationDelta = ({ key, shift }) => {
 
 // packages/ui/react-ui-table/src/components/Table/Table.tsx
 var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/ui/react-ui-table/src/components/Table/Table.tsx";
-var inlineEndLine = "[&>.dx-grid]:relative [&>.dx-grid]:after:absolute [&>.dx-grid]:after:inset-block-0 [&>.dx-grid]:after:-inline-end-px [&>.dx-grid]:after:is-px [&>.dx-grid]:after:bg-separator";
-var blockEndLine = "[&>.dx-grid]:before:absolute [&>.dx-grid]:before:inset-inline-0 [&>.dx-grid]:before:-block-end-px [&>.dx-grid]:before:bs-px [&>.dx-grid]:before:bg-separator";
 var TableRoot = ({ children, role }) => {
-  return /* @__PURE__ */ React7.createElement("div", {
+  return /* @__PURE__ */ React6.createElement("div", {
     role: "none",
     className: mx2("relative !border-separator", role === "section" ? "attention-surface overflow-hidden [&_.dx-grid]:max-is-[--dx-grid-content-inline-size]" : "flex flex-col [&_.dx-grid]:grow [&_.dx-grid]:max-is-[--dx-grid-content-inline-size] [&_.dx-grid]:bs-0 [&_.dx-grid]:max-bs-[--dx-grid-content-block-size]")
   }, children);
@@ -1911,14 +1878,18 @@ var TableMain = /* @__PURE__ */ forwardRef(({ model, presentation, ignoreAttenti
   }, [
     model
   ]);
+  const getCells = useCallback4((range, plane) => presentation?.getCells(range, plane) ?? {}, [
+    presentation
+  ]);
   useEffect2(() => {
     if (!presentation || !dxGrid) {
       return;
     }
-    dxGrid.getCells = (range, plane) => presentation.getCells(range, plane);
+    dxGrid.getCells = getCells;
   }, [
     presentation,
-    dxGrid
+    dxGrid,
+    getCells
   ]);
   useImperativeHandle(forwardedRef, () => {
     if (!presentation || !dxGrid) {
@@ -1974,10 +1945,6 @@ var TableMain = /* @__PURE__ */ forwardRef(({ model, presentation, ignoreAttenti
           modals.showColumnCreator();
           break;
         }
-        case "referencedCell": {
-          modals.showReferencePanel(data.targetId, data.schemaId);
-          break;
-        }
         case "sort": {
           model?.sorting?.toggleSort(data.fieldId);
           break;
@@ -2089,7 +2056,7 @@ var TableMain = /* @__PURE__ */ forwardRef(({ model, presentation, ignoreAttenti
       const space = model.space;
       invariant3(space, void 0, {
         F: __dxlog_file4,
-        L: 312,
+        L: 307,
         S: void 0,
         A: [
           "space",
@@ -2126,21 +2093,21 @@ var TableMain = /* @__PURE__ */ forwardRef(({ model, presentation, ignoreAttenti
     t
   ]);
   if (!model || !modals) {
-    return /* @__PURE__ */ React7.createElement("span", {
+    return /* @__PURE__ */ React6.createElement("span", {
       role: "none",
       className: "attention-surface"
     });
   }
-  return /* @__PURE__ */ React7.createElement(Grid.Root, {
+  return /* @__PURE__ */ React6.createElement(Grid.Root, {
     id: model.id ?? "table-grid"
-  }, /* @__PURE__ */ React7.createElement(TableCellEditor, {
+  }, /* @__PURE__ */ React6.createElement(TableCellEditor, {
     model,
     modals,
     onEnter: handleEnter,
     onFocus: handleFocus,
     onQuery: handleQuery
-  }), /* @__PURE__ */ React7.createElement(Grid.Content, {
-    className: mx2("[--dx-grid-base:var(--surface-bg)]", inlineEndLine, blockEndLine),
+  }), /* @__PURE__ */ React6.createElement(Grid.Content, {
+    className: mx2("[--dx-grid-base:var(--surface-bg)]", gridSeparatorInlineEnd, gridSeparatorBlockEnd),
     frozen,
     // getCells={getCells}
     columns: model.columnMeta.value,
@@ -2152,20 +2119,17 @@ var TableMain = /* @__PURE__ */ forwardRef(({ model, presentation, ignoreAttenti
     onKeyDown: handleKeyDown,
     onWheelCapture: handleWheel,
     ref: setDxGrid
-  }), /* @__PURE__ */ React7.createElement(RowActionsMenu, {
+  }), /* @__PURE__ */ React6.createElement(RowActionsMenu, {
     model,
     modals
-  }), /* @__PURE__ */ React7.createElement(ColumnActionsMenu, {
+  }), /* @__PURE__ */ React6.createElement(ColumnActionsMenu, {
     model,
     modals
-  }), /* @__PURE__ */ React7.createElement(ColumnSettings, {
+  }), /* @__PURE__ */ React6.createElement(ColumnSettings, {
     model,
     modals,
     onNewColumn: handleNewColumn
-  }), /* @__PURE__ */ React7.createElement(CreateRefPanel, {
-    model,
-    modals
-  }), /* @__PURE__ */ React7.createElement(RefPanel, {
+  }), /* @__PURE__ */ React6.createElement(CreateRefPanel, {
     model,
     modals
   }));
@@ -2176,7 +2140,7 @@ var Table = {
 };
 
 // packages/ui/react-ui-table/src/components/Table/DynamicTable.tsx
-import React8, { useRef as useRef2, useMemo as useMemo5, useCallback as useCallback5 } from "react";
+import React7, { useRef as useRef2, useMemo as useMemo5, useCallback as useCallback5 } from "react";
 import { useDefaultValue } from "@dxos/react-ui";
 import { mx as mx3 } from "@dxos/react-ui-theme";
 
@@ -2301,13 +2265,13 @@ var DynamicTable = ({ classNames, name = "example.com/dynamic-table", rows, prop
   }, [
     model
   ]);
-  return /* @__PURE__ */ React8.createElement("div", {
+  return /* @__PURE__ */ React7.createElement("div", {
     role: "none",
     className: mx3("is-full bs-full grow grid", classNames)
-  }, /* @__PURE__ */ React8.createElement("div", {
+  }, /* @__PURE__ */ React7.createElement("div", {
     role: "none",
     className: "grid min-bs-0 overflow-hidden"
-  }, /* @__PURE__ */ React8.createElement(Table.Root, null, /* @__PURE__ */ React8.createElement(Table.Main, {
+  }, /* @__PURE__ */ React7.createElement(Table.Root, null, /* @__PURE__ */ React7.createElement(Table.Main, {
     ref: tableRef,
     model,
     presentation,
@@ -2317,7 +2281,7 @@ var DynamicTable = ({ classNames, name = "example.com/dynamic-table", rows, prop
 };
 
 // packages/ui/react-ui-table/src/components/TableToolbar/TableToolbar.tsx
-import React9, { useCallback as useCallback6, useMemo as useMemo6 } from "react";
+import React8, { useCallback as useCallback6, useMemo as useMemo6 } from "react";
 import { live as live4 } from "@dxos/live-object";
 import { createGapSeparator, createMenuAction, MenuProvider, ToolbarMenu, useMenuActions } from "@dxos/react-ui-menu";
 var createTableToolbarActions = (state) => {
@@ -2379,11 +2343,11 @@ var TableToolbar = ({ classNames, viewDirty, attendableId, onAction }) => {
     state
   ]);
   const menu = useMenuActions(actionsCreator);
-  return /* @__PURE__ */ React9.createElement(MenuProvider, {
+  return /* @__PURE__ */ React8.createElement(MenuProvider, {
     ...menu,
     attendableId,
     onAction
-  }, /* @__PURE__ */ React9.createElement(ToolbarMenu, {
+  }, /* @__PURE__ */ React8.createElement(ToolbarMenu, {
     classNames
   }));
 };