@firecms/core 3.0.0-canary.109 → 3.0.0-canary.110

package/dist/index.umd.js

@@ -3605,7 +3605,6 @@
       previousValues,
       status
     }).then((entity) => {
-      console.log("Entity saved");
       try {
         if (callbacks?.onSaveSuccess) {
           const resolvedCollection = resolveCollection({
@@ -11245,7 +11244,6 @@
         className: ui.cls(
           ui.cardMixin,
           ui.cardClickableMixin,
-          ui.focusedMixin,
           "cursor-pointer flex flex-row items-center px-4 py-2 text-inherit dark:text-inherit visited:text-inherit visited:dark:text-inherit hover:text-inherit hover:dark:text-inherit "
         ),
         to: url,
@@ -13222,7 +13220,7 @@
                   {
                     variant: "subtitle1",
                     noWrap: true,
-                    className: ui.cls("!font-medium", drawerOpen ? "ml-2" : ""),
+                    className: ui.cls("transition-all", drawerOpen ? "ml-2" : ""),
                     children: title
                   }
                 ) : title
@@ -14415,7 +14413,6 @@
           disabled ? ui.fieldBackgroundDisabledMixin : ui.fieldBackgroundHoverMixin,
           dropZoneClasses,
           multipleFilesSupported && internalValue.length ? "" : "flex",
-          ui.focusedMixin,
           {
             [nonActiveDropClasses]: !isDragActive,
             [activeDropClasses]: isDragActive,
@@ -14482,7 +14479,7 @@
                           ref: provided.innerRef,
                           ...provided.draggableProps,
                           ...provided.dragHandleProps,
-                          className: ui.cls(ui.focusedMixin, "rounded-md"),
+                          className: ui.cls("rounded-md"),
                           style: {
                             ...provided.draggableProps.style
                           },
@@ -16232,10 +16229,10 @@
     minimalistView,
     isSubmitting,
     context,
-    customProps,
-    ...props
+    customProps
   }) {
     const highlight = customProps?.highlight;
+    const editorProps = customProps?.editorProps;
     const storageSource = useStorageSource();
     const storage = property.storage;
     const entityValues = context.values;
@@ -16306,7 +16303,8 @@
             throw new Error("Error uploading image");
           }
           return url;
-        }
+        },
+        ...editorProps
       }
     );
     if (minimalistView)
@@ -17412,7 +17410,7 @@
         sideEntityController.replace({
           path,
           entityId: updatedEntity.id,
-          selectedSubPath: selectedTabRef.current,
+          selectedSubPath: MAIN_TAB_VALUE === selectedTabRef.current ? void 0 : selectedTabRef.current,
           updateUrl: true,
           collection
         });
@@ -17887,7 +17885,7 @@
       )
     ] });
     function buildForm() {
-      let form = /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "h-full overflow-auto", children: [
+      let form = /* @__PURE__ */ jsxRuntime.jsxs(jsxRuntime.Fragment, { children: [
         pluginActions.length > 0 && /* @__PURE__ */ jsxRuntime.jsx(
           "div",
           {
@@ -17895,7 +17893,7 @@
             children: pluginActions
           }
         ),
-        /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "pt-12 pb-16 pl-8 pr-8 md:pl-10 md:pr-10", children: [
+        /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-full overflow-auto", children: /* @__PURE__ */ jsxRuntime.jsxs("div", { className: "pt-12 pb-16 pl-8 pr-8 md:pl-10 md:pr-10", children: [
           /* @__PURE__ */ jsxRuntime.jsxs(
             "div",
             {
@@ -17943,7 +17941,7 @@
             ),
             /* @__PURE__ */ jsxRuntime.jsx("div", { className: "h-14" })
           ] })
-        ] })
+        ] }) })
       ] });
       if (plugins) {
         plugins.forEach((plugin) => {
@@ -18085,7 +18083,7 @@
                 role: "tabpanel",
                 hidden: !mainViewVisible,
                 id: `form_${path}`,
-                className: " w-full",
+                className: "relative w-full",
                 children: globalLoading ? /* @__PURE__ */ jsxRuntime.jsx(CircularProgressCenter, {}) : entityView
               }
             ),
@@ -18184,8 +18182,10 @@
     return /* @__PURE__ */ jsxRuntime.jsxs(
       ui.Dialog,
       {
+        onEscapeKeyDown: () => {
+          handleCancel();
+        },
         open,
-        onOpenChange: (open2) => open2 ? handleCancel() : handleOk(),
         children: [
           /* @__PURE__ */ jsxRuntime.jsxs(ui.DialogContent, { children: [
             /* @__PURE__ */ jsxRuntime.jsx(ui.Typography, { variant: "h6", children: title }),
@@ -18250,6 +18250,7 @@
     const handleDrawerCloseOk = () => {
       setBlocked(false);
       setDrawerCloseRequested(false);
+      console.log("handleDrawerCloseOk");
       sideDialogsController.close();
       panel?.onClose?.();
     };
@@ -18257,9 +18258,11 @@
       setDrawerCloseRequested(false);
     };
     const onCloseRequest = (force) => {
+      console.log("onCloseRequest", blocked, force);
       if (blocked && !force) {
         setDrawerCloseRequested(true);
       } else {
+        console.log("onCloseRequest closing");
         sideDialogsController.close();
         panel?.onClose?.();
       }
@@ -18538,12 +18541,13 @@
       ...props,
       path: resolvedPath
     };
+    const entityViewWidth = getEntityViewWidth(props, smallLayout);
     return {
       key: `${props.path}/${props.entityId}`,
       component: /* @__PURE__ */ jsxRuntime.jsx(EntitySidePanel, { ...resolvedPanelProps }),
       urlPath: newPath,
       parentUrlPath: buildUrlCollectionPath(collectionPath),
-      width: getEntityViewWidth(props, smallLayout),
+      width: entityViewWidth,
       onClose: props.onClose
     };
   };