@mui/material 6.4.3 → 7.0.0-alpha.0

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 (194) hide show
  1. package/Accordion/Accordion.d.ts +3 -3
  2. package/AccordionActions/AccordionActions.d.ts +2 -2
  3. package/AccordionDetails/AccordionDetails.d.ts +2 -2
  4. package/AccordionSummary/AccordionSummary.d.ts +3 -3
  5. package/Alert/Alert.d.ts +3 -3
  6. package/AlertTitle/AlertTitle.d.ts +3 -3
  7. package/AppBar/AppBar.d.ts +3 -3
  8. package/Autocomplete/Autocomplete.d.ts +2 -2
  9. package/Avatar/Avatar.d.ts +2 -2
  10. package/AvatarGroup/AvatarGroup.d.ts +2 -2
  11. package/Backdrop/Backdrop.d.ts +3 -3
  12. package/Badge/Badge.d.ts +3 -3
  13. package/BottomNavigation/BottomNavigation.d.ts +2 -2
  14. package/BottomNavigationAction/BottomNavigationAction.d.ts +3 -3
  15. package/Box/Box.d.ts +2 -2
  16. package/Breadcrumbs/Breadcrumbs.d.ts +3 -3
  17. package/Button/Button.d.ts +4 -4
  18. package/ButtonBase/ButtonBase.d.ts +2 -2
  19. package/ButtonGroup/ButtonGroup.d.ts +2 -2
  20. package/CHANGELOG.md +24 -2242
  21. package/Card/Card.d.ts +3 -3
  22. package/CardActionArea/CardActionArea.d.ts +3 -3
  23. package/CardActions/CardActions.d.ts +2 -2
  24. package/CardContent/CardContent.d.ts +2 -2
  25. package/CardHeader/CardHeader.d.ts +2 -2
  26. package/CardMedia/CardMedia.d.ts +2 -2
  27. package/Checkbox/Checkbox.d.ts +4 -4
  28. package/Chip/Chip.d.ts +2 -2
  29. package/CircularProgress/CircularProgress.d.ts +3 -7
  30. package/ClickAwayListener/ClickAwayListener.d.ts +3 -3
  31. package/ClickAwayListener/ClickAwayListener.js +3 -3
  32. package/Collapse/Collapse.d.ts +5 -5
  33. package/Container/Container.d.ts +2 -2
  34. package/CssBaseline/CssBaseline.d.ts +2 -2
  35. package/Dialog/Dialog.d.ts +3 -3
  36. package/DialogActions/DialogActions.d.ts +2 -2
  37. package/DialogContent/DialogContent.d.ts +2 -2
  38. package/DialogContentText/DialogContentText.d.ts +3 -3
  39. package/DialogTitle/DialogTitle.d.ts +3 -3
  40. package/Divider/Divider.d.ts +3 -3
  41. package/Drawer/Drawer.d.ts +3 -3
  42. package/Fab/Fab.d.ts +3 -3
  43. package/Fade/Fade.d.ts +3 -3
  44. package/FilledInput/FilledInput.d.ts +3 -3
  45. package/FormControl/FormControl.d.ts +6 -6
  46. package/FormControlLabel/FormControlLabel.d.ts +4 -4
  47. package/FormGroup/FormGroup.d.ts +3 -3
  48. package/FormHelperText/FormHelperText.d.ts +2 -2
  49. package/FormLabel/FormLabel.d.ts +4 -4
  50. package/GlobalStyles/GlobalStyles.d.ts +2 -2
  51. package/Grid/Grid.d.ts +2 -2
  52. package/Grid2/Grid2.d.ts +2 -2
  53. package/Grid2/Grid2.js +2 -2
  54. package/Grow/Grow.d.ts +5 -5
  55. package/Hidden/Hidden.d.ts +2 -2
  56. package/Icon/Icon.d.ts +3 -3
  57. package/IconButton/IconButton.d.ts +4 -4
  58. package/ImageList/ImageList.d.ts +2 -2
  59. package/ImageListItem/ImageListItem.d.ts +2 -2
  60. package/ImageListItemBar/ImageListItemBar.d.ts +2 -2
  61. package/Input/Input.d.ts +3 -3
  62. package/InputAdornment/InputAdornment.d.ts +2 -2
  63. package/InputBase/InputBase.d.ts +2 -2
  64. package/InputLabel/InputLabel.d.ts +3 -3
  65. package/LinearProgress/LinearProgress.d.ts +3 -7
  66. package/Link/Link.d.ts +4 -4
  67. package/List/List.d.ts +3 -3
  68. package/ListItem/ListItem.d.ts +3 -3
  69. package/ListItemAvatar/ListItemAvatar.d.ts +2 -2
  70. package/ListItemButton/ListItemButton.d.ts +3 -3
  71. package/ListItemIcon/ListItemIcon.d.ts +2 -2
  72. package/ListItemSecondaryAction/ListItemSecondaryAction.d.ts +2 -2
  73. package/ListItemText/ListItemText.d.ts +2 -2
  74. package/ListSubheader/ListSubheader.d.ts +2 -2
  75. package/Menu/Menu.d.ts +4 -4
  76. package/Menu/Menu.js +6 -2
  77. package/MenuItem/MenuItem.d.ts +3 -3
  78. package/MenuList/MenuList.d.ts +4 -4
  79. package/MobileStepper/MobileStepper.d.ts +3 -3
  80. package/Modal/Modal.d.ts +7 -7
  81. package/Modal/Modal.js +9 -10
  82. package/NativeSelect/NativeSelect.d.ts +3 -3
  83. package/NoSsr/NoSsr.d.ts +2 -2
  84. package/NoSsr/NoSsr.js +2 -2
  85. package/OutlinedInput/OutlinedInput.d.ts +3 -3
  86. package/Pagination/Pagination.d.ts +2 -2
  87. package/PaginationItem/PaginationItem.d.ts +2 -2
  88. package/Paper/Paper.d.ts +3 -3
  89. package/PigmentContainer/PigmentContainer.d.ts +2 -2
  90. package/PigmentContainer/PigmentContainer.js +2 -2
  91. package/PigmentGrid/PigmentGrid.d.ts +2 -2
  92. package/PigmentGrid/PigmentGrid.js +2 -2
  93. package/PigmentHidden/PigmentHidden.d.ts +2 -2
  94. package/PigmentHidden/PigmentHidden.js +2 -2
  95. package/PigmentStack/PigmentStack.d.ts +2 -2
  96. package/PigmentStack/PigmentStack.js +2 -2
  97. package/Popover/Popover.d.ts +64 -10
  98. package/Popover/Popover.js +78 -51
  99. package/Popper/Popper.d.ts +4 -4
  100. package/Popper/Popper.js +4 -4
  101. package/Portal/Portal.d.ts +2 -2
  102. package/Portal/Portal.js +2 -2
  103. package/README.md +4 -3
  104. package/Radio/Radio.d.ts +3 -3
  105. package/RadioGroup/RadioGroup.d.ts +3 -3
  106. package/Rating/Rating.d.ts +2 -2
  107. package/ScopedCssBaseline/ScopedCssBaseline.d.ts +2 -2
  108. package/Select/Select.d.ts +3 -3
  109. package/Skeleton/Skeleton.d.ts +2 -2
  110. package/Slide/Slide.d.ts +4 -4
  111. package/Slider/Slider.d.ts +20 -11
  112. package/Slider/Slider.js +2 -2
  113. package/Snackbar/Snackbar.d.ts +80 -3
  114. package/Snackbar/Snackbar.js +122 -32
  115. package/SnackbarContent/SnackbarContent.d.ts +3 -3
  116. package/SpeedDial/SpeedDial.d.ts +2 -2
  117. package/SpeedDialAction/SpeedDialAction.d.ts +3 -3
  118. package/SpeedDialIcon/SpeedDialIcon.d.ts +2 -2
  119. package/Stack/Stack.d.ts +2 -2
  120. package/Step/Step.d.ts +2 -2
  121. package/StepButton/StepButton.d.ts +3 -3
  122. package/StepConnector/StepConnector.d.ts +2 -2
  123. package/StepContent/StepContent.d.ts +2 -2
  124. package/StepIcon/StepIcon.d.ts +3 -3
  125. package/StepLabel/StepLabel.d.ts +2 -2
  126. package/Stepper/Stepper.d.ts +2 -2
  127. package/SvgIcon/SvgIcon.d.ts +3 -3
  128. package/SwipeableDrawer/SwipeableDrawer.d.ts +3 -3
  129. package/Switch/Switch.d.ts +4 -4
  130. package/Tab/Tab.d.ts +3 -3
  131. package/TabScrollButton/TabScrollButton.d.ts +2 -2
  132. package/Table/Table.d.ts +2 -2
  133. package/TableBody/TableBody.d.ts +2 -2
  134. package/TableCell/TableCell.d.ts +2 -2
  135. package/TableContainer/TableContainer.d.ts +2 -2
  136. package/TableFooter/TableFooter.d.ts +2 -2
  137. package/TableHead/TableHead.d.ts +2 -2
  138. package/TablePagination/TablePagination.d.ts +4 -4
  139. package/TableRow/TableRow.d.ts +2 -2
  140. package/TableSortLabel/TableSortLabel.d.ts +3 -3
  141. package/Tabs/Tabs.d.ts +2 -2
  142. package/TextField/TextField.d.ts +10 -10
  143. package/TextareaAutosize/TextareaAutosize.d.ts +2 -2
  144. package/TextareaAutosize/TextareaAutosize.js +2 -2
  145. package/ToggleButton/ToggleButton.d.ts +3 -3
  146. package/ToggleButtonGroup/ToggleButtonGroup.d.ts +2 -2
  147. package/Toolbar/Toolbar.d.ts +2 -2
  148. package/Tooltip/Tooltip.d.ts +2 -2
  149. package/Typography/Typography.d.ts +3 -3
  150. package/Zoom/Zoom.d.ts +3 -3
  151. package/index.js +1 -1
  152. package/internal/SwitchBase.d.ts +33 -1
  153. package/internal/SwitchBase.js +84 -30
  154. package/modern/ClickAwayListener/ClickAwayListener.js +3 -3
  155. package/modern/Grid2/Grid2.js +2 -2
  156. package/modern/Menu/Menu.js +6 -2
  157. package/modern/Modal/Modal.js +9 -10
  158. package/modern/NoSsr/NoSsr.js +2 -2
  159. package/modern/PigmentContainer/PigmentContainer.js +2 -2
  160. package/modern/PigmentGrid/PigmentGrid.js +2 -2
  161. package/modern/PigmentHidden/PigmentHidden.js +2 -2
  162. package/modern/PigmentStack/PigmentStack.js +2 -2
  163. package/modern/Popover/Popover.js +78 -51
  164. package/modern/Popper/Popper.js +4 -4
  165. package/modern/Portal/Portal.js +2 -2
  166. package/modern/Slider/Slider.js +2 -2
  167. package/modern/Snackbar/Snackbar.js +122 -32
  168. package/modern/TextareaAutosize/TextareaAutosize.js +2 -2
  169. package/modern/index.js +1 -1
  170. package/modern/internal/SwitchBase.js +84 -30
  171. package/modern/utils/mergeSlotProps.js +10 -3
  172. package/modern/version/index.js +5 -5
  173. package/node/ClickAwayListener/ClickAwayListener.js +3 -3
  174. package/node/Grid2/Grid2.js +2 -2
  175. package/node/Menu/Menu.js +6 -2
  176. package/node/Modal/Modal.js +9 -10
  177. package/node/NoSsr/NoSsr.js +2 -2
  178. package/node/PigmentContainer/PigmentContainer.js +2 -2
  179. package/node/PigmentGrid/PigmentGrid.js +2 -2
  180. package/node/PigmentHidden/PigmentHidden.js +2 -2
  181. package/node/PigmentStack/PigmentStack.js +2 -2
  182. package/node/Popover/Popover.js +78 -51
  183. package/node/Popper/Popper.js +4 -4
  184. package/node/Portal/Portal.js +2 -2
  185. package/node/Slider/Slider.js +2 -2
  186. package/node/Snackbar/Snackbar.js +122 -32
  187. package/node/TextareaAutosize/TextareaAutosize.js +2 -2
  188. package/node/index.js +1 -1
  189. package/node/internal/SwitchBase.js +84 -30
  190. package/node/utils/mergeSlotProps.js +10 -3
  191. package/node/version/index.js +5 -5
  192. package/package.json +7 -7
  193. package/utils/mergeSlotProps.js +10 -3
  194. package/version/index.js +5 -5
