Skip to content

Commit 6e6ba4e

Browse files
Merge pull request #247 from commitd/ka-toast
Adds Toast component based on Radix Toast
2 parents 6a32ddf + c00f1f4 commit 6e6ba4e

File tree

10 files changed

+679
-16
lines changed

10 files changed

+679
-16
lines changed

package-lock.json

Lines changed: 207 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,7 @@
220220
"@radix-ui/react-slider": "0.1.1",
221221
"@radix-ui/react-switch": "0.1.1",
222222
"@radix-ui/react-tabs": "0.1.1",
223+
"@radix-ui/react-toast": "0.1.1",
223224
"@radix-ui/react-tooltip": "0.1.1",
224225
"@radix-ui/react-navigation-menu": "0.1.1",
225226
"@radix-ui/react-select": "0.1.1",

src/components/NavigationMenu/NavigationMenu.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ export const Variants = () => {
128128
</NavigationViewportPosition>
129129
</NavigationMenu>
130130

131-
<NavigationMenu>
131+
<NavigationMenu css={{ paddingTop: '$2' }}>
132132
<NavigationMenuList>
133133
<NavigationMenuItem>
134134
<NavigationMenuTrigger caret={true} variant={'primary'}>

src/components/NavigationMenu/NavigationMenu.tsx

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,8 @@ const StyledMenu = styled(Root, {
6464
const StyledList = styled(List, {
6565
all: 'unset',
6666
display: 'flex',
67-
justifyContent: 'center',
68-
alignItems: 'stretch',
6967
padding: '$0',
68+
gap: '$2',
7069
listStyle: 'none',
7170
fontSize: '$0',
7271
borderRadius: '$default',
@@ -90,7 +89,6 @@ const menuVariants = css({
9089
$$contrast: '$colors$primaryContrast',
9190
$$default: '$colors$default',
9291
$$defaultHover: '$colors$defaultHighlight',
93-
boxSizing: 'border-box',
9492
variants: {
9593
variant: mainVariants,
9694
},
@@ -99,10 +97,24 @@ const menuVariants = css({
9997
const StyledTrigger = styled(Trigger, menuVariants, {
10098
all: 'unset',
10199
...itemStyles,
100+
padding: '$1 $3',
101+
boxSizing: 'border-box',
102+
border: 'solid 2px',
103+
borderColor: 'transparent',
102104
display: 'flex',
103105
alignItems: 'center',
104106
justifyContent: 'space-between',
107+
defaultVariants: {
108+
variant: 'secondary',
109+
},
110+
})
105111

112+
const StyledMenuLink = styled(Link, menuVariants, {
113+
...itemStyles,
114+
display: 'flex',
115+
alignItems: 'center',
116+
justifyContent: 'space-between',
117+
height: '100%',
106118
defaultVariants: {
107119
variant: 'secondary',
108120
},
@@ -142,17 +154,6 @@ export const NavigationMenuTrigger = forwardRef<
142154
))
143155
NavigationMenuTrigger.toString = () => `.${NAV_MENU_TRIGGER_CLASS_NAME}`
144156

145-
const StyledMenuLink = styled(Link, menuVariants, {
146-
...itemStyles,
147-
display: 'flex',
148-
alignItems: 'center',
149-
justifyContent: 'space-between',
150-
height: '100%',
151-
defaultVariants: {
152-
variant: 'secondary',
153-
},
154-
})
155-
156157
export const NavigationMenuLink = StyledMenuLink
157158

158159
const StyledContent = styled(Content, paperStyles, {

0 commit comments

Comments
 (0)