@dxos/react-ui-table 0.6.14-main.f49f251 → 0.6.14-staging.54a8bab

package/dist/lib/browser/index.mjs

@@ -98,8 +98,8 @@ import { getSize as getSize2, mx as mx2 } from "@dxos/react-ui-theme";
 
 // packages/ui/react-ui-table/src/components/ColumnMenu/ColumnSettings.tsx
 import React2, { useRef, useState as useState2 } from "react";
+import { FormatEnums } from "@dxos/echo-schema";
 import { Button, Input, Select, useTranslation as useTranslation2 } from "@dxos/react-ui";
-import { FieldValueTypes } from "@dxos/schema";
 import { safeParseInt } from "@dxos/util";
 var ColumnSettings = ({ column, tableDef, tablesToReference, onUpdate, onDelete, onClose }) => {
   const { t } = useTranslation2(translationKey);
@@ -170,7 +170,7 @@ var ColumnSettings = ({ column, tableDef, tablesToReference, onUpdate, onDelete,
   }, /* @__PURE__ */ React2.createElement(Select.TriggerButton, {
     classNames: "is-full",
     placeholder: "Type"
-  }), /* @__PURE__ */ React2.createElement(Select.Portal, null, /* @__PURE__ */ React2.createElement(Select.Content, null, /* @__PURE__ */ React2.createElement(Select.Viewport, null, FieldValueTypes.map((type) => /* @__PURE__ */ React2.createElement(Select.Option, {
+  }), /* @__PURE__ */ React2.createElement(Select.Portal, null, /* @__PURE__ */ React2.createElement(Select.Content, null, /* @__PURE__ */ React2.createElement(Select.Viewport, null, FormatEnums.map((type) => /* @__PURE__ */ React2.createElement(Select.Option, {
     key: type,
     value: type
   }, t(`${type} column type label`)))))))), formState.type === "number" && /* @__PURE__ */ React2.createElement(Input.Root, null, /* @__PURE__ */ React2.createElement(Input.Label, null, t("digits label")), /* @__PURE__ */ React2.createElement(Input.TextInput, {
@@ -1390,53 +1390,54 @@ var ColumnBuilder = class {
 };
 
 // packages/ui/react-ui-table/src/schema/column-utils.ts
-import { FieldValueType, mapSchemaToFields } from "@dxos/schema";
+import { TypeEnum } from "@dxos/echo-schema";
+import { FormatEnum } from "@dxos/echo-schema";
+import { mapSchemaToFields } from "@dxos/schema";
 var schemaToColumnDefs = (schema) => {
   const { helper, builder } = createColumnBuilder();
-  const classified = mapSchemaToFields(schema);
-  return classified.map(([name, type]) => {
-    const propertyKey = name.toString();
-    let column;
-    switch (type) {
-      case FieldValueType.String: {
-        column = builder.string({
-          label: propertyKey,
-          classNames: [
-            name === "id" && "font-mono"
-          ]
-        });
-        break;
-      }
-      case FieldValueType.Number: {
-        column = builder.number({
-          label: propertyKey
-        });
-        break;
-      }
-      case FieldValueType.Boolean: {
-        column = builder.switch({
-          label: propertyKey
-        });
-        break;
+  return mapSchemaToFields(schema).map(({ property, type, format: format2 }) => {
+    const propertyKey = property.toString();
+    if (!format2) {
+      switch (type) {
+        case TypeEnum.String: {
+          return helper.accessor(propertyKey, builder.string({
+            label: propertyKey,
+            classNames: [
+              property === "id" && "font-mono"
+            ]
+          }));
+        }
+        case TypeEnum.Number: {
+          return helper.accessor(propertyKey, builder.number({
+            label: propertyKey
+          }));
+        }
+        case TypeEnum.Boolean: {
+          return helper.accessor(propertyKey, builder.switch({
+            label: propertyKey
+          }));
+        }
+        default: {
+          throw new Error(`Unhandled scalar type: ${type}`);
+        }
       }
-      case FieldValueType.Date: {
-        column = builder.date({
+    }
+    switch (format2) {
+      case FormatEnum.Date: {
+        return helper.accessor(propertyKey, builder.date({
           label: propertyKey
-        });
-        break;
+        }));
       }
-      case FieldValueType.JSON: {
-        column = builder.json({
+      case FormatEnum.JSON: {
+        return helper.accessor(propertyKey, builder.json({
           label: propertyKey,
           id: propertyKey
-        });
-        break;
+        }));
       }
       default: {
-        throw new Error(`Unhandled column type: ${type}`);
+        throw new Error(`Unhandled format: ${format2}`);
       }
     }
-    return helper.accessor(propertyKey, column);
   });
 };
 export {