@@ -9,7 +9,6 @@ Object.defineProperty(exports, "__esModule", {
9
9
  exports.default = void 0;
10
10
  var React = _interopRequireWildcard(require("react"));
11
11
  var _propTypes = _interopRequireDefault(require("prop-types"));
12
- var _clsx = _interopRequireDefault(require("clsx"));
13
12
  var _refType = _interopRequireDefault(require("@mui/utils/refType"));
14
13
  var _composeClasses = _interopRequireDefault(require("@mui/utils/composeClasses"));
15
14
  var _capitalize = _interopRequireDefault(require("../utils/capitalize"));
@@ -19,6 +18,7 @@ var _useControlled = _interopRequireDefault(require("../utils/useControlled"));
19
18
  var _useFormControl = _interopRequireDefault(require("../FormControl/useFormControl"));
20
19
  var _ButtonBase = _interopRequireDefault(require("../ButtonBase"));
21
20
  var _switchBaseClasses = require("./switchBaseClasses");
21
+ var _useSlot = _interopRequireDefault(require("../utils/useSlot"));
22
22
  var _jsxRuntime = require("react/jsx-runtime");
23
23
  const useUtilityClasses = ownerState => {
24
24
  const {
@@ -93,7 +93,6 @@ const SwitchBase = /*#__PURE__*/React.forwardRef(function SwitchBase(props, ref)
93
93
  autoFocus,
94
94
  checked: checkedProp,
95
95
  checkedIcon,
96
- className,
97
96
  defaultChecked,
98
97
  disabled: disabledProp,
99
98
  disableFocusRipple = false,
@@ -111,6 +110,8 @@ const SwitchBase = /*#__PURE__*/React.forwardRef(function SwitchBase(props, ref)
111
110
  tabIndex,
112
111
  type,
113
112
  value,
113
+ slots = {},
114
+ slotProps = {},
114
115
  ...other
115
116
  } = props;
116
117
  const [checked, setCheckedState] = (0, _useControlled.default)({
@@ -163,38 +164,75 @@ const SwitchBase = /*#__PURE__*/React.forwardRef(function SwitchBase(props, ref)
163
164
  edge
164
165
  };
165
166
  const classes = useUtilityClasses(ownerState);
166
- return /*#__PURE__*/(0, _jsxRuntime.jsxs)(SwitchBaseRoot, {
167
- component: "span",
168
- className: (0, _clsx.default)(classes.root, className),
169
- centerRipple: true,
170
- focusRipple: !disableFocusRipple,
171
- disabled: disabled,
172
- tabIndex: null,
173
- role: undefined,
174
- onFocus: handleFocus,
175
- onBlur: handleBlur,
176
- ownerState: ownerState,
177
- ref: ref,
178
- ...other,
179
- children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(SwitchBaseInput, {
180
- autoFocus: autoFocus,
167
+ const externalForwardedProps = {
168
+ slots,
169
+ slotProps: {
170
+ input: inputProps,
171
+ ...slotProps
172
+ }
173
+ };
174
+ const [RootSlot, rootSlotProps] = (0, _useSlot.default)('root', {
175
+ ref,
176
+ elementType: SwitchBaseRoot,
177
+ className: classes.root,
178
+ shouldForwardComponentProp: true,
179
+ externalForwardedProps: {
180
+ ...externalForwardedProps,
181
+ component: 'span',
182
+ ...other
183
+ },
184
+ getSlotProps: handlers => ({
185
+ ...handlers,
186
+ onFocus: event => {
187
+ handlers.onFocus?.(event);
188
+ handleFocus(event);
189
+ },
190
+ onBlur: event => {
191
+ handlers.onBlur?.(event);
192
+ handleBlur(event);
193
+ }
194
+ }),
195
+ ownerState,
196
+ additionalProps: {
197
+ centerRipple: true,
198
+ focusRipple: !disableFocusRipple,
199
+ disabled,
200
+ role: undefined,
201
+ tabIndex: null
202
+ }
203
+ });
204
+ const [InputSlot, inputSlotProps] = (0, _useSlot.default)('input', {
205
+ ref: inputRef,
206
+ elementType: SwitchBaseInput,
207
+ className: classes.input,
208
+ externalForwardedProps,
209
+ getSlotProps: handlers => ({
210
+ onChange: event => {
211
+ handlers.onChange?.(event);
212
+ handleInputChange(event);
213
+ }
214
+ }),
215
+ ownerState,
216
+ additionalProps: {
217
+ autoFocus,
181
218
  checked: checkedProp,
182
- defaultChecked: defaultChecked,
183
- className: classes.input,
184
- disabled: disabled,
219
+ defaultChecked,
220
+ disabled,
185
221
  id: hasLabelFor ? id : undefined,
186
- name: name,
187
- onChange: handleInputChange,
188
- readOnly: readOnly,
189
- ref: inputRef,
190
- required: required,
191
- ownerState: ownerState,
192
- tabIndex: tabIndex,
193
- type: type,
222
+ name,
223
+ readOnly,
224
+ required,
225
+ tabIndex,
226
+ type,
194
227
  ...(type === 'checkbox' && value === undefined ? {} : {
195
228
  value
196
- }),
197
- ...inputProps
229
+ })
230
+ }
231
+ });
232
+ return /*#__PURE__*/(0, _jsxRuntime.jsxs)(RootSlot, {
233
+ ...rootSlotProps,
234
+ children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(InputSlot, {
235
+ ...inputSlotProps
198
236
  }), checked ? checkedIcon : icon]
199
237
  });
200
238
  });
@@ -287,6 +325,22 @@ process.env.NODE_ENV !== "production" ? SwitchBase.propTypes = {
287
325
  * If `true`, the `input` element is required.
288
326
  */
289
327
  required: _propTypes.default.bool,
328
+ /**
329
+ * The props used for each slot inside.
330
+ * @default {}
331
+ */
332
+ slotProps: _propTypes.default.shape({
333
+ input: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object]),
334
+ root: _propTypes.default.oneOfType([_propTypes.default.func, _propTypes.default.object])
335
+ }),
336
+ /**
337
+ * The components used for each slot inside.
338
+ * @default {}
339
+ */
340
+ slots: _propTypes.default.shape({
341
+ input: _propTypes.default.elementType,
342
+ root: _propTypes.default.elementType
343
+ }),
290
344
  /**
291
345
  * The system prop that allows defining system overrides as well as additional CSS styles.
292
346
  */
@@ -29,22 +29,29 @@ function mergeSlotProps(externalSlotProps, defaultSlotProps) {
29
29
  ...defaultSlotPropsValue.style,
30
30
  ...externalSlotPropsValue.style
31
31
  }
32
+ }),
33
+ ...(defaultSlotPropsValue?.sx && externalSlotPropsValue?.sx && {
34
+ sx: [...(Array.isArray(defaultSlotPropsValue.sx) ? defaultSlotPropsValue.sx : [defaultSlotPropsValue.sx]), ...(Array.isArray(externalSlotPropsValue.sx) ? externalSlotPropsValue.sx : [externalSlotPropsValue.sx])]
32
35
  })
33
36
  };
34
37
  };
35
38
  }
