Skip to content

chore: use emotion for styling (pt. 3) #10026

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

Merged
merged 16 commits into from
Oct 5, 2023
Merged

chore: use emotion for styling (pt. 3) #10026

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
781b73f
emotion: `CodeExample`
aslilac Oct 3, 2023
20b1b73
emotion + refactor: `DropdownArrow`
aslilac Oct 3, 2023
01bdcd6
emotion: `InfoTooltip`
aslilac Oct 3, 2023
d995bcd
emotion: `ResourceCard`
aslilac Oct 3, 2023
632d05b
emotion: `RichParameterInput`
aslilac Oct 3, 2023
515511c
emotion: `CreateUserForm`
aslilac Oct 3, 2023
627d09b
emotion: `TemplateVersionEditor`
aslilac Oct 3, 2023
e06c71b
emotion: `HelpTooltip`
aslilac Oct 3, 2023
ad20b77
🧹
aslilac Oct 3, 2023
ed4e71b
emotion: `Markdown`
aslilac Oct 3, 2023
0bfa16a
silly!
aslilac Oct 4, 2023
ff884e1
emotion: `Stack`
aslilac Oct 4, 2023
da885f0
better stories
aslilac Oct 4, 2023
db60ab2
justice
aslilac Oct 4, 2023
7369494
this should be fine?
aslilac Oct 4, 2023
8e3d0a1
Merge branch 'main' into emotional-damage-3
aslilac Oct 4, 2023
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
Prev Previous commit
Next Next commit
emotion: Markdown
  • Loading branch information
@aslilac
aslilac committed Oct 3, 2023
commit ed4e71beff0abbee401c52e5c712c8a84f57179f
127 changes: 66 additions & 61 deletions site/src/components/Markdown/Markdown.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import Link from "@mui/material/Link";
import { makeStyles } from "@mui/styles";
import Table from "@mui/material/Table";
import TableBody from "@mui/material/TableBody";
import TableCell from "@mui/material/TableCell";
Expand All @@ -12,17 +11,24 @@ import { Prism as SyntaxHighlighter } from "react-syntax-highlighter";
import gfm from "remark-gfm";
import { colors } from "theme/colors";
import { darcula } from "react-syntax-highlighter/dist/cjs/styles/prism";
import { combineClasses } from "utils/combineClasses";
import { type Interpolation, type Theme } from "@emotion/react";

export const Markdown: FC<{ children: string; className?: string }> = ({
children,
className,
}) => {
const styles = useStyles();
interface MarkdownProps {
/**
* The Markdown text to parse and render
*/
children: string;

className?: string;
}

export const Markdown: FC<MarkdownProps> = (props) => {
const { children, className } = props;

return (
<ReactMarkdown
className={combineClasses([styles.markdown, className])}
css={markdownStyles}
className={className}
remarkPlugins={[gfm]}
components={{
a: ({ href, target, children }) => (
Expand Down Expand Up @@ -58,7 +64,16 @@ export const Markdown: FC<{ children: string; className?: string }> = ({
{String(children)}
</SyntaxHighlighter>
) : (
<code className={styles.codeWithoutLanguage} {...props}>
<code
css={(theme) => ({
padding: theme.spacing(0.125, 0.5),
background: theme.palette.divider,
borderRadius: 4,
color: theme.palette.text.primary,
fontSize: 14,
})}
{...props}
>
{children}
</code>
);
Expand Down Expand Up @@ -100,67 +115,57 @@ export const Markdown: FC<{ children: string; className?: string }> = ({

export const MemoizedMarkdown = memo(Markdown);

const useStyles = makeStyles((theme) => ({
markdown: {
fontSize: 16,
lineHeight: "24px",

"& h1, & h2, & h3, & h4, & h5, & h6": {
marginTop: theme.spacing(4),
marginBottom: theme.spacing(2),
lineHeight: "1.25",
},
const markdownStyles: Interpolation<Theme> = (theme: Theme) => ({
fontSize: 16,
lineHeight: "24px",

"& p": {
marginTop: 0,
marginBottom: theme.spacing(2),
},
"& h1, & h2, & h3, & h4, & h5, & h6": {
marginTop: theme.spacing(4),
marginBottom: theme.spacing(2),
lineHeight: "1.25",
},

"& p:only-child": {
marginTop: 0,
marginBottom: 0,
},
"& p": {
marginTop: 0,
marginBottom: theme.spacing(2),
},

"& ul, & ol": {
display: "flex",
flexDirection: "column",
gap: theme.spacing(1),
marginBottom: theme.spacing(2),
},
"& p:only-child": {
marginTop: 0,
marginBottom: 0,
},

"& li > ul, & li > ol": {
marginTop: theme.spacing(2),
},
"& ul, & ol": {
display: "flex",
flexDirection: "column",
gap: theme.spacing(1),
marginBottom: theme.spacing(2),
},

"& li > p": {
marginBottom: 0,
},
"& li > ul, & li > ol": {
marginTop: theme.spacing(2),
},

"& .prismjs": {
background: theme.palette.background.paperLight,
borderRadius: theme.shape.borderRadius,
padding: theme.spacing(2, 3),
overflowX: "auto",
"& li > p": {
marginBottom: 0,
},

"& code": {
color: theme.palette.text.secondary,
},
"& .prismjs": {
background: theme.palette.background.paperLight,
borderRadius: theme.shape.borderRadius,
padding: theme.spacing(2, 3),
overflowX: "auto",

"& .key, & .property, & .inserted, .keyword": {
color: colors.turquoise[7],
},
"& code": {
color: theme.palette.text.secondary,
},

"& .deleted": {
color: theme.palette.error.light,
},
"& .key, & .property, & .inserted, .keyword": {
color: colors.turquoise[7],
},
},

codeWithoutLanguage: {
padding: theme.spacing(0.125, 0.5),
background: theme.palette.divider,
borderRadius: 4,
color: theme.palette.text.primary,
fontSize: 14,
"& .deleted": {
color: theme.palette.error.light,
},
},
}));
});