@firecms/core 3.0.0-canary.206 → 3.0.0-canary.208

package/dist/app/Scaffold.d.ts

@@ -13,6 +13,10 @@ export interface ScaffoldProps {
      * Note that this has no effect if you are using a custom AppBar or Drawer.
      */
     logo?: string;
+    /**
+     * If true, the main content will be padded in large layouts. Defaults to true.
+     */
+    padding?: boolean;
     className?: string;
     style?: React.CSSProperties;
 }

package/dist/core/DefaultAppBar.d.ts

@@ -1,11 +1,17 @@
 import React from "react";
 import { User } from "../types";
 export type DefaultAppBarProps<ADDITIONAL_PROPS = object> = {
+    /**
+     * The content of the app bar, usually a title or logo. This includes a link to the home page.
+     */
     title?: React.ReactNode;
     /**
-     * A component that gets rendered on the upper side of the main toolbar
+     * A component that gets rendered on the upper side to the end of the main toolbar
      */
     endAdornment?: React.ReactNode;
+    /**
+     * A component that gets rendered on the upper side to the start of the main toolbar
+     */
     startAdornment?: React.ReactNode;
     dropDownActions?: React.ReactNode;
     includeModeToggle?: boolean;
@@ -20,4 +26,4 @@ export type DefaultAppBarProps<ADDITIONAL_PROPS = object> = {
  *
 
  */
-export declare const DefaultAppBar: ({ title, endAdornment, startAdornment, dropDownActions, includeModeToggle, className, style, user: userProp }: DefaultAppBarProps) => import("react/jsx-runtime").JSX.Element;
+export declare const DefaultAppBar: ({ title, endAdornment, startAdornment, dropDownActions, includeModeToggle, className, style, user: userProp, logo: logoProp, }: DefaultAppBarProps) => import("react/jsx-runtime").JSX.Element;

package/dist/core/FireCMS.d.ts

@@ -1,4 +1,4 @@
-import { EntityCollection, FireCMSProps, User } from "../types";
+import { FireCMSProps, User } from "../types";
 /**
  * If you are using independent components of the CMS
  * you need to wrap them with this main component, so the internal hooks work.
@@ -11,4 +11,4 @@ import { EntityCollection, FireCMSProps, User } from "../types";
 
  * @group Core
  */
-export declare function FireCMS<USER extends User, EC extends EntityCollection>(props: FireCMSProps<USER, EC>): import("react/jsx-runtime").JSX.Element;
+export declare function FireCMS<USER extends User>(props: FireCMSProps<USER>): import("react/jsx-runtime").JSX.Element;

package/dist/index.es.js

@@ -4518,7 +4518,7 @@ function useBuildNavigationController(props) {
       let shouldUpdateTopLevelNav = false;
       if (!areCollectionListsEqual(collectionsRef.current ?? [], resolvedCollections)) {
         collectionsRef.current = resolvedCollections;
-        console.log("Collections have changed", resolvedCollections);
+        console.debug("Collections have changed", resolvedCollections);
         shouldUpdateTopLevelNav = true;
       }
       if (collectionsRef.current === void 0) {
@@ -15390,14 +15390,16 @@ const DefaultAppBar = function DefaultAppBar2(t0) {
     includeModeToggle: t1,
     className,
     style,
-    user: userProp
+    user: userProp,
+    logo: logoProp
   } = t0;
   const includeModeToggle = t1 === void 0 ? true : t1;
   const {
     hasDrawer,
     drawerOpen,
-    logo
+    logo: appLogo
   } = useApp();
+  const logo = logoProp ?? appLogo;
   const navigation = useNavigationController();
   const breadcrumbs = useBreadcrumbsController();
   const authController = useAuthController();
@@ -15481,7 +15483,7 @@ const DefaultAppBar = function DefaultAppBar2(t0) {
   }
   let t7;
   if ($[18] !== breadcrumbs.breadcrumbs) {
-    t7 = breadcrumbs.breadcrumbs && /* @__PURE__ */ jsx("div", { className: "mr-8 hidden lg:block", children: /* @__PURE__ */ jsx("div", { className: "flex flex-row gap-2", children: breadcrumbs.breadcrumbs.map(_temp$a) }) });
+    t7 = (breadcrumbs.breadcrumbs ?? []).length > 0 && /* @__PURE__ */ jsx("div", { className: "mr-8 hidden lg:block", children: /* @__PURE__ */ jsx("div", { className: "flex flex-row gap-2", children: breadcrumbs.breadcrumbs.map(_temp$a) }) });
     $[18] = breadcrumbs.breadcrumbs;
     $[19] = t7;
   } else {
@@ -23288,7 +23290,6 @@ function EntityFullScreenRoute({
   const collectionPath = navigation.resolveIdsFrom(isNew ? lastCollectionEntry.path : lastEntityEntry.path);
   return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(EntityEditView, { entityId: isNew ? void 0 : entityId, collection, layout: "full_screen", path: collectionPath, copy: isCopy, selectedTab: selectedTab ?? void 0, onValuesModified: (modified) => blocked.current = modified, onSaved: (params) => {
-      console.log("Entity saved", params);
       const newSelectedTab = params.selectedTab;
       const newEntityId = params.entityId;
       if (newSelectedTab) {
@@ -23515,92 +23516,94 @@ function AppBar(t0) {
 AppBar.componentType = "AppBar";
 const DRAWER_WIDTH = 280;
 const Scaffold = React__default.memo(function Scaffold2(props) {
-  const $ = c(46);
+  const $ = c(48);
   const {
     children,
     autoOpenDrawer,
     logo,
     className,
-    style
+    style,
+    padding: t0
   } = props;
-  let t0;
+  const padding = t0 === void 0 ? true : t0;
+  let t1;
   if ($[0] !== children) {
-    t0 = React__default.Children.toArray(children).filter(_temp);
+    t1 = React__default.Children.toArray(children).filter(_temp);
     $[0] = children;
-    $[1] = t0;
+    $[1] = t1;
   } else {
-    t0 = $[1];
+    t1 = $[1];
   }
-  const drawerChildren = t0;
+  const drawerChildren = t1;
   if (drawerChildren.length > 1) {
     throw Error("Only one Drawer component is allowed in Scaffold");
   }
-  let t1;
+  let t2;
   if ($[2] !== children) {
-    t1 = React__default.Children.toArray(children).filter(_temp2);
+    t2 = React__default.Children.toArray(children).filter(_temp2);
     $[2] = children;
-    $[3] = t1;
+    $[3] = t2;
   } else {
-    t1 = $[3];
+    t2 = $[3];
   }
-  const appBarChildren = t1;
+  const appBarChildren = t2;
   if (appBarChildren.length > 1) {
     throw Error("Only one AppBar component is allowed in Scaffold");
   }
-  let t2;
+  let t3;
   if ($[4] !== children) {
-    t2 = React__default.Children.toArray(children).filter(_temp3);
+    t3 = React__default.Children.toArray(children).filter(_temp3);
     $[4] = children;
-    $[5] = t2;
+    $[5] = t3;
   } else {
-    t2 = $[5];
+    t3 = $[5];
   }
-  const otherChildren = t2;
+  const otherChildren = t3;
   const includeDrawer = drawerChildren.length > 0;
   const largeLayout = useLargeLayout();
   const [drawerOpen, setDrawerOpen] = React__default.useState(false);
   const [onHover, setOnHover] = React__default.useState(false);
-  let t3;
+  let t4;
   if ($[6] === Symbol.for("react.memo_cache_sentinel")) {
-    t3 = () => setOnHover(true);
-    $[6] = t3;
+    t4 = () => setOnHover(true);
+    $[6] = t4;
   } else {
-    t3 = $[6];
+    t4 = $[6];
   }
-  const setOnHoverTrue = t3;
-  let t4;
+  const setOnHoverTrue = t4;
+  let t5;
   if ($[7] === Symbol.for("react.memo_cache_sentinel")) {
-    t4 = () => setOnHover(false);
-    $[7] = t4;
+    t5 = () => setOnHover(false);
+    $[7] = t5;
   } else {
-    t4 = $[7];
+    t5 = $[7];
   }
-  const setOnHoverFalse = t4;
-  let t5;
+  const setOnHoverFalse = t5;
+  let t6;
   if ($[8] === Symbol.for("react.memo_cache_sentinel")) {
-    t5 = () => {
+    t6 = () => {
       setDrawerOpen(true);
     };
-    $[8] = t5;
+    $[8] = t6;
   } else {
-    t5 = $[8];
+    t6 = $[8];
   }
-  const handleDrawerOpen = t5;
-  let t6;
+  const handleDrawerOpen = t6;
+  let t7;
   if ($[9] === Symbol.for("react.memo_cache_sentinel")) {
-    t6 = () => {
+    t7 = () => {
       setDrawerOpen(false);
     };
-    $[9] = t6;
+    $[9] = t7;
   } else {
-    t6 = $[9];
+    t7 = $[9];
   }
-  const handleDrawerClose = t6;
+  const handleDrawerClose = t7;
   const computedDrawerOpen = drawerOpen || Boolean(largeLayout && autoOpenDrawer && onHover);
   const hasAppBar = Boolean(appBarChildren.length > 0);
-  let t7;
+  let t8;
   if ($[10] !== autoOpenDrawer || $[11] !== computedDrawerOpen || $[12] !== includeDrawer || $[13] !== logo || $[14] !== onHover) {
-    t7 = {
+    t8 = {
       logo,
       hasDrawer: includeDrawer,
       drawerHovered: onHover,
@@ -23614,21 +23617,21 @@ const Scaffold = React__default.memo(function Scaffold2(props) {
     $[12] = includeDrawer;
     $[13] = logo;
     $[14] = onHover;
-    $[15] = t7;
+    $[15] = t8;
   } else {
-    t7 = $[15];
+    t8 = $[15];
   }
-  let t8;
+  let t9;
   if ($[16] !== className) {
-    t8 = cls("flex h-screen w-screen bg-surface-50 dark:bg-surface-900 text-surface-900 dark:text-white overflow-hidden", className);
+    t9 = cls("flex h-screen w-screen bg-surface-50 dark:bg-surface-900 text-surface-900 dark:text-white overflow-hidden", className);
     $[16] = className;
-    $[17] = t8;
+    $[17] = t9;
   } else {
-    t8 = $[17];
+    t9 = $[17];
   }
-  let t9;
+  let t10;
   if ($[18] !== style) {
-    t9 = {
+    t10 = {
       paddingTop: "env(safe-area-inset-top)",
       paddingLeft: "env(safe-area-inset-left)",
       paddingRight: "env(safe-area-inset-right)",
@@ -23637,96 +23640,101 @@ const Scaffold = React__default.memo(function Scaffold2(props) {
       ...style
     };
     $[18] = style;
-    $[19] = t9;
+    $[19] = t10;
   } else {
-    t9 = $[19];
+    t10 = $[19];
   }
-  const t10 = includeDrawer && drawerChildren;
-  let t11;
-  if ($[20] !== computedDrawerOpen || $[21] !== includeDrawer || $[22] !== onHover || $[23] !== t10) {
-    t11 = /* @__PURE__ */ jsx(DrawerWrapper, { displayed: includeDrawer, onMouseEnter: setOnHoverTrue, onMouseMove: setOnHoverTrue, onMouseLeave: setOnHoverFalse, open: computedDrawerOpen, hovered: onHover, setDrawerOpen, children: t10 });
+  const t11 = includeDrawer && drawerChildren;
+  let t12;
+  if ($[20] !== computedDrawerOpen || $[21] !== includeDrawer || $[22] !== onHover || $[23] !== t11) {
+    t12 = /* @__PURE__ */ jsx(DrawerWrapper, { displayed: includeDrawer, onMouseEnter: setOnHoverTrue, onMouseMove: setOnHoverTrue, onMouseLeave: setOnHoverFalse, open: computedDrawerOpen, hovered: onHover, setDrawerOpen, children: t11 });
     $[20] = computedDrawerOpen;
     $[21] = includeDrawer;
     $[22] = onHover;
-    $[23] = t10;
-    $[24] = t11;
+    $[23] = t11;
+    $[24] = t12;
   } else {
-    t11 = $[24];
+    t12 = $[24];
   }
-  let t12;
+  let t13;
   if ($[25] !== hasAppBar) {
-    t12 = hasAppBar && /* @__PURE__ */ jsx(DrawerHeader, {});
+    t13 = hasAppBar && /* @__PURE__ */ jsx(DrawerHeader, {});
     $[25] = hasAppBar;
-    $[26] = t12;
+    $[26] = t13;
   } else {
-    t12 = $[26];
+    t13 = $[26];
   }
-  const t13 = !hasAppBar;
-  let t14;
-  if ($[27] !== t13) {
-    t14 = cls(defaultBorderMixin, "flex-grow overflow-auto lg:m-0 lg:mx-4 lg:mb-4 lg:rounded-lg lg:border lg:border-solid m-0 mt-1", {
-      "lg:mt-4": t13
+  const t14 = !hasAppBar;
+  const t15 = hasAppBar && !padding;
+  let t16;
+  if ($[27] !== padding || $[28] !== t14 || $[29] !== t15) {
+    t16 = cls(defaultBorderMixin, "flex-grow overflow-auto m-0 mt-1", {
+      "lg:mt-4": t14,
+      "lg:m-0 lg:mx-4 lg:mb-4 lg:rounded-lg lg:border lg:border-solid": padding,
+      "border-t": t15
     });
-    $[27] = t13;
+    $[27] = padding;
     $[28] = t14;
+    $[29] = t15;
+    $[30] = t16;
   } else {
-    t14 = $[28];
+    t16 = $[30];
   }
-  let t15;
-  if ($[29] !== otherChildren) {
-    t15 = /* @__PURE__ */ jsx(ErrorBoundary, { children: otherChildren });
-    $[29] = otherChildren;
-    $[30] = t15;
+  let t17;
+  if ($[31] !== otherChildren) {
+    t17 = /* @__PURE__ */ jsx(ErrorBoundary, { children: otherChildren });
+    $[31] = otherChildren;
+    $[32] = t17;
   } else {
-    t15 = $[30];
+    t17 = $[32];
   }
-  let t16;
-  if ($[31] !== t14 || $[32] !== t15) {
-    t16 = /* @__PURE__ */ jsx("div", { className: t14, children: t15 });
-    $[31] = t14;
-    $[32] = t15;
+  let t18;
+  if ($[33] !== t16 || $[34] !== t17) {
+    t18 = /* @__PURE__ */ jsx("div", { className: t16, children: t17 });
     $[33] = t16;
+    $[34] = t17;
+    $[35] = t18;
   } else {
-    t16 = $[33];
+    t18 = $[35];
   }
-  let t17;
-  if ($[34] !== t12 || $[35] !== t16) {
-    t17 = /* @__PURE__ */ jsxs("main", { className: "flex flex-col flex-grow overflow-auto", children: [
-      t12,
-      t16
+  let t19;
+  if ($[36] !== t13 || $[37] !== t18) {
+    t19 = /* @__PURE__ */ jsxs("main", { className: "flex flex-col flex-grow overflow-auto", children: [
+      t13,
+      t18
     ] });
-    $[34] = t12;
-    $[35] = t16;
-    $[36] = t17;
+    $[36] = t13;
+    $[37] = t18;
+    $[38] = t19;
   } else {
-    t17 = $[36];
+    t19 = $[38];
   }
-  let t18;
-  if ($[37] !== appBarChildren || $[38] !== t11 || $[39] !== t17 || $[40] !== t8 || $[41] !== t9) {
-    t18 = /* @__PURE__ */ jsxs("div", { className: t8, style: t9, children: [
+  let t20;
+  if ($[39] !== appBarChildren || $[40] !== t10 || $[41] !== t12 || $[42] !== t19 || $[43] !== t9) {
+    t20 = /* @__PURE__ */ jsxs("div", { className: t9, style: t10, children: [
       appBarChildren,
-      t11,
-      t17
+      t12,
+      t19
     ] });
-    $[37] = appBarChildren;
-    $[38] = t11;
-    $[39] = t17;
-    $[40] = t8;
-    $[41] = t9;
-    $[42] = t18;
+    $[39] = appBarChildren;
+    $[40] = t10;
+    $[41] = t12;
+    $[42] = t19;
+    $[43] = t9;
+    $[44] = t20;
   } else {
-    t18 = $[42];
+    t20 = $[44];
   }
-  let t19;
-  if ($[43] !== t18 || $[44] !== t7) {
-    t19 = /* @__PURE__ */ jsx(AppContext.Provider, { value: t7, children: t18 });
-    $[43] = t18;
-    $[44] = t7;
-    $[45] = t19;
+  let t21;
+  if ($[45] !== t20 || $[46] !== t8) {
+    t21 = /* @__PURE__ */ jsx(AppContext.Provider, { value: t8, children: t20 });
+    $[45] = t20;
+    $[46] = t8;
+    $[47] = t21;
   } else {
-    t19 = $[45];
+    t21 = $[47];
   }
-  return t19;
+  return t21;
 }, equal);
 const DrawerHeader = () => {
   const $ = c(1);