36
- const className = (0, _clsx.default)(defaultSlotProps?.className, externalSlotProps?.className);
39
+ const typedDefaultSlotProps = defaultSlotProps;
40
+ const className = (0, _clsx.default)(typedDefaultSlotProps?.className, externalSlotProps?.className);
37
41
  return {
38
42
  ...defaultSlotProps,
39
43
  ...externalSlotProps,
40
44
  ...(!!className && {
41
45
  className
42
46
  }),
43
- ...(defaultSlotProps?.style && externalSlotProps?.style && {
47
+ ...(typedDefaultSlotProps?.style && externalSlotProps?.style && {
44
48
  style: {
45
- ...defaultSlotProps.style,
49
+ ...typedDefaultSlotProps.style,
46
50
  ...externalSlotProps.style
47
51
  }
52
+ }),
53
+ ...(typedDefaultSlotProps?.sx && externalSlotProps?.sx && {
54
+ sx: [...(Array.isArray(typedDefaultSlotProps.sx) ? typedDefaultSlotProps.sx : [typedDefaultSlotProps.sx]), ...(Array.isArray(externalSlotProps.sx) ? externalSlotProps.sx : [externalSlotProps.sx])]
48
55
  })
49
56
  };
50
57
  }
@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.version = exports.prerelease = exports.patch = exports.minor = exports.major = exports.default = void 0;
7
- const version = exports.version = "6.4.3";
8
- const major = exports.major = Number("6");
9
- const minor = exports.minor = Number("4");
10
- const patch = exports.patch = Number("3");
11
- const prerelease = exports.prerelease = undefined;
7
+ const version = exports.version = "7.0.0-alpha.0";
8
+ const major = exports.major = Number("7");
9
+ const minor = exports.minor = Number("0");
10
+ const patch = exports.patch = Number("0");
11
+ const prerelease = exports.prerelease = "alpha.0";
12
12
  var _default = exports.default = version;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@mui/material",
3
- "version": "6.4.3",
3
+ "version": "7.0.0-alpha.0",
4
4
  "private": false,
5
5
  "author": "MUI Team",
6
6
  "description": "Material UI is an open-source React component library that implements Google's Material Design. It's comprehensive and can be used in production out of the box.",
@@ -27,7 +27,7 @@
27
27
  "url": "https://opencollective.com/mui-org"
28
28
  },
