From bd5797389b1f14b2f3874d9e67c6e176f0078ca5 Mon Sep 17 00:00:00 2001 From: Marija Najdova Date: Wed, 2 Dec 2020 15:08:52 +0100 Subject: [PATCH 1/3] extracted color prop to Badge, updated buildAPI --- docs/pages/api-docs/badge-unstyled.md | 4 -- docs/pages/api-docs/badge.md | 6 +-- docs/scripts/buildApi.ts | 52 ++++++++++++++++++- .../src/BadgeUnstyled/BadgeUnstyled.d.ts | 11 ---- .../src/BadgeUnstyled/BadgeUnstyled.js | 42 ++++++--------- .../src/BadgeUnstyled/badgeClasses.d.ts | 7 ++- .../src/BadgeUnstyled/badgeClasses.js | 29 +++++------ .../src/BadgeUnstyled/index.d.ts | 1 + .../src/BadgeUnstyled/index.js | 2 +- packages/material-ui-utils/src/index.ts | 1 + .../material-ui-utils/src/usePreviousProps.ts | 11 ++++ packages/material-ui/src/Badge/Badge.d.ts | 28 +++++++++- packages/material-ui/src/Badge/Badge.js | 34 +++++++++++- 13 files changed, 157 insertions(+), 71 deletions(-) create mode 100644 packages/material-ui-utils/src/usePreviousProps.ts diff --git a/docs/pages/api-docs/badge-unstyled.md b/docs/pages/api-docs/badge-unstyled.md index efe4313aad0a1b..391efc86321e4f 100644 --- a/docs/pages/api-docs/badge-unstyled.md +++ b/docs/pages/api-docs/badge-unstyled.md @@ -30,7 +30,6 @@ You can learn more about the difference by [reading this guide](/guides/minimizi | badgeContent | node | | The content rendered within the badge. | | children | node | | The badge will be added relative to this node. | | classes | object | | Override or extend the styles applied to the component. See [CSS API](#css) below for more details. | -| color | 'default'
| 'error'
| 'primary'
| 'secondary' | 'default' | The color of the component. It supports those theme colors that make sense for this component. | | components | { Badge?: elementType, Root?: elementType } | {} | The components used for each slot inside the Badge. Either a string to use a HTML element or a component. | | componentsProps | object | {} | The props used for each slot inside the Badge. | | invisible | bool | | If `true`, the badge is invisible. | @@ -49,9 +48,6 @@ Any other props supplied will be provided to the root element (native element). |:-----|:-------------|:------------| | root | .MuiBadge-root | Styles applied to the root element. | badge | .MuiBadge-badge | Styles applied to the badge `span` element. -| colorPrimary | .MuiBadge-colorPrimary | Styles applied to the root element if `color="primary"`. -| colorSecondary | .MuiBadge-colorSecondary | Styles applied to the root element if `color="secondary"`. -| colorError | .MuiBadge-colorError | Styles applied to the root element if `color="error"`. | dot | .MuiBadge-dot | Styles applied to the root element if `variant="dot"`. | standard | .MuiBadge-standard | Styles applied to the root element if `variant="standard"`. | anchorOriginTopRightRectangular | .MuiBadge-anchorOriginTopRightRectangular | Styles applied to the root element if `anchorOrigin={{ 'top', 'right' }} overlap="rectangular"`. diff --git a/docs/pages/api-docs/badge.md b/docs/pages/api-docs/badge.md index dd6ca581b83c9f..bd21e2d53f7270 100644 --- a/docs/pages/api-docs/badge.md +++ b/docs/pages/api-docs/badge.md @@ -52,9 +52,6 @@ Any other props supplied will be provided to the root element ([BadgeUnstyled](/ |:-----|:-------------|:------------| | root | .MuiBadge-root | Styles applied to the root element. | badge | .MuiBadge-badge | Styles applied to the badge `span` element. -| colorPrimary | .MuiBadge-colorPrimary | Styles applied to the root element if `color="primary"`. -| colorSecondary | .MuiBadge-colorSecondary | Styles applied to the root element if `color="secondary"`. -| colorError | .MuiBadge-colorError | Styles applied to the root element if `color="error"`. | dot | .MuiBadge-dot | Styles applied to the root element if `variant="dot"`. | standard | .MuiBadge-standard | Styles applied to the root element if `variant="standard"`. | anchorOriginTopRightRectangular | .MuiBadge-anchorOriginTopRightRectangular | Styles applied to the root element if `anchorOrigin={{ 'top', 'right' }} overlap="rectangular"`. @@ -66,6 +63,9 @@ Any other props supplied will be provided to the root element ([BadgeUnstyled](/ | anchorOriginTopLeftCircular | .MuiBadge-anchorOriginTopLeftCircular | Styles applied to the root element if `anchorOrigin={{ 'top', 'left' }} overlap="circular"`. | anchorOriginBottomLeftCircular | .MuiBadge-anchorOriginBottomLeftCircular | Styles applied to the root element if `anchorOrigin={{ 'bottom', 'left' }} overlap="circular"`. | invisible | .MuiBadge-invisible | Pseudo-class to the badge `span` element if `invisible={true}`. +| colorPrimary | .MuiBadge-colorPrimary | Styles applied to the root element if `color="primary"`. +| colorSecondary | .MuiBadge-colorSecondary | Styles applied to the root element if `color="secondary"`. +| colorError | .MuiBadge-colorError | Styles applied to the root element if `color="error"`. You can override the style of the component thanks to one of these customization points: diff --git a/docs/scripts/buildApi.ts b/docs/scripts/buildApi.ts index 0e19d8e2122969..b6218ae82b475c 100644 --- a/docs/scripts/buildApi.ts +++ b/docs/scripts/buildApi.ts @@ -20,6 +20,7 @@ import createGenerateClassName from '../../packages/material-ui-styles/src/creat import getStylesCreator from '../../packages/material-ui-styles/src/getStylesCreator'; import createMuiTheme from '../../packages/material-ui/src/styles/createMuiTheme'; import { getLineFeed, getUnstyledFilename } from './helpers'; +import { CssBaseline } from '@material-ui/core'; const generateClassName = createGenerateClassName(); @@ -227,7 +228,6 @@ async function updateStylesDefinition(context: { const unstyledFileName = getUnstyledFilename(typesFilename, true); try { - // If the JSON file doesn't exists try extracting the info from the TS definition const typesSource = readFileSync(unstyledFileName, { encoding: 'utf8' }); const typesAST = await babel.parseAsync(typesSource, { configFile: false, @@ -251,7 +251,53 @@ async function updateStylesDefinition(context: { const members = (node.typeAnnotation.typeAnnotation as babel.types.TSTypeLiteral).members; if (members) { - styles.descriptions = {}; + styles.descriptions = styles.descriptions || {}; + members.forEach((member) => { + const className = ((member as babel.types.TSPropertySignature) + .key as babel.types.Identifier).name; + styles.classes.push(className); + if (member.leadingComments) { + styles.descriptions[className] = trimComment(member.leadingComments[0].value); + } + }); + } + } + }, + }); + + const source = readFileSync(typesFilename, { encoding: 'utf8' }); + const sourceAST = await babel.parseAsync(source, { + configFile: false, + filename: typesFilename, + presets: [require.resolve('@babel/preset-typescript')], + }); + if (sourceAST === null) { + throw new Error('No AST returned from babel.'); + } + + traverse(sourceAST, { + TSPropertySignature(babelPath) { + const { node } = babelPath; + const possiblyPropName = (node.key as babel.types.Identifier).name; + if (possiblyPropName === 'classes' && node.typeAnnotation !== null) { + let classesDeclarationNode = null; + const types = (node.typeAnnotation.typeAnnotation as babel.types.TSIntersectionType) + .types; + + if (types) { + types.forEach((node) => { + if (node.type === 'TSTypeLiteral') { + classesDeclarationNode = node; + } + }); + } + + const members = classesDeclarationNode + ? (classesDeclarationNode as babel.types.TSTypeLiteral).members + : []; + + if (members) { + styles.descriptions = styles.descriptions || {}; members.forEach((member) => { const className = ((member as babel.types.TSPropertySignature) .key as babel.types.Identifier).name; @@ -267,6 +313,8 @@ async function updateStylesDefinition(context: { } catch (e) { // Do nothing as not every components has an unstyled version } + + styles.classes = Array.from(new Set(styles.classes)); } async function annotateClassesDefinition(context: { diff --git a/packages/material-ui-unstyled/src/BadgeUnstyled/BadgeUnstyled.d.ts b/packages/material-ui-unstyled/src/BadgeUnstyled/BadgeUnstyled.d.ts index a451805c5192ba..8471bfaa5c9a9f 100644 --- a/packages/material-ui-unstyled/src/BadgeUnstyled/BadgeUnstyled.d.ts +++ b/packages/material-ui-unstyled/src/BadgeUnstyled/BadgeUnstyled.d.ts @@ -60,12 +60,6 @@ export interface BadgeUnstyledTypeMap

{ - const ref = React.useRef({}); - React.useEffect(() => { - ref.current = value; - }); - return ref.current; -}; - -const useBadgeClasses = (props) => { - const { color, variant, anchorOrigin, overlap, invisible, classes = {} } = props; +const useBadgeClasses = (props, extendClasses) => { + const classes = (extendClasses ? extendClasses(props) : props.classes) || {}; + const { variant, anchorOrigin, overlap, invisible } = props; const utilityClasses = { root: clsx(badgeClasses['root'], classes['root']), badge: clsx( badgeClasses['badge'], classes['badge'], - getUtilityClass(variant), + getBadgeUtilityClass(variant), badgeClasses[ `anchorOrigin${capitalize(anchorOrigin.vertical)}${capitalize( anchorOrigin.horizontal, @@ -33,8 +26,6 @@ const useBadgeClasses = (props) => { )}${capitalize(overlap)}` ], { - [badgeClasses[`color${capitalize(color)}`]]: color !== 'default', - [classes[`color${capitalize(color)}`]]: color !== 'default', [badgeClasses['invisible']]: invisible, [classes.invisible]: invisible, }, @@ -53,7 +44,6 @@ const BadgeUnstyled = React.forwardRef(function BadgeUnstyled(props, ref) { badgeContent: badgeContentProp, children, className, - color: colorProp = 'default', components = {}, componentsProps = {}, invisible: invisibleProp, @@ -61,6 +51,8 @@ const BadgeUnstyled = React.forwardRef(function BadgeUnstyled(props, ref) { overlap: overlapProp = 'rectangular', showZero = false, variant: variantProp = 'standard', + styleProps: stylePropsProp = {}, + extendClasses, /* eslint-disable react/prop-types */ theme, ...other @@ -69,10 +61,10 @@ const BadgeUnstyled = React.forwardRef(function BadgeUnstyled(props, ref) { const prevProps = usePreviousProps({ anchorOrigin: anchorOriginProp, badgeContent: badgeContentProp, - color: colorProp, max: maxProp, overlap: overlapProp, variant: variantProp, + styleProps: stylePropsProp, }); let invisible = invisibleProp; @@ -87,17 +79,16 @@ const BadgeUnstyled = React.forwardRef(function BadgeUnstyled(props, ref) { const { anchorOrigin = anchorOriginProp, badgeContent, - color = colorProp, max = maxProp, overlap = overlapProp, variant = variantProp, + styleProps = stylePropsProp, } = invisible ? prevProps : props; const stateAndProps = { ...props, anchorOrigin, badgeContent, - color, invisible, max, overlap, @@ -110,7 +101,9 @@ const BadgeUnstyled = React.forwardRef(function BadgeUnstyled(props, ref) { displayValue = badgeContent > max ? `${max}+` : badgeContent; } - const classes = useBadgeClasses(stateAndProps); + const classes = useBadgeClasses(stateAndProps, extendClasses); + + const extendedStyleProps = { ...stateAndProps, ...styleProps }; const Root = components.Root || 'span'; const rootProps = componentsProps.root || {}; @@ -121,7 +114,7 @@ const BadgeUnstyled = React.forwardRef(function BadgeUnstyled(props, ref) { return ( string; + declare const badgeClasses: BadgeClasses; export default badgeClasses; diff --git a/packages/material-ui-unstyled/src/BadgeUnstyled/badgeClasses.js b/packages/material-ui-unstyled/src/BadgeUnstyled/badgeClasses.js index 731fcb5af924b5..e5764edb8747c5 100644 --- a/packages/material-ui-unstyled/src/BadgeUnstyled/badgeClasses.js +++ b/packages/material-ui-unstyled/src/BadgeUnstyled/badgeClasses.js @@ -1,23 +1,20 @@ -export const getUtilityClass = (name) => { +export const getBadgeUtilityClass = (name) => { return `MuiBadge-${name}`; }; const badgeClasses = { - root: getUtilityClass('root'), - badge: getUtilityClass('badge'), - dot: getUtilityClass('dot'), - anchorOriginTopLeftCircular: getUtilityClass('anchorOriginTopLeftCircular'), - anchorOriginTopLeftRectangular: getUtilityClass('anchorOriginTopLeftRectangular'), - anchorOriginTopRightCircular: getUtilityClass('anchorOriginTopRightCircular'), - anchorOriginTopRightRectangular: getUtilityClass('anchorOriginTopRightRectangular'), - anchorOriginBottomLeftCircular: getUtilityClass('anchorOriginBottomLeftCircular'), - anchorOriginBottomLeftRectangular: getUtilityClass('anchorOriginBottomLeftRectangular'), - anchorOriginBottomRightCircular: getUtilityClass('anchorOriginBottomRightCircular'), - anchorOriginBottomRightRectangular: getUtilityClass('anchorOriginBottomRightRectangular'), - colorError: getUtilityClass('colorError'), - colorPrimary: getUtilityClass('colorPrimary'), - colorSecondary: getUtilityClass('colorSecondary'), - invisible: getUtilityClass('invisible'), + root: getBadgeUtilityClass('root'), + badge: getBadgeUtilityClass('badge'), + dot: getBadgeUtilityClass('dot'), + anchorOriginTopLeftCircular: getBadgeUtilityClass('anchorOriginTopLeftCircular'), + anchorOriginTopLeftRectangular: getBadgeUtilityClass('anchorOriginTopLeftRectangular'), + anchorOriginTopRightCircular: getBadgeUtilityClass('anchorOriginTopRightCircular'), + anchorOriginTopRightRectangular: getBadgeUtilityClass('anchorOriginTopRightRectangular'), + anchorOriginBottomLeftCircular: getBadgeUtilityClass('anchorOriginBottomLeftCircular'), + anchorOriginBottomLeftRectangular: getBadgeUtilityClass('anchorOriginBottomLeftRectangular'), + anchorOriginBottomRightCircular: getBadgeUtilityClass('anchorOriginBottomRightCircular'), + anchorOriginBottomRightRectangular: getBadgeUtilityClass('anchorOriginBottomRightRectangular'), + invisible: getBadgeUtilityClass('invisible'), }; export default badgeClasses; diff --git a/packages/material-ui-unstyled/src/BadgeUnstyled/index.d.ts b/packages/material-ui-unstyled/src/BadgeUnstyled/index.d.ts index 58129331d9e689..c5255a074ca963 100644 --- a/packages/material-ui-unstyled/src/BadgeUnstyled/index.d.ts +++ b/packages/material-ui-unstyled/src/BadgeUnstyled/index.d.ts @@ -1,3 +1,4 @@ export { default } from './BadgeUnstyled'; export * from './BadgeUnstyled'; export { default as badgeClasses } from './badgeClasses'; +export * from './badgeClasses'; diff --git a/packages/material-ui-unstyled/src/BadgeUnstyled/index.js b/packages/material-ui-unstyled/src/BadgeUnstyled/index.js index 91e88ee334a4bf..f023045fff15d2 100644 --- a/packages/material-ui-unstyled/src/BadgeUnstyled/index.js +++ b/packages/material-ui-unstyled/src/BadgeUnstyled/index.js @@ -1,2 +1,2 @@ export { default } from './BadgeUnstyled'; -export { default as badgeClasses } from './badgeClasses'; +export { default as badgeClasses, getBadgeUtilityClass } from './badgeClasses'; diff --git a/packages/material-ui-utils/src/index.ts b/packages/material-ui-utils/src/index.ts index e3cd7c13caadb3..76c7bac5d29c81 100644 --- a/packages/material-ui-utils/src/index.ts +++ b/packages/material-ui-utils/src/index.ts @@ -29,3 +29,4 @@ export { detectScrollType as unstable_detectScrollType, getNormalizedScrollLeft as unstable_getNormalizedScrollLeft, } from './scrollLeft'; +export { default as usePreviousProps } from './usePreviousProps'; diff --git a/packages/material-ui-utils/src/usePreviousProps.ts b/packages/material-ui-utils/src/usePreviousProps.ts new file mode 100644 index 00000000000000..bd70ebdabf9c05 --- /dev/null +++ b/packages/material-ui-utils/src/usePreviousProps.ts @@ -0,0 +1,11 @@ +import * as React from 'react'; + +const usePreviousProps = (value: object): object => { + const ref = React.useRef({}); + React.useEffect(() => { + ref.current = value; + }); + return ref.current; +}; + +export default usePreviousProps; diff --git a/packages/material-ui/src/Badge/Badge.d.ts b/packages/material-ui/src/Badge/Badge.d.ts index 54dfcbc1a8ed2d..10afd9457e8cb3 100644 --- a/packages/material-ui/src/Badge/Badge.d.ts +++ b/packages/material-ui/src/Badge/Badge.d.ts @@ -2,7 +2,11 @@ import * as React from 'react'; import { SxProps } from '@material-ui/system'; import { Theme } from '@material-ui/core/styles'; import { OverridableStringUnion } from '@material-ui/types'; -import { ExtendBadgeUnstyledTypeMap } from '@material-ui/unstyled'; +import { + ExtendBadgeUnstyledTypeMap, + BadgeUnstyledTypeMap, + BadgeClasses, +} from '@material-ui/unstyled'; import { OverridableComponent, OverrideProps } from '../OverridableComponent'; export interface BadgePropsVariantOverrides {} @@ -13,6 +17,22 @@ export type BadgeTypeMap< P = {} > = ExtendBadgeUnstyledTypeMap<{ props: P & { + /** + * Override or extend the styles applied to the component. + */ + classes?: BadgeUnstyledTypeMap['props']['classes'] & { + /** Styles applied to the root element if `color="primary"`. */ + colorPrimary?: string; + /** Styles applied to the root element if `color="secondary"`. */ + colorSecondary?: string; + /** Styles applied to the root element if `color="error"`. */ + colorError?: string; + }; + /** + * The color of the component. It supports those theme colors that make sense for this component. + * @default 'default' + */ + color?: 'primary' | 'secondary' | 'default' | 'error'; /** * The system prop that allows defining system overrides as well as additional CSS styles. */ @@ -47,6 +67,12 @@ export type BadgeClassKey = keyof NonNullable; */ declare const Badge: OverridableComponent; +export const badgeClasses: BadgeClasses & { + primaryColor: string; + secondaryColor: string; + errorColor: string; +}; + export type BadgeProps< D extends React.ElementType = BadgeTypeMap['defaultComponent'], P = {} diff --git a/packages/material-ui/src/Badge/Badge.js b/packages/material-ui/src/Badge/Badge.js index 0fc3fc9bcff141..ea652a88a9abb4 100644 --- a/packages/material-ui/src/Badge/Badge.js +++ b/packages/material-ui/src/Badge/Badge.js @@ -1,10 +1,23 @@ import * as React from 'react'; import PropTypes from 'prop-types'; -import { BadgeUnstyled, badgeClasses } from '@material-ui/unstyled'; +import clsx from 'clsx'; +import { usePreviousProps } from '@material-ui/utils'; +import { + BadgeUnstyled, + badgeClasses as unstyledBadgeClasses, + getBadgeUtilityClass, +} from '@material-ui/unstyled'; import styled from '../styles/experimentalStyled'; import useThemeProps from '../styles/useThemeProps'; import capitalize from '../utils/capitalize'; +const badgeClasses = { + ...unstyledBadgeClasses, + colorError: getBadgeUtilityClass('colorError'), + colorPrimary: getBadgeUtilityClass('colorPrimary'), + colorSecondary: getBadgeUtilityClass('colorSecondary'), +}; + export { badgeClasses }; const RADIUS_STANDARD = 10; @@ -184,9 +197,24 @@ const BadgeBadge = styled( }), })); +const extendBadgeClasses = (props) => { + const { + styleProps: { color = 'default' }, + classes = {}, + } = props; + + return { + ...classes, + badge: clsx(classes.badge, { + [getBadgeUtilityClass(`color${capitalize(color)}`)]: color !== 'default', + [classes[`color${capitalize(color)}`]]: color !== 'default', + }), + }; +}; + const Badge = React.forwardRef(function Badge(inputProps, ref) { const { isRtl, ...props } = useThemeProps({ props: inputProps, name: 'MuiBadge' }); - const { components = {}, ...other } = props; + const { components = {}, color = 'default', ...other } = props; return ( ); From 7572c905d57a5e44630dc1980ea1395424dd0947 Mon Sep 17 00:00:00 2001 From: Marija Najdova Date: Thu, 3 Dec 2020 12:55:30 +0100 Subject: [PATCH 2/3] wip --- docs/pages/api-docs/badge-unstyled.md | 2 +- docs/pages/api-docs/badge.md | 2 +- .../src/BadgeUnstyled/BadgeUnstyled.d.ts | 1 + .../src/BadgeUnstyled/BadgeUnstyled.js | 23 +++++------ packages/material-ui/src/Badge/Badge.d.ts | 1 + packages/material-ui/src/Badge/Badge.js | 40 +++++++++++++++---- 6 files changed, 46 insertions(+), 23 deletions(-) diff --git a/docs/pages/api-docs/badge-unstyled.md b/docs/pages/api-docs/badge-unstyled.md index 391efc86321e4f..af9ea9b93207ee 100644 --- a/docs/pages/api-docs/badge-unstyled.md +++ b/docs/pages/api-docs/badge-unstyled.md @@ -29,7 +29,7 @@ You can learn more about the difference by [reading this guide](/guides/minimizi | anchorOrigin | { horizontal: 'left'
| 'right', vertical: 'bottom'
| 'top' } | { vertical: 'top', horizontal: 'right',} | The anchor of the badge. | | badgeContent | node | | The content rendered within the badge. | | children | node | | The badge will be added relative to this node. | -| classes | object | | Override or extend the styles applied to the component. See [CSS API](#css) below for more details. | +| classes | object | {} | Override or extend the styles applied to the component. | | components | { Badge?: elementType, Root?: elementType } | {} | The components used for each slot inside the Badge. Either a string to use a HTML element or a component. | | componentsProps | object | {} | The props used for each slot inside the Badge. | | invisible | bool | | If `true`, the badge is invisible. | diff --git a/docs/pages/api-docs/badge.md b/docs/pages/api-docs/badge.md index bd21e2d53f7270..ebc686440d4741 100644 --- a/docs/pages/api-docs/badge.md +++ b/docs/pages/api-docs/badge.md @@ -31,7 +31,7 @@ The `MuiBadge` name can be used for providing [default props](/customization/glo | anchorOrigin | { horizontal: 'left'
| 'right', vertical: 'bottom'
| 'top' } | { vertical: 'top', horizontal: 'right',} | The anchor of the badge. | | badgeContent | node | | The content rendered within the badge. | | children | node | | The badge will be added relative to this node. | -| classes | object | | Override or extend the styles applied to the component. See [CSS API](#css) below for more details. | +| classes | object | {} | Override or extend the styles applied to the component. | | color | 'default'
| 'error'
| 'primary'
| 'secondary' | 'default' | The color of the component. It supports those theme colors that make sense for this component. | | components | { Badge?: elementType, Root?: elementType } | {} | The components used for each slot inside the Badge. Either a string to use a HTML element or a component. | | componentsProps | object | {} | The props used for each slot inside the Badge. | diff --git a/packages/material-ui-unstyled/src/BadgeUnstyled/BadgeUnstyled.d.ts b/packages/material-ui-unstyled/src/BadgeUnstyled/BadgeUnstyled.d.ts index 8471bfaa5c9a9f..9af9af1227b329 100644 --- a/packages/material-ui-unstyled/src/BadgeUnstyled/BadgeUnstyled.d.ts +++ b/packages/material-ui-unstyled/src/BadgeUnstyled/BadgeUnstyled.d.ts @@ -54,6 +54,7 @@ export interface BadgeUnstyledTypeMap

{ - const classes = (extendClasses ? extendClasses(props) : props.classes) || {}; - const { variant, anchorOrigin, overlap, invisible } = props; +const useBadgeClasses = (props) => { + const { variant, anchorOrigin, overlap, invisible, classes = {} } = props; const utilityClasses = { root: clsx(badgeClasses['root'], classes['root']), @@ -41,6 +40,7 @@ const BadgeUnstyled = React.forwardRef(function BadgeUnstyled(props, ref) { vertical: 'top', horizontal: 'right', }, + classes: classesProp = {}, badgeContent: badgeContentProp, children, className, @@ -51,8 +51,6 @@ const BadgeUnstyled = React.forwardRef(function BadgeUnstyled(props, ref) { overlap: overlapProp = 'rectangular', showZero = false, variant: variantProp = 'standard', - styleProps: stylePropsProp = {}, - extendClasses, /* eslint-disable react/prop-types */ theme, ...other @@ -64,7 +62,6 @@ const BadgeUnstyled = React.forwardRef(function BadgeUnstyled(props, ref) { max: maxProp, overlap: overlapProp, variant: variantProp, - styleProps: stylePropsProp, }); let invisible = invisibleProp; @@ -82,7 +79,6 @@ const BadgeUnstyled = React.forwardRef(function BadgeUnstyled(props, ref) { max = maxProp, overlap = overlapProp, variant = variantProp, - styleProps = stylePropsProp, } = invisible ? prevProps : props; const stateAndProps = { @@ -101,9 +97,7 @@ const BadgeUnstyled = React.forwardRef(function BadgeUnstyled(props, ref) { displayValue = badgeContent > max ? `${max}+` : badgeContent; } - const classes = useBadgeClasses(stateAndProps, extendClasses); - - const extendedStyleProps = { ...stateAndProps, ...styleProps }; + const classes = useBadgeClasses(stateAndProps); const Root = components.Root || 'span'; const rootProps = componentsProps.root || {}; @@ -113,22 +107,22 @@ const BadgeUnstyled = React.forwardRef(function BadgeUnstyled(props, ref) { return ( {children} {displayValue} @@ -163,6 +157,7 @@ BadgeUnstyled.propTypes = { children: PropTypes.node, /** * Override or extend the styles applied to the component. + * @default {} */ classes: PropTypes.object, /** diff --git a/packages/material-ui/src/Badge/Badge.d.ts b/packages/material-ui/src/Badge/Badge.d.ts index 10afd9457e8cb3..1e78d61e13f6f8 100644 --- a/packages/material-ui/src/Badge/Badge.d.ts +++ b/packages/material-ui/src/Badge/Badge.d.ts @@ -19,6 +19,7 @@ export type BadgeTypeMap< props: P & { /** * Override or extend the styles applied to the component. + * @default {} */ classes?: BadgeUnstyledTypeMap['props']['classes'] & { /** Styles applied to the root element if `color="primary"`. */ diff --git a/packages/material-ui/src/Badge/Badge.js b/packages/material-ui/src/Badge/Badge.js index ea652a88a9abb4..92fd04bbe6976c 100644 --- a/packages/material-ui/src/Badge/Badge.js +++ b/packages/material-ui/src/Badge/Badge.js @@ -198,10 +198,7 @@ const BadgeBadge = styled( })); const extendBadgeClasses = (props) => { - const { - styleProps: { color = 'default' }, - classes = {}, - } = props; + const { color, classes = {} } = props; return { ...classes, @@ -214,7 +211,32 @@ const extendBadgeClasses = (props) => { const Badge = React.forwardRef(function Badge(inputProps, ref) { const { isRtl, ...props } = useThemeProps({ props: inputProps, name: 'MuiBadge' }); - const { components = {}, color = 'default', ...other } = props; + const { + components = {}, + color: colorProp = 'default', + invisible: invisibleProp, + badgeContent: badgeContentProp, + showZero = false, + variant: variantProp = 'standard', + ...other + } = props; + + const prevProps = usePreviousProps({ + color: colorProp, + }); + + let invisible = invisibleProp; + + if ( + invisibleProp == null && + ((badgeContentProp === 0 && !showZero) || (badgeContentProp == null && variantProp !== 'dot')) + ) { + invisible = true; + } + + const { color = colorProp } = invisible ? prevProps : props; + + const classes = extendBadgeClasses({ ...props, invisible, color }); return ( ); @@ -257,6 +282,7 @@ Badge.propTypes = { children: PropTypes.node, /** * Override or extend the styles applied to the component. + * @default {} */ classes: PropTypes.object, /** From 7b3cfa78eadcdd456d56e1e431dddd8c3066e0e8 Mon Sep 17 00:00:00 2001 From: Marija Najdova Date: Thu, 3 Dec 2020 13:08:36 +0100 Subject: [PATCH 3/3] fixes --- packages/material-ui/src/Badge/Badge.js | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/packages/material-ui/src/Badge/Badge.js b/packages/material-ui/src/Badge/Badge.js index 92fd04bbe6976c..7caaba9a5b6cbd 100644 --- a/packages/material-ui/src/Badge/Badge.js +++ b/packages/material-ui/src/Badge/Badge.js @@ -213,6 +213,7 @@ const Badge = React.forwardRef(function Badge(inputProps, ref) { const { isRtl, ...props } = useThemeProps({ props: inputProps, name: 'MuiBadge' }); const { components = {}, + componentsProps = {}, color: colorProp = 'default', invisible: invisibleProp, badgeContent: badgeContentProp, @@ -240,15 +241,22 @@ const Badge = React.forwardRef(function Badge(inputProps, ref) { return (