@firecms/core 3.0.0-alpha.44 → 3.0.0-alpha.46

package/dist/{hooks → internal}/useBuildDataSource.d.ts

@@ -1,12 +1,13 @@
-import { DataSource, DataSourceDelegate, EntityReference, GeoPoint, PropertyConfig } from "../types";
+import { DataSource, DataSourceDelegate, EntityReference, GeoPoint, NavigationController, PropertyConfig } from "../types";
 /**
  * Use this hook to build a {@link DataSource} based on Firestore
  * @param firebaseApp
  * @group Firebase
  */
-export declare function useBuildDataSource({ delegate, propertyConfigs }: {
+export declare function useBuildDataSource({ delegate, propertyConfigs, navigationController }: {
     delegate: DataSourceDelegate;
     propertyConfigs?: Record<string, PropertyConfig>;
+    navigationController: NavigationController;
 }): DataSource;
 /**
  * Recursive function that converts Firestore data types into CMS or plain

package/dist/internal/useBuildNavigationController.d.ts

@@ -0,0 +1,14 @@
+import { AuthController, CMSView, CMSViewsBuilder, DataSourceDelegate, EntityCollection, EntityCollectionsBuilder, FireCMSPlugin, NavigationController, User, UserConfigurationPersistence } from "../types";
+type BuildNavigationContextProps<EC extends EntityCollection, UserType extends User> = {
+    basePath?: string;
+    baseCollectionPath?: string;
+    authController: AuthController<UserType>;
+    collections?: EC[] | EntityCollectionsBuilder<EC>;
+    views?: CMSView[] | CMSViewsBuilder;
+    userConfigPersistence?: UserConfigurationPersistence;
+    plugins?: FireCMSPlugin[];
+    dataSource: DataSourceDelegate;
+};
+export declare function useBuildNavigationController<EC extends EntityCollection, UserType extends User>({ basePath, baseCollectionPath, authController, collections: baseCollections, views: baseViews, userConfigPersistence, plugins, dataSource }: BuildNavigationContextProps<EC, UserType>): NavigationController;
+export declare function getSidePanelKey(path: string, entityId?: string): string;
+export {};

package/dist/internal/useBuildSideEntityController.d.ts

@@ -1,4 +1,4 @@
-import { EntityCollection, EntitySidePanelProps, NavigationContext, SideDialogsController, SideEntityController } from "../types";
+import { EntityCollection, EntitySidePanelProps, NavigationController, SideDialogsController, SideEntityController } from "../types";
 export declare function getEntityViewWidth(props: EntitySidePanelProps<any>, small: boolean): string;
-export declare const useBuildSideEntityController: (navigation: NavigationContext, sideDialogsController: SideDialogsController) => SideEntityController;
+export declare const useBuildSideEntityController: (navigation: NavigationController, sideDialogsController: SideDialogsController) => SideEntityController;
 export declare function buildSidePanelsFromUrl(path: string, collections: EntityCollection[], newFlag: boolean): EntitySidePanelProps<any>[];

package/dist/types/datasource.d.ts

@@ -7,7 +7,7 @@ import { ResolvedEntityCollection } from "./resolved_entities";
 export interface FetchEntityProps<M extends Record<string, any> = any> {
     path: string;
     entityId: string;
-    collection: EntityCollection<M>;
+    collection?: EntityCollection<M>;
 }
 /**
  * @group Datasource
@@ -21,7 +21,7 @@ export type ListenEntityProps<M extends Record<string, any> = any> = FetchEntity
  */
 export interface FetchCollectionProps<M extends Record<string, any> = any> {
     path: string;
-    collection: EntityCollection<M> | ResolvedEntityCollection<M>;
+    collection?: EntityCollection<M> | ResolvedEntityCollection<M>;
     filter?: FilterValues<Extract<keyof M, string>>;
     limit?: number;
     startAfter?: any[];
@@ -44,7 +44,7 @@ export interface SaveEntityProps<M extends Record<string, any> = any> {
     values: Partial<EntityValues<M>>;
     entityId?: string;
     previousValues?: Partial<EntityValues<M>>;
-    collection: EntityCollection<M> | ResolvedEntityCollection<M>;
+    collection?: EntityCollection<M> | ResolvedEntityCollection<M>;
     status: EntityStatus;
 }
 /**

package/dist/types/firecms.d.ts

@@ -1,7 +1,7 @@
 import React from "react";
 import { User } from "./user";
 import { AuthController } from "./auth";
-import { DataSource } from "./datasource";
+import { DataSourceDelegate } from "./datasource";
 import { EntityCollection, EntityCustomView } from "./collections";
 import { CMSView } from "./navigation";
 import { FireCMSContext } from "./firecms_context";
@@ -25,7 +25,7 @@ import { CMSAnalyticsEvent } from "./analytics";
 export type EntityCollectionsBuilder<EC extends EntityCollection = EntityCollection> = (params: {
     user: User | null;
     authController: AuthController;
-    dataSource: DataSource;
+    dataSource: DataSourceDelegate;
 }) => EC[] | Promise<EC[]>;
 /**
  * Use this callback to build custom views dynamically.
@@ -39,7 +39,7 @@ export type EntityCollectionsBuilder<EC extends EntityCollection = EntityCollect
 export type CMSViewsBuilder = (params: {
     user: User | null;
     authController: AuthController;
-    dataSource: DataSource;
+    dataSource: DataSourceDelegate;
 }) => CMSView[] | Promise<CMSView[]>;
 /**
  * @group Models
@@ -100,7 +100,7 @@ export type FireCMSProps<UserType extends User, EC extends EntityCollection> = {
     /**
      * Connector to your database
      */
-    dataSource: DataSource;
+    dataSourceDelegate: DataSourceDelegate;
     /**
      * Connector to your file upload/fetch implementation
      */

package/dist/types/firecms_context.d.ts

@@ -1,7 +1,7 @@
 import { Locale } from "./locales";
 import { DataSource } from "./datasource";
 import { StorageSource } from "./storage";
-import { NavigationContext } from "./navigation";
+import { NavigationController } from "./navigation";
 import { SideEntityController } from "./side_entity_controller";
 import { AuthController } from "./auth";
 import { EntityLinkBuilder } from "./entity_link_builder";
@@ -44,7 +44,7 @@ export type FireCMSContext<UserType extends User = User, AuthControllerType exte
      * attributes.
      * @see useNavigation
      */
-    navigation: NavigationContext;
+    navigation: NavigationController;
     /**
      * Controller to open the side dialog displaying entity forms
      * @see useSideEntityController

package/dist/types/navigation.d.ts

@@ -1,11 +1,11 @@
 import { EntityCollection } from "./collections";
 import { EntityReference } from "./entities";
 /**
- * Context that includes the resolved navigation and utility methods and
+ * Controller that includes the resolved navigation and utility methods and
  * attributes.
  * @group Models
  */
-export type NavigationContext = {
+export type NavigationController = {
     /**
      * List of the mapped collections in the CMS.
      * Each entry relates to a collection in the root database.

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@firecms/core",
-    "version": "3.0.0-alpha.44",
+    "version": "3.0.0-alpha.46",
     "description": "Awesome Firebase/Firestore-based headless open-source CMS",
     "funding": {
         "url": "https://github.com/sponsors/firecmsco"
@@ -133,7 +133,7 @@
         "dist",
         "src"
     ],
-    "gitHead": "50d78c13f520ad741773a85b155a6644423a14d1",
+    "gitHead": "53ef13adab3db13baeea2ad7953e37cf3552fd62",
     "publishConfig": {
         "access": "public"
     }

package/src/components/EntityCollectionTable/fields/TableReferenceField.tsx

@@ -4,7 +4,7 @@ import { CollectionSize, Entity, EntityCollection, EntityReference, FilterValues
 
 import { getPreviewSizeFrom } from "../../../preview/util";
 import { getReferenceFrom } from "../../../util";
-import { useFireCMSContext, useNavigationContext, useReferenceDialog } from "../../../hooks";
+import { useFireCMSContext, useNavigationController, useReferenceDialog } from "../../../hooks";
 import { ErrorView } from "../../ErrorView";
 import { Button } from "../../../ui/Button";
 
@@ -24,9 +24,9 @@ type TableReferenceFieldProps = {
 export function TableReferenceField(props: TableReferenceFieldProps) {
 
     const context = useFireCMSContext();
-    const navigationContext = useNavigationContext();
+    const navigationController = useNavigationController();
     const { path } = props;
-    const collection = navigationContext.getCollection<EntityCollection>(path);
+    const collection = navigationController.getCollection<EntityCollection>(path);
     if (!collection) {
         if (context.components?.missingReference) {
             return <context.components.missingReference path={path}/>;

package/src/components/EntityCollectionTable/filters/ReferenceFilterField.tsx

@@ -3,7 +3,7 @@ import { VirtualTableWhereFilterOp } from "../../VirtualTable";
 import { Entity, EntityCollection, EntityReference } from "../../../types";
 import { ReferencePreview } from "../../../preview";
 import { getReferenceFrom } from "../../../util";
-import { useNavigationContext, useReferenceDialog } from "../../../hooks";
+import { useNavigationController, useReferenceDialog } from "../../../hooks";
 import { Button, Select, SelectItem } from "../../../ui";
 
 interface ReferenceFilterFieldProps {
@@ -94,9 +94,9 @@ export function ReferenceFilterField({
         }
     }
 
-    const navigationContext = useNavigationContext();
+    const navigationController = useNavigationController();
     const collection: EntityCollection | undefined = useMemo(() => {
-        return path ? navigationContext.getCollection(path) : undefined;
+        return path ? navigationController.getCollection(path) : undefined;
     }, [path]);
 
     const onSingleEntitySelected = (entity: Entity<any>) => {

package/src/components/EntityCollectionTable/useEntityCollectionTableController.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useMemo } from "react";
 
-import { useCollectionFetch, useDataSource, useNavigationContext } from "../../hooks";
+import { useCollectionFetch, useDataSource, useNavigationController } from "../../hooks";
 import { useDataOrder } from "../../hooks/data/useDataOrder";
 import { Entity, EntityCollection, FilterValues, SelectedCellProps, TableController, User } from "../../types";
 import { useDebouncedData } from "./useDebouncedData";
@@ -45,7 +45,7 @@ export function useEntityCollectionTableController<M extends Record<string, any>
 
     const [popupCell, setPopupCell] = React.useState<SelectedCellProps<M> | undefined>(undefined);
 
-    const navigation = useNavigationContext();
+    const navigation = useNavigationController();
     const dataSource = useDataSource();
     const resolvedPath = useMemo(() => navigation.resolveAliasesFrom(fullPath), [fullPath, navigation.resolveAliasesFrom]);
 

package/src/components/EntityCollectionView/EntityCollectionView.tsx

@@ -42,7 +42,7 @@ import {
     useDataSource,
     useFireCMSContext,
     useLargeLayout,
-    useNavigationContext,
+    useNavigationController,
     useSideEntityController
 } from "../../hooks";
 import { useUserConfigurationPersistence } from "../../hooks/useUserConfigurationPersistence";
@@ -109,7 +109,7 @@ export const EntityCollectionView = React.memo(
     ) {
 
         const dataSource = useDataSource();
-        const navigation = useNavigationContext();
+        const navigation = useNavigationController();
         const sideEntityController = useSideEntityController();
         const authController = useAuthController();
         const userConfigPersistence = useUserConfigurationPersistence();
@@ -304,6 +304,7 @@ export const EntityCollectionView = React.memo(
 
             return saveEntityWithCallbacks({
                 ...saveProps,
+                collection,
                 callbacks: collection.callbacks,
                 dataSource,
                 context,
@@ -668,7 +669,7 @@ function EntitiesCount({
 }) {
 
     const dataSource = useDataSource();
-    const navigation = useNavigationContext();
+    const navigation = useNavigationController();
     const [count, setCount] = useState<number | undefined>(undefined);
     const [error, setError] = useState<Error | undefined>(undefined);
 

package/src/components/EntityCollectionView/EntityCollectionViewActions.tsx

@@ -111,11 +111,11 @@ export function EntityCollectionViewActions<M extends Record<string, any>>({
         ));
 
     if (plugins) {
-        plugins.forEach(plugin => {
+        plugins.forEach((plugin, i) => {
             if (plugin.collections?.CollectionActions) {
                 actions.push(...toArray(plugin.collections?.CollectionActions)
-                    .map((Action, i) => (
-                        <ErrorBoundary key={`plugin_actions_${i}`}>
+                    .map((Action, j) => (
+                        <ErrorBoundary key={`plugin_actions_${i}_${j}`}>
                             <Action {...actionProps} {...plugin.collections?.collectionActionsProps}/>
                         </ErrorBoundary>
                     )));

package/src/components/FireCMSAppBar.tsx

@@ -3,7 +3,7 @@ import React from "react";
 import { Link as ReactLink } from "react-router-dom";
 import { ErrorBoundary } from "../components";
 import { Avatar, cn, IconButton, Menu, MenuItem, Typography } from "../ui";
-import { useAuthController, useLargeLayout, useModeController, useNavigationContext } from "../hooks";
+import { useAuthController, useLargeLayout, useModeController, useNavigationController } from "../hooks";
 import { DarkModeIcon, LightModeIcon, LogoutIcon } from "../icons";
 import { Skeleton } from "../ui/Skeleton";
 import { User } from "../types";
@@ -50,7 +50,7 @@ export const FireCMSAppBar = function FireCMSAppBar({
                                                         style,
                                                         user: userProp
                                                     }: FireCMSAppBarProps) {
-    const navigation = useNavigationContext();
+    const navigation = useNavigationController();
 
     const authController = useAuthController();
     const {

package/src/components/HomePage/DefaultHomePage.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useState } from "react";
 
-import { useFireCMSContext, useNavigationContext } from "../../hooks";
+import { useFireCMSContext, useNavigationController } from "../../hooks";
 import { PluginGenericProps, PluginHomePageAdditionalCardsProps } from "../../types";
 
 import { toArray } from "../../util/arrays";
@@ -35,9 +35,9 @@ export function DefaultHomePage({
 }) {
 
     const context = useFireCMSContext();
-    const navigationContext = useNavigationContext();
+    const navigationController = useNavigationController();
 
-    if (!navigationContext.topLevelNavigation)
+    if (!navigationController.topLevelNavigation)
         throw Error("Navigation not ready in FireCMSHomePage");
 
     const {
@@ -49,7 +49,7 @@ export function DefaultHomePage({
     const {
         navigationEntries,
         groups
-    } = navigationContext.topLevelNavigation;
+    } = navigationController.topLevelNavigation;
 
     const [filteredUrls, setFilteredUrls] = useState<string[] | null>(null);
 

package/src/components/HomePage/FavouritesView.tsx

@@ -1,5 +1,5 @@
 import { useNavigate } from "react-router-dom";
-import { useNavigationContext } from "../../hooks";
+import { useNavigationController } from "../../hooks";
 import { useUserConfigurationPersistence } from "../../hooks/useUserConfigurationPersistence";
 import { TopNavigationEntry } from "../../types";
 import { Chip, Collapse } from "../../ui";
@@ -46,14 +46,14 @@ function NavigationChip({ entry }: { entry: TopNavigationEntry }) {
 
 export function FavouritesView({ hidden }: { hidden: boolean }) {
 
-    const navigationContext = useNavigationContext();
+    const navigationController = useNavigationController();
     const userConfigurationPersistence = useUserConfigurationPersistence();
 
     if (!userConfigurationPersistence)
         return null;
 
     const favouriteCollections = (userConfigurationPersistence?.favouritePaths ?? [])
-        .map((path) => navigationContext.topLevelNavigation?.navigationEntries.find((entry) => entry.path === path))
+        .map((path) => navigationController.topLevelNavigation?.navigationEntries.find((entry) => entry.path === path))
         .filter(Boolean) as TopNavigationEntry[];
 
     return <Collapse in={favouriteCollections.length > 0}>

package/src/components/ReferenceSelectionInner.tsx

@@ -8,7 +8,7 @@ import {
     useDataSource,
     useFireCMSContext,
     useLargeLayout,
-    useNavigationContext,
+    useNavigationController,
     useSideEntityController
 } from "../hooks";
 import { ErrorView } from "./ErrorView";
@@ -101,7 +101,7 @@ export function ReferenceSelectionInner<M extends Record<string, any>>(
 
     const sideDialogContext = useSideDialogContext();
     const sideEntityController = useSideEntityController();
-    const navigation = useNavigationContext();
+    const navigation = useNavigationController();
     const context = useFireCMSContext();
 
     const fullPath = navigation.resolveAliasesFrom(pathInput);

package/src/contexts/NavigationContext.tsx

@@ -1,4 +1,4 @@
 import React from "react";
-import { NavigationContext } from "../types";
+import { NavigationController } from "../types";
 
-export const NavigationContextInstance = React.createContext<NavigationContext>({} as NavigationContext);
+export const NavigationContext = React.createContext<NavigationController>({} as NavigationController);

package/src/core/Drawer.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback } from "react";
 
-import { useFireCMSContext, useLargeLayout, useNavigationContext } from "../hooks";
+import { useFireCMSContext, useLargeLayout, useNavigationController } from "../hooks";
 
 import { NavLink } from "react-router-dom";
 import { CMSAnalyticsEvent, TopNavigationEntry, TopNavigationResult } from "../types";
@@ -28,7 +28,7 @@ export function Drawer({
                        }: DrawerProps) {
 
     const context = useFireCMSContext();
-    const navigation = useNavigationContext();
+    const navigation = useNavigationController();
 
     const tooltipsOpen = hovered && !drawerOpen;
     const largeLayout = useLargeLayout();

package/src/core/EntitySidePanel.tsx

@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect, useMemo } from "react";
 
 import { EntitySidePanelProps } from "../types";
-import { useNavigationContext } from "../hooks";
+import { useNavigationController } from "../hooks";
 
 import { ErrorBoundary } from "../components";
 import { EntityView } from "../internal/EntityView";
@@ -23,21 +23,21 @@ export function EntitySidePanel(props: EntitySidePanelProps) {
         setBlockedNavigationMessage
     } = useSideDialogContext();
 
-    const navigationContext = useNavigationContext();
+    const navigationController = useNavigationController();
 
     const collection = useMemo(() => {
         if (!props) return undefined;
         let usedCollection = props.collection;
 
         if (!usedCollection) {
-            usedCollection = navigationContext.getCollection(props.path, props.entityId);
+            usedCollection = navigationController.getCollection(props.path, props.entityId);
             if (!usedCollection) {
                 console.error("ERROR: No collection found in path `", props.path, "`. Entity id: ", props.entityId);
                 throw Error("ERROR: No collection found in path `" + props.path + "`. Make sure you have defined a collection for this path in the root navigation.");
             }
         }
         return usedCollection;
-    }, [navigationContext, props]);
+    }, [navigationController, props]);
 
     useEffect(() => {
         function beforeunload(e: any) {

package/src/core/FireCMS.tsx

@@ -2,25 +2,22 @@ import React, { useMemo } from "react";
 
 import { EntityCollection, FireCMSContext, FireCMSPlugin, FireCMSProps, User } from "../types";
 import { BreadcrumbsProvider } from "../contexts/BreacrumbsContext";
-import { ModeControllerContext } from "../contexts/ModeController";
+import { AuthControllerContext, ModeControllerContext } from "../contexts";
 import { useBuildSideEntityController } from "../internal/useBuildSideEntityController";
-import { useBuildNavigationContext } from "../internal/useBuildNavigationContext";
-import { useBuildSideDialogsController } from "../internal/useBuildSideDialogsController";
 import { FireCMSContextInstance, useFireCMSContext, useModeController } from "../hooks";
+import { useBuildSideDialogsController } from "../internal/useBuildSideDialogsController";
 import { ErrorView } from "../components";
 import { StorageSourceContext } from "../contexts/StorageSourceContext";
 import { UserConfigurationPersistenceContext } from "../contexts/UserConfigurationPersistenceContext";
 import { DataSourceContext } from "../contexts/DataSourceContext";
 import { SideEntityControllerContext } from "../contexts/SideEntityControllerContext";
-import { NavigationContextInstance } from "../contexts/NavigationContext";
-import { AuthControllerContext } from "../contexts/AuthControllerContext";
+import { NavigationContext } from "../contexts/NavigationContext";
 import { SideDialogsControllerContext } from "../contexts/SideDialogsControllerContext";
 import { useLocaleConfig } from "../internal/useLocaleConfig";
 import { CenteredView } from "../ui";
 import { DialogsProvider } from "../contexts/DialogsProvider";
-
-const DEFAULT_BASE_PATH = "/";
-const DEFAULT_COLLECTION_PATH = "/c";
+import { useBuildNavigationController } from "../internal/useBuildNavigationController";
+import { useBuildDataSource } from "../internal/useBuildDataSource";
 
 /**
  * If you are using independent components of the CMS
@@ -39,43 +36,52 @@ export function FireCMS<UserType extends User, EC extends EntityCollection>(prop
     const modeController = useModeController();
     const {
         children,
-        collections,
-        views,
         entityLinkBuilder,
         userConfigPersistence,
         dateTimeFormat,
         locale,
         authController,
         storageSource,
-        dataSource,
-        basePath = DEFAULT_BASE_PATH,
-        baseCollectionPath = DEFAULT_COLLECTION_PATH,
+        dataSourceDelegate,
         plugins,
         onAnalyticsEvent,
         propertyConfigs,
         entityViews,
-        components
+        components,
+        baseCollectionPath,
+        basePath,
+        collections,
+        views
     } = props;
 
     useLocaleConfig(locale);
 
-    const navigation = useBuildNavigationContext({
+    const navigationController = useBuildNavigationController({
         basePath,
         baseCollectionPath,
         authController,
         collections,
         views,
         userConfigPersistence,
-        dataSource,
+        dataSource: dataSourceDelegate,
         plugins
     });
 
+    /**
+     * Controller in charge of fetching and persisting data
+     */
+    const dataSource = useBuildDataSource({
+        delegate: dataSourceDelegate,
+        propertyConfigs,
+        navigationController
+    });
+
     const sideDialogsController = useBuildSideDialogsController();
-    const sideEntityController = useBuildSideEntityController(navigation, sideDialogsController);
+    const sideEntityController = useBuildSideEntityController(navigationController, sideDialogsController);
 
     const pluginsLoading = plugins?.some(p => p.loading) ?? false;
 
-    const loading = authController.initialLoading || navigation.loading || pluginsLoading;
+    const loading = authController.initialLoading || navigationController.loading || pluginsLoading;
 
     const context: Partial<FireCMSContext> = useMemo(() => ({
         entityLinkBuilder,
@@ -88,12 +94,12 @@ export function FireCMS<UserType extends User, EC extends EntityCollection>(prop
         components
     }), [dateTimeFormat, locale, plugins, entityViews, propertyConfigs, components]);
 
-    if (navigation.navigationLoadingError) {
+    if (navigationController.navigationLoadingError) {
         return (
             <CenteredView maxWidth={"md"} fullScreen={true}>
                 <ErrorView
                     title={"Error loading navigation"}
-                    error={navigation.navigationLoadingError}/>
+                    error={navigationController.navigationLoadingError}/>
             </CenteredView>
         );
     }
@@ -123,8 +129,8 @@ export function FireCMS<UserType extends User, EC extends EntityCollection>(prop
                                     value={sideDialogsController}>
                                     <SideEntityControllerContext.Provider
                                         value={sideEntityController}>
-                                        <NavigationContextInstance.Provider
-                                            value={navigation}>
+                                        <NavigationContext.Provider
+                                            value={navigationController}>
                                             <BreadcrumbsProvider>
                                                 <DialogsProvider>
                                                     <FireCMSInternal
@@ -133,7 +139,7 @@ export function FireCMS<UserType extends User, EC extends EntityCollection>(prop
                                                     </FireCMSInternal>
                                                 </DialogsProvider>
                                             </BreadcrumbsProvider>
-                                        </NavigationContextInstance.Provider>
+                                        </NavigationContext.Provider>
                                     </SideEntityControllerContext.Provider>
                                 </SideDialogsControllerContext.Provider>
                             </AuthControllerContext.Provider>

package/src/core/NavigationRoutes.tsx

@@ -3,7 +3,7 @@ import React, { PropsWithChildren } from "react";
 import { Route, Routes, useLocation } from "react-router-dom";
 import { CMSView } from "../types";
 import { DefaultHomePage, EntityCollectionView, NotFoundPage } from "../components";
-import { useBreadcrumbsContext, useNavigationContext } from "../hooks";
+import { useBreadcrumbsContext, useNavigationController } from "../hooks";
 import { toArray } from "../util/arrays";
 import equal from "react-fast-compare"
 
@@ -23,7 +23,7 @@ export type NavigationRoutesProps = {
 /**
  * This component is in charge of rendering
  * all the related routes (entity collection root views, custom views
- * or the home route) related to a {@link NavigationContext}.
+ * or the home route) related to a {@link NavigationController}.
  * This component needs a parent {@link FireCMS}
  *
  * @constructor
@@ -37,7 +37,7 @@ export const NavigationRoutes = React.memo<NavigationRoutesProps>(
                               }: NavigationRoutesProps) {
 
         const location = useLocation();
-        const navigation = useNavigationContext();
+        const navigation = useNavigationController();
 
         if (!navigation)
             return <></>;

package/src/core/Scaffold.tsx

@@ -3,7 +3,7 @@ import equal from "react-fast-compare"
 import { Link } from "react-router-dom";
 
 import { Drawer as DefaultDrawer, DrawerProps } from "./Drawer";
-import { useLargeLayout, useNavigationContext } from "../hooks";
+import { useLargeLayout, useNavigationController } from "../hooks";
 import { CircularProgressCenter, ErrorBoundary, FireCMSAppBar, FireCMSAppBarProps, FireCMSLogo } from "../components";
 import { cn, IconButton, Sheet, Tooltip } from "../ui";
 import { ChevronLeftIcon, MenuIcon } from "../icons";
@@ -85,7 +85,7 @@ export const Scaffold = React.memo<PropsWithChildren<ScaffoldProps>>(
 
         const largeLayout = useLargeLayout();
 
-        const navigation = useNavigationContext();
+        const navigation = useNavigationController();
         const [drawerOpen, setDrawerOpen] = React.useState(false);
         const [onHover, setOnHover] = React.useState(false);
 
@@ -171,7 +171,7 @@ function StyledDrawer(props: {
     onMouseLeave: () => void
 }) {
 
-    const navigation = useNavigationContext();
+    const navigation = useNavigationController();
 
     const width = !props.displayed ? 0 : (props.open ? DRAWER_WIDTH : 72);
     const innerDrawer = <div

package/src/core/index.tsx

@@ -1,4 +1,4 @@
-export { FireCMS } from "./FireCMS";
+export * from "./FireCMS";
 
 export type { ScaffoldProps } from "./Scaffold";
 export { Scaffold } from "./Scaffold";

package/src/form/components/ReferenceWidget.tsx

@@ -7,7 +7,7 @@ import { LabelWithIcon } from "../components";
 import {
     useEntityFetch,
     useFireCMSContext,
-    useNavigationContext,
+    useNavigationController,
     useReferenceDialog,
     useSideEntityController
 } from "../../hooks";
@@ -49,12 +49,12 @@ export function ReferenceWidget<M extends Record<string, any>>({
 }) {
 
     const fireCMSContext = useFireCMSContext();
-    const navigationContext = useNavigationContext();
+    const navigationController = useNavigationController();
     const sideEntityController = useSideEntityController();
 
     const collection: EntityCollection | undefined = useMemo(() => {
-        return navigationContext.getCollection(path);
-    }, [path, navigationContext]);
+        return navigationController.getCollection(path);
+    }, [path, navigationController]);
 
     if (!collection) {
         throw Error(`Couldn't find the corresponding collection for the path: ${path}`);