@firecms/core 3.3.0-canary.102f274 → 3.3.0-canary.3afa809

package/dist/index.es.js

@@ -849,8 +849,13 @@ const resolveCollection = ({
     ...a,
     ...b
   }), {});
+  const {
+    properties: overrideProps,
+    ...restOverrides
+  } = collectionOverride ?? {};
   return {
     ...collection,
+    ...restOverrides,
     properties: cleanedProperties,
     originalCollection: collection
   };
@@ -12353,7 +12358,7 @@ function StorageUpload(t0) {
       newValue.splice(fromIndex, 1);
       newValue.splice(toIndex, 0, item);
       setInternalValue(newValue);
-      const fieldValue = newValue.filter(_temp3$4).map(_temp4$3);
+      const fieldValue = newValue.filter(_temp3$4).map(_temp4$4);
       onChange(fieldValue);
     };
     $[0] = multipleFilesSupported;
@@ -12547,7 +12552,7 @@ function _temp6$2(v_1) {
 function _temp5$2(v_0) {
   return !!v_0.storagePathOrDownloadUrl;
 }
-function _temp4$3(e_0) {
+function _temp4$4(e_0) {
   return e_0.storagePathOrDownloadUrl;
 }
 function _temp3$4(e) {
@@ -18782,7 +18787,7 @@ function StringNumberFilterField(t0) {
   let t11;
   if ($[40] !== dataType || $[41] !== enumValues || $[42] !== internalValue || $[43] !== isNullOperation || $[44] !== multiple || $[45] !== name || $[46] !== operation || $[47] !== updateFilter) {
     t11 = enumValues && multiple && /* @__PURE__ */ jsx(MultiSelect, { size: "medium", position: "item-aligned", value: Array.isArray(internalValue) ? internalValue.map(_temp3$3) : [], disabled: isNullOperation, onValueChange: (value_2) => {
-      updateFilter(operation, dataType === "number" ? value_2.map(_temp4$2) : value_2);
+      updateFilter(operation, dataType === "number" ? value_2.map(_temp4$3) : value_2);
     }, multiple, endAdornment: internalValue && /* @__PURE__ */ jsx(IconButton, { className: "absolute right-2 top-3", onClick: (e_2) => updateFilter(operation, void 0), children: /* @__PURE__ */ jsx(CloseIcon, {}) }), children: enumValues.map((enumConfig_0) => /* @__PURE__ */ jsx(MultiSelectItem, { value: String(enumConfig_0.id), children: /* @__PURE__ */ jsx(EnumValuesChip, { enumKey: String(enumConfig_0.id), enumValues, size: "small" }) }, `select_value_${name}_${enumConfig_0.id}`)) });
     $[40] = dataType;
     $[41] = enumValues;
@@ -18824,7 +18829,7 @@ function StringNumberFilterField(t0) {
   }
   return t13;
 }
-function _temp4$2(v) {
+function _temp4$3(v) {
   return parseInt(v);
 }
 function _temp3$3(e_1) {
@@ -25536,7 +25541,12 @@ const EntityCollectionView$1 = React__default.memo(function EntityCollectionView
   const scrollRestoration = useScrollRestoration();
   const collection = useMemo(() => {
     const userOverride = userConfigPersistence?.getCollectionConfig(fullPath);
-    return userOverride ? mergeDeep(collectionProp, userOverride) : collectionProp;
+    if (!userOverride) return collectionProp;
+    const {
+      properties,
+      ...rest
+    } = userOverride;
+    return mergeDeep(collectionProp, rest);
   }, [collectionProp, fullPath, userConfigPersistence?.getCollectionConfig]);
   const openEntityMode = collection?.openEntityMode ?? DEFAULT_ENTITY_OPEN_MODE;
   const collectionRef = React__default.useRef(collection);
@@ -25790,11 +25800,12 @@ const EntityCollectionView$1 = React__default.memo(function EntityCollectionView
     collection,
     path: fullPath,
     propertyConfigs: customizationController.propertyConfigs,
-    authController
-  }), [collection, fullPath]);
+    authController,
+    userConfigPersistence
+  }), [collection, fullPath, userConfigPersistence]);
   const hasEnumProperty = useMemo(() => {
-    const properties = resolvedCollection.properties;
-    return Object.values(properties).some((prop) => prop && prop.dataType === "string" && prop.enumValues);
+    const properties_0 = resolvedCollection.properties;
+    return Object.values(properties_0).some((prop) => prop && prop.dataType === "string" && prop.enumValues);
   }, [resolvedCollection.properties]);
   const enabledViews = useMemo(() => {
     const configured = collection.enabledViews ?? ["table", "cards", "kanban"];
@@ -25805,8 +25816,8 @@ const EntityCollectionView$1 = React__default.memo(function EntityCollectionView
   }, [collection.enabledViews, hasEnumProperty]);
   const kanbanPropertyOptions = useMemo(() => {
     const options = [];
-    const properties_0 = resolvedCollection.properties;
-    for (const [key_0, property_0] of Object.entries(properties_0)) {
+    const properties_1 = resolvedCollection.properties;
+    for (const [key_0, property_0] of Object.entries(properties_1)) {
       const prop_0 = property_0;
       if (prop_0 && prop_0.dataType === "string" && prop_0.enumValues) {
         options.push({
@@ -28109,7 +28120,14 @@ function useBuildNavigationController(props) {
     if (!collections_0) return void 0;
     const baseCollection = getCollectionByPathOrId(removeInitialAndTrailingSlashes(idOrPath), collections_0);
     const userOverride = includeUserOverride ? userConfigPersistence?.getCollectionConfig(idOrPath) : void 0;
-    const overriddenCollection = baseCollection ? mergeDeep(baseCollection, userOverride ?? {}) : void 0;
+    let overriddenCollection = baseCollection;
+    if (baseCollection && userOverride) {
+      const {
+        properties,
+        ...rest
+      } = userOverride;
+      overriddenCollection = mergeDeep(baseCollection, rest);
+    }
     let result = overriddenCollection;
     if (overriddenCollection) {
       const subcollections = overriddenCollection.subcollections;
@@ -30050,7 +30068,7 @@ function useBuildSideDialogsController() {
             replace: true,
             state: {
               base_location: baseLocation,
-              panels: updatedPanels.map(_temp4$1)
+              panels: updatedPanels.map(_temp4$2)
             }
           });
         }
@@ -30148,7 +30166,7 @@ function _temp6$1(p_4) {
 function _temp5$1(p_3) {
   return p_3.key;
 }
-function _temp4$1(p_2) {
+function _temp4$2(p_2) {
   return p_2.key;
 }
 function _temp3$2(p_1) {
@@ -32294,7 +32312,7 @@ const Scaffold = React__default.memo(function Scaffold2(props) {
   const otherChildren = t3;
   const includeDrawer = drawerChildren.length > 0;
   const largeLayout = useLargeLayout();
-  const [drawerOpen, setDrawerOpen] = React__default.useState(false);
+  const [drawerOpen, setDrawerOpen] = React__default.useState(_temp4$1);
   const [onHover, setOnHover] = React__default.useState(false);
   let t4;
   if ($[6] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
@@ -32316,6 +32334,10 @@ const Scaffold = React__default.memo(function Scaffold2(props) {
   if ($[8] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
     t6 = () => {
       setDrawerOpen(true);
+      try {
+        localStorage.setItem("firecms_drawer_open", "true");
+      } catch {
+      }
     };
     $[8] = t6;
   } else {
@@ -32326,6 +32348,10 @@ const Scaffold = React__default.memo(function Scaffold2(props) {
   if ($[9] === /* @__PURE__ */ Symbol.for("react.memo_cache_sentinel")) {
     t7 = () => {
       setDrawerOpen(false);
+      try {
+        localStorage.setItem("firecms_drawer_open", "false");
+      } catch {
+      }
     };
     $[9] = t7;
   } else {
@@ -32678,6 +32704,13 @@ function _temp2$1(child_0) {
 function _temp3$1(child_1) {
   return child_1.type.componentType !== "Drawer" && child_1.type.componentType !== "AppBar";
 }
+function _temp4$1() {
+  try {
+    return localStorage.getItem("firecms_drawer_open") === "true";
+  } catch {
+    return false;
+  }
+}
 const en = {
   // ─── Form actions ────────────────────────────────────────────
   save: "Save",