29
29
  "dependencies": {
30
- "@babel/runtime": "^7.26.0",
30
+ "@babel/runtime": "^7.26.7",
31
31
  "@popperjs/core": "^2.11.8",
32
32
  "@types/react-transition-group": "^4.4.12",
33
33
  "clsx": "^2.1.1",
@@ -35,10 +35,10 @@
35
35
  "prop-types": "^15.8.1",
36
36
  "react-is": "^19.0.0",
37
37
  "react-transition-group": "^4.4.5",
38
- "@mui/system": "^6.4.3",
39
- "@mui/core-downloads-tracker": "^6.4.3",
40
- "@mui/types": "^7.2.21",
41
- "@mui/utils": "^6.4.3"
38
+ "@mui/core-downloads-tracker": "^7.0.0-alpha.0",
39
+ "@mui/system": "7.0.0-alpha.0",
40
+ "@mui/types": "^7.2.22",
41
+ "@mui/utils": "7.0.0-alpha.0"
42
42
  },
43
43
  "peerDependencies": {
44
44
  "@emotion/react": "^11.5.0",
@@ -46,7 +46,7 @@
46
46
  "@types/react": "^17.0.0 || ^18.0.0 || ^19.0.0",
47
47
  "react": "^17.0.0 || ^18.0.0 || ^19.0.0",
48
48
  "react-dom": "^17.0.0 || ^18.0.0 || ^19.0.0",
49
- "@mui/material-pigment-css": "^6.4.3"
49
+ "@mui/material-pigment-css": "7.0.0-alpha.0"
50
50
  },
