@mui/material 7.0.0-beta.3 → 7.0.0-beta.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (75) hide show
  1. package/Accordion/Accordion.d.ts +13 -2
  2. package/Accordion/Accordion.js +18 -6
  3. package/AccordionSummary/AccordionSummary.d.ts +39 -4
  4. package/AccordionSummary/AccordionSummary.js +67 -16
  5. package/CHANGELOG.md +60 -0
  6. package/ListItemText/ListItemText.d.ts +10 -0
  7. package/ListItemText/ListItemText.js +14 -5
  8. package/SpeedDial/SpeedDial.d.ts +10 -0
  9. package/SpeedDial/SpeedDial.js +40 -11
  10. package/SpeedDialAction/SpeedDialAction.js +1 -1
  11. package/TextareaAutosize/TextareaAutosize.js +25 -14
  12. package/Tooltip/Tooltip.d.ts +1 -1
  13. package/Tooltip/Tooltip.js +1 -1
  14. package/Typography/Typography.d.ts +3 -3
  15. package/esm/Accordion/Accordion.d.ts +13 -2
  16. package/esm/Accordion/Accordion.js +18 -6
  17. package/esm/AccordionSummary/AccordionSummary.d.ts +39 -4
  18. package/esm/AccordionSummary/AccordionSummary.js +67 -16
  19. package/esm/ListItemText/ListItemText.d.ts +10 -0
  20. package/esm/ListItemText/ListItemText.js +14 -5
  21. package/esm/SpeedDial/SpeedDial.d.ts +10 -0
  22. package/esm/SpeedDial/SpeedDial.js +40 -11
  23. package/esm/SpeedDialAction/SpeedDialAction.js +1 -1
  24. package/esm/TextareaAutosize/TextareaAutosize.js +26 -15
  25. package/esm/Tooltip/Tooltip.d.ts +1 -1
  26. package/esm/Tooltip/Tooltip.js +1 -1
  27. package/esm/Typography/Typography.d.ts +3 -3
  28. package/esm/index.js +1 -1
  29. package/esm/styles/ThemeProvider.d.ts +6 -0
  30. package/esm/styles/ThemeProvider.js +11 -0
  31. package/esm/styles/adaptV4Theme.d.ts +2 -2
  32. package/esm/styles/createThemeNoVars.d.ts +3 -3
  33. package/esm/styles/createTypography.d.ts +4 -4
  34. package/esm/styles/index.d.ts +1 -1
  35. package/esm/styles/responsiveFontSizes.d.ts +3 -3
  36. package/esm/useScrollTrigger/useScrollTrigger.d.ts +1 -1
  37. package/esm/useScrollTrigger/useScrollTrigger.js +3 -0
  38. package/esm/version/index.js +2 -2
  39. package/index.js +1 -1
  40. package/modern/Accordion/Accordion.d.ts +13 -2
  41. package/modern/Accordion/Accordion.js +18 -6
  42. package/modern/AccordionSummary/AccordionSummary.d.ts +39 -4
  43. package/modern/AccordionSummary/AccordionSummary.js +67 -16
  44. package/modern/ListItemText/ListItemText.d.ts +10 -0
  45. package/modern/ListItemText/ListItemText.js +14 -5
  46. package/modern/SpeedDial/SpeedDial.d.ts +10 -0
  47. package/modern/SpeedDial/SpeedDial.js +40 -11
  48. package/modern/SpeedDialAction/SpeedDialAction.js +1 -1
  49. package/modern/TextareaAutosize/TextareaAutosize.js +26 -15
  50. package/modern/Tooltip/Tooltip.d.ts +1 -1
  51. package/modern/Tooltip/Tooltip.js +1 -1
  52. package/modern/Typography/Typography.d.ts +3 -3
  53. package/modern/index.js +1 -1
  54. package/modern/styles/ThemeProvider.d.ts +6 -0
  55. package/modern/styles/ThemeProvider.js +11 -0
  56. package/modern/styles/adaptV4Theme.d.ts +2 -2
  57. package/modern/styles/createThemeNoVars.d.ts +3 -3
  58. package/modern/styles/createTypography.d.ts +4 -4
  59. package/modern/styles/index.d.ts +1 -1
  60. package/modern/styles/responsiveFontSizes.d.ts +3 -3
  61. package/modern/useScrollTrigger/useScrollTrigger.d.ts +1 -1
  62. package/modern/useScrollTrigger/useScrollTrigger.js +3 -0
  63. package/modern/version/index.js +2 -2
  64. package/package.json +6 -6
  65. package/styles/ThemeProvider.d.ts +6 -0
  66. package/styles/ThemeProvider.js +11 -0
  67. package/styles/adaptV4Theme.d.ts +2 -2
  68. package/styles/createThemeNoVars.d.ts +3 -3
  69. package/styles/createTypography.d.ts +4 -4
  70. package/styles/index.d.ts +1 -1
  71. package/styles/responsiveFontSizes.d.ts +3 -3
  72. package/tsconfig.build.tsbuildinfo +1 -1
  73. package/useScrollTrigger/useScrollTrigger.d.ts +1 -1
  74. package/useScrollTrigger/useScrollTrigger.js +3 -0
  75. package/version/index.js +2 -2
