diff --git a/.eslintignore b/.eslintignore index ed77de73..8ef75f0e 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,6 +1,8 @@ docs/node_modules docs/build docs/.docusaurus +theme-builder/node_modules +theme-builder/.next node_modules coverage dist diff --git a/docs/src/pages/kitchen-sink.js b/docs/src/pages/kitchen-sink.js index 9b6281e2..6c1f6c87 100644 --- a/docs/src/pages/kitchen-sink.js +++ b/docs/src/pages/kitchen-sink.js @@ -172,6 +172,7 @@ const KitchenSink = () => { { /> { requiredMarkerColor="#FF6347" > =16" + "react": ">= 16.8", + "react-dom": ">= 16.8" }, "husky": { "hooks": { @@ -73,7 +74,7 @@ "prism-react-renderer": "^1.0.2", "react": "^16.13.0", "react-docgen-typescript-loader": "^3.7.0", - "react-dom": "^16.13.0", + "react-dom": "^16.13.1", "react-live": "^2.2.2", "rollup-plugin-postcss": "^3.1.1", "semantic-release": "^17.0.2", diff --git a/src/Image/index.tsx b/src/Image/index.tsx index bd67bd42..4f5e677f 100644 --- a/src/Image/index.tsx +++ b/src/Image/index.tsx @@ -25,7 +25,7 @@ export const Image = forwardRef(function Image( ) { const theme = useTheme(); - warning(!alt, 'Images require an `alt` attribute to be accessible.'); + warning(alt, 'Images require an `alt` attribute to be accessible.'); return ( diff --git a/src/Input/index.tsx b/src/Input/index.tsx index df5c16a5..59064938 100644 --- a/src/Input/index.tsx +++ b/src/Input/index.tsx @@ -49,7 +49,7 @@ export const Input = forwardRef(function Input( const componentStyles = useComponentStyles('Input'); warning( - !hiddenLabel, + hiddenLabel, 'Inputs without associated labels require a `hiddenLabel` attribute to be accessible.' ); diff --git a/src/Modal/index.tsx b/src/Modal/index.tsx index 82cda872..d581e527 100644 --- a/src/Modal/index.tsx +++ b/src/Modal/index.tsx @@ -94,10 +94,9 @@ export const ModalFooter = forwardRef(function ModalFooter( { children, ...props }: ModalFooterProps, ref ) { - // const theme = useTheme(); const componentStyles = useComponentStyles('ModalFooter'); return ( - + {children} ); diff --git a/src/theme.ts b/src/theme.ts index ce428f92..e2e865ae 100644 --- a/src/theme.ts +++ b/src/theme.ts @@ -20,9 +20,11 @@ export interface ThemeComponent extends React.CSSProperties, PseudoBoxProps {} export interface MinervaTheme extends Theme { Button?: React.CSSProperties; Drawer?: React.CSSProperties; + Heading?: React.CSSProperties; Modal?: React.CSSProperties; ModalContent?: React.CSSProperties; ModalBody?: React.CSSProperties; + ModalHeader?: React.CSSProperties; ModalFooter?: React.CSSProperties; Text?: React.CSSProperties; Input?: ThemeComponent; @@ -77,6 +79,7 @@ const defaultTheme: MinervaTheme = { }, Checkbox: {}, Drawer: {}, + Heading: { fontWeight: 'bold' }, Image: {}, Input: { appearance: 'none', @@ -106,6 +109,7 @@ const defaultTheme: MinervaTheme = { Link: {}, Tabs: {}, Modal: {}, + ModalHeader: {}, ModalBody: {}, ModalFooter: {}, ModalContent: {}, diff --git a/test/__snapshots__/alert.test.tsx.snap b/test/__snapshots__/alert.test.tsx.snap index 5751b80d..1aeb4ae5 100644 --- a/test/__snapshots__/alert.test.tsx.snap +++ b/test/__snapshots__/alert.test.tsx.snap @@ -5,8 +5,10 @@ exports[` should render 1`] = ` box-sizing: border-box; min-width: 0; color: #374151; + font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; margin: 0; font-size: 16px; + font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; line-height: normal; } @@ -14,14 +16,17 @@ exports[` should render 1`] = ` box-sizing: border-box; min-width: 0; color: #374151; + font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; background-color: #e5e7eb; line-height: 1; + font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; display: -webkit-box; display: -webkit-flex; display: -ms-flexbox; display: flex; background-color: #e5e7eb; line-height: 1; + font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; padding: 16px; border-radius: 5px; -webkit-align-items: center; @@ -30,6 +35,7 @@ exports[` should render 1`] = ` align-items: center; background-color: #e5e7eb; line-height: 1; + font-family: -apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,"Noto Sans",sans-serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol","Noto Color Emoji"; } .c2 { diff --git a/test/__snapshots__/button.test.tsx.snap b/test/__snapshots__/button.test.tsx.snap index 8245b9e3..ecbfd2fe 100644 --- a/test/__snapshots__/button.test.tsx.snap +++ b/test/__snapshots__/button.test.tsx.snap @@ -5,10 +5,12 @@ exports[`