@firecms/core 3.0.0-canary.120 → 3.0.0-canary.121

package/dist/form/field_bindings/{MultiSelectBinding.d.ts → MultiSelectFieldBinding.d.ts}

@@ -6,4 +6,4 @@ import { EnumType, FieldProps } from "../../types";
  * and tables to the specified properties.
  * @group Form fields
  */
-export declare function MultiSelectBinding({ propertyKey, value, setValue, error, showError, disabled, property, includeDescription, size, autoFocus }: FieldProps<EnumType[], any, any>): import("react/jsx-runtime").JSX.Element;
+export declare function MultiSelectFieldBinding({ propertyKey, value, setValue, error, showError, disabled, property, includeDescription, size, autoFocus }: FieldProps<EnumType[], any, any>): import("react/jsx-runtime").JSX.Element;

package/dist/form/index.d.ts

@@ -1,5 +1,5 @@
 import { SelectFieldBinding } from "./field_bindings/SelectFieldBinding";
-import { MultiSelectBinding } from "./field_bindings/MultiSelectBinding";
+import { MultiSelectFieldBinding } from "./field_bindings/MultiSelectFieldBinding";
 import { ArrayOfReferencesFieldBinding } from "./field_bindings/ArrayOfReferencesFieldBinding";
 import { StorageUploadFieldBinding } from "./field_bindings/StorageUploadFieldBinding";
 import { TextFieldBinding } from "./field_bindings/TextFieldBinding";
@@ -13,7 +13,7 @@ import { BlockFieldBinding } from "./field_bindings/BlockFieldBinding";
 import { ReadOnlyFieldBinding } from "./field_bindings/ReadOnlyFieldBinding";
 import { MarkdownEditorFieldBinding } from "./field_bindings/MarkdownEditorFieldBinding";
 import { ArrayCustomShapedFieldBinding } from "./field_bindings/ArrayCustomShapedFieldBinding";
-export { ArrayCustomShapedFieldBinding, RepeatFieldBinding, MultiSelectBinding, ArrayOfReferencesFieldBinding, BlockFieldBinding, DateTimeFieldBinding, ReadOnlyFieldBinding, MapFieldBinding, KeyValueFieldBinding, ReferenceFieldBinding, SelectFieldBinding, StorageUploadFieldBinding, SwitchFieldBinding, MarkdownEditorFieldBinding, TextFieldBinding };
+export { ArrayCustomShapedFieldBinding, RepeatFieldBinding, MultiSelectFieldBinding, ArrayOfReferencesFieldBinding, BlockFieldBinding, DateTimeFieldBinding, ReadOnlyFieldBinding, MapFieldBinding, KeyValueFieldBinding, ReferenceFieldBinding, SelectFieldBinding, StorageUploadFieldBinding, SwitchFieldBinding, MarkdownEditorFieldBinding, TextFieldBinding };
 export * from "./components";
 export { PropertyFieldBinding } from "./PropertyFieldBinding";
 export * from "./useClearRestoreValue";

package/dist/index.es.js

