Skip to content

Commit

Permalink
Bump PRC + add new color dev story (#1161)
Browse files Browse the repository at this point in the history
* add new stories

* install

* fix dark cb

* fix imports

* vscode, you good bro?
  • Loading branch information
langermank authored Jan 24, 2025
1 parent e2e4c44 commit dc7190e
Show file tree
Hide file tree
Showing 23 changed files with 292 additions and 956 deletions.
980 changes: 48 additions & 932 deletions docs/storybook/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"dependencies": {
"@primer/octicons-react": "^18.0.0",
"@primer/react": "^36.7.0",
"@primer/react": "^37.10.0",
"react": "18.3",
"react-dom": "18.3"
},
Expand Down
2 changes: 1 addition & 1 deletion docs/storybook/stories/Color/DataVis/Charts.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react'
// eslint-disable-next-line import/extensions
import colorTokens from '../../../../../dist/docs/functional/themes/light.json'
import {ColorTokenSwatch} from '../../StorybookComponents/ColorTokenSwatch/ColorTokenSwatch'
import {DataTable, Table} from '@primer/react/drafts'
import {DataTable, Table} from '@primer/react/experimental'
import {InlineCode} from '../../StorybookComponents/InlineCode/InlineCode'
import {getTokensByName} from '../../utilities/getTokensByName'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react'
// eslint-disable-next-line import/extensions
import colorTokens from '../../../../../dist/docs/functional/themes/light.json'
import {ColorTokenSwatch} from '../../StorybookComponents/ColorTokenSwatch/ColorTokenSwatch'
import {DataTable, Table} from '@primer/react/drafts'
import {DataTable, Table} from '@primer/react/experimental'
import {InlineCode} from '../../StorybookComponents/InlineCode/InlineCode'
import {getTokensByName} from '../../utilities/getTokensByName'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react'
// eslint-disable-next-line import/extensions
import colorTokens from '../../../../../dist/docs/functional/themes/light.json'
import {ColorTokenSwatch} from '../../StorybookComponents/ColorTokenSwatch/ColorTokenSwatch'
import {DataTable, Table} from '@primer/react/drafts'
import {DataTable, Table} from '@primer/react/experimental'
import {InlineCode} from '../../StorybookComponents/InlineCode/InlineCode'
import {getTokensByName} from '../../utilities/getTokensByName'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react'
// eslint-disable-next-line import/extensions
import colorTokens from '../../../../../dist/docs/functional/themes/light.json'
import {ColorTokenSwatch} from '../../StorybookComponents/ColorTokenSwatch/ColorTokenSwatch'
import {DataTable, Table} from '@primer/react/drafts'
import {DataTable, Table} from '@primer/react/experimental'
import {InlineCode} from '../../StorybookComponents/InlineCode/InlineCode'
import {getTokensByName} from '../../utilities/getTokensByName'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import lightHCColorTokens from '../../../../../dist/docs/functional/themes/light
import darkHCColorTokens from '../../../../../dist/docs/functional/themes/dark-high-contrast.json'
import darkDimmedColorTokens from '../../../../../dist/docs/functional/themes/dark-dimmed.json'
import {ColorTokenSwatch} from '../../StorybookComponents/ColorTokenSwatch/ColorTokenSwatch'
import {DataTable, Table, Stack} from '@primer/react/drafts'
import {DataTable, Table, Stack} from '@primer/react/experimental'
import {InlineCode} from '../../StorybookComponents/InlineCode/InlineCode'

export default {
Expand Down
6 changes: 3 additions & 3 deletions docs/storybook/stories/Demo/BorderColorTesting.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react'
import {DataTable, Table} from '@primer/react/drafts'
import {DataTable, Table} from '@primer/react/experimental'
import './BorderTesting.css'
import {
ThreeBarsIcon,
Expand Down Expand Up @@ -29,7 +29,7 @@ import {
PeopleIcon,
SearchIcon,
} from '@primer/octicons-react'
import {PageLayout, Button, TextInput, SegmentedControl, NavList, Box, Text, IconButton, Octicon} from '@primer/react'
import {PageLayout, Button, TextInput, SegmentedControl, NavList, Box, Text, IconButton} from '@primer/react'

export default {
title: 'Testing/Borders',
Expand Down Expand Up @@ -128,7 +128,7 @@ export const BorderDemo = () => {
}}
>
<IconButton icon={ThreeBarsIcon} aria-label="Menu" />
<Octicon icon={MarkGithubIcon} size={32} />
<MarkGithubIcon size={32} />
<Box sx={{display: 'flex', gap: 2}}>
<Text sx={{fontSize: 1, fontWeight: 'bold'}}>Settings</Text>
</Box>
Expand Down
2 changes: 1 addition & 1 deletion docs/storybook/stories/Demo/Diff/Diff.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react'
import './Diff.css'
import {Box, Link} from '@primer/react'
import {Link} from '@primer/react'

export default {
title: 'Testing/Diff',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import cssShadowVars from './DeprecatedShadowTokensMap.json'
import noChangeCssVars from './NoChangeTokensMap.json'
// eslint-disable-next-line import/extensions
import fallbackVars from './static-fallbacks.json'
import {DataTable, Table} from '@primer/react/drafts'
import {DataTable, Table} from '@primer/react/experimental'

export default {
title: 'Migration/Tables',
Expand Down
2 changes: 1 addition & 1 deletion docs/storybook/stories/Motion/Base.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
// eslint-disable-next-line import/extensions
import baseMotionTokens from '../../../../dist/docs/base/motion/motion.json'
import {DataTable, Table} from '@primer/react/drafts'
import {DataTable, Table} from '@primer/react/experimental'
import {InlineCode} from '../StorybookComponents/InlineCode/InlineCode'
import {getTokensByName} from '../utilities/getTokensByName'
import {CubicBezier} from '../StorybookComponents/BezierCurve/BezierCurve'
Expand Down
2 changes: 1 addition & 1 deletion docs/storybook/stories/Size/Border.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
// eslint-disable-next-line import/extensions
import {SizeTokenSwatch} from '../StorybookComponents/SizeTokenSwatch/SizeTokenSwatch'
import {DataTable, Table} from '@primer/react/drafts'
import {DataTable, Table} from '@primer/react/experimental'
import {InlineCode} from '../StorybookComponents/InlineCode/InlineCode'
import {getTokensByName} from '../utilities/getTokensByName'
import sizeTokens from '../../../../dist/docs/functional/size/border.json'
Expand Down
2 changes: 1 addition & 1 deletion docs/storybook/stories/Size/Breakpoints.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
// eslint-disable-next-line import/extensions
import sizeTokens from '../../../../dist/docs/functional/size/breakpoints.json'
import {DataTable, Table} from '@primer/react/drafts'
import {DataTable, Table} from '@primer/react/experimental'
import {InlineCode} from '../StorybookComponents/InlineCode/InlineCode'
import {getTokensByName} from '../utilities/getTokensByName'

Expand Down
2 changes: 1 addition & 1 deletion docs/storybook/stories/Size/Control.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import sizeTokensCoarse from '../../../../dist/docs/functional/size/size-coarse.
import {ControlSizeDemo} from '../StorybookComponents/ControlSizeDemo/ControlSizeDemo'
import {ControlStackDemo} from '../StorybookComponents/ControlStackDemo/ControlStackDemo'
import {TouchTargetDemo} from '../StorybookComponents/TouchTargetDemo/TouchTargetDemo'
import {DataTable, Table} from '@primer/react/drafts'
import {DataTable, Table} from '@primer/react/experimental'
import {InlineCode} from '../StorybookComponents/InlineCode/InlineCode'
import {getTokensByName} from '../utilities/getTokensByName'

Expand Down
2 changes: 1 addition & 1 deletion docs/storybook/stories/Size/Overlay.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
// eslint-disable-next-line import/extensions
import sizeTokens from '../../../../dist/docs/functional/size/size.json'
import {DataTable, Table} from '@primer/react/drafts'
import {DataTable, Table} from '@primer/react/experimental'
import {InlineCode} from '../StorybookComponents/InlineCode/InlineCode'
import {getTokensByName} from '../utilities/getTokensByName'

Expand Down
2 changes: 1 addition & 1 deletion docs/storybook/stories/Size/Size.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react'
// eslint-disable-next-line import/extensions
import sizeTokens from '../../../../dist/docs/base/size/size.json'
import {SizeTokenSwatch} from '../StorybookComponents/SizeTokenSwatch/SizeTokenSwatch'
import {DataTable, Table} from '@primer/react/drafts'
import {DataTable, Table} from '@primer/react/experimental'
import {InlineCode} from '../StorybookComponents/InlineCode/InlineCode'
import {getTokensByName} from '../utilities/getTokensByName'

Expand Down
2 changes: 1 addition & 1 deletion docs/storybook/stories/Size/Stack.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react'
// eslint-disable-next-line import/extensions
import sizeTokens from '../../../../dist/docs/functional/size/size.json'
import {StackDemo} from '../StorybookComponents/StackDemo/StackDemo'
import {DataTable, Table} from '@primer/react/drafts'
import {DataTable, Table} from '@primer/react/experimental'
import {InlineCode} from '../StorybookComponents/InlineCode/InlineCode'
import {getTokensByName} from '../utilities/getTokensByName'

Expand Down
2 changes: 1 addition & 1 deletion docs/storybook/stories/Size/ViewportRange.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
// eslint-disable-next-line import/extensions
import sizeTokens from '../../../../dist/docs/functional/size/viewport.json'
import {DataTable, Table} from '@primer/react/drafts'
import {DataTable, Table} from '@primer/react/experimental'
import {InlineCode} from '../StorybookComponents/InlineCode/InlineCode'
import {getTokensByName} from '../utilities/getTokensByName'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
import React from 'react'
import {toHex, readableColor} from 'color2k'
import './ColorScale.css'
import {useTheme} from '@primer/react/lib-esm/ThemeProvider'

export type ColorScaleProps = {
color?: string
border?: boolean
}

export const ColorScale = ({color, border}: ColorScaleProps) => {
const {resolvedColorScheme: theme} = useTheme()
const ref = React.useRef<HTMLDivElement | null>(null)
const [hex, setHex] = React.useState<string | null>(null)
const [textColor, setTextColor] = React.useState<string>('currentColor')
Expand All @@ -25,7 +23,7 @@ export const ColorScale = ({color, border}: ColorScaleProps) => {
setHex(asHex)
setTextColor(asHex ? readableColor(asHex) : 'currentColor')
}, 0)
}, [color, theme])
}, [color])

return (
<div
Expand Down
2 changes: 1 addition & 1 deletion docs/storybook/stories/Typography/Base.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
// eslint-disable-next-line import/extensions
import sizeTokens from '../../../../dist/docs/base/typography/typography.json'
import {DataTable, Table} from '@primer/react/drafts'
import {DataTable, Table} from '@primer/react/experimental'
import {InlineCode} from '../StorybookComponents/InlineCode/InlineCode'
import {TypographyDemo} from '../StorybookComponents/TypographyDemo/TypographyDemo'
import {getTokensByName} from '../utilities/getTokensByName'
Expand Down
2 changes: 1 addition & 1 deletion docs/storybook/stories/Typography/Functional.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
// eslint-disable-next-line import/extensions
import sizeTokens from '../../../../dist/docs/functional/typography/typography.json'
import {DataTable, Table} from '@primer/react/drafts'
import {DataTable, Table} from '@primer/react/experimental'
import {InlineCode} from '../StorybookComponents/InlineCode/InlineCode'
import {TypographyDemo} from '../StorybookComponents/TypographyDemo/TypographyDemo'
import {getTokensByName} from '../utilities/getTokensByName'
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
.swatch {
height: 50px;
width: 50px;
background: var(--bgColor-default);
border: solid 1px var(--borderColor-default);
display: grid;
place-content: center;
font: var(--text-codeInline-shorthand);
font-size: 12px;
}

.name {
width: 300px;
display: grid;
place-content: center end;
background: #ffffff;
}

.sticky {
position: sticky;
top: 0;
}
Loading

0 comments on commit dc7190e

Please sign in to comment.