Merge pull request #10907 from marmelab/ra-core-primitives

slax57 · web-flow · commit 31204a0a50bf · 2025-09-01T10:29:00.000+02:00
Move more primitives from `ra-ui-materialui` to `ra-core`
diff --git a/packages/ra-core/src/controller/input/SimpleFormIteratorContext.ts b/packages/ra-core/src/controller/input/SimpleFormIteratorContext.ts
diff --git a/packages/ra-core/src/controller/input/SimpleFormIteratorItemContext.ts b/packages/ra-core/src/controller/input/SimpleFormIteratorItemContext.ts
diff --git a/packages/ra-core/src/controller/input/index.ts b/packages/ra-core/src/controller/input/index.ts
@@ -1,19 +1,12 @@
-import {
-    getStatusForInput,
-    getSelectedReferencesStatus,
-    getStatusForArrayInput,
-} from './referenceDataStatus';
-
+export * from './referenceDataStatus';
 export * from './useReferenceArrayInputController';
 export * from './useReferenceInputController';
 export * from './ReferenceInputBase';
 export * from './ReferenceArrayInputBase';
 export * from './ArrayInputContext';
 export * from './useArrayInput';
 export * from './sanitizeInputRestProps';
-
-export {
-    getStatusForInput,
-    getSelectedReferencesStatus,
-    getStatusForArrayInput,
-};
+export * from './SimpleFormIteratorContext';
+export * from './SimpleFormIteratorItemContext';
+export * from './useSimpleFormIterator';
+export * from './useSimpleFormIteratorItem';
diff --git a/packages/ra-core/src/controller/input/useSimpleFormIterator.ts b/packages/ra-core/src/controller/input/useSimpleFormIterator.ts
diff --git a/packages/ra-core/src/controller/input/useSimpleFormIteratorItem.ts b/packages/ra-core/src/controller/input/useSimpleFormIteratorItem.ts
diff --git a/packages/ra-core/src/controller/list/FilterContext.tsx b/packages/ra-core/src/controller/list/FilterContext.tsx
diff --git a/packages/ra-core/src/controller/list/index.ts b/packages/ra-core/src/controller/list/index.ts
@@ -1,3 +1,4 @@
+export * from './FilterContext';
 export * from './InfiniteListBase';
 export * from './InfinitePaginationContext';
 export * from './ListBase';
@@ -10,6 +11,7 @@ export * from './ListPaginationContext';
 export * from './ListSortContext';
 export * from './queryReducer';
 export * from './useExpanded';
+export * from './useFilterContext';
 export * from './useInfiniteListController';
 export * from './useInfinitePaginationContext';
 export * from './useList';
diff --git a/packages/ra-core/src/controller/list/useFilterContext.ts b/packages/ra-core/src/controller/list/useFilterContext.ts
@@ -0,0 +1,6 @@
+import { useContext } from 'react';
+import { FilterContext, type FilterContextType } from './FilterContext';
+
+export const useFilterContext = (): FilterContextType => {
+    return useContext(FilterContext);
+};
diff --git a/packages/ra-core/src/core/UserMenuContext.ts b/packages/ra-core/src/core/UserMenuContext.ts
diff --git a/packages/ra-core/src/core/UserMenuContextProvider.tsx b/packages/ra-core/src/core/UserMenuContextProvider.tsx
diff --git a/packages/ra-core/src/core/index.ts b/packages/ra-core/src/core/index.ts
@@ -13,6 +13,8 @@ export * from './ResourceContext';
 export * from './ResourceContextProvider';
 export * from './ResourceDefinitionContext';
 export * from './SourceContext';
+export * from './UserMenuContext';
+export * from './UserMenuContextProvider';
 export * from './useFirstResourceWithListAccess';
 export * from './useGetResourceLabel';
 export * from './useGetRecordRepresentation';
@@ -21,4 +23,5 @@ export * from './useResourceDefinitionContext';
 export * from './useResourceContext';
 export * from './useResourceDefinition';
 export * from './useResourceDefinitions';
+export * from './useUserMenu';
 export * from './useWrappedSource';