51
51
  "peerDependenciesMeta": {
52
52
  "@types/react": {
@@ -22,22 +22,29 @@ export default function mergeSlotProps(externalSlotProps, defaultSlotProps) {
22
22
  ...defaultSlotPropsValue.style,
23
23
  ...externalSlotPropsValue.style
24
24
  }
25
+ }),
26
+ ...(defaultSlotPropsValue?.sx && externalSlotPropsValue?.sx && {
27
+ sx: [...(Array.isArray(defaultSlotPropsValue.sx) ? defaultSlotPropsValue.sx : [defaultSlotPropsValue.sx]), ...(Array.isArray(externalSlotPropsValue.sx) ? externalSlotPropsValue.sx : [externalSlotPropsValue.sx])]
25
28
  })
26
29
  };
27
30
  };
28
31
  }
29
- const className = clsx(defaultSlotProps?.className, externalSlotProps?.className);
32
+ const typedDefaultSlotProps = defaultSlotProps;
33
+ const className = clsx(typedDefaultSlotProps?.className, externalSlotProps?.className);
30
34
  return {
31
35
  ...defaultSlotProps,
32
36
  ...externalSlotProps,
33
37
  ...(!!className && {
34
38
  className
35
39
  }),
36
- ...(defaultSlotProps?.style && externalSlotProps?.style && {
40
+ ...(typedDefaultSlotProps?.style && externalSlotProps?.style && {
37
41
  style: {
38
- ...defaultSlotProps.style,
42
+ ...typedDefaultSlotProps.style,
39
43
  ...externalSlotProps.style
40
44
  }
45
+ }),
46
+ ...(typedDefaultSlotProps?.sx && externalSlotProps?.sx && {
47
+ sx: [...(Array.isArray(typedDefaultSlotProps.sx) ? typedDefaultSlotProps.sx : [typedDefaultSlotProps.sx]), ...(Array.isArray(externalSlotProps.sx) ? externalSlotProps.sx : [externalSlotProps.sx])]
41
48
  })
42
49
  };
43
50
  }
package/version/index.js CHANGED
@@ -1,6 +1,6 @@
1
- export const version = "6.4.3";
2
- export const major = Number("6");
3
- export const minor = Number("4");
4
- export const patch = Number("3");
5
- export const prerelease = undefined;
1
+ export const version = "7.0.0-alpha.0";
2
+ export const major = Number("7");
3
+ export const minor = Number("0");
4
+ export const patch = Number("0");
5
+ export const prerelease = "alpha.0";
6
6
  export default version;