Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

COM-283: Refactor theming of BlockElement #1719

Merged
merged 3 commits into from
Feb 20, 2024
Merged

COM-283: Refactor theming of BlockElement #1719

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1caeeb9
refactor styling of BlockElement
juliawegmayr Feb 6, 2024
6ff67c5
include style of the given type
juliawegmayr Feb 20, 2024
fe96639
add condition to include style of given type
juliawegmayr Feb 20, 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
173 changes: 100 additions & 73 deletions packages/admin/admin-rte/src/core/BlockElement.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ComponentsOverrides, Theme, Typography, TypographyProps } from "@mui/material";
import { createStyles, WithStyles, withStyles } from "@mui/styles";
import { ThemedComponentBaseProps } from "@comet/admin";
import { ComponentsOverrides, css, styled, Theme, Typography, TypographyProps, useThemeProps } from "@mui/material";
import * as React from "react";

import { SupportedThings } from "./Rte";
Expand All @@ -12,81 +12,108 @@ type StylableBlockTypes = Extract<

export type RteBlockElementClassKey = StylableBlockTypes | "root";

export interface RteBlockElementProps extends TypographyProps {
type OwnerState = Pick<RteBlockElementProps, "type">;

const Root = styled(Typography, {
name: "CometAdminRteBlockElement",
slot: "root",
overridesResolver({ ownerState }: { ownerState: OwnerState }, styles) {
return [styles.root, ownerState.type && styles[ownerState.type]];
},
})<{ ownerState: OwnerState }>(
({ theme, ownerState }) => css`
font-size: 16px;
line-height: 20px;
font-weight: 300;
color: ${theme.palette.grey[800]};
margin-bottom: 10px;

${ownerState.type === "header-one" &&
css`
font-size: 30px;
line-height: 1.2;
font-weight: 500;
`}

${ownerState.type === "header-two" &&
css`
font-size: 28px;
line-height: 1.2;
font-weight: 500;
`}

${ownerState.type === "header-three" &&
css`
font-size: 26px;
line-height: 1.2;
font-weight: 500;
`}

${ownerState.type === "header-four" &&
css`
font-size: 22px;
line-height: 1.2;
font-weight: 500;
`}

${ownerState.type === "header-five" &&
css`
font-size: 20px;
line-height: 1.2;
font-weight: 500;
`}

${ownerState.type === "header-six" &&
css`
font-size: 18px;
line-height: 1.2;
font-weight: 500;
`}

${ownerState.type === "ordered-list" &&
css`
padding-left: 0;
`}

${ownerState.type === "unordered-list" &&
css`
padding-left: 0;
`}

${ownerState.type === "blockquote" &&
css`
display: block;
position: relative;
padding-left: 20px;
padding-top: 5px;
padding-bottom: 5px;

&:before {
content: "";
position: absolute;
top: 0;
bottom: 0;
left: 2px;
width: 4px;
background-color: ${theme.palette.grey[200]};
border-radius: 2px;
}
`}
`,
);

export interface RteBlockElementProps extends ThemedComponentBaseProps<{ root: typeof Typography }>, TypographyProps {
type?: StylableBlockTypes;
component?: React.ElementType;
}

const RteBlockElement = ({ classes, type, ...restProps }: RteBlockElementProps & WithStyles<typeof styles>) => {
return <Typography component="div" classes={{ root: `${classes.root} ${type ? classes[type] : ""}` }} {...restProps} />;
};

const styles = ({ palette }: Theme) => {
return createStyles<RteBlockElementClassKey, RteBlockElementProps>({
root: {
fontSize: 16,
lineHeight: "20px",
fontWeight: 300,
color: palette.grey[800],
marginBottom: 10,
},
"header-one": {
fontSize: 30,
lineHeight: 1.2,
fontWeight: 500,
},
"header-two": {
fontSize: 28,
lineHeight: 1.2,
fontWeight: 500,
},
"header-three": {
fontSize: 26,
lineHeight: 1.2,
fontWeight: 500,
},
"header-four": {
fontSize: 22,
lineHeight: 1.2,
fontWeight: 500,
},
"header-five": {
fontSize: 20,
lineHeight: 1.2,
fontWeight: 500,
},
"header-six": {
fontSize: 18,
lineHeight: 1.2,
fontWeight: 500,
},
"ordered-list": {
paddingLeft: 0,
},
"unordered-list": {
paddingLeft: 0,
},
blockquote: {
display: "block",
position: "relative",
paddingLeft: 20,
paddingTop: 5,
paddingBottom: 5,
"&:before": {
content: '""',
position: "absolute",
top: 0,
bottom: 0,
left: 2,
width: 4,
backgroundColor: palette.grey[200],
borderRadius: 2,
},
},
});
};

export const BlockElement = withStyles(styles, { name: "CometAdminRteBlockElement" })(RteBlockElement);
export function BlockElement(inProps: RteBlockElementProps) {
const { type, slotProps, ...restProps } = useThemeProps({ props: inProps, name: "CometAdminRteBlockElement" });
const ownerState: OwnerState = {
type,
};
return <Root component="div" ownerState={ownerState} {...slotProps?.root} {...restProps} />;
}

declare module "@mui/material/styles" {
interface ComponentNameToClassKey {
Expand Down
Loading