diff --git a/packages/ra-core/src/core/useUserMenu.ts b/packages/ra-core/src/core/useUserMenu.ts
diff --git a/packages/ra-ui-materialui/src/detail/Create.tsx b/packages/ra-ui-materialui/src/detail/Create.tsx
@@ -1,12 +1,6 @@
 import * as React from 'react';
 import { ReactElement } from 'react';
-import {
-    CreateBase,
-    CreateBaseProps,
-    Identifier,
-    RaRecord,
-    useCheckMinimumRequiredProps,
-} from 'ra-core';
+import { CreateBase, CreateBaseProps, Identifier, RaRecord } from 'ra-core';
 import { useThemeProps } from '@mui/material/styles';
 
 import { CreateView, CreateViewProps } from './CreateView';
diff --git a/packages/ra-ui-materialui/src/input/ArrayInput/AddItemButton.tsx b/packages/ra-ui-materialui/src/input/ArrayInput/AddItemButton.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import AddIcon from '@mui/icons-material/AddCircleOutline';
 import clsx from 'clsx';
-import { useSimpleFormIterator } from './useSimpleFormIterator';
+import { useSimpleFormIterator } from 'ra-core';
 import { IconButtonWithTooltip, ButtonProps } from '../../button';
 
 export const AddItemButton = (props: ButtonProps) => {
diff --git a/packages/ra-ui-materialui/src/input/ArrayInput/ReOrderButtons.tsx b/packages/ra-ui-materialui/src/input/ArrayInput/ReOrderButtons.tsx
@@ -1,10 +1,9 @@
 import * as React from 'react';
 import clsx from 'clsx';
-import { IconButtonWithTooltip } from '../../button';
+import { useSimpleFormIterator, useSimpleFormIteratorItem } from 'ra-core';
 import ArrowUpwardIcon from '@mui/icons-material/ArrowCircleUp';
 import ArrowDownwardIcon from '@mui/icons-material/ArrowCircleDown';
-import { useSimpleFormIteratorItem } from './useSimpleFormIteratorItem';
-import { useSimpleFormIterator } from './useSimpleFormIterator';
+import { IconButtonWithTooltip } from '../../button';
 
 export const ReOrderButtons = ({ className }: { className?: string }) => {
     const { index, total, reOrder } = useSimpleFormIteratorItem();
diff --git a/packages/ra-ui-materialui/src/input/ArrayInput/RemoveItemButton.tsx b/packages/ra-ui-materialui/src/input/ArrayInput/RemoveItemButton.tsx
@@ -1,10 +1,9 @@
 import * as React from 'react';
 import CloseIcon from '@mui/icons-material/RemoveCircleOutline';
 import clsx from 'clsx';
+import { useSimpleFormIterator, useSimpleFormIteratorItem } from 'ra-core';
 
 import { IconButtonWithTooltip, ButtonProps } from '../../button';
-import { useSimpleFormIteratorItem } from './useSimpleFormIteratorItem';
-import { useSimpleFormIterator } from './useSimpleFormIterator';
 
 export const RemoveItemButton = (props: Omit<ButtonProps, 'onClick'>) => {
     const { remove, index } = useSimpleFormIteratorItem();
diff --git a/packages/ra-ui-materialui/src/input/ArrayInput/SimpleFormIterator.stories.tsx b/packages/ra-ui-materialui/src/input/ArrayInput/SimpleFormIterator.stories.tsx
@@ -8,11 +8,11 @@ import { SimpleFormIterator } from './SimpleFormIterator';
 import { TextInput } from '../TextInput';
 import { AdminContext } from '../../AdminContext';
 import { defaultTheme } from '../../theme/defaultTheme';
-import { useSimpleFormIteratorItem } from './useSimpleFormIteratorItem';
 import {
     FormDataConsumer,
     ResourceContextProvider,
     testDataProvider,
+    useSimpleFormIteratorItem,
 } from 'ra-core';
 
 export default { title: 'ra-ui-materialui/input/SimpleFormIterator' };
diff --git a/packages/ra-ui-materialui/src/input/ArrayInput/SimpleFormIterator.tsx b/packages/ra-ui-materialui/src/input/ArrayInput/SimpleFormIterator.tsx
@@ -20,6 +20,7 @@ import get from 'lodash/get';
 import {
     FormDataConsumer,
     type RaRecord,
+    SimpleFormIteratorContext,
     useRecordContext,
     useArrayInput,
     useTranslate,
@@ -31,7 +32,6 @@ import {
     SimpleFormIteratorClasses,
     SimpleFormIteratorPrefix as PREFIX,
 } from './useSimpleFormIteratorStyles';
-import { SimpleFormIteratorContext } from './SimpleFormIteratorContext';
 import {
     DisableRemoveFunction,
     SimpleFormIteratorItem,
diff --git a/packages/ra-ui-materialui/src/input/ArrayInput/SimpleFormIteratorItem.tsx b/packages/ra-ui-materialui/src/input/ArrayInput/SimpleFormIteratorItem.tsx
@@ -3,20 +3,18 @@ import { ReactElement, ReactNode, useMemo } from 'react';
 import { Typography, Stack } from '@mui/material';
 import clsx from 'clsx';
 import {
-    ArrayInputContextValue,
-    RaRecord,
+    type ArrayInputContextValue,
+    type RaRecord,
     RecordContextProvider,
+    SimpleFormIteratorItemContext,
+    type SimpleFormIteratorItemContextValue,
     SourceContextProvider,
     useResourceContext,
+    useSimpleFormIterator,
     useSourceContext,
 } from 'ra-core';
 
 import { SimpleFormIteratorClasses } from './useSimpleFormIteratorStyles';
-import { useSimpleFormIterator } from './useSimpleFormIterator';
-import {
-    SimpleFormIteratorItemContext,
-    SimpleFormIteratorItemContextValue,
-} from './SimpleFormIteratorItemContext';
 import { RemoveItemButton as DefaultRemoveItemButton } from './RemoveItemButton';
 import { ReOrderButtons as DefaultReOrderButtons } from './ReOrderButtons';
 
diff --git a/packages/ra-ui-materialui/src/input/ArrayInput/index.ts b/packages/ra-ui-materialui/src/input/ArrayInput/index.ts
@@ -1,16 +1,20 @@
 export * from './ArrayInput';
 export * from './SimpleFormIterator';
-export * from './SimpleFormIteratorContext';
 export * from './SimpleFormIteratorItem';
-export * from './SimpleFormIteratorItemContext';
-export * from './useSimpleFormIterator';
-export * from './useSimpleFormIteratorItem';
 export * from './useSimpleFormIteratorStyles';
 export * from './AddItemButton';
 export * from './RemoveItemButton';
 export * from './ReOrderButtons';
 
 /**
  * @deprecated Import from `ra-core` or `react-admin` instead
+ * FIXME: remove the re-export in v6
  */
-export { ArrayInputContext, useArrayInput } from 'ra-core';
+export {
+    ArrayInputContext,
+    useArrayInput,
+    useSimpleFormIterator,
+    useSimpleFormIteratorItem,
+    SimpleFormIteratorContext,
+    SimpleFormIteratorItemContext,
+} from 'ra-core';
diff --git a/packages/ra-ui-materialui/src/input/DatagridInput.tsx b/packages/ra-ui-materialui/src/input/DatagridInput.tsx
@@ -3,6 +3,7 @@ import { cloneElement, ReactElement, ReactNode, useCallback } from 'react';
 import clsx from 'clsx';
 import {
     ChoicesProps,
+    FilterContext,
     Identifier,
     ListContextProvider,
     useChoicesContext,
@@ -17,13 +18,7 @@ import {
 import { CommonInputProps } from './CommonInputProps';
 import { InputHelperText } from './InputHelperText';
 import { SupportCreateSuggestionOptions } from './useSupportCreateSuggestion';
-import {
-    Datagrid,
-    DatagridProps,
-    FilterButton,
-    FilterForm,
-    FilterContext,
-} from '../list';
+import { Datagrid, DatagridProps, FilterButton, FilterForm } from '../list';
 import { Pagination as DefaultPagination } from '../list/pagination';
 import { sanitizeInputRestProps } from './sanitizeInputRestProps';
 
diff --git a/packages/ra-ui-materialui/src/layout/AppBar.stories.tsx b/packages/ra-ui-materialui/src/layout/AppBar.stories.tsx
@@ -20,13 +20,13 @@ import {
     StoreContextProvider,
     TestMemoryRouter,
     memoryStore,
+    useUserMenu,
 } from 'ra-core';
 
 import { AppBar } from './AppBar';
 import { Title } from './Title';
 import { TitlePortal } from './TitlePortal';
 import { UserMenu } from './UserMenu';
-import { useUserMenu } from './useUserMenu';
 import { defaultTheme } from '../theme/defaultTheme';
 import { ThemesContext, ThemeProvider } from '../theme';
 import { Logout } from '../auth';
diff --git a/packages/ra-ui-materialui/src/layout/UserMenu.tsx b/packages/ra-ui-materialui/src/layout/UserMenu.tsx
@@ -14,11 +14,15 @@ import {
     styled,
     useThemeProps,
 } from '@mui/material/styles';
-import { useAuthProvider, useGetIdentity, useTranslate } from 'ra-core';
+import {
+    useAuthProvider,
+    useGetIdentity,
+    UserMenuContextProvider,
+    useTranslate,
+} from 'ra-core';
 import * as React from 'react';
 import { type ReactNode, useCallback, useMemo, useState } from 'react';
 import { Logout } from '../auth/Logout';
-import { UserMenuContextProvider } from './UserMenuContextProvider';
 
 /**
  * The UserMenu component renders a Mui Button that shows a Menu.
diff --git a/packages/ra-ui-materialui/src/layout/index.ts b/packages/ra-ui-materialui/src/layout/index.ts
@@ -27,6 +27,10 @@ export * from './Title';
 export * from './TitlePortal';
 export * from './TopToolbar';
 export * from './UserMenu';
-export * from './UserMenuContext';
 export * from './useSidebarState';
-export * from './useUserMenu';
+
+/**
+ * @deprecated Import from `ra-core` or `react-admin` instead
+ * FIXME: remove the re-export in v6
+ */
+export { UserMenuContext, UserMenuContextProvider, useUserMenu } from 'ra-core';
diff --git a/packages/ra-ui-materialui/src/list/ListActions.tsx b/packages/ra-ui-materialui/src/list/ListActions.tsx
@@ -1,17 +1,17 @@
 import * as React from 'react';
-import { cloneElement, useMemo, useContext, ReactElement } from 'react';
+import { cloneElement, useMemo, ReactElement } from 'react';
 import {
     sanitizeListRestProps,
     Exporter,
     useListContext,
     useResourceContext,
     useResourceDefinition,
+    useFilterContext,
 } from 'ra-core';
 import { ToolbarProps } from '@mui/material';
 
 import TopToolbar from '../layout/TopToolbar';
 import { CreateButton, ExportButton } from '../button';
-import { FilterContext } from './FilterContext';
 import { FilterButton } from './filter';
 
 /**
@@ -49,7 +49,7 @@ export const ListActions = (props: ListActionsProps) => {
         useListContext();
     const resource = useResourceContext(props);
     const { hasCreate } = useResourceDefinition(props);
-    const filters = useContext(FilterContext) || filtersProp;
+    const filters = useFilterContext() || filtersProp;
     return useMemo(
         () => (
             <TopToolbar className={className} {...sanitizeListRestProps(rest)}>
diff --git a/packages/ra-ui-materialui/src/list/ListToolbar.tsx b/packages/ra-ui-materialui/src/list/ListToolbar.tsx
@@ -6,10 +6,9 @@ import {
     useThemeProps,
 } from '@mui/material/styles';
 import type { ToolbarProps } from '@mui/material';
-import type { Exporter } from 'ra-core';
+import { type Exporter, FilterContext } from 'ra-core';
 
 import { FilterForm } from './filter';
-import { FilterContext } from './FilterContext';
 
 export const ListToolbar: FC<ListToolbarProps> = memo(inProps => {
     const props = useThemeProps({
diff --git a/packages/ra-ui-materialui/src/list/filter/Filter.tsx b/packages/ra-ui-materialui/src/list/filter/Filter.tsx
@@ -1,9 +1,9 @@
 import * as React from 'react';
 import { Children, ReactNode } from 'react';
+import { FilterContext } from 'ra-core';
 
 import { FilterForm } from './FilterForm';
 import { FilterButton } from './FilterButton';
-import { FilterContext } from '../FilterContext';
 
 /**
  * Filter button/form combo
diff --git a/packages/ra-ui-materialui/src/list/filter/FilterButton.tsx b/packages/ra-ui-materialui/src/list/filter/FilterButton.tsx
@@ -5,7 +5,6 @@ import {
     useRef,
     type ReactNode,
     type HtmlHTMLAttributes,
-    useContext,
 } from 'react';
 import {
     Menu,
@@ -24,13 +23,17 @@ import BookmarkRemoveIcon from '@mui/icons-material/BookmarkRemove';
 import BookmarkBorderIcon from '@mui/icons-material/BookmarkBorder';
 import ContentFilter from '@mui/icons-material/FilterList';
 import isEqual from 'lodash/isEqual';
-import { useListContext, useResourceContext, useTranslate } from 'ra-core';
+import {
+    useFilterContext,
+    useListContext,
+    useResourceContext,
+    useTranslate,
+} from 'ra-core';
 import { stringify } from 'query-string';
 import { useNavigate } from 'react-router';
 
 import { FilterButtonMenuItem } from './FilterButtonMenuItem';
 import { Button } from '../../button';
-import { FilterContext } from '../FilterContext';
 import { extractValidSavedQueries, useSavedQueries } from './useSavedQueries';
 import { AddSavedQueryDialog } from './AddSavedQueryDialog';
 import { RemoveSavedQueryDialog } from './RemoveSavedQueryDialog';
@@ -48,7 +51,7 @@ export const FilterButton = (inProps: FilterButtonProps) => {
         variant,
         ...rest
     } = props;
-    const filters = useContext(FilterContext) || filtersProp;
+    const filters = useFilterContext() || filtersProp;
     const resource = useResourceContext(props);
     const translate = useTranslate();
     if (!resource && !disableSaveQuery) {
diff --git a/packages/ra-ui-materialui/src/list/filter/FilterForm.tsx b/packages/ra-ui-materialui/src/list/filter/FilterForm.tsx
@@ -4,17 +4,20 @@ import {
     useThemeProps,
 } from '@mui/material/styles';
 import get from 'lodash/get';
-import { FilterLiveForm, useListContext, useResourceContext } from 'ra-core';
+import {
+    FilterLiveForm,
+    useFilterContext,
+    useListContext,
+    useResourceContext,
+} from 'ra-core';
 import * as React from 'react';
 import {
     type HtmlHTMLAttributes,
     type ReactNode,
     useCallback,
-    useContext,
     useEffect,
 } from 'react';
 
-import { FilterContext } from '../FilterContext';
 import { FilterFormInput } from './FilterFormInput';
 
 export const FilterForm = (inProps: FilterFormProps) => {
@@ -23,7 +26,7 @@ export const FilterForm = (inProps: FilterFormProps) => {
         name: PREFIX,
     });
     const { filters: filtersProps, ...rest } = props;
-    const filters = useContext(FilterContext) || filtersProps;
+    const filters = useFilterContext() || filtersProps;
 
     return (
         <FilterLiveForm formComponent={StyledForm} {...sanitizeRestProps(rest)}>
diff --git a/packages/ra-ui-materialui/src/list/filter/index.ts b/packages/ra-ui-materialui/src/list/filter/index.ts
@@ -14,3 +14,8 @@ export * from './RemoveSavedQueryIconButton';
 export * from './SavedQueriesList';
 export * from './SavedQueryFilterListItem';
 export * from './useSavedQueries';
+/**
+ * @deprecated Import from `ra-core` or `react-admin` instead
+ * FIXME: remove the re-export in v6
+ */
+export { FilterContext } from 'ra-core';
diff --git a/packages/ra-ui-materialui/src/list/index.ts b/packages/ra-ui-materialui/src/list/index.ts
@@ -5,7 +5,6 @@ export * from './datatable';
 export * from './Empty';
 export * from './InfiniteList';
 export * from './filter';
-export * from './FilterContext';
 export * from './List';
 export * from './ListActions';
 export * from './listFieldTypes';
