fix(striker-ui): allow BodyText to inherit colour

main
Tsu-ba-me 2 years ago
parent 4c057a30f7
commit 823bb7110f
  1. 42
      striker-ui/components/Text/BodyText.tsx

@ -1,4 +1,4 @@
import { FC, ReactNode } from 'react'; import { FC, ReactNode, useMemo } from 'react';
import { import {
Typography as MUITypography, Typography as MUITypography,
TypographyProps as MUITypographyProps, TypographyProps as MUITypographyProps,
@ -7,6 +7,7 @@ import {
import { BLACK, TEXT, UNSELECTED } from '../../lib/consts/DEFAULT_THEME'; import { BLACK, TEXT, UNSELECTED } from '../../lib/consts/DEFAULT_THEME';
type BodyTextOptionalProps = { type BodyTextOptionalProps = {
inheritColour?: boolean;
inverted?: boolean; inverted?: boolean;
monospaced?: boolean; monospaced?: boolean;
selected?: boolean; selected?: boolean;
@ -18,6 +19,7 @@ type BodyTextProps = MUITypographyProps & BodyTextOptionalProps;
const BODY_TEXT_CLASS_PREFIX = 'BodyText'; const BODY_TEXT_CLASS_PREFIX = 'BodyText';
const BODY_TEXT_DEFAULT_PROPS: Required<BodyTextOptionalProps> = { const BODY_TEXT_DEFAULT_PROPS: Required<BodyTextOptionalProps> = {
inheritColour: false,
inverted: false, inverted: false,
monospaced: false, monospaced: false,
selected: true, selected: true,
@ -25,6 +27,7 @@ const BODY_TEXT_DEFAULT_PROPS: Required<BodyTextOptionalProps> = {
}; };
const BODY_TEXT_CLASSES = { const BODY_TEXT_CLASSES = {
inheritColour: `${BODY_TEXT_CLASS_PREFIX}-inherit-colour`,
inverted: `${BODY_TEXT_CLASS_PREFIX}-inverted`, inverted: `${BODY_TEXT_CLASS_PREFIX}-inverted`,
monospaced: `${BODY_TEXT_CLASS_PREFIX}-monospaced`, monospaced: `${BODY_TEXT_CLASS_PREFIX}-monospaced`,
selected: `${BODY_TEXT_CLASS_PREFIX}-selected`, selected: `${BODY_TEXT_CLASS_PREFIX}-selected`,
@ -32,17 +35,21 @@ const BODY_TEXT_CLASSES = {
}; };
const buildBodyTextClasses = ({ const buildBodyTextClasses = ({
isInheritColour,
isInvert, isInvert,
isMonospace, isMonospace,
isSelect, isSelect,
}: { }: {
isInheritColour?: boolean;
isInvert?: boolean; isInvert?: boolean;
isMonospace?: boolean; isMonospace?: boolean;
isSelect?: boolean; isSelect?: boolean;
}) => { }) => {
const bodyTextClasses: string[] = []; const bodyTextClasses: string[] = [];
if (isInvert) { if (isInheritColour) {
bodyTextClasses.push(BODY_TEXT_CLASSES.inheritColour);
} else if (isInvert) {
bodyTextClasses.push(BODY_TEXT_CLASSES.inverted); bodyTextClasses.push(BODY_TEXT_CLASSES.inverted);
} else if (isSelect) { } else if (isSelect) {
bodyTextClasses.push(BODY_TEXT_CLASSES.selected); bodyTextClasses.push(BODY_TEXT_CLASSES.selected);
@ -60,20 +67,30 @@ const buildBodyTextClasses = ({
const BodyText: FC<BodyTextProps> = ({ const BodyText: FC<BodyTextProps> = ({
children, children,
className, className,
inverted = BODY_TEXT_DEFAULT_PROPS.inverted, inheritColour: isInheritColour = BODY_TEXT_DEFAULT_PROPS.inheritColour,
monospaced = BODY_TEXT_DEFAULT_PROPS.monospaced, inverted: isInvert = BODY_TEXT_DEFAULT_PROPS.inverted,
selected = BODY_TEXT_DEFAULT_PROPS.selected, monospaced: isMonospace = BODY_TEXT_DEFAULT_PROPS.monospaced,
selected: isSelect = BODY_TEXT_DEFAULT_PROPS.selected,
sx, sx,
text = BODY_TEXT_DEFAULT_PROPS.text, text = BODY_TEXT_DEFAULT_PROPS.text,
...muiTypographyRestProps ...muiTypographyRestProps
}) => ( }) => {
const baseClassName = useMemo(
() =>
buildBodyTextClasses({
isInheritColour,
isInvert,
isMonospace,
isSelect,
}),
[isInheritColour, isInvert, isMonospace, isSelect],
);
const content = useMemo(() => text ?? children, [children, text]);
return (
<MUITypography <MUITypography
{...{ {...{
className: `${buildBodyTextClasses({ className: `${baseClassName} ${className}`,
isInvert: inverted,
isMonospace: monospaced,
isSelect: selected,
})} ${className}`,
variant: 'subtitle1', variant: 'subtitle1',
...muiTypographyRestProps, ...muiTypographyRestProps,
sx: { sx: {
@ -98,9 +115,10 @@ const BodyText: FC<BodyTextProps> = ({
}, },
}} }}
> >
{text ?? children} {content}
</MUITypography> </MUITypography>
); );
};
BodyText.defaultProps = BODY_TEXT_DEFAULT_PROPS; BodyText.defaultProps = BODY_TEXT_DEFAULT_PROPS;

Loading…
Cancel
Save