@@ -185,6 +185,20 @@ const Accordion = /*#__PURE__*/React.forwardRef(function Accordion(inProps, ref)
185
185
  slots: backwardCompatibleSlots,
186
186
  slotProps: backwardCompatibleSlotProps
187
187
  };
188
+ const [RootSlot, rootProps] = useSlot('root', {
189
+ elementType: AccordionRoot,
190
+ externalForwardedProps: {
191
+ ...externalForwardedProps,
192
+ ...other
193
+ },
194
+ className: clsx(classes.root, className),
195
+ shouldForwardComponentProp: true,
196
+ ownerState,
197
+ ref,
198
+ additionalProps: {
199
+ square
200
+ }
201
+ });
188
202
  const [AccordionHeadingSlot, accordionProps] = useSlot('heading', {
189
203
  elementType: AccordionHeading,
190
204
  externalForwardedProps,
@@ -196,12 +210,8 @@ const Accordion = /*#__PURE__*/React.forwardRef(function Accordion(inProps, ref)
196
210
  externalForwardedProps,
197
211
  ownerState
198
212
  });
199
- return /*#__PURE__*/_jsxs(AccordionRoot, {
200
- className: clsx(classes.root, className),
201
- ref: ref,
202
- ownerState: ownerState,
203
- square: square,
204
- ...other,
213
+ return /*#__PURE__*/_jsxs(RootSlot, {
214
+ ...rootProps,
205
215
  children: [/*#__PURE__*/_jsx(AccordionHeadingSlot, {
206
216
  ...accordionProps,
207
217
  children: /*#__PURE__*/_jsx(AccordionContext.Provider, {
@@ -281,6 +291,7 @@ process.env.NODE_ENV !== "production" ? Accordion.propTypes /* remove-proptypes
281
291
  */
282
292
  slotProps: PropTypes.shape({
283
293
  heading: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
294
+ root: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
284
295
  transition: PropTypes.oneOfType([PropTypes.func, PropTypes.object])
285
296
  }),
286
297
  /**
@@ -289,6 +300,7 @@ process.env.NODE_ENV !== "production" ? Accordion.propTypes /* remove-proptypes
289
300
  */
290
301
  slots: PropTypes.shape({
291
302
  heading: PropTypes.elementType,
303
+ root: PropTypes.elementType,
292
304
  transition: PropTypes.elementType
293
305
  }),
294
306
  /**
@@ -1,13 +1,47 @@
1
1
  import * as React from 'react';
2
2
  import { SxProps } from '@mui/system';
3
- import { ExtendButtonBase, ExtendButtonBaseTypeMap } from "../ButtonBase/index.js";
3
+ import { ButtonBaseProps, ExtendButtonBase, ExtendButtonBaseTypeMap } from "../ButtonBase/index.js";
4
4
  import { OverrideProps } from "../OverridableComponent/index.js";
5
- import { Theme } from "../index.js";
5
+ import { CreateSlotsAndSlotProps, SlotProps, Theme } from "../index.js";
6
6
  import { AccordionSummaryClasses } from "./accordionSummaryClasses.js";
7
- export interface AccordionSummaryOwnProps {
7
+ export interface AccordionSummarySlots {
8
8
  /**
9
- * The content of the component.
9
+ * The component that renders the root slot.
10
+ * @default ButtonBase
10
11
  */
12
+ root: React.ElementType;
13
+ /**
14
+ * The component that renders the content slot.
15
+ * @default div
16
+ */
17
+ content: React.ElementType;
18
+ /**
19
+ * The component that renders the expand icon wrapper slot.
20
+ * @default div
21
+ */
22
+ expandIconWrapper: React.ElementType;
23
+ }
24
+ export interface AccordionSummaryRootSlotPropsOverrides {}
25
+ export interface AccordionSummaryContentSlotPropsOverrides {}
26
+ export interface AccordionSummaryExpandIconWrapperSlotPropsOverrides {}
27
+ export type AccordionSummarySlotsAndSlotProps = CreateSlotsAndSlotProps<AccordionSummarySlots, {
28
+ /**
29
+ * Props forwarded to the root slot.
30
+ * By default, the avaible props are based on the [ButtonBase](https://mui.com/material-ui/api/button-base/#props) component.
31
+ */
32
+ root: SlotProps<React.ElementType<ButtonBaseProps>, AccordionSummaryRootSlotPropsOverrides, AccordionSummaryOwnerState>;
33
+ /**
34
+ * Props forwarded to the content slot.
35
+ * By default, the avaible props are based on a div element.
36
+ */
37
+ content: SlotProps<'div', AccordionSummaryContentSlotPropsOverrides, AccordionSummaryOwnerState>;
38
+ /**
39
+ * Props forwarded to the expand icon wrapper slot.
40
+ * By default, the avaible props are based on a div element.
41
+ */
42
+ expandIconWrapper: SlotProps<'div', AccordionSummaryExpandIconWrapperSlotPropsOverrides, AccordionSummaryOwnerState>;
43
+ }>;
44
+ export interface AccordionSummaryOwnProps extends AccordionSummarySlotsAndSlotProps {
11
45
  children?: React.ReactNode;
12
46
  /**
13
47
  * Override or extend the styles applied to the component.
@@ -26,6 +60,7 @@ export type AccordionSummaryTypeMap<AdditionalProps = {}, RootComponent extends
26
60
  props: AdditionalProps & AccordionSummaryOwnProps;
27
61
  defaultComponent: RootComponent;
28
62
  }>;
63
+ export interface AccordionSummaryOwnerState extends Omit<AccordionSummaryProps, 'slots' | 'slotProps'> {}
29
64
 
30
65
  /**
31
66
  *
@@ -10,6 +10,7 @@ import { useDefaultProps } from "../DefaultPropsProvider/index.js";
10
10
  import ButtonBase from "../ButtonBase/index.js";
11
11
  import AccordionContext from "../Accordion/AccordionContext.js";
12
12
  import accordionSummaryClasses, { getAccordionSummaryUtilityClass } from "./accordionSummaryClasses.js";
13
+ import useSlot from "../utils/useSlot.js";
13
14
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
14
15
  const useUtilityClasses = ownerState => {
15
16
  const {
@@ -112,6 +113,8 @@ const AccordionSummary = /*#__PURE__*/React.forwardRef(function AccordionSummary
112
113
  expandIcon,
113
114
  focusVisibleClassName,
114
115
  onClick,
116
+ slots,
117
+ slotProps,
115
118
  ...other
116
119
  } = props;
117
120
  const {
@@ -135,24 +138,54 @@ const AccordionSummary = /*#__PURE__*/React.forwardRef(function AccordionSummary
135
138
  disableGutters
136
139
  };
137
140
  const classes = useUtilityClasses(ownerState);
138
- return /*#__PURE__*/_jsxs(AccordionSummaryRoot, {
139
- focusRipple: false,
140
- disableRipple: true,
141
- disabled: disabled,
142
- "aria-expanded": expanded,
141
+ const externalForwardedProps = {
142
+ slots,
143
+ slotProps
144
+ };
145
+ const [RootSlot, rootSlotProps] = useSlot('root', {
146
+ ref,
147
+ shouldForwardComponentProp: true,
143
148
  className: clsx(classes.root, className),
144
- focusVisibleClassName: clsx(classes.focusVisible, focusVisibleClassName),
145
- onClick: handleChange,
146
- ref: ref,
147
- ownerState: ownerState,
148
- ...other,
149
- children: [/*#__PURE__*/_jsx(AccordionSummaryContent, {
150
- className: classes.content,
151
- ownerState: ownerState,
149
+ elementType: AccordionSummaryRoot,
150
+ externalForwardedProps: {
151
+ ...externalForwardedProps,
152
+ ...other
153
+ },
154
+ ownerState,
155
+ additionalProps: {
156
+ focusRipple: false,
157
+ disableRipple: true,
158
+ disabled,
159
+ 'aria-expanded': expanded,
160
+ focusVisibleClassName: clsx(classes.focusVisible, focusVisibleClassName)
161
+ },
162
+ getSlotProps: handlers => ({
163
+ ...handlers,
164
+ onClick: event => {
165
+ handlers.onClick?.(event);
166
+ handleChange(event);
167
+ }
168
+ })
169
+ });
170
+ const [ContentSlot, contentSlotProps] = useSlot('content', {
171
+ className: classes.content,
172
+ elementType: AccordionSummaryContent,
173
+ externalForwardedProps,
174
+ ownerState
175
+ });
176
+ const [ExpandIconWrapperSlot, expandIconWrapperSlotProps] = useSlot('expandIconWrapper', {
177
+ className: classes.expandIconWrapper,
178
+ elementType: AccordionSummaryExpandIconWrapper,
179
+ externalForwardedProps,
180
+ ownerState
181
+ });
182
+ return /*#__PURE__*/_jsxs(RootSlot, {
183
+ ...rootSlotProps,
184
+ children: [/*#__PURE__*/_jsx(ContentSlot, {
185
+ ...contentSlotProps,
152
186
  children: children
153
- }), expandIcon && /*#__PURE__*/_jsx(AccordionSummaryExpandIconWrapper, {
154
- className: classes.expandIconWrapper,
155
- ownerState: ownerState,
187
+ }), expandIcon && /*#__PURE__*/_jsx(ExpandIconWrapperSlot, {
188
+ ...expandIconWrapperSlotProps,
156
189
  children: expandIcon
157
190
  })]
158
191
  });
@@ -191,6 +224,24 @@ process.env.NODE_ENV !== "production" ? AccordionSummary.propTypes /* remove-pro
191
224
  * @ignore
192
225
  */
193
226
  onClick: PropTypes.func,
227
+ /**
228
+ * The props used for each slot inside.
229
+ * @default {}
230
+ */
231
+ slotProps: PropTypes.shape({
232
+ content: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
233
+ expandIconWrapper: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
234
+ root: PropTypes.oneOfType([PropTypes.func, PropTypes.object])
235
+ }),
236
+ /**
237
+ * The components used for each slot inside.
238
+ * @default {}
239
+ */
240
+ slots: PropTypes.shape({
241
+ content: PropTypes.elementType,
242
+ expandIconWrapper: PropTypes.elementType,
243
+ root: PropTypes.elementType
244
+ }),
194
245
  /**
195
246
  * The system prop that allows defining system overrides as well as additional CSS styles.
196
247
  */
@@ -5,6 +5,11 @@ import { TypographyProps } from "../Typography/index.js";
5
5
  import { ListItemTextClasses } from "./listItemTextClasses.js";
6
6
  import { CreateSlotsAndSlotProps, SlotProps } from "../utils/types.js";
7
7
  export interface ListItemTextSlots {
8
+ /**
9
+ * The component that renders the root slot.
10
+ * @default 'div'
11
+ */
12
+ root?: React.ElementType;
8
13
  /**
9
14
  * The component that renders the primary slot.
10
15
  * @default Typography
@@ -17,6 +22,11 @@ export interface ListItemTextSlots {
17
22
  secondary?: React.ElementType;
18
23
  }
19
24
  export type ListItemTextSlotsAndSlotProps = CreateSlotsAndSlotProps<ListItemTextSlots, {
25
+ /**
26
+ * Props forwared to the root slot.
27
+ * By default, the available props are based on `div` element.
28
+ */
29
+ root: SlotProps<'div', {}, ListItemTextOwnerState>;
20
30
  /**
21
31
  * Props forwared to the primary slot (as long as disableTypography is not `true`)
22
32
  * By default, the available props are based on the [Typography](https://mui.com/material-ui/api/typography/#props) component
@@ -107,6 +107,16 @@ const ListItemText = /*#__PURE__*/React.forwardRef(function ListItemText(inProps
107
107
  ...slotProps
108
108
  }
109
109
  };
110
+ const [RootSlot, rootSlotProps] = useSlot('root', {
111
+ className: clsx(classes.root, className),
112
+ elementType: ListItemTextRoot,
113
+ externalForwardedProps: {
114
+ ...externalForwardedProps,
115
+ ...other
116
+ },
117
+ ownerState,
118
+ ref
119
+ });
110
120
  const [PrimarySlot, primarySlotProps] = useSlot('primary', {
111
121
  className: classes.primary,
112
122
  elementType: Typography,
@@ -135,11 +145,8 @@ const ListItemText = /*#__PURE__*/React.forwardRef(function ListItemText(inProps
135
145
  children: secondary
136
146
  });
137
147
  }
138
- return /*#__PURE__*/_jsxs(ListItemTextRoot, {
139
- className: clsx(classes.root, className),
140
- ownerState: ownerState,
141
- ref: ref,
142
- ...other,
148
+ return /*#__PURE__*/_jsxs(RootSlot, {
149
+ ...rootSlotProps,
143
150
  children: [primary, secondary]
144
151
  });
145
152
  });
@@ -200,6 +207,7 @@ process.env.NODE_ENV !== "production" ? ListItemText.propTypes /* remove-proptyp
200
207
  */
201
208
  slotProps: PropTypes.shape({
202
209
  primary: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
210
+ root: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
203
211
  secondary: PropTypes.oneOfType([PropTypes.func, PropTypes.object])
204
212
  }),
205
213
  /**
@@ -208,6 +216,7 @@ process.env.NODE_ENV !== "production" ? ListItemText.propTypes /* remove-proptyp
208
216
  */
209
217
  slots: PropTypes.shape({
210
218
  primary: PropTypes.elementType,
219
+ root: PropTypes.elementType,
211
220
  secondary: PropTypes.elementType
212
221
  }),
213
222
  /**
@@ -9,6 +9,11 @@ import { CreateSlotsAndSlotProps, SlotComponentProps } from "../utils/types.js";
9
9
  export type CloseReason = 'toggle' | 'blur' | 'mouseLeave' | 'escapeKeyDown';
10
10
  export type OpenReason = 'toggle' | 'focus' | 'mouseEnter';
11
11
  export interface SpeedDialSlots {
12
+ /**
13
+ * The component that renders the root slot.
14
+ * @default 'div'
15
+ */
16
+ root: React.ElementType;
12
17
  /**
13
18
  * The component that renders the transition.
14
19
  * [Follow this guide](https://mui.com/material-ui/transitions/#transitioncomponent-prop) to learn more about the requirements for this component.
@@ -17,6 +22,11 @@ export interface SpeedDialSlots {
17
22
  transition: React.ElementType;
18
23
  }
19
24
  export type SpeedDialSlotsAndSlotProps = CreateSlotsAndSlotProps<SpeedDialSlots, {
25
+ /**
26
+ * Props forwarded to the root slot.
27
+ * By default, the avaible props are based on div element.
28
+ */
29
+ root: SlotComponentProps<'div', React.HTMLAttributes<HTMLDivElement>, SpeedDialOwnerState>;
20
30
  /**
21
31
  * Props forwarded to the transition slot.
22
32
  * By default, the avaible props are based on the [Zoom](https://mui.com/material-ui/api/zoom/#props) component.
@@ -372,22 +372,49 @@ const SpeedDial = /*#__PURE__*/React.forwardRef(function SpeedDial(inProps, ref)
372
372
  slots: backwardCompatibleSlots,
373
373
  slotProps: backwardCompatibleSlotProps
374
374
  };
375
+ const [RootSlot, rootSlotProps] = useSlot('root', {
376
+ elementType: SpeedDialRoot,
377
+ externalForwardedProps: {
378
+ ...externalForwardedProps,
379
+ ...other
380
+ },
381
+ ownerState,
382
+ ref,
383
+ className: clsx(classes.root, className),
384
+ additionalProps: {
385
+ role: 'presentation'
386
+ },
387
+ getSlotProps: handlers => ({
388
+ ...handlers,
389
+ onKeyDown: event => {
390
+ handlers.onKeyDown?.(event);
391
+ handleKeyDown(event);
392
+ },
393
+ onBlur: event => {
394
+ handlers.onBlur?.(event);
395
+ handleClose(event);
396
+ },
397
+ onFocus: event => {
398
+ handlers.onFocus?.(event);
399
+ handleOpen(event);
400
+ },
401
+ onMouseEnter: event => {
402
+ handlers.onMouseEnter?.(event);
403
+ handleOpen(event);
404
+ },
405
+ onMouseLeave: event => {
406
+ handlers.onMouseLeave?.(event);
407
+ handleClose(event);
408
+ }
409
+ })
410
+ });
375
411
  const [TransitionSlot, transitionProps] = useSlot('transition', {
376
412
  elementType: Zoom,
377
413
  externalForwardedProps,
378
414
  ownerState
379
415
  });
380
- return /*#__PURE__*/_jsxs(SpeedDialRoot, {
381
- className: clsx(classes.root, className),
382
- ref: ref,
383
- role: "presentation",
384
- onKeyDown: handleKeyDown,
385
- onBlur: handleClose,
386
- onFocus: handleOpen,
387
- onMouseEnter: handleOpen,
388
- onMouseLeave: handleClose,
389
- ownerState: ownerState,
390
- ...other,
416
+ return /*#__PURE__*/_jsxs(RootSlot, {
417
+ ...rootSlotProps,
391
418
  children: [/*#__PURE__*/_jsx(TransitionSlot, {
392
419
  in: !hidden,
393
420
  timeout: transitionDuration,
@@ -507,6 +534,7 @@ process.env.NODE_ENV !== "production" ? SpeedDial.propTypes /* remove-proptypes
507
534
  * @default {}
508
535
  */
509
536
  slotProps: PropTypes.shape({
537
+ root: PropTypes.oneOfType([PropTypes.func, PropTypes.object]),
510
538
  transition: PropTypes.oneOfType([PropTypes.func, PropTypes.object])
511
539
  }),
512
540
  /**
@@ -514,6 +542,7 @@ process.env.NODE_ENV !== "production" ? SpeedDial.propTypes /* remove-proptypes
514
542
  * @default {}
515
543
  */
516
544
  slots: PropTypes.shape({
545
+ root: PropTypes.elementType,
517
546
  transition: PropTypes.elementType
518
547
  }),
519
548
  /**
@@ -341,7 +341,7 @@ process.env.NODE_ENV !== "production" ? SpeedDialAction.propTypes /* remove-prop
341
341
  * @default 'left'
342
342
  * @deprecated Use `slotProps.tooltip.placement` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
343
343
  */
344
- tooltipPlacement: PropTypes.oneOf(['bottom-end', 'bottom-start', 'bottom', 'left-end', 'left-start', 'left', 'right-end', 'right-start', 'right', 'top-end', 'top-start', 'top']),
344
+ tooltipPlacement: PropTypes.oneOf(['auto-end', 'auto-start', 'auto', 'bottom-end', 'bottom-start', 'bottom', 'left-end', 'left-start', 'left', 'right-end', 'right-start', 'right', 'top-end', 'top-start', 'top']),
345
345
  /**
346
346
  * Label to display in the tooltip.
347
347
  * @deprecated Use `slotProps.tooltip.title` instead. This prop will be removed in v7. See [Migrating from deprecated APIs](/material-ui/migration/migrating-from-deprecated-apis/) for more details.
@@ -2,7 +2,7 @@
2
2
 
3
3
  import * as React from 'react';
4
4
  import PropTypes from 'prop-types';
5
- import { unstable_debounce as debounce, unstable_useForkRef as useForkRef, unstable_useEnhancedEffect as useEnhancedEffect, unstable_ownerWindow as ownerWindow } from '@mui/utils';
5
+ import { unstable_debounce as debounce, unstable_useForkRef as useForkRef, unstable_useEnhancedEffect as useEnhancedEffect, unstable_useEventCallback as useEventCallback, unstable_ownerWindow as ownerWindow } from '@mui/utils';
6
6
  import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
7
7
  function getStyleValue(value) {
8
8
  return parseInt(value, 10) || 0;
@@ -112,6 +112,15 @@ const TextareaAutosize = /*#__PURE__*/React.forwardRef(function TextareaAutosize
112
112
  overflowing
113
113
  };
114
114
  }, [maxRows, minRows, props.placeholder]);
115
+ const didHeightChange = useEventCallback(() => {
116
+ const textarea = textareaRef.current;
117
+ const textareaStyles = calculateTextareaStyles();
118
+ if (!textarea || !textareaStyles || isEmpty(textareaStyles)) {
119
+ return false;
120
+ }
121
+ const outerHeightStyle = textareaStyles.outerHeightStyle;
122
+ return heightRef.current != null && heightRef.current !== outerHeightStyle;
123
+ });
115
124
  const syncHeight = React.useCallback(() => {
116
125
  const textarea = textareaRef.current;
117
126
  const textareaStyles = calculateTextareaStyles();
@@ -127,37 +136,39 @@ const TextareaAutosize = /*#__PURE__*/React.forwardRef(function TextareaAutosize
127
136
  }, [calculateTextareaStyles]);
128
137
  const frameRef = React.useRef(-1);
129
138
  useEnhancedEffect(() => {
130
- const debounceHandleResize = debounce(() => syncHeight());
139
+ const debouncedHandleResize = debounce(syncHeight);
131
140
  const textarea = textareaRef?.current;
132
141
  if (!textarea) {
133
142
  return undefined;
134
143
  }
135
144
  const containerWindow = ownerWindow(textarea);
136
- containerWindow.addEventListener('resize', debounceHandleResize);
145
+ containerWindow.addEventListener('resize', debouncedHandleResize);
137
146
  let resizeObserver;
138
147
  if (typeof ResizeObserver !== 'undefined') {
139
148
  resizeObserver = new ResizeObserver(() => {
140
- // avoid "ResizeObserver loop completed with undelivered notifications" error
141
- // by temporarily unobserving the textarea element while manipulating the height
142
- // and reobserving one frame later
143
- resizeObserver.unobserve(textarea);
144
- cancelAnimationFrame(frameRef.current);
145
- syncHeight();
146
- frameRef.current = requestAnimationFrame(() => {
147
- resizeObserver.observe(textarea);
148
- });
149
+ if (didHeightChange()) {
150
+ // avoid "ResizeObserver loop completed with undelivered notifications" error
151
+ // by temporarily unobserving the textarea element while manipulating the height
152
+ // and reobserving one frame later
153
+ resizeObserver.unobserve(textarea);
154
+ cancelAnimationFrame(frameRef.current);
155
+ syncHeight();
156
+ frameRef.current = requestAnimationFrame(() => {
157
+ resizeObserver.observe(textarea);
158
+ });
159
+ }
149
160
  });
150
161
  resizeObserver.observe(textarea);
151
162
  }
152
163
  return () => {
153
- debounceHandleResize.clear();
164
+ debouncedHandleResize.clear();
154
165
  cancelAnimationFrame(frameRef.current);
155
- containerWindow.removeEventListener('resize', debounceHandleResize);
166
+ containerWindow.removeEventListener('resize', debouncedHandleResize);
156
167
  if (resizeObserver) {
157
168
  resizeObserver.disconnect();
158
169
  }
159
170
  };
160
- }, [calculateTextareaStyles, syncHeight]);
171
+ }, [calculateTextareaStyles, syncHeight, didHeightChange]);
161
172
  useEnhancedEffect(() => {
162
173
  syncHeight();
163
174
  });
@@ -178,7 +178,7 @@ export interface TooltipProps extends StandardProps<React.HTMLAttributes<HTMLDiv
178
178
  * Tooltip placement.
179
179
  * @default 'bottom'
180
180
  */
181
- placement?: 'bottom-end' | 'bottom-start' | 'bottom' | 'left-end' | 'left-start' | 'left' | 'right-end' | 'right-start' | 'right' | 'top-end' | 'top-start' | 'top';
181
+ placement?: PopperProps['placement'];
182
182
  /**
183
183
  * The component used for the popper.
184
184
  * @deprecated use the `slots.popper` prop instead. This prop will be removed in v7. See [Migrating from deprecated APIs](https://mui.com/material-ui/migration/migrating-from-deprecated-apis/) for more details.
@@ -841,7 +841,7 @@ process.env.NODE_ENV !== "production" ? Tooltip.propTypes /* remove-proptypes */
841
841
  * Tooltip placement.
842
842
  * @default 'bottom'
843
843
  */
844
- placement: PropTypes.oneOf(['bottom-end', 'bottom-start', 'bottom', 'left-end', 'left-start', 'left', 'right-end', 'right-start', 'right', 'top-end', 'top-start', 'top']),
844
+ placement: PropTypes.oneOf(['auto-end', 'auto-start', 'auto', 'bottom-end', 'bottom-start', 'bottom', 'left-end', 'left-start', 'left', 'right-end', 'right-start', 'right', 'top-end', 'top-start', 'top']),
845
845
  /**
846
846
  * The component used for the popper.
847
847
  * @deprecated use the `slots.popper` prop instead. This prop will be removed in v7. See [Migrating from deprecated APIs](https://mui.com/material-ui/migration/migrating-from-deprecated-apis/) for more details.
@@ -3,7 +3,7 @@ import { OverridableStringUnion } from '@mui/types';
3
3
  import { SxProps, SystemProps } from '@mui/system';
4
4
  import { Theme, TypeText } from "../styles/index.js";
5
5
  import { OverrideProps, OverridableComponent } from "../OverridableComponent/index.js";
6
- import { Variant } from "../styles/createTypography.js";
6
+ import { TypographyVariant } from "../styles/createTypography.js";
7
7
  import { TypographyClasses } from "./typographyClasses.js";
8
8
  export interface TypographyPropsVariantOverrides {}
9
9
  export interface TypographyPropsColorOverrides {}
@@ -54,7 +54,7 @@ export interface TypographyOwnProps extends Omit<SystemProps<Theme>, 'color'> {
54
54
  * Applies the theme typography styles.
55
55
  * @default 'body1'
56
56
  */
57
- variant?: OverridableStringUnion<Variant | 'inherit', TypographyPropsVariantOverrides>;
57
+ variant?: OverridableStringUnion<TypographyVariant | 'inherit', TypographyPropsVariantOverrides>;
58
58
  /**
59
59
  * The component maps the variant prop to a range of different HTML element types.
60
60
  * For instance, subtitle1 to `<h6>`.
@@ -74,7 +74,7 @@ export interface TypographyOwnProps extends Omit<SystemProps<Theme>, 'color'> {
74
74
  * inherit: 'p',
75
75
  * }
76
76
  */
77
- variantMapping?: Partial<Record<OverridableStringUnion<Variant | 'inherit', TypographyPropsVariantOverrides>, string>>;
77
+ variantMapping?: Partial<Record<OverridableStringUnion<TypographyVariant | 'inherit', TypographyPropsVariantOverrides>, string>>;
78
78
  }
79
79
  export interface TypographyTypeMap<AdditionalProps = {}, RootComponent extends React.ElementType = 'span'> {
80
80
  props: AdditionalProps & TypographyOwnProps;
package/esm/index.js CHANGED
@@ -1,5 +1,5 @@
1
1
  /**
2
- * @mui/material v7.0.0-beta.3
2
+ * @mui/material v7.0.0-beta.4
3
3
  *
4
4
  * @license MIT
5
5
  * This source code is licensed under the MIT license found in the
@@ -21,6 +21,12 @@ type ThemeProviderCssVariablesProps = CssThemeVariables extends {
21
21
  * @default false
22
22
  */
23
23
  disableStyleSheetGeneration?: boolean;
24
+ /**
25
+ * If `true`, theme values are recalculated when the mode changes.
26
+ * The `theme.colorSchemes.{mode}.*` nodes will be shallow merged to the top-level of the theme.
27
+ * @default false
28
+ */
29
+ forceThemeRerender?: boolean;
24
30
  } : {};
25
31
  export interface ThemeProviderProps<Theme = DefaultTheme> extends ThemeProviderCssVariablesProps {
26
32
  children?: React.ReactNode;
@@ -17,6 +17,17 @@ export default function ThemeProvider({
17
17
  }
18
18
  const muiTheme = THEME_ID in theme ? theme[THEME_ID] : theme;
19
19
  if (!('colorSchemes' in muiTheme)) {
20
+ if (!('vars' in muiTheme)) {
21
+ // For non-CSS variables themes, set `vars` to null to prevent theme inheritance from the upper theme.
22
+ // The example use case is the docs demo that uses ThemeProvider to customize the theme while the upper theme is using CSS variables.
23
+ return /*#__PURE__*/_jsx(ThemeProviderNoVars, {
24
+ theme: {
25
+ ...theme,
26
+ vars: null
27
+ },
28
+ ...props
29
+ });
30
+ }
20
31
  return /*#__PURE__*/_jsx(ThemeProviderNoVars, {
21
32
  theme: theme,
22
33
  ...props
@@ -1,7 +1,7 @@
1
1
  import { BreakpointsOptions, ShapeOptions, SpacingOptions } from '@mui/system';
2
2
  import { MixinsOptions } from "./createMixins.js";
3
3
  import { Palette, PaletteOptions } from "./createPalette.js";
4
- import { TypographyOptions } from "./createTypography.js";
4
+ import { TypographyVariantsOptions } from "./createTypography.js";
5
5
  import { Shadows } from "./shadows.js";
6
6
  import { TransitionsOptions } from "./createTransitions.js";
7
7
  import { ZIndexOptions } from "./zIndex.js";
@@ -21,7 +21,7 @@ export interface DeprecatedThemeOptions {
21
21
  shadows?: Shadows;
22
22
  spacing?: SpacingOptions;
23
23
  transitions?: TransitionsOptions;
24
- typography?: TypographyOptions | ((palette: Palette) => TypographyOptions);
24
+ typography?: TypographyVariantsOptions | ((palette: Palette) => TypographyVariantsOptions);
25
25
  variants?: ComponentsVariants;
26
26
  zIndex?: ZIndexOptions;
27
27
  unstable_strictMode?: boolean;
@@ -1,7 +1,7 @@
1
1
  import { ThemeOptions as SystemThemeOptions, Theme as SystemTheme, SxProps, CSSObject, SxConfig } from '@mui/system';
2
2
  import { Mixins, MixinsOptions } from "./createMixins.js";
3
3
  import { Palette, PaletteOptions } from "./createPalette.js";
4
- import { Typography, TypographyOptions } from "./createTypography.js";
4
+ import { TypographyVariants, TypographyVariantsOptions } from "./createTypography.js";
5
5
  import { Shadows } from "./shadows.js";
6
6
  import { Transitions, TransitionsOptions } from "./createTransitions.js";
7
7
  import { ZIndex, ZIndexOptions } from "./zIndex.js";
@@ -28,7 +28,7 @@ export interface ThemeOptions extends Omit<SystemThemeOptions, 'zIndex'>, CssVar
28
28
  palette?: PaletteOptions;
29
29
  shadows?: Shadows;
30
30
  transitions?: TransitionsOptions;
31
- typography?: TypographyOptions | ((palette: Palette) => TypographyOptions);
31
+ typography?: TypographyVariantsOptions | ((palette: Palette) => TypographyVariantsOptions);
32
32
  zIndex?: ZIndexOptions;
33
33
  unstable_strictMode?: boolean;
34
34
  unstable_sxConfig?: SxConfig;
@@ -40,7 +40,7 @@ export interface BaseTheme extends SystemTheme {
40
40
  } ? CssVarsPalette : {});
41
41
  shadows: Shadows;
42
42
  transitions: Transitions;
43
- typography: Typography;
43
+ typography: TypographyVariants;
44
44
  zIndex: ZIndex;
45
45
  unstable_strictMode?: boolean;
46
46
  }
@@ -1,7 +1,7 @@
1
1
  import * as React from 'react';
2
2
  import * as CSS from 'csstype';
3
3
  import { Palette } from "./createPalette.js";
4
- export type Variant = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6' | 'subtitle1' | 'subtitle2' | 'body1' | 'body2' | 'caption' | 'button' | 'overline';
4
+ export type TypographyVariant = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6' | 'subtitle1' | 'subtitle2' | 'body1' | 'body2' | 'caption' | 'button' | 'overline';
5
5
  export interface FontStyle {
6
6
  fontFamily: React.CSSProperties['fontFamily'];
7
7
  fontSize: number;
@@ -45,6 +45,6 @@ export interface TypographyStyleOptions extends TypographyStyle {}
45
45
  export interface TypographyUtils {
46
46
  pxToRem: (px: number) => string;
47
47
  }
48
- export interface Typography extends Record<Variant, TypographyStyle>, FontStyle, TypographyUtils {}
49
- export interface TypographyOptions extends Partial<Record<Variant, TypographyStyleOptions> & FontStyleOptions> {}
50
- export default function createTypography(palette: Palette, typography: TypographyOptions | ((palette: Palette) => TypographyOptions)): Typography;
48
+ export interface TypographyVariants extends Record<TypographyVariant, TypographyStyle>, FontStyle, TypographyUtils {}
49
+ export interface TypographyVariantsOptions extends Partial<Record<TypographyVariant, TypographyStyleOptions> & FontStyleOptions> {}
50
+ export default function createTypography(palette: Palette, typography: TypographyVariantsOptions | ((palette: Palette) => TypographyVariantsOptions)): TypographyVariants;
@@ -6,7 +6,7 @@ export { ZIndex } from "./zIndex.js";
6
6
  export { CommonColors, Palette, PaletteColor, PaletteColorOptions, PaletteOptions, SimplePaletteColorOptions, TypeText, TypeAction, TypeBackground, PaletteMode, Color } from "./createPalette.js";
7
7
  export { default as createColorScheme } from "./createColorScheme.js";
8
8
  export { default as createStyles } from "./createStyles.js";
9
- export { Typography as TypographyVariants, TypographyOptions as TypographyVariantsOptions, TypographyStyle, Variant as TypographyVariant } from "./createTypography.js";
9
+ export { TypographyVariants, TypographyVariantsOptions, TypographyStyle, TypographyVariant } from "./createTypography.js";
10
10
  export { default as responsiveFontSizes } from "./responsiveFontSizes.js";
11
11
  export { Duration, Easing, Transitions, TransitionsOptions, duration, easing } from "./createTransitions.js";
12
12
  export { Mixins } from "./createMixins.js";