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

package/dist/index.umd.js

@@ -6325,9 +6325,7 @@
   }
   function VirtualTableSelect(props) {
     const {
-      name,
       enumValues,
-      error,
       internalValue,
       disabled,
       small,
@@ -6344,6 +6342,7 @@
       }
     }, [focused, ref]);
     const onChange = React.useCallback((updatedValue) => {
+      console.trace("onChange");
       if (valueType === "number") {
         if (multiple) {
           const newValue = updatedValue.map((v) => parseFloat(v));
@@ -6360,41 +6359,28 @@
         throw Error("Missing mapping in TableSelect");
       }
     }, [multiple, updateValue, valueType]);
-    const renderValue = (enumKey, index) => {
-      if (multiple && Array.isArray(enumKey)) {
-        return /* @__PURE__ */ jsxRuntime.jsx(
-          ArrayEnumPreview,
-          {
-            value: enumKey,
-            name,
-            enumValues,
-            size: small ? "small" : "medium"
-          },
-          `${enumKey}-${index}`
-        );
-      } else {
-        return /* @__PURE__ */ jsxRuntime.jsx(
-          EnumValuesChip,
-          {
-            enumKey,
-            enumValues,
-            size: small ? "small" : "medium"
-          },
-          `${enumKey}-${index}`
-        );
-      }
+    const renderValue = (enumKey) => {
+      return /* @__PURE__ */ jsxRuntime.jsx(
+        EnumValuesChip,
+        {
+          enumKey: String(enumKey),
+          enumValues,
+          size: small ? "small" : "medium"
+        },
+        `${enumKey}`
+      );
     };
     return multiple ? /* @__PURE__ */ jsxRuntime.jsx(
       ui.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__ */ jsxRuntime.jsx(
           ui.MultiSelectItem,
           {
@@ -6418,12 +6404,9 @@
         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__ */ jsxRuntime.jsx(
           ui.SelectItem,
@@ -7738,8 +7721,9 @@
         }
       }, [ref, onSelect, selected, disabled]);
       const onFocus = React.useCallback((event) => {
-        onSelectCallback();
         event.stopPropagation();
+        event.preventDefault();
+        onSelectCallback();
       }, [onSelectCallback]);
       const isOverflowing = React.useMemo(() => {
         if (bounds) {
@@ -9622,6 +9606,7 @@
       }
     }
     const multiple = multipleSelectOperations$1.includes(operation);
+    console.log("internalValue", { internalValue });
     return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "flex w-[440px]", children: [
       /* @__PURE__ */ jsxRuntime.jsx("div", { className: "w-[80px]", children: /* @__PURE__ */ jsxRuntime.jsx(
         ui.Select,
@@ -9654,16 +9639,15 @@
             )
           }
         ),
-        enumValues && /* @__PURE__ */ jsxRuntime.jsx(
+        enumValues && !multiple && /* @__PURE__ */ jsxRuntime.jsx(
           ui.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__ */ jsxRuntime.jsx(
               ui.IconButton,
               {
@@ -9675,6 +9659,8 @@
             renderValue: (enumKey) => {
               if (enumKey === null)
                 return "Filter for null values";
+              if (enumKey === void 0)
+                return null;
               return /* @__PURE__ */ jsxRuntime.jsx(
                 EnumValuesChip,
                 {
@@ -9698,6 +9684,40 @@
                   }
                 )
               },
+              `select_item_${name}_${enumConfig.id}`
+            ))
+          }
+        ),
+        enumValues && multiple && /* @__PURE__ */ jsxRuntime.jsx(
+          ui.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__ */ jsxRuntime.jsx(
+              ui.IconButton,
+              {
+                className: "absolute right-2 top-3",
+                onClick: (e) => updateFilter(operation, void 0),
+                children: /* @__PURE__ */ jsxRuntime.jsx(ui.ClearIcon, {})
+              }
+            ),
+            children: enumValues.map((enumConfig) => /* @__PURE__ */ jsxRuntime.jsx(
+              ui.MultiSelectItem,
+              {
+                value: String(enumConfig.id),
+                children: /* @__PURE__ */ jsxRuntime.jsx(
+                  EnumValuesChip,
+                  {
+                    enumKey: String(enumConfig.id),
+                    enumValues,
+                    size: "small"
+                  }
+                )
+              },
               `select_value_${name}_${enumConfig.id}`
             ))
           }
@@ -13981,7 +14001,7 @@
       )
     ] });
   }
-  function MultiSelectBinding({
+  function MultiSelectFieldBinding({
     propertyKey,
     value,
     setValue,
@@ -14045,13 +14065,15 @@
         enumKey
       );
     }, [enumValues, setValue, value]);
-    return /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "mt-0.5 ml-0.5  mt-2", children: [
+    return /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
       /* @__PURE__ */ jsxRuntime.jsx(
         ui.MultiSelect,
         {
+          className: "w-full mt-2",
           size: size === "medium" ? "medium" : "small",
           value: validValue ? value.map((v) => v.toString()) : [],
           disabled,
+          modalPopover: true,
           label: /* @__PURE__ */ jsxRuntime.jsx(
             LabelWithIconAndTooltip,
             {
@@ -14062,8 +14084,7 @@
               className: "text-text-secondary dark:text-text-secondary-dark ml-3.5"
             }
           ),
-          renderValue: React.useCallback((v) => renderValue(v, false), [renderValue]),
-          onMultiValueChange: (updatedValue) => {
+          onValueChange: (updatedValue) => {
             let newValue;
             if (of && of?.dataType === "number") {
               newValue = updatedValue ? updatedValue.map((e) => parseFloat(e)) : [];
@@ -16564,7 +16585,7 @@
           dataType: "string",
           enumValues: []
         },
-        Field: MultiSelectBinding
+        Field: MultiSelectFieldBinding
       }
     },
     number_input: {
@@ -16602,7 +16623,7 @@
           dataType: "number",
           enumValues: []
         },
-        Field: MultiSelectBinding
+        Field: MultiSelectFieldBinding
       }
     },
     file_upload: {
@@ -18883,14 +18904,6 @@
       }) => {
         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,
@@ -18935,7 +18948,10 @@
         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
@@ -19771,7 +19787,7 @@
   exports2.MarkdownEditorFieldBinding = MarkdownEditorFieldBinding;
   exports2.ModeControllerContext = ModeControllerContext;
   exports2.ModeControllerProvider = ModeControllerProvider;
-  exports2.MultiSelectBinding = MultiSelectBinding;
+  exports2.MultiSelectFieldBinding = MultiSelectFieldBinding;
   exports2.NavigationCard = NavigationCard;
   exports2.NavigationCardBinding = NavigationCardBinding;
   exports2.NavigationGroup = NavigationGroup;