@@ -6321,9 +6321,7 @@ function VirtualTableInput(props) {
 }
 function VirtualTableSelect(props) {
   const {
-    name,
     enumValues,
-    error,
     internalValue,
     disabled,
     small,
@@ -6340,6 +6338,7 @@ function VirtualTableSelect(props) {
     }
   }, [focused, ref]);
   const onChange = useCallback((updatedValue) => {
+    console.trace("onChange");
     if (valueType === "number") {
       if (multiple) {
         const newValue = updatedValue.map((v) => parseFloat(v));
@@ -6356,41 +6355,28 @@ function VirtualTableSelect(props) {
       throw Error("Missing mapping in TableSelect");
     }
   }, [multiple, updateValue, valueType]);
-  const renderValue = (enumKey, index) => {
-    if (multiple && Array.isArray(enumKey)) {
-      return /* @__PURE__ */ jsx(
-        ArrayEnumPreview,
-        {
-          value: enumKey,
-          name,
-          enumValues,
-          size: small ? "small" : "medium"
-        },
-        `${enumKey}-${index}`
-      );
-    } else {
-      return /* @__PURE__ */ jsx(
-        EnumValuesChip,
-        {
-          enumKey,
-          enumValues,
-          size: small ? "small" : "medium"
-        },
-        `${enumKey}-${index}`
-      );
-    }
+  const renderValue = (enumKey) => {
+    return /* @__PURE__ */ jsx(
+      EnumValuesChip,
+      {
+        enumKey: String(enumKey),
+        enumValues,
+        size: small ? "small" : "medium"
+      },
+      `${enumKey}`
+    );
   };
   return multiple ? /* @__PURE__ */ jsx(
     MultiSelect,
     {
       inputRef: ref,
-      containerClassName: "w-full h-full",
       className: "w-full h-full p-0 bg-transparent",
       position: "item-aligned",
       disabled,
+      includeClear: false,
+      useChips: false,
       value: validValue ? internalValue.map((v) => v.toString()) : [],
-      onMultiValueChange: onChange,
-      renderValue,
+      onValueChange: onChange,
       children: enumValues?.map((enumConfig) => /* @__PURE__ */ jsx(
         MultiSelectItem,
         {
@@ -6414,12 +6400,9 @@ function VirtualTableSelect(props) {
       className: "w-full h-full p-0 bg-transparent",
       position: "item-aligned",
       disabled,
-      multiple,
       padding: false,
-      includeFocusOutline: false,
-      value: validValue ? multiple ? internalValue.map((v) => v.toString()) : internalValue?.toString() : multiple ? [] : "",
+      value: validValue ? internalValue?.toString() : "",
       onValueChange: onChange,
-      onMultiValueChange: onChange,
       renderValue,
       children: enumValues?.map((enumConfig) => /* @__PURE__ */ jsx(
         SelectItem,
@@ -7734,8 +7717,9 @@ const EntityTableCell = React__default.memo(
       }
     }, [ref, onSelect, selected, disabled]);
     const onFocus = useCallback((event) => {
-      onSelectCallback();
       event.stopPropagation();
+      event.preventDefault();
+      onSelectCallback();
     }, [onSelectCallback]);
     const isOverflowing = useMemo(() => {
       if (bounds) {
@@ -9618,6 +9602,7 @@ function StringNumberFilterField({
     }
   }
   const multiple = multipleSelectOperations$1.includes(operation);
+  console.log("internalValue", { internalValue });
   return /* @__PURE__ */ jsxs("div", { className: "flex w-[440px]", children: [
     /* @__PURE__ */ jsx("div", { className: "w-[80px]", children: /* @__PURE__ */ jsx(
       Select,
@@ -9650,16 +9635,15 @@ function StringNumberFilterField({
           )
         }
       ),
-      enumValues && /* @__PURE__ */ jsx(
+      enumValues && !multiple && /* @__PURE__ */ jsx(
         Select,
         {
           position: "item-aligned",
-          value: internalValue !== void 0 ? Array.isArray(internalValue) ? internalValue.map((e) => String(e)) : String(internalValue) : isArray ? [] : "",
+          value: typeof internalValue === "string" ? internalValue : "",
           onValueChange: (value2) => {
             if (value2 !== "")
               updateFilter(operation, dataType === "number" ? parseInt(value2) : value2);
           },
-          multiple,
           endAdornment: internalValue && /* @__PURE__ */ jsx(
             IconButton,
             {
@@ -9671,6 +9655,8 @@ function StringNumberFilterField({
           renderValue: (enumKey) => {
             if (enumKey === null)
               return "Filter for null values";
+            if (enumKey === void 0)
+              return null;
             return /* @__PURE__ */ jsx(
               EnumValuesChip,
               {
@@ -9694,6 +9680,40 @@ function StringNumberFilterField({
                 }
               )
             },
+            `select_item_${name}_${enumConfig.id}`
+          ))
+        }
+      ),
+      enumValues && multiple && /* @__PURE__ */ jsx(
+        MultiSelect,
+        {
+          position: "item-aligned",
+          value: Array.isArray(internalValue) ? internalValue.map((e) => String(e)) : [],
+          onValueChange: (value2) => {
+            updateFilter(operation, dataType === "number" ? value2.map((v) => parseInt(v)) : value2);
+          },
+          multiple,
+          endAdornment: internalValue && /* @__PURE__ */ jsx(
+            IconButton,
+            {
+              className: "absolute right-2 top-3",
+              onClick: (e) => updateFilter(operation, void 0),
+              children: /* @__PURE__ */ jsx(ClearIcon, {})
+            }
+          ),
+          children: enumValues.map((enumConfig) => /* @__PURE__ */ jsx(
+            MultiSelectItem,
+            {
+              value: String(enumConfig.id),
+              children: /* @__PURE__ */ jsx(
+                EnumValuesChip,
+                {
+                  enumKey: String(enumConfig.id),
+                  enumValues,
+                  size: "small"
+                }
+              )
+            },
             `select_value_${name}_${enumConfig.id}`
           ))
         }
@@ -13977,7 +13997,7 @@ function SelectFieldBinding({
     )
   ] });
 }
-function MultiSelectBinding({
+function MultiSelectFieldBinding({
   propertyKey,
   value,
   setValue,
@@ -14041,13 +14061,15 @@ function MultiSelectBinding({
       enumKey
     );
   }, [enumValues, setValue, value]);
-  return /* @__PURE__ */ jsxs("div", { className: "mt-0.5 ml-0.5  mt-2", children: [
+  return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(
       MultiSelect,
       {
+        className: "w-full mt-2",
         size: size === "medium" ? "medium" : "small",
         value: validValue ? value.map((v) => v.toString()) : [],
         disabled,
+        modalPopover: true,
         label: /* @__PURE__ */ jsx(
           LabelWithIconAndTooltip,
           {
@@ -14058,8 +14080,7 @@ function MultiSelectBinding({
             className: "text-text-secondary dark:text-text-secondary-dark ml-3.5"
           }
         ),
-        renderValue: useCallback((v) => renderValue(v, false), [renderValue]),
-        onMultiValueChange: (updatedValue) => {
+        onValueChange: (updatedValue) => {
           let newValue;
           if (of && of?.dataType === "number") {
             newValue = updatedValue ? updatedValue.map((e) => parseFloat(e)) : [];
@@ -16560,7 +16581,7 @@ const DEFAULT_FIELD_CONFIGS = {
         dataType: "string",
         enumValues: []
       },
-      Field: MultiSelectBinding
+      Field: MultiSelectFieldBinding
     }
   },
   number_input: {
@@ -16598,7 +16619,7 @@ const DEFAULT_FIELD_CONFIGS = {
         dataType: "number",
         enumValues: []
       },
-      Field: MultiSelectBinding
+      Field: MultiSelectFieldBinding
     }
   },
   file_upload: {
@@ -18879,14 +18900,6 @@ function useBuildDataSource({
     }) => {
       const collection = collectionProp ?? navigationController.getCollection(path);
       const usedDelegate = collection?.overrides?.dataSourceDelegate ?? delegate;
-      console.log("useBuildDatasource save", {
-        path,
-        entityId,
-        values,
-        collectionProp,
-        collection,
-        status
-      });
       const resolvedCollection = collection ? resolveCollection({
         collection,
         path,
@@ -18931,7 +18944,10 @@ function useBuildDataSource({
       collection
     }) => {
       const usedDelegate = collection?.overrides?.dataSourceDelegate ?? delegate;
-      return usedDelegate.deleteEntity({ entity, collection });
+      return usedDelegate.deleteEntity({
+        entity,
+        collection
+      });
     }, [delegate.deleteEntity]),
     /**
      * Check if the given property is unique in the given collection
@@ -19768,7 +19784,7 @@ export {
   MarkdownEditorFieldBinding,
   ModeControllerContext,
   ModeControllerProvider,
-  MultiSelectBinding,
+  MultiSelectFieldBinding,
   NavigationCard,
   NavigationCardBinding,
   NavigationGroup,