@rebasepro/admin 0.8.0 → 0.9.1-canary.09aaf62

package/src/components/{EntityView.tsx → EntityViewBinding.tsx}

@@ -1,31 +1,31 @@
 import type { Properties } from "@rebasepro/types";
-import type { EntityCollection } from "@rebasepro/types";
+import type { CollectionConfig } from "@rebasepro/types";
 import type { CustomizationController } from "@rebasepro/types";
 import React from "react";
 import { Entity } from "@rebasepro/types";
 import { cls, defaultBorderMixin, ExternalLinkIcon, IconButton, Typography } from "@rebasepro/ui";
 ;
-import { useCustomizationController } from "@rebasepro/core";
-import { useAuthController } from "@rebasepro/core";
+import { useCustomizationController } from "@rebasepro/app";
+import { useAuthController } from "@rebasepro/app";
 import { PropertyCollectionView } from "./PropertyCollectionView";
 
 /**
  * @group Components
  */
-export interface EntityViewProps<M extends Record<string, unknown>> {
+export interface EntityViewBindingProps<M extends Record<string, unknown>> {
     entity: Entity<M>;
-    collection: EntityCollection<M>;
+    collection: CollectionConfig<M>;
     path: string;
     className?: string;
 }
 
-export function EntityView<M extends Record<string, unknown>>(
+export function EntityViewBinding<M extends Record<string, unknown>>(
     {
         entity,
         collection,
         path,
         className
-    }: EntityViewProps<M>) {
+    }: EntityViewBindingProps<M>) {
 
     const customizationController: CustomizationController = useCustomizationController();
 

package/src/components/HomePage/ContentHomePage.tsx

@@ -19,10 +19,10 @@ import { SortableContext, verticalListSortingStrategy } from "@dnd-kit/sortable"
 import { restrictToVerticalAxis, restrictToWindowEdges } from "@dnd-kit/modifiers";
 import { RenameGroupDialog } from "./RenameGroupDialog";
 import { toArray } from "@rebasepro/utils";
-import { useCollapsedGroups, buildCollapsedDefaults, useCustomizationController, useTranslation, useSlot, useAdminModeController, useRebaseRegistry } from "@rebasepro/core";
-import { useRestoreScroll } from "@rebasepro/core";
+import { useCollapsedGroups, buildCollapsedDefaults, useCustomizationController, useTranslation, useSlot, useAdminModeController, useRebaseRegistry } from "@rebasepro/app";
+import { useRestoreScroll } from "@rebasepro/app";
 
-import { SchemaDriftBanner } from "@rebasepro/core";
+import { SchemaDriftBanner } from "@rebasepro/app";
 import { useBreadcrumbsController, useCMSContext } from "../../index";
 
 export const DEFAULT_GROUP_NAME = "Views";
@@ -64,7 +64,7 @@ export function ContentHomePage({
     } = navigationStateController.topLevelNavigation || {};
 
     // Build a set of Studio-only dev view slugs so we can distinguish them from
-    // CMS custom views added via <RebaseCMS views={...}> or plugins.
+    // CMS custom views added via <RebaseAdmin views={...}> or plugins.
     const studioViewSlugs = useMemo(() => {
         const slugs = new Set<string>();
         (registry.studioConfig?.devViews ?? []).forEach(v => slugs.add(v.slug));

package/src/components/HomePage/FavouritesView.tsx

@@ -2,7 +2,7 @@ import type { NavigationEntry } from "@rebasepro/types";
 import { useNavigate } from "react-router-dom";
 ;
 import { Chip, Collapse, StarIcon } from "@rebasepro/ui";
-import { useUserConfigurationPersistence } from "@rebasepro/core";
+import { useUserConfigurationPersistence } from "@rebasepro/app";
 import { useNavigationStateController } from "../../index";
 
 function NavigationChip({ entry }: { entry: NavigationEntry }) {

package/src/components/HomePage/NavigationCardBinding.tsx

@@ -1,13 +1,13 @@
-import type { NavigationEntry, EntityCollection } from "@rebasepro/types";
+import type { NavigationEntry, CollectionConfig } from "@rebasepro/types";
 import { useNavigate } from "react-router-dom";
 ;
 import { IconButton, StarIcon, Tooltip } from "@rebasepro/ui";
 import { NavigationCard } from "./NavigationCard";
 import { SmallNavigationCard } from "./SmallNavigationCard";
 import React from "react";
-import { useRebaseContext, useSlot } from "@rebasepro/core";
-import { IconForView } from "@rebasepro/core";
-import { useUserConfigurationPersistence } from "@rebasepro/core";
+import { useRebaseContext, useSlot } from "@rebasepro/app";
+import { IconForView } from "@rebasepro/app";
+import { useUserConfigurationPersistence } from "@rebasepro/app";
 
 /**
  * This is the component used in the home page to render a card for each

package/src/components/HomePage/NavigationGroup.tsx

@@ -1,6 +1,6 @@
 import React, { PropsWithChildren, useState } from "react";
 import { cls, ExpandablePanel, IconButton, iconSize, PencilIcon, Typography } from "@rebasepro/ui";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 
 export function NavigationGroup({
     children,

package/src/components/HomePage/RenameGroupDialog.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useRef, useState } from "react";
 import { Button, Dialog, DialogActions, DialogContent, DialogTitle, TextField } from "@rebasepro/ui";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 
 interface RenameGroupDialogProps {
     open: boolean;

package/src/components/{EntityJsonPreview.tsx → JsonPreviewBinding.tsx}

@@ -1,8 +1,8 @@
 import React, { useRef } from "react";
 import { Highlight, themes } from "prism-react-renderer";
-import { useModeController } from "@rebasepro/core";
+import { useModeController } from "@rebasepro/app";
 
-export function EntityJsonPreview({ values }: { values: object }) {
+export function JsonPreviewBinding({ values }: { values: object }) {
     const code = JSON.stringify(values, null, "\t");
     const { mode } = useModeController();
     const preRef = useRef<HTMLPreElement>(null);

package/src/components/{RebaseCMS.tsx → RebaseAdmin.tsx}

@@ -1,6 +1,6 @@
 import React, { useLayoutEffect } from "react";
-import { useRebaseRegistryDispatch } from "@rebasepro/core";
-import type { RebaseCMSConfig } from "@rebasepro/types";
+import { useRebaseRegistryDispatch } from "@rebasepro/app";
+import type { RebaseAdminConfig } from "@rebasepro/types";
 
 /**
  * Declarative component to configure the CMS in Rebase.
@@ -10,7 +10,7 @@ import type { RebaseCMSConfig } from "@rebasepro/types";
  * is auto-wired as a native feature (slots, provider, Studio view) without
  * needing any external plugin.
  */
-export function RebaseCMS({ collections, views, homePage, entityViews, entityActions, collectionEditor, navigationGroupMappings }: RebaseCMSConfig) {
+export function RebaseAdmin({ collections, views, homePage, entityViews, entityActions, collectionEditor, navigationGroupMappings, basePath }: RebaseAdminConfig) {
     const dispatch = useRebaseRegistryDispatch();
 
     useLayoutEffect(() => {
@@ -20,9 +20,10 @@ homePage,
 entityViews,
 entityActions,
 collectionEditor,
-navigationGroupMappings });
+navigationGroupMappings,
+basePath });
         return () => dispatch.unregisterCMS();
-    }, [dispatch, collections, views, homePage, entityViews, entityActions, collectionEditor, navigationGroupMappings]);
+    }, [dispatch, collections, views, homePage, entityViews, entityActions, collectionEditor, navigationGroupMappings, basePath]);
 
     return null;
 }

package/src/components/RebaseAuthGate.tsx

@@ -2,9 +2,9 @@ import React from "react";
 import {
     useRebaseRegistry,
     useAuthController
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 import { CircularProgressCenter } from "@rebasepro/ui";
-import { LoginView } from "@rebasepro/core";
+import { LoginView } from "@rebasepro/app";
 import type { AuthControllerExtended } from "@rebasepro/types";
 
 /**

package/src/components/RebaseLayout.tsx

@@ -4,10 +4,9 @@ import {
     useAdminModeController,
     useComponentOverride,
     useRebaseRegistry
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 
 import { Scaffold } from "./app/Scaffold";
-import { AppBar } from "./app/AppBar";
 import { Drawer } from "./app/Drawer";
 import { SideDialogs } from "./SideDialogs";
 import { AdminModeSyncer } from "./AdminModeSyncer";
@@ -16,7 +15,7 @@ import type { AppView } from "@rebasepro/types";
 export interface RebaseLayoutProps {
     /** Title shown in the drawer. */
     title?: string;
-    /** Custom AppBar to override the default. */
+    /** Top bar. Only rendered if provided — pass `<AppBar/>` for the default one. */
     appBar?: React.ReactNode;
     /** Custom Drawer to override the default. */
     drawer?: React.ReactNode;
@@ -27,17 +26,18 @@ export interface RebaseLayoutProps {
 }
 
 /**
- * Layout layer — provides the Scaffold, AppBar, Drawer, and SideDialogs.
+ * Layout layer — provides the Scaffold, Drawer, and SideDialogs.
  *
  * Wraps the route outlet with the standard Rebase admin layout.
- * Override individual pieces (appBar, drawer) via props.
+ * Override the drawer via props; pass `appBar` to add a top bar (there is
+ * none by default — the drawer owns navigation and user actions).
  *
  * **Independently usable**: Use this when you want the Rebase layout
  * without its default route definitions.
  *
  * @example
  * ```tsx
- * <RebaseLayout title="My Admin">
+ * <RebaseLayout title="My Admin" appBar={<AppBar/>}>
  *   <Route path="/" element={<MyHomePage />} />
  *   <Route path="/custom" element={<CustomView />} />
  * </RebaseLayout>
@@ -53,14 +53,8 @@ export function RebaseLayout(props: RebaseLayoutProps) {
     } = props;
 
     const adminModeController = useAdminModeController();
-    const ResolvedAppBar = useComponentOverride("Shell.AppBar", AppBar);
     const ResolvedDrawer = useComponentOverride("Shell.Drawer", Drawer);
 
-    const ActiveAppBar = appBar ?? <ResolvedAppBar
-        includeLanguageToggle={false}
-        includeModeToggle={false}
-        includeUserMenu={false}
-    />;
     const ActiveDrawer = drawer ?? (
         <ResolvedDrawer
             title={title}
@@ -71,7 +65,7 @@ export function RebaseLayout(props: RebaseLayoutProps) {
     return (
         <Scaffold autoOpenDrawer={autoOpenDrawer}>
             <AdminModeSyncer devViews={devViews}/>
-            {ActiveAppBar}
+            {appBar}
             {ActiveDrawer}
             <Outlet/>
             <SideDialogs/>

package/src/components/RebaseNavigation.tsx

@@ -1,4 +1,4 @@
-import React, { useMemo, useRef, useEffect, lazy, Suspense } from "react";
+import React, { useMemo, useRef, useEffect, useCallback, useContext, lazy, Suspense } from "react";
 import {
     useRebaseRegistry,
     useRebaseContext,
@@ -9,19 +9,20 @@ import {
     useRebaseClient,
     useData,
     useDataSources,
+    CollectionResolverRegistrationContext,
     StudioBridgeRegistryProvider,
     useBridgeRegistration,
     CustomizationControllerContext,
     RebaseDataContext
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 import { buildRoutedRebaseData, resolveDataSource } from "@rebasepro/common";
 import { CircularProgressCenter } from "@rebasepro/ui";
-import type { AppView, CollectionEditorOptions, EntityCustomView, EntityAction, EntityCollection, RebasePlugin } from "@rebasepro/types";
+import type { AppView, CollectionEditorOptions, EntityCustomView, EntityAction, CollectionConfig, RebasePlugin } from "@rebasepro/types";
 import type { CollectionRegistryController } from "@rebasepro/types";
 import type { UrlController, NavigationStateController } from "@rebasepro/types";
 
 const EMPTY_PLUGINS: RebasePlugin[] = [];
-const EMPTY_COLLECTIONS: EntityCollection[] = [];
+const EMPTY_COLLECTIONS: CollectionConfig[] = [];
 
 import { useBuildNavigationStateController } from "../hooks/navigation/useBuildNavigationStateController";
 import { useBuildUrlController } from "../hooks/navigation/useBuildUrlController";
@@ -31,7 +32,7 @@ import { CollectionRegistryContext } from "../hooks/navigation/contexts/Collecti
 import { UrlContext } from "../hooks/navigation/contexts/UrlContext";
 import { NavigationStateContext } from "../hooks/navigation/contexts/NavigationStateContext";
 
-import { SideEntityProvider } from "./SideEntityProvider";
+import { SidePanelProvider } from "./SidePanelProvider";
 
 // Collection editor internals — used when collectionEditor is enabled
 import { useLocalCollectionsConfigController } from "../collection_editor/useLocalCollectionsConfigController";
@@ -61,7 +62,7 @@ export interface RebaseNavigationProps {
  * ```tsx
  * <RebaseNavigation>
  *   <MyCustomLayout>
- *     <EntityCollectionView ... />
+ *     <CollectionViewBinding ... />
  *   </MyCustomLayout>
  * </RebaseNavigation>
  * ```
@@ -103,14 +104,37 @@ export function RebaseNavigation({ children }: RebaseNavigationProps) {
     const defaultData = useData();
     const getCollectionRef = useRef(collectionRegistryController.getCollection);
     getCollectionRef.current = collectionRegistryController.getCollection;
+
+    // Hand the data layer a way to read this registry. It was built by <Rebase>,
+    // above us, and needs a collection's primary keys to give its rows an
+    // address — rows themselves carry only columns.
+    //
+    // Registered during render, not in an effect: the views that fetch rows are
+    // below us, and their effects run before ours, so an effect here would bind
+    // after the first page had already been converted. The call only assigns a
+    // ref, so repeating it per render is free.
+    const registerCollectionResolver = useContext(CollectionResolverRegistrationContext);
+    const resolveCollection = useCallback(
+        (slug: string) => getCollectionRef.current(slug),
+        []);
+    registerCollectionResolver(resolveCollection);
     const routedData = useMemo(() => buildRoutedRebaseData({
         defaultData,
         sources: dataSources.sources,
         resolveKey: (slugOrPath) => resolveDataSource(getCollectionRef.current(slugOrPath), dataSources.registry).key
     }), [defaultData, dataSources]);
 
+    // Normalize the configured mount prefix to a leading-slash, no-trailing-slash
+    // form (e.g. "admin" or "/admin/" -> "/admin"); empty/"/" stays "/".
+    const basePath = useMemo(() => {
+        const raw = registry.cmsConfig?.basePath;
+        if (!raw || raw === "/") return "/";
+        const trimmed = raw.replace(/^\/+/, "").replace(/\/+$/, "");
+        return trimmed ? `/${trimmed}` : "/";
+    }, [registry.cmsConfig?.basePath]);
+
     const urlController = useBuildUrlController({
-        basePath: "/",
+        basePath,
         baseCollectionPath: "/c",
         collectionRegistryController
     });
@@ -211,9 +235,9 @@ export function RebaseNavigation({ children }: RebaseNavigationProps) {
 
     // ── Merge CMS-registered entityViews/entityActions into the customization controller ──
     // The <Rebase> component builds the customizationController from its own props,
-    // but entity views passed to <RebaseCMS> are stored in the registry and not
+    // but entity views passed to <RebaseAdmin> are stored in the registry and not
     // automatically merged. We re-provide an enriched controller here so that
-    // downstream consumers (EntityEditView, side panels, etc.) can resolve
+    // downstream consumers (EditViewBinding, side panels, etc.) can resolve
     // string-keyed entity views like "blog_preview".
     const enrichedCustomizationController = useMemo(() => {
         const cmsEntityViews = (registry.cmsConfig?.entityViews ?? []) as EntityCustomView[];
@@ -245,14 +269,14 @@ export function RebaseNavigation({ children }: RebaseNavigationProps) {
             <CollectionRegistryContext.Provider value={collectionRegistryController}>
                 <UrlContext.Provider value={urlController}>
                     <NavigationStateContext.Provider value={navigationStateController}>
-                        <SideEntityProvider>
+                        <SidePanelProvider>
                             <BridgeAutoRegistrar
                                 collectionRegistryController={collectionRegistryController}
                                 urlController={urlController}
                                 navigationStateController={navigationStateController}
                             />
                             {children}
-                        </SideEntityProvider>
+                        </SidePanelProvider>
                     </NavigationStateContext.Provider>
                 </UrlContext.Provider>
             </CollectionRegistryContext.Provider>

package/src/components/RebaseRouteDefs.tsx

@@ -7,7 +7,7 @@ import {
     UIReferenceView,
     NotFoundPage,
     useComponentOverride
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 import { CircularProgressCenter } from "@rebasepro/ui";
 
 import { ContentHomePage as DefaultHomePage } from "./HomePage/ContentHomePage";
@@ -17,7 +17,7 @@ import { CustomViewRoute } from "../routes/CustomViewRoute";
 import { useNavigationStateController } from "../hooks/navigation/contexts/NavigationStateContext";
 import { CollectionEditorDialogs } from "./CollectionEditorDialogs";
 import { useEffect } from "react";
-import { useTranslation } from "@rebasepro/core";
+import { useTranslation } from "@rebasepro/app";
 import { useBreadcrumbsController } from "../index";
 
 function SettingsView() {

package/src/components/RebaseShell.tsx

@@ -1,7 +1,7 @@
 import React, { useMemo } from "react";
 import {
     useRebaseRegistry
-} from "@rebasepro/core";
+} from "@rebasepro/app";
 import { ErrorBoundary } from "@rebasepro/ui";
 
 import { RebaseAuthGate } from "./RebaseAuthGate";
@@ -11,6 +11,7 @@ import { RebaseRouteDefs } from "./RebaseRouteDefs";
 
 export interface RebaseShellProps {
     title?: string;
+    /** Top bar. Only rendered if provided — pass `<AppBar/>` for the default one. */
     appBar?: React.ReactNode;
     drawer?: React.ReactNode;
     autoOpenDrawer?: boolean;

package/src/components/ReferenceTable/{EntitySelectionTable.tsx → SelectionTableBinding.tsx}

@@ -1,33 +1,34 @@
-import type { EntityCollection } from "@rebasepro/types";
+import type { CollectionConfig } from "@rebasepro/types";
 import React, { MouseEventHandler, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import { CollectionSize, Entity, FilterValues } from "@rebasepro/types";
 
 import {
-    EntityCollectionRowActions,
-    EntityCollectionTable
-} from "../EntityCollectionTable";
+    CollectionRowActions,
+    CollectionTableBinding
+} from "../CollectionTableBinding";
 import {
+    CollectionScopeProvider,
     useAuthController,
     useCustomizationController,
     useData,
     useDataTableController,
     useLargeLayout,
     usePermissions
-} from "@rebasepro/core";
-import { ErrorView } from "@rebasepro/core";
+} from "@rebasepro/app";
+import { ErrorView } from "@rebasepro/app";
 import { Button, DialogActions, PlusIcon, Typography } from "@rebasepro/ui";
-import { IconForView } from "@rebasepro/core";
-import { useSelectionController } from "../EntityCollectionView/useSelectionController";
+import { IconForView } from "@rebasepro/app";
+import { useSelectionController } from "../CollectionViewBinding/useSelectionController";
 
-import { useColumnIds } from "@rebasepro/core";
+import { useColumnIds } from "@rebasepro/app";
 import { useSideDialogContext } from "../SideDialogs";
-import { useAnalyticsController } from "@rebasepro/core";
-import { useUrlController, useSideEntityController } from "../../index";
+import { useAnalyticsController } from "@rebasepro/app";
+import { useUrlController, useSidePanel } from "../../index";
 
 /**
  * @group Components
  */
-export interface EntitySelectionProps<M extends Record<string, unknown>> {
+export interface SelectionProps<M extends Record<string, unknown>> {
 
     /**
      * Allow multiple selection of values
@@ -37,7 +38,7 @@ export interface EntitySelectionProps<M extends Record<string, unknown>> {
     /**
      * Entity collection config
      */
-    collection?: EntityCollection<M>;
+    collection?: CollectionConfig<M>;
 
     /**
      * Absolute path of the collection.
@@ -87,20 +88,20 @@ export interface EntitySelectionProps<M extends Record<string, unknown>> {
 
 /**
  * This component allows to select entities from a given collection.
- * You probably want to open this dialog as a side view using {@link useEntitySelectionTable}
+ * You probably want to open this dialog as a side view using {@link useSelectionTableBinding}
  * @group Components
  */
-export function EntitySelectionTable<M extends Record<string, unknown>>(
-    props: EntitySelectionProps<M>
+export function SelectionTableBinding<M extends Record<string, unknown>>(
+    props: SelectionProps<M>
 ) {
     if (!props.collection) {
         return <ErrorView
             error={"Could not find collection"}/>
     }
-    return <EntitySelectionTableInternal {...props} collection={props.collection} />;
+    return <SelectionTableBindingInternal {...props} collection={props.collection} />;
 }
 
-function EntitySelectionTableInternal<M extends Record<string, unknown>>(
+function SelectionTableBindingInternal<M extends Record<string, unknown>>(
     {
         onSingleEntitySelected,
         onMultipleEntitiesSelected,
@@ -111,10 +112,10 @@ function EntitySelectionTableInternal<M extends Record<string, unknown>>(
         description,
         fixedFilter,
         maxSelection
-    }: EntitySelectionProps<M> & { collection: EntityCollection<M> }) {
+    }: SelectionProps<M> & { collection: CollectionConfig<M> }) {
 
     const sideDialogContext = useSideDialogContext();
-    const sideEntityController = useSideEntityController();
+    const sidePanelController = useSidePanel();
     const urlController = useUrlController();
     const analyticsController = useAnalyticsController();
 
@@ -212,7 +213,7 @@ function EntitySelectionTableInternal<M extends Record<string, unknown>>(
         analyticsController.onAnalyticsEvent?.("reference_selection_new_entity", {
             path
         });
-        sideEntityController.open({
+        sidePanelController.open({
             path: path,
             collection,
             updateUrl: true,
@@ -237,7 +238,7 @@ function EntitySelectionTableInternal<M extends Record<string, unknown>>(
     }) => {
         const selectedEntities = selectionController.selectedEntities;
         const isSelected = selectedEntities && selectedEntities.map(e => e.id).indexOf(entity.id) > -1;
-        return <EntityCollectionRowActions
+        return <CollectionRowActions
             width={width}
             frozen={frozen}
             entity={entity}
@@ -269,11 +270,12 @@ function EntitySelectionTableInternal<M extends Record<string, unknown>>(
 
     return (
 
+        <CollectionScopeProvider collection={collection}>
         <div className="flex flex-col h-full">
 
             <div className="grow">
                 {entitiesDisplayedFirst &&
-                    <EntityCollectionTable
+                    <CollectionTableBinding
                         additionalFields={collection.additionalFields}
                         displayedColumnIds={displayedColumnIds}
                         onEntityClick={onEntityClick}
@@ -316,6 +318,7 @@ function EntitySelectionTableInternal<M extends Record<string, unknown>>(
                 </Button>
             </DialogActions>
         </div>
+        </CollectionScopeProvider>
 
     );
 
@@ -327,7 +330,7 @@ function EntitySelectionDialogActions({
     onClear,
     onNewClick
 }: {
-    collection: EntityCollection<any>,
+    collection: CollectionConfig<any>,
     path: string,
     onClear: () => void,
     onNewClick: () => void

package/src/components/ReferenceWidget.tsx

@@ -1,5 +1,5 @@
-import { useEntitySelectionDialog } from "../hooks/useEntitySelectionDialog";
-import type { EntityCollection } from "@rebasepro/types";
+import { useSelectionDialog } from "../hooks/useSelectionDialog";
+import type { CollectionConfig } from "@rebasepro/types";
 import React, { useCallback, useMemo } from "react";
 
 import { Entity, EntityReference, FilterValues } from "@rebasepro/types";
@@ -55,7 +55,7 @@ export function ReferenceWidget<M extends Record<string, unknown>>({
 
     const collectionRegistryController = useCollectionRegistryController();
 
-    const collection: EntityCollection | undefined = useMemo(() => {
+    const collection: CollectionConfig | undefined = useMemo(() => {
         return collectionRegistryController.getCollection(path);
     }, [path, collectionRegistryController.getCollection]);
 
@@ -83,7 +83,7 @@ export function ReferenceWidget<M extends Record<string, unknown>>({
         }
     }, [disabled, onReferenceSelected]);
 
-    const referenceDialogController = useEntitySelectionDialog({
+    const referenceDialogController = useSelectionDialog({
         multiselect,
         path,
         collection,