@firecms/core 3.3.0-canary.3ea2cd2 → 3.3.0-canary.5906216

package/src/core/DefaultDrawer.tsx

@@ -10,7 +10,16 @@ import {
 import { Link, useNavigate } from "react-router-dom";
 import { CMSAnalyticsEvent, NavigationEntry, NavigationResult } from "../types";
 import { IconForView } from "../util";
-import { cls, IconButton, Menu, MenuItem, MoreVertIcon, Tooltip } from "@firecms/ui";
+import {
+    cls,
+    KeyboardDoubleArrowLeftIcon,
+    KeyboardDoubleArrowRightIcon,
+    Menu,
+    MenuItem,
+    MoreVertIcon,
+    Tooltip,
+    Typography
+} from "@firecms/ui";
 import { useAnalyticsController } from "../hooks/useAnalyticsController";
 import { DrawerNavigationGroup } from "./DrawerNavigationGroup";
 import { FireCMSLogo } from "../components";
@@ -37,6 +46,14 @@ export function DefaultDrawer({
 
     const [adminMenuOpen, setAdminMenuOpen] = React.useState(false);
 
+    const scrollRef = React.useRef<HTMLDivElement>(null);
+    const [scrolled, setScrolled] = React.useState(false);
+    const handleScroll = () => {
+        if (scrollRef.current) {
+            setScrolled(scrollRef.current.scrollTop > 0);
+        }
+    };
+
     const analyticsController = useAnalyticsController();
     const navigation = useNavigationController();
     const { t } = useTranslation();
@@ -59,6 +76,8 @@ export function DefaultDrawer({
     // Collapsible groups state - using "drawer" namespace for independent state from home page
     const { isGroupCollapsed, toggleGroupCollapsed } = useCollapsedGroups(groupsWithoutAdmin, "drawer");
 
+    const drawerVisuallyOpen = drawerOpen || drawerHovered;
+
     const onItemClick = (view: NavigationEntry) => {
         const eventName: CMSAnalyticsEvent = view.type === "collection"
             ? "drawer_navigate_to_collection"
@@ -69,56 +88,66 @@ export function DefaultDrawer({
     };
 
     return (
-        <>
-            <div className={cls("flex flex-col h-full relative flex-grow w-full", className)} style={style}>
-
-                <DrawerLogo logo={logo} />
-
-                <div className={"mt-4 flex-grow overflow-scroll no-scrollbar"}
-                    style={{
-                        maskImage: "linear-gradient(to bottom, transparent 0, black 20px, black calc(100% - 20px), transparent 100%)",
-                    }}>
-
-                    {groupsWithoutAdmin.map((group) => {
-                        const entriesInGroup = Object.values(navigationEntries).filter(e => e.group === group);
-                        return (
-                            <DrawerNavigationGroup
-                                key={`drawer_group_${group}`}
-                                group={group}
-                                entries={entriesInGroup}
-                                collapsed={isGroupCollapsed(group)}
-                                onToggleCollapsed={() => toggleGroupCollapsed(group)}
-                                drawerOpen={drawerOpen}
-                                tooltipsOpen={tooltipsOpen}
-                                adminMenuOpen={adminMenuOpen}
-                                onItemClick={onItemClick}
-                            />
-                        );
-                    })}
+        <div role="navigation" aria-label="Main navigation"
+             className={cls("flex flex-col h-full relative grow w-full", className)} style={style}>
 
-                </div>
+            <DrawerLogo logo={logo} />
+
+            <div
+                ref={scrollRef}
+                onScroll={handleScroll}
+                className={"flex-grow min-h-0 overflow-y-auto overflow-x-hidden no-scrollbar px-2"}
+                style={{
+                    maskImage: scrolled
+                        ? "linear-gradient(to bottom, transparent 0, black 20px, black calc(100% - 20px), transparent 100%)"
+                        : "linear-gradient(to bottom, black 0, black calc(100% - 20px), transparent 100%)"
+                }}>
+
+                {groupsWithoutAdmin.map((group) => {
+                    const entriesInGroup = Object.values(navigationEntries).filter(e => e.group === group);
+                    return (
+                        <DrawerNavigationGroup
+                            key={`drawer_group_${group}`}
+                            group={group}
+                            entries={entriesInGroup}
+                            collapsed={isGroupCollapsed(group)}
+                            onToggleCollapsed={() => toggleGroupCollapsed(group)}
+                            drawerOpen={drawerVisuallyOpen}
+                            tooltipsOpen={tooltipsOpen}
+                            adminMenuOpen={adminMenuOpen}
+                            onItemClick={onItemClick}
+                        />
+                    );
+                })}
 
-                {adminViews.length > 0 && <Menu
+            </div>
+
+            {adminViews.length > 0 && <div className={"shrink-0 px-4"}>
+                <Menu
                     side={"right"}
                     open={adminMenuOpen}
                     onOpenChange={setAdminMenuOpen}
                     trigger={
-                        <IconButton
-                            shape={"square"}
-                            className={"m-4 text-surface-900 dark:text-white w-fit"}>
-                            <Tooltip title={"Admin"}
-                                open={tooltipsOpen}
-                                side={"right"} sideOffset={28}>
-                                <MoreVertIcon />
-                            </Tooltip>
-                            {drawerOpen && <div
+                        <div
+                            className={cls(
+                                "flex flex-row items-center rounded-lg cursor-pointer w-full",
+                                "hover:bg-surface-accent-100 dark:hover:bg-surface-800 transition-colors duration-150 h-[30px]"
+                            )}>
+                            <div
+                                className={"shrink-0 flex items-center justify-center w-[44px] h-[30px] text-surface-500 dark:text-surface-400"}>
+                                <Tooltip title={"Admin"}
+                                         open={drawerVisuallyOpen || adminMenuOpen ? false : tooltipsOpen}
+                                         side={"right"} sideOffset={28}>
+                                    <MoreVertIcon size={"small"} />
+                                </Tooltip>
+                            </div>
+                            {drawerVisuallyOpen && <div
                                 className={cls(
-                                    drawerOpen ? "opacity-100" : "opacity-0 hidden",
-                                    "mx-4 font-inherit text-inherit"
+                                    "font-semibold text-[11px] uppercase tracking-wider text-surface-400"
                                 )}>
-                                ADMIN
+                                {t("admin")}
                             </div>}
-                        </IconButton>}
+                        </div>}
                 >
                     {adminViews.map((entry) =>
                         <MenuItem
@@ -131,46 +160,103 @@ export function DefaultDrawer({
                             {t(entry.name)}
                         </MenuItem>)}
 
-                </Menu>}
-            </div>
+                </Menu>
+            </div>}
 
-        </>
+            <DrawerToggle />
+        </div>
     );
 }
 
 /**
- * This is the logo displayed in the drawer
- * It expands when the drawer is open.
+ * Collapse/expand toggle rendered at the bottom of the drawer.
+ * Uses double-chevron icons to indicate direction. Reads the drawer state
+ * from {@link useApp} so it can be dropped into any drawer.
  *
- * @param logo
+ * @group Core
+ */
+export function DrawerToggle() {
+    const {
+        drawerOpen,
+        drawerHovered,
+        openDrawer,
+        closeDrawer
+    } = useApp();
+    const isExpanded = drawerOpen;
+    const isHovered = drawerHovered && !drawerOpen;
+    const showFullContent = isExpanded || isHovered;
+
+    return (
+        <div className="shrink-0 mt-auto px-4 pt-0.5 pb-2">
+            <Tooltip
+                title={isExpanded ? "Collapse" : "Expand"}
+                side="right"
+                sideOffset={12}
+                open={isHovered ? false : undefined}
+            >
+                <div
+                    className={cls(
+                        "flex flex-row items-center rounded-lg cursor-pointer",
+                        "hover:bg-surface-accent-100 dark:hover:bg-surface-800",
+                        "transition-colors duration-150 h-[30px]"
+                    )}
+                    role="button"
+                    tabIndex={0}
+                    aria-expanded={isExpanded}
+                    aria-label={isExpanded ? "Collapse" : "Expand"}
+                    onClick={() => isExpanded ? closeDrawer() : openDrawer()}
+                    onKeyDown={(e) => {
+                        if (e.key === "Enter" || e.key === " ") {
+                            e.preventDefault();
+                            isExpanded ? closeDrawer() : openDrawer();
+                        }
+                    }}
+                >
+                    <div className="shrink-0 flex items-center justify-center w-[44px] h-[30px] text-surface-500 dark:text-surface-400">
+                        {isExpanded
+                            ? <KeyboardDoubleArrowLeftIcon size={"small"} />
+                            : <KeyboardDoubleArrowRightIcon size={"small"} />}
+                    </div>
+                    <div className={cls(
+                        "overflow-hidden transition-all duration-200 ease-in-out",
+                        showFullContent ? "opacity-100 w-auto" : "opacity-0 w-0"
+                    )}>
+                        <Typography
+                            variant="body2"
+                            className="text-surface-500 dark:text-surface-400 select-none whitespace-nowrap"
+                        >
+                            {isExpanded ? "Collapse" : "Expand"}
+                        </Typography>
+                    </div>
+                </div>
+            </Tooltip>
+        </div>
+    );
+}
 
+/**
+ * This is the logo displayed in the drawer.
+ * A compact logo aligned to the left of the drawer header.
+ *
+ * @param logo
  */
 export function DrawerLogo({ logo }: {
     logo?: string;
 }) {
 
     const navigation = useNavigationController();
-    const { drawerOpen } = useApp();
-    return <div
-        style={{
-            transition: "padding 100ms cubic-bezier(0.4, 0, 0.6, 1) 0ms",
-            padding: drawerOpen ? "32px 144px 0px 24px" : "72px 12px 0px 12px"
-        }}
-        className={cls("cursor-pointer rounded ml-3 mr-1")}>
-
+    return <div className="flex flex-row items-center shrink-0 pt-4 pb-0 px-2">
         <Tooltip title={"Home"}
-            sideOffset={20}
-            side="right">
+                 sideOffset={20}
+                 side="right">
             <Link
-                className={"block"}
+                className={"shrink-0 flex items-center justify-center w-[56px] h-[40px]"}
                 to={navigation.basePath}>
                 {logo
                     ? <img src={logo}
-                        alt="Logo"
-                        className={cls("max-w-full max-h-full transition-all object-contain",
-                            drawerOpen ? "w-[96px] h-[96px]" : "w-[32px] h-[32px]")} />
-                    : <FireCMSLogo />}
-
+                           alt="Logo"
+                           className={"w-[28px] h-[28px] object-contain"} />
+                    : <FireCMSLogo width={"28px"} height={"28px"} />}
             </Link>
         </Tooltip>
     </div>;

package/src/core/DrawerNavigationGroup.tsx

@@ -62,43 +62,41 @@ export function DrawerNavigationGroup({
     const { t } = useTranslation();
     return (
         <div
-            className={"bg-surface-50 dark:bg-surface-800/30 my-4 rounded-lg ml-3 mr-1"}
+            className={"my-2 mx-2 flex flex-col"}
             key={`drawer_group_${group}`}
         >
             {/* Group Header */}
-            {drawerOpen ? (
-                <div
-                    className="pl-4 pr-2 py-2 flex flex-row items-center cursor-pointer hover:bg-surface-100 dark:hover:bg-surface-700/50 rounded-t-lg transition-colors"
-                    onClick={onToggleCollapsed}
-                >
-                    <ExpandMoreIcon
-                        size={"smallest"}
-                        className={cls(
-                            "text-surface-500 dark:text-surface-400 transition-transform duration-200 mr-1",
-                            collapsed ? "-rotate-90" : "rotate-0"
-                        )}
-                    />
-                    <Typography
-                        variant={"caption"}
-                        color={"secondary"}
-                        className="font-medium flex-grow line-clamp-1"
-                    >
-                        {(group && group !== "__default__" ? group : t("views_group")).toUpperCase()}
-                    </Typography>
-                    {headerActions && (
-                        <div onClick={(e) => e.stopPropagation()}>
-                            {headerActions}
-                        </div>
+            <div
+                className={cls("pl-3 pr-2 py-0.5 flex flex-row items-center transition-colors",
+                    drawerOpen ? "cursor-pointer hover:bg-surface-100 dark:hover:bg-surface-800/40 rounded-lg" : "opacity-0 invisible pointer-events-none"
+                )}
+                onClick={drawerOpen ? onToggleCollapsed : undefined}
+            >
+                <ExpandMoreIcon
+                    size={"smallest"}
+                    className={cls(
+                        "text-surface-400 dark:text-surface-400 transition-transform duration-200 mr-1",
+                        collapsed ? "-rotate-90" : "rotate-0"
                     )}
-                </div>
-            ) : (
-                <div className="w-full" />
-            )}
+                />
+                <Typography
+                    variant={"caption"}
+                    color={"secondary"}
+                    className="font-semibold text-[11px] uppercase tracking-wider flex-grow line-clamp-1 text-surface-400 dark:text-surface-400"
+                >
+                    {(group && group !== "__default__" ? group : t("views_group"))}
+                </Typography>
+                {headerActions && (
+                    <div onClick={(e) => e.stopPropagation()}>
+                        {headerActions}
+                    </div>
+                )}
+            </div>
 
             {/* Collapsible Content */}
             <div
                 className={cls(
-                    "overflow-hidden transition-all duration-200 ease-in-out",
+                    "transition-all duration-200 ease-in-out overflow-hidden rounded-lg",
                     collapsed ? "max-h-0 opacity-0" : "max-h-[2000px] opacity-100"
                 )}
             >

package/src/core/DrawerNavigationItem.tsx

@@ -22,7 +22,7 @@ export function DrawerNavigationItem({
 }) {
 
     const iconWrap = <div
-        className={"text-text-secondary dark:text-text-secondary-dark"}>
+        className={"shrink-0 flex items-center justify-center w-[44px] h-[30px] text-surface-500 dark:text-text-secondary-dark group-hover/nav:text-primary transition-colors duration-150"}>
         {icon}
     </div>;
 
@@ -33,14 +33,12 @@ export function DrawerNavigationItem({
                 width: "100%",
                 transition: drawerOpen ? "width 150ms ease-in" : undefined
             }}
-            className={({ isActive }: any) => cls("rounded-lg truncate",
-                "hover:bg-surface-accent-300 hover:bg-opacity-75 hover:bg-surface-accent-300/75 dark:hover:bg-surface-accent-800 dark:hover:bg-opacity-75 dark:hover:bg-surface-accent-800/75 text-text-primary dark:text-surface-200 hover:text-surface-900 hover:dark:text-white hover:bg-surface-accent-300/75 dark:hover:bg-surface-accent-800/75",
-                "flex flex-row items-center mr-8",
-                // "transition-all ease-in-out delay-100 duration-300",
-                // drawerOpen ? "w-full" : "w-18",
-                drawerOpen ? "pl-4 h-10" : "pl-4 h-9",
-                "font-semibold text-xs",
-                isActive ? "bg-surface-accent-200 bg-opacity-60 dark:bg-surface-800 dark:bg-opacity-50 bg-surface-accent-200/60 dark:bg-surface-800/50" : ""
+            className={({ isActive }: { isActive: boolean }) => cls("rounded-lg truncate group/nav",
+                "hover:bg-primary/5 dark:hover:bg-primary/5 text-surface-700 dark:text-surface-300 hover:text-surface-900 dark:hover:text-white",
+                "flex flex-row items-center",
+                drawerOpen ? "pr-4 h-[30px]" : "h-[30px]",
+                "font-medium text-[13px]",
+                isActive ? "bg-primary/8 dark:bg-primary/10 text-primary dark:text-primary [&_div]:text-primary" : ""
             )}
             to={url}
         >
@@ -49,11 +47,11 @@ export function DrawerNavigationItem({
 
             <div
                 className={cls(
-                    "text-text-primary dark:text-surface-200",
+                    "text-surface-700 dark:text-surface-300",
                     drawerOpen ? "opacity-100" : "opacity-0 hidden",
-                    "ml-4 font-inherit"
+                    "font-inherit truncate space-x-2"
                 )}>
-                {name.toUpperCase()}
+                {name}
             </div>
         </NavLink>
     </div>;

package/src/core/EntityEditView.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useState } from "react";
+import React, { useEffect, useMemo, useRef, useState } from "react";
 import {
     Entity,
     EntityCollection,
@@ -13,6 +13,7 @@ import {
 import { CircularProgressCenter, EntityCollectionView, EntityView, ErrorBoundary } from "../components";
 import {
     canEditEntity,
+    encodeEntityId,
     removeInitialAndTrailingSlashes,
     resolveCollection,
     resolveDefaultSelectedView,
@@ -246,6 +247,47 @@ export function EntityEditViewInner<M extends Record<string, any>>({
 
     const authController = useAuthController();
 
+    // Track which tabs have been visited so we keep them mounted (preserving
+    // their state) without eagerly mounting tabs that were never opened.
+    const mountedTabsRef = useRef<Set<string>>(new Set());
+    if (selectedTab) {
+        mountedTabsRef.current.add(selectedTab);
+    }
+
+    // Memoize the read-only fallback form context so it is not recreated on
+    // every render when there is no real formContext (read-only entity views).
+    const readOnlyFormContext = useMemo<FormContext | undefined>(() => {
+        if (formContext) return undefined; // real formContext takes precedence
+        if (!entityId) return undefined;
+        const formexStub = createFormexStub<M>(usedEntity?.values ?? {} as M);
+        return {
+            entityId,
+            disabled: false,
+            openEntityMode: layout,
+            status: status,
+            values: usedEntity?.values ?? {},
+            setFieldValue: (key: string, value: any) => {
+                throw new Error("You can't update values in read only mode");
+            },
+            save: () => {
+                throw new Error("You can't save in read only mode");
+            },
+            collection: resolveCollection<M>({
+                collection,
+                path,
+                entityId,
+                values: usedEntity?.values ?? {},
+                previousValues: usedEntity?.values ?? {},
+                propertyConfigs: customizationController.propertyConfigs,
+                authController
+            }),
+            path,
+            entity: usedEntity,
+            savingError: undefined,
+            formex: formexStub
+        };
+    }, [formContext, entityId, layout, status, usedEntity, collection, path, customizationController.propertyConfigs, authController]);
+
     const customViewsView: React.ReactNode[] | undefined = customViews && resolvedEntityViews
         .filter(e => !e.includeActions)
         .map((customView) => {
@@ -262,38 +304,18 @@ export function EntityEditViewInner<M extends Record<string, any>>({
                 return null;
             }
 
-            const formexStub = createFormexStub<M>(usedEntity?.values ?? {} as M);
-            const usedFormContext: FormContext = formContext ?? {
-                entityId,
-                disabled: false,
-                openEntityMode: layout,
-                status: status,
-                values: usedEntity?.values ?? {},
-                setFieldValue: (key: string, value: any) => {
-                    throw new Error("You can't update values in read only mode");
-                },
-                save: () => {
-                    throw new Error("You can't save in read only mode");
-                },
-                collection: resolveCollection<M>({
-                    collection,
-                    path,
-                    entityId,
-                    values: usedEntity?.values ?? {},
-                    previousValues: usedEntity?.values ?? {},
-                    propertyConfigs: customizationController.propertyConfigs,
-                    authController
-                }),
-                path,
-                entity: usedEntity,
-                savingError: undefined,
-                formex: formexStub
-            };
+            // Only mount tabs that are active or have been visited before.
+            const isActive = selectedTab === customView.key;
+            if (!isActive && !mountedTabsRef.current.has(customView.key)) {
+                return null;
+            }
+
+            const usedFormContext: FormContext = formContext ?? readOnlyFormContext!;
 
             return <div
                 className={cls(defaultBorderMixin,
                     "relative flex-1 w-full h-full overflow-auto",
-                    { "hidden": selectedTab !== customView.key }
+                    { "hidden": !isActive }
                 )}
                 key={`custom_view_${customView.key}`}
                 role="tabpanel">
@@ -311,7 +333,8 @@ export function EntityEditViewInner<M extends Record<string, any>>({
 
     const globalLoading = dataLoading && !usedEntity;
 
-    const jsonView = <div
+    // Only mount the JSON view once its tab has been selected at least once.
+    const jsonView = (selectedTab === JSON_TAB_VALUE || mountedTabsRef.current.has(JSON_TAB_VALUE)) ? <div
         className={cls("relative flex-1 h-full overflow-auto w-full",
             { "hidden": selectedTab !== JSON_TAB_VALUE })}
         key={"json_view"}
@@ -320,12 +343,14 @@ export function EntityEditViewInner<M extends Record<string, any>>({
             <EntityJsonPreview
                 values={formContext?.values ?? entity?.values ?? {}} />
         </ErrorBoundary>
-    </div>;
+    </div> : null;
 
     const subCollectionsViews = subcollections && subcollections.map((subcollection) => {
         const subcollectionId = subcollection.id ?? subcollection.path;
+        // `newFullPath` addresses the datasource, so the parent id stays raw.
         const newFullPath = usedEntity ? `${path}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(subcollection.path)}` : undefined;
-        const newFullIdPath = fullIdPath ? `${fullIdPath}/${usedEntity?.id}/${removeInitialAndTrailingSlashes(subcollectionId)}` : undefined;
+        // `newFullIdPath` is fed to buildUrlCollectionPath downstream, so it stays escaped.
+        const newFullIdPath = fullIdPath && usedEntity ? `${fullIdPath}/${encodeEntityId(usedEntity.id)}/${removeInitialAndTrailingSlashes(subcollectionId)}` : undefined;
 
         if (selectedTab !== subcollectionId) return null;
         return (

package/src/core/field_configs.tsx

@@ -6,6 +6,7 @@ import {
     ArrayOfReferencesFieldBinding,
     BlockFieldBinding,
     DateTimeFieldBinding,
+    GeopointFieldBinding,
     KeyValueFieldBinding,
     MapFieldBinding,
     MultiSelectFieldBinding,
@@ -34,6 +35,7 @@ import {
     ListAltIcon,
     ListIcon,
     MailIcon,
+    LocationOnIcon,
     NumbersIcon, PersonIcon,
     RepeatIcon,
     ScheduleIcon,
@@ -273,6 +275,17 @@ export const DEFAULT_FIELD_CONFIGS: Record<string, PropertyConfig<any>> = {
             Field: DateTimeFieldBinding
         }
     },
+    geopoint: {
+        key: "geopoint",
+        name: "Geopoint",
+        description: "Latitude and longitude pair",
+        Icon: LocationOnIcon,
+        color: "#0ea5e9",
+        property: {
+            dataType: "geopoint",
+            Field: GeopointFieldBinding
+        }
+    },
     group: {
         key: "group",
         name: "Group",
@@ -419,6 +432,8 @@ export function getDefaultFieldId(property: Property | ResolvedProperty) {
         return "switch";
     } else if (property.dataType === "date") {
         return "date_time";
+    } else if (property.dataType === "geopoint") {
+        return "geopoint";
     } else if (property.dataType === "reference") {
         return "reference";
     }

package/src/form/field_bindings/ArrayOfReferencesFieldBinding.tsx

@@ -58,7 +58,7 @@ export function ArrayOfReferencesFieldBinding({
     }
 
     const onMultipleEntitiesSelected = useCallback((entities: Entity<any>[]) => {
-        setValue(entities.map(e => getReferenceFrom(e)));
+        setValue(entities.filter(Boolean).map(e => getReferenceFrom(e)));
     }, [setValue]);
 
     const referenceDialogController = useReferenceDialog({