Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[TreeView] Use useDefaultProps instead of useThemeProps #14772

Closed
wants to merge 2 commits into from
Closed

[TreeView] Use useDefaultProps instead of useThemeProps #14772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
949d5e8
[TreeView] Use useDefaultProps instead of useThemeProps
flaviendelangle Sep 30, 2024
d5652c8
Code review: June
flaviendelangle Sep 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions packages/x-tree-view-pro/src/RichTreeViewPro/RichTreeViewPro.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@
import * as React from 'react';
import PropTypes from 'prop-types';
import composeClasses from '@mui/utils/composeClasses';
import { useLicenseVerifier, Watermark } from '@mui/x-license';
import useSlotProps from '@mui/utils/useSlotProps';
import { useDefaultProps } from '@mui/material/DefaultPropsProvider';
import { useLicenseVerifier, Watermark } from '@mui/x-license';
import { TreeItem, TreeItemProps } from '@mui/x-tree-view/TreeItem';
import { useTreeView, TreeViewProvider } from '@mui/x-tree-view/internals';
import { warnOnce } from '@mui/x-internals/warning';
import { styled, createUseThemeProps } from '../internals/zero-styled';
import { styled } from '../internals/zero-styled';
import { getRichTreeViewProUtilityClass } from './richTreeViewProClasses';
import { RichTreeViewProProps } from './RichTreeViewPro.types';
import {
Expand All @@ -16,8 +17,6 @@ import {
} from './RichTreeViewPro.plugins';
import { getReleaseInfo } from '../internals/utils/releaseInfo';

const useThemeProps = createUseThemeProps('MuiRichTreeViewPro');

const useUtilityClasses = <R extends {}, Multiple extends boolean | undefined>(
ownerState: RichTreeViewProProps<R, Multiple>,
) => {
Expand Down Expand Up @@ -108,7 +107,7 @@ const RichTreeViewPro = React.forwardRef(function RichTreeViewPro<
R extends {},
Multiple extends boolean | undefined = undefined,
>(inProps: RichTreeViewProProps<R, Multiple>, ref: React.Ref<HTMLUListElement>) {
const props = useThemeProps({ props: inProps, name: 'MuiRichTreeViewPro' });
const props = useDefaultProps({ props: inProps, name: 'MuiRichTreeViewPro' });

useLicenseVerifier('x-tree-view-pro', releaseInfo);

Expand Down
7 changes: 0 additions & 7 deletions packages/x-tree-view-pro/src/internals/zero-styled/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
import { useThemeProps } from '@mui/material/styles';

export { styled } from '@mui/material/styles';

// eslint-disable-next-line @typescript-eslint/no-unused-vars
export function createUseThemeProps(name: string) {
return useThemeProps;
}
7 changes: 3 additions & 4 deletions packages/x-tree-view/src/RichTreeView/RichTreeView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,16 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import composeClasses from '@mui/utils/composeClasses';
import useSlotProps from '@mui/utils/useSlotProps';
import { useDefaultProps } from '@mui/material/DefaultPropsProvider';
import { warnOnce } from '@mui/x-internals/warning';
import { getRichTreeViewUtilityClass } from './richTreeViewClasses';
import { RichTreeViewProps } from './RichTreeView.types';
import { styled, createUseThemeProps } from '../internals/zero-styled';
import { styled } from '../internals/zero-styled';
import { useTreeView } from '../internals/useTreeView';
import { TreeViewProvider } from '../internals/TreeViewProvider';
import { RICH_TREE_VIEW_PLUGINS, RichTreeViewPluginSignatures } from './RichTreeView.plugins';
import { TreeItem, TreeItemProps } from '../TreeItem';

const useThemeProps = createUseThemeProps('MuiRichTreeView');

const useUtilityClasses = <R extends {}, Multiple extends boolean | undefined>(
ownerState: RichTreeViewProps<R, Multiple>,
) => {
Expand Down Expand Up @@ -76,7 +75,7 @@ const RichTreeView = React.forwardRef(function RichTreeView<
R extends {},
Multiple extends boolean | undefined = undefined,
>(inProps: RichTreeViewProps<R, Multiple>, ref: React.Ref<HTMLUListElement>) {
const props = useThemeProps({ props: inProps, name: 'MuiRichTreeView' });
const props = useDefaultProps({ props: inProps, name: 'MuiRichTreeView' });

if (process.env.NODE_ENV !== 'production') {
if ((props as any).children != null) {
Expand Down
7 changes: 3 additions & 4 deletions packages/x-tree-view/src/SimpleTreeView/SimpleTreeView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,15 @@ import * as React from 'react';
import PropTypes from 'prop-types';
import composeClasses from '@mui/utils/composeClasses';
import useSlotProps from '@mui/utils/useSlotProps';
import { useDefaultProps } from '@mui/material/DefaultPropsProvider';
import { warnOnce } from '@mui/x-internals/warning';
import { styled, createUseThemeProps } from '../internals/zero-styled';
import { styled } from '../internals/zero-styled';
import { getSimpleTreeViewUtilityClass } from './simpleTreeViewClasses';
import { SimpleTreeViewProps } from './SimpleTreeView.types';
import { useTreeView } from '../internals/useTreeView';
import { TreeViewProvider } from '../internals/TreeViewProvider';
import { SIMPLE_TREE_VIEW_PLUGINS, SimpleTreeViewPluginSignatures } from './SimpleTreeView.plugins';

const useThemeProps = createUseThemeProps('MuiSimpleTreeView');

const useUtilityClasses = <Multiple extends boolean | undefined>(
ownerState: SimpleTreeViewProps<Multiple>,
) => {
Expand Down Expand Up @@ -56,7 +55,7 @@ const EMPTY_ITEMS: any[] = [];
const SimpleTreeView = React.forwardRef(function SimpleTreeView<
Multiple extends boolean | undefined = undefined,
>(inProps: SimpleTreeViewProps<Multiple>, ref: React.Ref<HTMLUListElement>) {
const props = useThemeProps({ props: inProps, name: 'MuiSimpleTreeView' });
const props = useDefaultProps({ props: inProps, name: 'MuiSimpleTreeView' });
const ownerState = props as SimpleTreeViewProps<any>;

if (process.env.NODE_ENV !== 'production') {
Expand Down
7 changes: 3 additions & 4 deletions packages/x-tree-view/src/TreeItem/TreeItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ import resolveComponentProps from '@mui/utils/resolveComponentProps';
import useSlotProps from '@mui/utils/useSlotProps';
import unsupportedProp from '@mui/utils/unsupportedProp';
import elementTypeAcceptingRef from '@mui/utils/elementTypeAcceptingRef';
import { styled, createUseThemeProps } from '../internals/zero-styled';
import { useDefaultProps } from '@mui/material/DefaultPropsProvider';
import { styled } from '../internals/zero-styled';
import { TreeItemContent } from './TreeItemContent';
import { treeItemClasses, getTreeItemUtilityClass } from './treeItemClasses';
import {
Expand All @@ -31,8 +32,6 @@ import { isTargetInDescendants } from '../internals/utils/tree';
import { TreeViewItemPluginSlotPropsEnhancerParams } from '../internals/models';
import { generateTreeItemIdAttribute } from '../internals/corePlugins/useTreeViewId/useTreeViewId.utils';

const useThemeProps = createUseThemeProps('MuiTreeItem');

const useUtilityClasses = (ownerState: TreeItemOwnerState) => {
const { classes } = ownerState;

Expand Down Expand Up @@ -205,7 +204,7 @@ export const TreeItem = React.forwardRef(function TreeItem(
} = useTreeViewContext<TreeItemMinimalPlugins, TreeItemOptionalPlugins>();
const depthContext = React.useContext(TreeViewItemDepthContext);

const props = useThemeProps({ props: inProps, name: 'MuiTreeItem' });
const props = useDefaultProps({ props: inProps, name: 'MuiTreeItem' });

const {
children,
Expand Down
7 changes: 3 additions & 4 deletions packages/x-tree-view/src/TreeItem2/TreeItem2.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import MuiCheckbox, { CheckboxProps } from '@mui/material/Checkbox';
import useSlotProps from '@mui/utils/useSlotProps';
import { shouldForwardProp } from '@mui/system/createStyled';
import composeClasses from '@mui/utils/composeClasses';
import { styled, createUseThemeProps } from '../internals/zero-styled';
import { useDefaultProps } from '@mui/material/DefaultPropsProvider';
import { styled } from '../internals/zero-styled';
import { TreeItem2Props, TreeItem2OwnerState } from './TreeItem2.types';
import {
useTreeItem2,
Expand All @@ -23,8 +24,6 @@ import { TreeItem2DragAndDropOverlay } from '../TreeItem2DragAndDropOverlay';
import { TreeItem2Provider } from '../TreeItem2Provider';
import { TreeItem2LabelInput } from '../TreeItem2LabelInput';

const useThemeProps = createUseThemeProps('MuiTreeItem2');

export const TreeItem2Root = styled('li', {
name: 'MuiTreeItem2',
slot: 'Root',
Expand Down Expand Up @@ -229,7 +228,7 @@ export const TreeItem2 = React.forwardRef(function TreeItem2(
inProps: TreeItem2Props,
forwardedRef: React.Ref<HTMLLIElement>,
) {
const props = useThemeProps({ props: inProps, name: 'MuiTreeItem2' });
const props = useDefaultProps({ props: inProps, name: 'MuiTreeItem2' });

const { id, itemId, label, disabled, children, slots = {}, slotProps = {}, ...other } = props;

Expand Down
14 changes: 7 additions & 7 deletions packages/x-tree-view/src/TreeItem2DragAndDropOverlay/TreeItem2DragAndDropOverlay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,26 +24,26 @@ const TreeItem2DragAndDropOverlayRoot = styled('div', {
style: {
marginLeft: 'calc(var(--TreeView-indentMultiplier) * var(--TreeView-itemDepth))',
borderRadius: theme.shape.borderRadius,
backgroundColor: alpha((theme.vars || theme).palette.primary.dark, 0.15),
backgroundColor: alpha(theme.palette.primary.dark, 0.15),
},
},
{
props: { action: 'reorder-above' },
style: {
marginLeft: 'calc(var(--TreeView-indentMultiplier) * var(--TreeView-itemDepth))',
borderTop: `1px solid ${alpha((theme.vars || theme).palette.grey[900], 0.6)}`,
borderTop: `1px solid ${alpha(theme.palette.grey[900], 0.6)}`,
...theme.applyStyles('dark', {
borderTopColor: alpha((theme.vars || theme).palette.grey[100], 0.6),
borderTopColor: alpha(theme.palette.grey[100], 0.6),
}),
},
},
{
props: { action: 'reorder-below' },
style: {
marginLeft: 'calc(var(--TreeView-indentMultiplier) * var(--TreeView-itemDepth))',
borderBottom: `1px solid ${alpha((theme.vars || theme).palette.grey[900], 0.6)}`,
borderBottom: `1px solid ${alpha(theme.palette.grey[900], 0.6)}`,
...theme.applyStyles('dark', {
borderBottomColor: alpha((theme.vars || theme).palette.grey[100], 0.6),
borderBottomColor: alpha(theme.palette.grey[100], 0.6),
}),
},
},
Expand All @@ -52,9 +52,9 @@ const TreeItem2DragAndDropOverlayRoot = styled('div', {
style: {
marginLeft:
'calc(var(--TreeView-indentMultiplier) * calc(var(--TreeView-itemDepth) - 1))' as any,
borderBottom: `1px solid ${alpha((theme.vars || theme).palette.grey[900], 0.6)}`,
borderBottom: `1px solid ${alpha(theme.palette.grey[900], 0.6)}`,
...theme.applyStyles('dark', {
borderBottomColor: alpha((theme.vars || theme).palette.grey[900], 0.6),
borderBottomColor: alpha(theme.palette.grey[900], 0.6),
}),
},
},
Expand Down
7 changes: 3 additions & 4 deletions packages/x-tree-view/src/TreeView/TreeView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,12 @@
import * as React from 'react';
import PropTypes from 'prop-types';
import composeClasses from '@mui/utils/composeClasses';
import { styled, createUseThemeProps } from '../internals/zero-styled';
import { useDefaultProps } from '@mui/material/DefaultPropsProvider';
import { styled } from '../internals/zero-styled';
import { getTreeViewUtilityClass } from './treeViewClasses';
import { TreeViewProps } from './TreeView.types';
import { SimpleTreeView, SimpleTreeViewRoot } from '../SimpleTreeView';

const useThemeProps = createUseThemeProps('MuiTreeView');

const useUtilityClasses = <Multiple extends boolean | undefined>(
ownerState: TreeViewProps<Multiple>,
) => {
Expand Down Expand Up @@ -70,7 +69,7 @@ const TreeView = React.forwardRef(function TreeView<
warn();
}

const props = useThemeProps({ props: inProps, name: 'MuiTreeView' });
const props = useDefaultProps({ props: inProps, name: 'MuiTreeView' });

const classes = useUtilityClasses(props);

Expand Down
7 changes: 0 additions & 7 deletions packages/x-tree-view/src/internals/zero-styled/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1 @@
import { useThemeProps } from '@mui/material/styles';

export { styled } from '@mui/material/styles';

// eslint-disable-next-line @typescript-eslint/no-unused-vars
export function createUseThemeProps(name: string) {
return useThemeProps;
}
Loading