Skip to content

Commit

Permalink
Merge pull request #100 from dolthub/taylor/storybook
Browse files Browse the repository at this point in the history
components: Up storybook to v8
  • Loading branch information
tbantle22 authored Apr 5, 2024
2 parents 85c3b5c + ceb2711 commit 5472279
Show file tree
Hide file tree
Showing 5 changed files with 952 additions and 3,257 deletions.
10 changes: 4 additions & 6 deletions packages/components/.storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@ function getAbsolutePath(value: string): string {
}

const config: StorybookConfig = {
stories: ["../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
addons: [
getAbsolutePath("@storybook/addon-links"),
getAbsolutePath("@storybook/addon-essentials"),
getAbsolutePath("@storybook/addon-interactions"),
getAbsolutePath("@storybook/addon-styling-webpack"),
getAbsolutePath("display-element-css"),
{
name: getAbsolutePath("storybook-css-modules"),
options: {
Expand All @@ -28,13 +27,12 @@ const config: StorybookConfig = {
},
},
},
"@storybook/addon-webpack5-compiler-swc",
],
framework: {
name: "@storybook/react-webpack5",
name: getAbsolutePath("@storybook/react-webpack5"),
options: {
builder: {
useSWC: true,
},
builder: {},
},
},
webpackFinal: async config => {
Expand Down
22 changes: 11 additions & 11 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,16 @@
"@rollup/plugin-commonjs": "^25.0.7",
"@rollup/plugin-node-resolve": "^15.2.3",
"@rollup/plugin-typescript": "^11.1.5",
"@storybook/addon-essentials": "^7.6.17",
"@storybook/addon-interactions": "^7.6.17",
"@storybook/addon-links": "^7.6.17",
"@storybook/addon-styling-webpack": "^0.0.6",
"@storybook/addon-viewport": "^7.6.17",
"@storybook/blocks": "^7.6.17",
"@storybook/react": "^7.6.17",
"@storybook/react-webpack5": "^7.6.17",
"@storybook/test": "^7.6.17",
"@storybook/addon-essentials": "^8.0.6",
"@storybook/addon-interactions": "^8.0.6",
"@storybook/addon-links": "^8.0.6",
"@storybook/addon-styling-webpack": "^1.0.0",
"@storybook/addon-viewport": "^8.0.6",
"@storybook/addon-webpack5-compiler-swc": "^1.0.2",
"@storybook/blocks": "^8.0.6",
"@storybook/react": "^8.0.6",
"@storybook/react-webpack5": "^8.0.6",
"@storybook/test": "^8.0.6",
"@testing-library/jest-dom": "^6.4.1",
"@testing-library/react": "^14.2.0",
"@testing-library/react-hooks": "^8.0.1",
Expand All @@ -104,7 +105,6 @@
"babel-jest": "^29.7.0",
"chromatic": "^11.0.6",
"cssnano": "^6.1.2",
"display-element-css": "cfpb/storybook-addon-display-element-css",
"eslint": "^8.57.0",
"eslint-plugin-storybook": "^0.8.0",
"identity-obj-proxy": "^3.0.0",
Expand All @@ -124,7 +124,7 @@
"rollup-plugin-peer-deps-external": "^2.2.4",
"rollup-plugin-postcss": "^4.0.2",
"rollup-plugin-terser": "^7.0.2",
"storybook": "^7.6.17",
"storybook": "^8.0.6",
"storybook-css-modules": "^1.0.8",
"stylelint": "^16.2.1",
"stylelint-config-recommended": "^14.0.0",
Expand Down
71 changes: 71 additions & 0 deletions packages/components/src/__stories__/colors.mdx
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
import { Meta, ColorPalette, ColorItem } from "@storybook/blocks";
import { staticColors, baseColorVariableValues } from "../tailwind/theme/base/colors"
import { colors as dolthubColors } from "../tailwind/theme/dolthub/colors"
import { tailwindColorTheme as hostedTailwindColorTheme, colors as hostedColors } from "../tailwind/theme/hosted/colors"
import { tailwindColorTheme as workbenchTailwindColorTheme, colors as workbenchColors } from "../tailwind/theme/workbench/colors"

<Meta title="Colors" />

# Colors

Colors we use in our design system.

## Base Colors

<ColorPalette>
{Object.entries(staticColors).map(([k, v], i) => {
return (
<ColorItem key={i} title={k} colors={[v]} />
)
})}
</ColorPalette>

## Theme Colors

Colors with <code>(c)</code> share a name among all themes but have different values.

### DoltHub

<ColorPalette>
{Object.entries(baseColorVariableValues).map(([k, v], i) => {
return (
<ColorItem key={i} title={`${k.replace("rgb-", "")} (c)`} colors={[`rgba(${v})`]} />
)
})}
{Object.entries(dolthubColors).map(([k, v], i) => {
return (
<ColorItem key={i} title={k} colors={[v]} />
)
})}
</ColorPalette>

### Hosted

<ColorPalette>
{Object.entries(hostedTailwindColorTheme).map(([k, v], i) => {
return (
<ColorItem key={i} title={`${k.replace("rgb-", "")} (c)`} colors={[`rgba(${v})`]} />
)
})}
{Object.entries(hostedColors).map(([k, v], i) => {
return (
<ColorItem key={i} title={k} colors={[v]} />
)
})}
</ColorPalette>

### Workbench

<ColorPalette>
{Object.entries(workbenchTailwindColorTheme).map(([k, v], i) => {
return (
<ColorItem key={i} title={`${k.replace("rgb-", "")} (c)`} colors={[`rgba(${v})`]} />
)
})}
{Object.entries(workbenchColors).map(([k, v], i) => {
return (
<ColorItem key={i} title={k} colors={[v]} />
)
})}
</ColorPalette>

56 changes: 34 additions & 22 deletions packages/components/src/tailwind/theme/base/colors.ts
Original file line number Diff line number Diff line change
@@ -1,36 +1,48 @@
import { IThemeColors, IThemeRGB, IThemeVariables } from "../../types";

// TODO: Improve these names
const staticColors = {
"ld-blue": "#6db0fc",
"ld-darkerblue": "#1e2842",
"ld-darkergrey": "#384B52",
"ld-darkestblue": "#182134",
"ld-darkgrey": "#95a3a7",
"ld-green": "#5deda2",
"ld-grey": "#f2f5fb",
const greys = {
"ld-lightblue": "#f6f8f9",
"ld-lightgrey": "#e1e5e7",
"ld-lightpurple": "#f1f3f8",
"ld-grey": "#f2f5fb",
"ld-lightgrey": "#e1e5e7",
"acc-lightgrey": "#c6cdd0",
"acc-grey": "#b2c0c4",
"ld-darkgrey": "#95a3a7",
"acc-light-text": "#999db3",
"acc-darkgrey": "#5d6280",
"acc-code": "#575662",
"ld-darkergrey": "#384B52",
};

const blues = {
"ld-blue": "#6db0fc",
"acc-hoverlinkblue": "#3d91f0",
"acc-linkblue": "#1f6dc6",
"ld-mediumblue": "#2b5db6",
"acc-hoverblue": "#1d2c7f",
"ld-darkerblue": "#1e2842",
"ld-darkestblue": "#182134",
};

const accents = {
"acc-lightgreen": "#d4f5e4",
"ld-green": "#5deda2",
"acc-bright-green": "#29e3c1",
"acc-code": "#575662",
"acc-darkgrey": "#5d6280",
"acc-green": "#5ac58d",
"acc-grey": "#b2c0c4",
"acc-hoverblue": "#1d2c7f",
"acc-hovergreen": "#6fdda4",
"acc-hoverlinkblue": "#3d91f0",
"acc-hoverred": "#fca8a7",
"acc-lightgreen": "#d4f5e4",
"acc-lightgrey": "#c6cdd0",
"acc-light-text": "#999db3",
"acc-linkblue": "#1f6dc6",
"acc-green": "#5ac58d",

"acc-hoverred": "#EF4341",
"acc-red": "#FF6967",
"acc-orange": "#ed8936",
"acc-pink": "#d588d5",
"acc-purple": "#805EDD",
"acc-red": "#ff9a99",
};

// TODO: Improve these names
export const staticColors = {
...greys,
...blues,
...accents,
};

const configurableColors: IThemeColors = {
Expand Down
Loading

0 comments on commit 5472279

Please sign in to comment.