From 0ecb620500c4094f909b1101cffefe1da297e7f8 Mon Sep 17 00:00:00 2001 From: Jesse Pinho Date: Tue, 9 Jul 2024 15:39:38 -0700 Subject: [PATCH] Add a Normalize component --- packages/ui/.storybook/preview.jsx | 23 +- packages/ui/package.json | 1 + packages/ui/src/Normalize/index.tsx | 4 + packages/ui/src/Normalize/normalize.css | 349 +++++++++++++++++++ packages/ui/src/Normalize/normalize.css.d.ts | 4 + pnpm-lock.yaml | 99 ++++-- 6 files changed, 447 insertions(+), 33 deletions(-) create mode 100644 packages/ui/src/Normalize/index.tsx create mode 100644 packages/ui/src/Normalize/normalize.css create mode 100644 packages/ui/src/Normalize/normalize.css.d.ts diff --git a/packages/ui/.storybook/preview.jsx b/packages/ui/.storybook/preview.jsx index 944dddeca8..e7904476cd 100644 --- a/packages/ui/.storybook/preview.jsx +++ b/packages/ui/.storybook/preview.jsx @@ -1,18 +1,25 @@ import React from 'react'; import globalsCssUrl from '../styles/globals.css?url'; import penumbraTheme from './penumbraTheme'; +import { Normalize } from '../src/Normalize'; /** @type { import('@storybook/react').Preview } */ const preview = { decorators: [ - (Story, { title }) => ( - <> - {title.startsWith('Deprecated/') && ( - - )} - - - ), + (Story, { title }) => { + const css = title.startsWith('Deprecated/') ? ( + + ) : ( + + ); + + return ( + <> + {css} + + + ); + }, ], parameters: { actions: { argTypesRegex: '^on[A-Z].*' }, diff --git a/packages/ui/package.json b/packages/ui/package.json index 39ea90d3d0..8776a18e70 100644 --- a/packages/ui/package.json +++ b/packages/ui/package.json @@ -106,6 +106,7 @@ "react-loader-spinner": "^6.1.6", "react-router-dom": "^6.23.1", "sonner": "1.4.3", + "styled-components": "^6.1.11", "tailwind-merge": "^2.3.0", "tinycolor2": "^1.6.0" }, diff --git a/packages/ui/src/Normalize/index.tsx b/packages/ui/src/Normalize/index.tsx new file mode 100644 index 0000000000..b7768c00b9 --- /dev/null +++ b/packages/ui/src/Normalize/index.tsx @@ -0,0 +1,4 @@ +import { createGlobalStyle } from 'styled-components'; +import cssContents from './normalize.css?raw'; + +export const Normalize = createGlobalStyle`${cssContents}`; diff --git a/packages/ui/src/Normalize/normalize.css b/packages/ui/src/Normalize/normalize.css new file mode 100644 index 0000000000..c46998948f --- /dev/null +++ b/packages/ui/src/Normalize/normalize.css @@ -0,0 +1,349 @@ +/*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */ + +/* Document + ========================================================================== */ + +/** + * 1. Correct the line height in all browsers. + * 2. Prevent adjustments of font size after orientation changes in iOS. + */ + + html { + line-height: 1.15; /* 1 */ + -webkit-text-size-adjust: 100%; /* 2 */ +} + +/* Sections + ========================================================================== */ + +/** + * Remove the margin in all browsers. + */ + +body { + margin: 0; +} + +/** + * Render the `main` element consistently in IE. + */ + +main { + display: block; +} + +/** + * Correct the font size and margin on `h1` elements within `section` and + * `article` contexts in Chrome, Firefox, and Safari. + */ + +h1 { + font-size: 2em; + margin: 0.67em 0; +} + +/* Grouping content + ========================================================================== */ + +/** + * 1. Add the correct box sizing in Firefox. + * 2. Show the overflow in Edge and IE. + */ + +hr { + box-sizing: content-box; /* 1 */ + height: 0; /* 1 */ + overflow: visible; /* 2 */ +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +pre { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/* Text-level semantics + ========================================================================== */ + +/** + * Remove the gray background on active links in IE 10. + */ + +a { + background-color: transparent; +} + +/** + * 1. Remove the bottom border in Chrome 57- + * 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari. + */ + +abbr[title] { + border-bottom: none; /* 1 */ + text-decoration: underline; /* 2 */ + text-decoration: underline dotted; /* 2 */ +} + +/** + * Add the correct font weight in Chrome, Edge, and Safari. + */ + +b, +strong { + font-weight: bolder; +} + +/** + * 1. Correct the inheritance and scaling of font size in all browsers. + * 2. Correct the odd `em` font sizing in all browsers. + */ + +code, +kbd, +samp { + font-family: monospace, monospace; /* 1 */ + font-size: 1em; /* 2 */ +} + +/** + * Add the correct font size in all browsers. + */ + +small { + font-size: 80%; +} + +/** + * Prevent `sub` and `sup` elements from affecting the line height in + * all browsers. + */ + +sub, +sup { + font-size: 75%; + line-height: 0; + position: relative; + vertical-align: baseline; +} + +sub { + bottom: -0.25em; +} + +sup { + top: -0.5em; +} + +/* Embedded content + ========================================================================== */ + +/** + * Remove the border on images inside links in IE 10. + */ + +img { + border-style: none; +} + +/* Forms + ========================================================================== */ + +/** + * 1. Change the font styles in all browsers. + * 2. Remove the margin in Firefox and Safari. + */ + +button, +input, +optgroup, +select, +textarea { + font-family: inherit; /* 1 */ + font-size: 100%; /* 1 */ + line-height: 1.15; /* 1 */ + margin: 0; /* 2 */ +} + +/** + * Show the overflow in IE. + * 1. Show the overflow in Edge. + */ + +button, +input { /* 1 */ + overflow: visible; +} + +/** + * Remove the inheritance of text transform in Edge, Firefox, and IE. + * 1. Remove the inheritance of text transform in Firefox. + */ + +button, +select { /* 1 */ + text-transform: none; +} + +/** + * Correct the inability to style clickable types in iOS and Safari. + */ + +button, +[type="button"], +[type="reset"], +[type="submit"] { + -webkit-appearance: button; +} + +/** + * Remove the inner border and padding in Firefox. + */ + +button::-moz-focus-inner, +[type="button"]::-moz-focus-inner, +[type="reset"]::-moz-focus-inner, +[type="submit"]::-moz-focus-inner { + border-style: none; + padding: 0; +} + +/** + * Restore the focus styles unset by the previous rule. + */ + +button:-moz-focusring, +[type="button"]:-moz-focusring, +[type="reset"]:-moz-focusring, +[type="submit"]:-moz-focusring { + outline: 1px dotted ButtonText; +} + +/** + * Correct the padding in Firefox. + */ + +fieldset { + padding: 0.35em 0.75em 0.625em; +} + +/** + * 1. Correct the text wrapping in Edge and IE. + * 2. Correct the color inheritance from `fieldset` elements in IE. + * 3. Remove the padding so developers are not caught out when they zero out + * `fieldset` elements in all browsers. + */ + +legend { + box-sizing: border-box; /* 1 */ + color: inherit; /* 2 */ + display: table; /* 1 */ + max-width: 100%; /* 1 */ + padding: 0; /* 3 */ + white-space: normal; /* 1 */ +} + +/** + * Add the correct vertical alignment in Chrome, Firefox, and Opera. + */ + +progress { + vertical-align: baseline; +} + +/** + * Remove the default vertical scrollbar in IE 10+. + */ + +textarea { + overflow: auto; +} + +/** + * 1. Add the correct box sizing in IE 10. + * 2. Remove the padding in IE 10. + */ + +[type="checkbox"], +[type="radio"] { + box-sizing: border-box; /* 1 */ + padding: 0; /* 2 */ +} + +/** + * Correct the cursor style of increment and decrement buttons in Chrome. + */ + +[type="number"]::-webkit-inner-spin-button, +[type="number"]::-webkit-outer-spin-button { + height: auto; +} + +/** + * 1. Correct the odd appearance in Chrome and Safari. + * 2. Correct the outline style in Safari. + */ + +[type="search"] { + -webkit-appearance: textfield; /* 1 */ + outline-offset: -2px; /* 2 */ +} + +/** + * Remove the inner padding in Chrome and Safari on macOS. + */ + +[type="search"]::-webkit-search-decoration { + -webkit-appearance: none; +} + +/** + * 1. Correct the inability to style clickable types in iOS and Safari. + * 2. Change font properties to `inherit` in Safari. + */ + +::-webkit-file-upload-button { + -webkit-appearance: button; /* 1 */ + font: inherit; /* 2 */ +} + +/* Interactive + ========================================================================== */ + +/* + * Add the correct display in Edge, IE 10+, and Firefox. + */ + +details { + display: block; +} + +/* + * Add the correct display in all browsers. + */ + +summary { + display: list-item; +} + +/* Misc + ========================================================================== */ + +/** + * Add the correct display in IE 10+. + */ + +template { + display: none; +} + +/** + * Add the correct display in IE 10. + */ + +[hidden] { + display: none; +} diff --git a/packages/ui/src/Normalize/normalize.css.d.ts b/packages/ui/src/Normalize/normalize.css.d.ts new file mode 100644 index 0000000000..5c6c9ddebb --- /dev/null +++ b/packages/ui/src/Normalize/normalize.css.d.ts @@ -0,0 +1,4 @@ +declare module './normalize.css*?raw' { + const content: string; + export default content; +} diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 97a572bf64..0f37112726 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -695,7 +695,7 @@ importers: version: 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@testing-library/jest-dom': specifier: ^6.4.5 - version: 6.4.6(vitest@1.6.0(@types/node@20.14.10)(@vitest/browser@1.6.0(playwright@1.45.0)(vitest@1.6.0))(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(terser@5.31.1)) + version: 6.4.6(vitest@1.6.0(@types/node@20.14.10)(terser@5.31.1)) '@textea/json-viewer': specifier: ^3.4.1 version: 3.4.1(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@mui/material@5.15.20(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@emotion/styled@11.11.5(@emotion/react@11.11.4(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react@18.3.1))(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1))(@types/react@18.3.3)(immer@10.1.1)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -771,6 +771,9 @@ importers: sonner: specifier: 1.4.3 version: 1.4.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + styled-components: + specifier: ^6.1.11 + version: 6.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1) tailwind-merge: specifier: ^2.3.0 version: 2.3.0 @@ -795,13 +798,13 @@ importers: version: 8.1.10(@types/react-dom@18.3.0)(@types/react@18.3.3)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@storybook/addon-interactions': specifier: ^8.1.1 - version: 8.1.10(vitest@1.6.0(@types/node@20.14.10)(@vitest/browser@1.6.0(playwright@1.45.0)(vitest@1.6.0))(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(terser@5.31.1)) + version: 8.1.10(vitest@1.6.0(@types/node@20.14.10)(terser@5.31.1)) '@storybook/addon-links': specifier: ^8.1.1 version: 8.1.10(react@18.3.1) '@storybook/addon-postcss': specifier: ^2.0.0 - version: 2.0.0(webpack@5.92.1(@swc/core@1.6.13(@swc/helpers@0.5.11))(esbuild@0.20.2)) + version: 2.0.0(webpack@5.92.1(esbuild@0.20.2)) '@storybook/blocks': specifier: ^8.1.1 version: 8.1.10(@types/react-dom@18.3.0)(@types/react@18.3.3)(prettier@3.3.2)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -16351,11 +16354,11 @@ snapshots: dependencies: '@storybook/global': 5.0.0 - '@storybook/addon-interactions@8.1.10(vitest@1.6.0(@types/node@20.14.10)(@vitest/browser@1.6.0(playwright@1.45.0)(vitest@1.6.0))(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(terser@5.31.1))': + '@storybook/addon-interactions@8.1.10(vitest@1.6.0(@types/node@20.14.10)(terser@5.31.1))': dependencies: '@storybook/global': 5.0.0 '@storybook/instrumenter': 8.1.10 - '@storybook/test': 8.1.10(vitest@1.6.0(@types/node@20.14.10)(@vitest/browser@1.6.0(playwright@1.45.0)(vitest@1.6.0))(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(terser@5.31.1)) + '@storybook/test': 8.1.10(vitest@1.6.0(@types/node@20.14.10)(terser@5.31.1)) '@storybook/types': 8.1.10 polished: 4.3.1 ts-dedent: 2.2.0 @@ -16384,13 +16387,13 @@ snapshots: '@storybook/global': 5.0.0 ts-dedent: 2.2.0 - '@storybook/addon-postcss@2.0.0(webpack@5.92.1(@swc/core@1.6.13(@swc/helpers@0.5.11))(esbuild@0.20.2))': + '@storybook/addon-postcss@2.0.0(webpack@5.92.1(esbuild@0.20.2))': dependencies: '@storybook/node-logger': 6.5.16 - css-loader: 3.6.0(webpack@5.92.1(@swc/core@1.6.13(@swc/helpers@0.5.11))(esbuild@0.20.2)) + css-loader: 3.6.0(webpack@5.92.1(esbuild@0.20.2)) postcss: 7.0.39 - postcss-loader: 4.3.0(postcss@7.0.39)(webpack@5.92.1(@swc/core@1.6.13(@swc/helpers@0.5.11))(esbuild@0.20.2)) - style-loader: 1.3.0(webpack@5.92.1(@swc/core@1.6.13(@swc/helpers@0.5.11))(esbuild@0.20.2)) + postcss-loader: 4.3.0(postcss@7.0.39)(webpack@5.92.1(esbuild@0.20.2)) + style-loader: 1.3.0(webpack@5.92.1(esbuild@0.20.2)) transitivePeerDependencies: - webpack @@ -17119,14 +17122,14 @@ snapshots: - prettier - supports-color - '@storybook/test@8.1.10(vitest@1.6.0(@types/node@20.14.10)(@vitest/browser@1.6.0(playwright@1.45.0)(vitest@1.6.0))(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(terser@5.31.1))': + '@storybook/test@8.1.10(vitest@1.6.0(@types/node@20.14.10)(terser@5.31.1))': dependencies: '@storybook/client-logger': 8.1.10 '@storybook/core-events': 8.1.10 '@storybook/instrumenter': 8.1.10 '@storybook/preview-api': 8.1.10 '@testing-library/dom': 9.3.4 - '@testing-library/jest-dom': 6.4.6(vitest@1.6.0(@types/node@20.14.10)(@vitest/browser@1.6.0(playwright@1.45.0)(vitest@1.6.0))(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(terser@5.31.1)) + '@testing-library/jest-dom': 6.4.6(vitest@1.6.0(@types/node@20.14.10)(terser@5.31.1)) '@testing-library/user-event': 14.5.2(@testing-library/dom@9.3.4) '@vitest/expect': 1.3.1 '@vitest/spy': 1.6.0 @@ -17408,6 +17411,19 @@ snapshots: optionalDependencies: vitest: 1.6.0(@types/node@20.14.10)(@vitest/browser@1.6.0)(jsdom@24.1.0(bufferutil@4.0.8)(utf-8-validate@6.0.4))(terser@5.31.1) + '@testing-library/jest-dom@6.4.6(vitest@1.6.0(@types/node@20.14.10)(terser@5.31.1))': + dependencies: + '@adobe/css-tools': 4.4.0 + '@babel/runtime': 7.24.7 + aria-query: 5.3.0 + chalk: 3.0.0 + css.escape: 1.5.1 + dom-accessibility-api: 0.6.3 + lodash: 4.17.21 + redent: 3.0.0 + optionalDependencies: + vitest: 1.6.0(@types/node@20.14.10)(terser@5.31.1) + '@testing-library/react@15.0.7(@types/react@18.3.3)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@babel/runtime': 7.24.7 @@ -18459,7 +18475,7 @@ snapshots: acorn-walk@8.3.3: dependencies: - acorn: 8.12.0 + acorn: 8.12.1 acorn@7.4.1: {} @@ -19361,7 +19377,7 @@ snapshots: css-color-keywords@1.0.0: {} - css-loader@3.6.0(webpack@5.92.1(@swc/core@1.6.13(@swc/helpers@0.5.11))(esbuild@0.20.2)): + css-loader@3.6.0(webpack@5.92.1(esbuild@0.20.2)): dependencies: camelcase: 5.3.1 cssesc: 3.0.0 @@ -19376,7 +19392,7 @@ snapshots: postcss-value-parser: 4.2.0 schema-utils: 2.7.1 semver: 6.3.1 - webpack: 5.92.1(@swc/core@1.6.13(@swc/helpers@0.5.11))(esbuild@0.20.2) + webpack: 5.92.1(esbuild@0.20.2) css-to-react-native@3.2.0: dependencies: @@ -21543,7 +21559,7 @@ snapshots: mlly@1.7.1: dependencies: - acorn: 8.12.0 + acorn: 8.12.1 pathe: 1.1.2 pkg-types: 1.1.1 ufo: 1.5.3 @@ -22095,7 +22111,7 @@ snapshots: postcss: 8.4.38 ts-node: 10.9.2(@swc/core@1.6.13(@swc/helpers@0.5.11))(@types/node@20.14.10)(typescript@5.5.3) - postcss-loader@4.3.0(postcss@7.0.39)(webpack@5.92.1(@swc/core@1.6.13(@swc/helpers@0.5.11))(esbuild@0.20.2)): + postcss-loader@4.3.0(postcss@7.0.39)(webpack@5.92.1(esbuild@0.20.2)): dependencies: cosmiconfig: 7.1.0 klona: 2.0.6 @@ -22103,7 +22119,7 @@ snapshots: postcss: 7.0.39 schema-utils: 3.3.0 semver: 7.6.2 - webpack: 5.92.1(@swc/core@1.6.13(@swc/helpers@0.5.11))(esbuild@0.20.2) + webpack: 5.92.1(esbuild@0.20.2) postcss-modules-extract-imports@2.0.0: dependencies: @@ -23184,11 +23200,11 @@ snapshots: dependencies: js-tokens: 9.0.0 - style-loader@1.3.0(webpack@5.92.1(@swc/core@1.6.13(@swc/helpers@0.5.11))(esbuild@0.20.2)): + style-loader@1.3.0(webpack@5.92.1(esbuild@0.20.2)): dependencies: loader-utils: 2.0.4 schema-utils: 2.7.1 - webpack: 5.92.1(@swc/core@1.6.13(@swc/helpers@0.5.11))(esbuild@0.20.2) + webpack: 5.92.1(esbuild@0.20.2) styled-components@6.1.11(react-dom@18.3.1(react@18.3.1))(react@18.3.1): dependencies: @@ -23362,16 +23378,15 @@ snapshots: term-size@2.2.1: {} - terser-webpack-plugin@5.3.10(@swc/core@1.6.13(@swc/helpers@0.5.11))(esbuild@0.20.2)(webpack@5.92.1(@swc/core@1.6.13(@swc/helpers@0.5.11))(esbuild@0.20.2)): + terser-webpack-plugin@5.3.10(esbuild@0.20.2)(webpack@5.92.1(esbuild@0.20.2)): dependencies: '@jridgewell/trace-mapping': 0.3.25 jest-worker: 27.5.1 schema-utils: 3.3.0 serialize-javascript: 6.0.2 terser: 5.31.1 - webpack: 5.92.1(@swc/core@1.6.13(@swc/helpers@0.5.11))(esbuild@0.20.2) + webpack: 5.92.1(esbuild@0.20.2) optionalDependencies: - '@swc/core': 1.6.13(@swc/helpers@0.5.11) esbuild: 0.20.2 terser@5.31.1: @@ -23841,7 +23856,7 @@ snapshots: debug: 4.3.5 pathe: 1.1.2 picocolors: 1.0.1 - vite: 5.3.1(@types/node@20.14.10)(terser@5.31.1) + vite: 5.3.3(@types/node@20.14.10)(terser@5.31.1) transitivePeerDependencies: - '@types/node' - less @@ -23929,6 +23944,40 @@ snapshots: - supports-color - terser + vitest@1.6.0(@types/node@20.14.10)(terser@5.31.1): + dependencies: + '@vitest/expect': 1.6.0 + '@vitest/runner': 1.6.0 + '@vitest/snapshot': 1.6.0 + '@vitest/spy': 1.6.0 + '@vitest/utils': 1.6.0 + acorn-walk: 8.3.3 + chai: 4.4.1 + debug: 4.3.5 + execa: 8.0.1 + local-pkg: 0.5.0 + magic-string: 0.30.10 + pathe: 1.1.2 + picocolors: 1.0.1 + std-env: 3.7.0 + strip-literal: 2.1.0 + tinybench: 2.8.0 + tinypool: 0.8.4 + vite: 5.3.3(@types/node@20.14.10)(terser@5.31.1) + vite-node: 1.6.0(@types/node@20.14.10)(terser@5.31.1) + why-is-node-running: 2.2.2 + optionalDependencies: + '@types/node': 20.14.10 + transitivePeerDependencies: + - less + - lightningcss + - sass + - stylus + - sugarss + - supports-color + - terser + optional: true + vm-browserify@1.1.2: {} w3c-xmlserializer@5.0.0: @@ -23954,7 +24003,7 @@ snapshots: webpack-virtual-modules@0.6.2: {} - webpack@5.92.1(@swc/core@1.6.13(@swc/helpers@0.5.11))(esbuild@0.20.2): + webpack@5.92.1(esbuild@0.20.2): dependencies: '@types/eslint-scope': 3.7.7 '@types/estree': 1.0.5 @@ -23977,7 +24026,7 @@ snapshots: neo-async: 2.6.2 schema-utils: 3.3.0 tapable: 2.2.1 - terser-webpack-plugin: 5.3.10(@swc/core@1.6.13(@swc/helpers@0.5.11))(esbuild@0.20.2)(webpack@5.92.1(@swc/core@1.6.13(@swc/helpers@0.5.11))(esbuild@0.20.2)) + terser-webpack-plugin: 5.3.10(esbuild@0.20.2)(webpack@5.92.1(esbuild@0.20.2)) watchpack: 2.4.1 webpack-sources: 3.2.3 transitivePeerDependencies: