@firecms/core 3.0.0-canary.295 → 3.0.0-canary.297

package/dist/components/VirtualTable/VirtualTable.performance.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/form/components/StorageUploadProgress.d.ts

@@ -3,7 +3,7 @@ export interface StorageUploadItemProps {
     storagePath: string;
     metadata?: any;
     entry: StorageFieldItem;
-    onFileUploadComplete: (value: string, entry: StorageFieldItem, metadata?: any) => Promise<void>;
+    onFileUploadComplete: (value: string, entry: StorageFieldItem, metadata?: any, uploadedUrl?: string) => Promise<void>;
     imageSize: number;
     simple: boolean;
 }

package/dist/index.es.js

@@ -222,6 +222,15 @@ class EntityReference {
   get pathWithId() {
     return `${this.path}/${this.id}`;
   }
+  get pathWithIdAndDatabase() {
+    if (this.databaseId) {
+      if (this.databaseId === "(default)") {
+        return this.pathWithId;
+      }
+      return `${this.databaseId}:::${this.path}/${this.id}`;
+    }
+    return this.pathWithId;
+  }
   isEntityReference() {
     return true;
   }
@@ -6012,7 +6021,7 @@ const EntityPreviewContainer = React.forwardRef((t0, ref) => {
   const t7 = onClick ? "cursor-pointer" : "";
   let t8;
   if ($[11] !== className || $[12] !== t4 || $[13] !== t5 || $[14] !== t6 || $[15] !== t7) {
-    t8 = cls("bg-white dark:bg-surface-900", "min-h-[42px]", t4, "items-center", t5, t6, "flex border rounded-lg", t7, defaultBorderMixin, className);
+    t8 = cls("bg-white dark:bg-surface-900", "min-h-[44px]", t4, "items-center", t5, t6, "flex border rounded-lg", t7, defaultBorderMixin, className);
     $[11] = className;
     $[12] = t4;
     $[13] = t5;
@@ -6097,7 +6106,7 @@ const ReferencePreview = function ReferencePreview2(props) {
   return t0;
 };
 function ReferencePreviewInternal(t0) {
-  const $ = c(16);
+  const $ = c(22);
   const {
     disabled,
     reference,
@@ -6135,24 +6144,43 @@ function ReferencePreviewInternal(t0) {
       }
       return t42;
     } else {
-      throw Error(`Couldn't find the corresponding collection view for the path: ${reference.path}`);
+      const t42 = size ?? "medium";
+      let t5;
+      if ($[6] !== reference.pathWithId) {
+        t5 = /* @__PURE__ */ jsx(ErrorView, { error: "Unexpected reference value. Click to edit", tooltip: reference.pathWithId });
+        $[6] = reference.pathWithId;
+        $[7] = t5;
+      } else {
+        t5 = $[7];
+      }
+      let t6;
+      if ($[8] !== onClick || $[9] !== t42 || $[10] !== t5) {
+        t6 = /* @__PURE__ */ jsx(EntityPreviewContainer, { onClick, size: t42, children: t5 });
+        $[8] = onClick;
+        $[9] = t42;
+        $[10] = t5;
+        $[11] = t6;
+      } else {
+        t6 = $[11];
+      }
+      return t6;
     }
   }
   let t4;
-  if ($[6] !== collection || $[7] !== disabled || $[8] !== hover || $[9] !== includeEntityLink || $[10] !== includeId || $[11] !== onClick || $[12] !== previewProperties || $[13] !== reference || $[14] !== size) {
+  if ($[12] !== collection || $[13] !== disabled || $[14] !== hover || $[15] !== includeEntityLink || $[16] !== includeId || $[17] !== onClick || $[18] !== previewProperties || $[19] !== reference || $[20] !== size) {
     t4 = /* @__PURE__ */ jsx(ReferencePreviewExisting, { reference, collection, previewProperties, size, disabled, includeEntityLink, includeId, onClick, hover });
-    $[6] = collection;
-    $[7] = disabled;
-    $[8] = hover;
-    $[9] = includeEntityLink;
-    $[10] = includeId;
-    $[11] = onClick;
-    $[12] = previewProperties;
-    $[13] = reference;
-    $[14] = size;
-    $[15] = t4;
+    $[12] = collection;
+    $[13] = disabled;
+    $[14] = hover;
+    $[15] = includeEntityLink;
+    $[16] = includeId;
+    $[17] = onClick;
+    $[18] = previewProperties;
+    $[19] = reference;
+    $[20] = size;
+    $[21] = t4;
   } else {
-    t4 = $[15];
+    t4 = $[21];
   }
   return t4;
 }
@@ -8359,9 +8387,16 @@ function useStorageUploadController({
       propertyKey
     }) ?? "/";
   }, [entityId, entityValues, path, resolvedProperty, propertyKey, storage]);
-  const onFileUploadComplete = useCallback(async (uploadedPath, entry, metadata_0) => {
+  const onFileUploadComplete = useCallback(async (uploadedPath, entry, metadata_0, uploadedUrl) => {
     console.debug("onFileUploadComplete", uploadedPath, entry);
     let uploadPathOrDownloadUrl = uploadedPath;
+    if (storage.includeBucketUrl) {
+      if (!uploadedUrl) {
+        console.warn("includeBucketUrl is set but no fully-qualified storage URL was returned by the StorageSource. Falling back to the storage path.");
+      } else {
+        uploadPathOrDownloadUrl = uploadedUrl;
+      }
+    }
     if (storage.storeUrl) {
       uploadPathOrDownloadUrl = (await storageSource.getDownloadURL(uploadedPath)).url;
     }
@@ -8534,10 +8569,11 @@ function StorageUploadProgress({
       path: storagePath,
       metadata
     }).then(async ({
-      path
+      path,
+      storageUrl
     }) => {
       console.debug("Upload successful", path);
-      await onFileUploadComplete(path, entry, metadata);
+      await onFileUploadComplete(path, entry, metadata, storageUrl);
       if (mounted.current) setLoading(false);
     }).catch((e) => {
       console.warn("Upload error", e);
@@ -10213,10 +10249,6 @@ function getEntityFromCache(path) {
       const entityString = localStorage.getItem(key);
       if (entityString) {
         const entity = JSON.parse(entityString, customReviver);
-        console.log("Loaded entity from localStorage:", {
-          key,
-          entity
-        });
         return entity;
       }
     } catch (error) {
@@ -11520,7 +11552,7 @@ const VirtualTable = React__default.memo(function VirtualTable2({
     /* @__PURE__ */ jsx(AssignmentIcon, {}),
     emptyComponent
   ] }) : void 0;
-  const virtualListController = {
+  const virtualListController = useMemo(() => ({
     data,
     rowHeight,
     cellRenderer,
@@ -11539,7 +11571,7 @@ const VirtualTable = React__default.memo(function VirtualTable2({
     rowClassName,
     endAdornment,
     AddColumnComponent
-  };
+  }), [data, rowHeight, cellRenderer, columns, currentSort, onRowClick, customView, onColumnResizeInternal, onColumnResizeEndInternal, filterInput, onColumnSort, onFilterUpdateInternal, sortByProperty, hoverRow, createFilterField2, rowClassName, endAdornment, AddColumnComponent]);
   return /* @__PURE__ */ jsx("div", { ref: measureRef, style, className: cls("h-full w-full", className), children: /* @__PURE__ */ jsx(VirtualListContext.Provider, { value: virtualListController, children: /* @__PURE__ */ jsx(MemoizedList, { outerRef: tableRef, width: bounds.width, height: bounds.height, itemCount: (data?.length ?? 0) + (endAdornment ? 1 : 0), onScroll, includeAddColumn: Boolean(AddColumnComponent), itemSize: rowHeight }, rowHeight) }) });
 }, equal);
 function MemoizedList({
@@ -23693,7 +23725,15 @@ function SideDialogView({
     pendingClose,
     setPendingClose
   }, children: [
-    /* @__PURE__ */ jsxs(Sheet, { open: Boolean(panel), onOpenChange: (open) => !open && onCloseRequest(), title: "Side dialog " + panel?.key, children: [
+    /* @__PURE__ */ jsxs(Sheet, { open: Boolean(panel), onOpenChange: (open) => {
+      if (!open) {
+        const suggestionMenu = document.querySelector('[data-suggestion-menu="true"]');
+        if (suggestionMenu && window.getComputedStyle(suggestionMenu).visibility !== "hidden") {
+          return;
+        }
+        onCloseRequest();
+      }
+    }, title: "Side dialog " + panel?.key, children: [
       panel && /* @__PURE__ */ jsx("div", { className: "transform max-w-[100vw] lg:max-w-[95vw] flex flex-col h-full transition-all duration-250 ease-in-out bg-white dark:bg-surface-900 ", style: {
         width: panel.width,
         transform: `translateX(-${offsetPosition * 200}px)`