Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support for empty navbar actions/menu links #110

Merged
merged 5 commits into from
Jun 7, 2024
Merged

Support for empty navbar actions/menu links #110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a32e940
Support for empty navbar actions/menu links
marcoacierno Jun 6, 2024
47424e0
format
marcoacierno Jun 6, 2024
7978716
fix
marcoacierno Jun 6, 2024
75d3380
fix biome
marcoacierno Jun 6, 2024
76340fe
Merge branch 'main' into navbar-updates
marcoacierno Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 50 additions & 0 deletions biome.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"$schema": "https://biomejs.dev/schemas/1.7.1/schema.json",
"organizeImports": {
"enabled": true
},
"linter": {
"enabled": true,
"rules": {
"recommended": true,
"correctness": {
"useExhaustiveDependencies": "off"
},
"style": {
"noNonNullAssertion": "off"
},
"suspicious": {
"noExplicitAny": "off",
"noArrayIndexKey": "off"
},
"a11y": {
"useKeyWithClickEvents": "off"
},
"complexity": {
"noForEach": "off"
},
"security": {
"noDangerouslySetInnerHtml": "off"
}
}
},
"formatter": {
"enabled": true,
"indentStyle": "space"
},
"files": {
"ignore": [
"**/lodash-is-equal.ts",
".cache/",
".docz/",
"public/",
"src/generated",
"_schema.json",
"package.json",
"src/types.tsx"
]
},
"javascript": {
"jsxRuntime": "reactClassic"
}
}
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
},
"devDependencies": {
"@babel/core": "^7.24.5",
"@biomejs/biome": "^1.8.0",
"@rollup/plugin-commonjs": "^21.1.0",
"@rollup/plugin-node-resolve": "^13.3.0",
"@storybook/addon-essentials": "^6.5.16",
Expand Down
91 changes: 91 additions & 0 deletions pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/navbar/header-bar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React from "react";

import { Container } from "../container";
import { ActionItem } from "./action-item";
import { Action } from "./types";
import type { Action } from "./types";

type HeaderBarProps = {
hidden?: boolean;
Expand Down
99 changes: 55 additions & 44 deletions src/navbar/menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React from "react";
import { Separator } from "../separator";
import { Container } from "../container";
import { Heading } from "../heading";
import { Link } from "../link";
import { Link as LinkType } from "./types";
import { Separator } from "../separator";
import { Text } from "../text";
import { Container } from "../container";
import type { Link as LinkType } from "./types";

export const Menu = ({
mainLinks,
Expand All @@ -20,49 +20,60 @@ export const Menu = ({

return (
<div>
<Separator />
<Container className="py-8 lg:py-20">
<div className="grid grid-cols-1 gap-4 lg:gap-14 lg:grid-cols-2">
{mainLinksSplit
.filter((split) => split.length > 0)
.map((split, index) => (
<ul
className="grid grid-cols-1 content-start gap-4 lg:gap-6"
key={index}
>
{split.map(({ text, link }) => (
<li key={`${text}${link}`}>
<Link hoverColor="caramel" href={link}>
<Heading color="none" size="display2">
{text}
</Heading>
</Link>
</li>
{mainLinks.length > 0 && (
<>
<Separator />
<Container className="py-8 lg:py-20">
<div className="grid grid-cols-1 gap-4 lg:gap-14 lg:grid-cols-2">
{mainLinksSplit
.filter((split) => split.length > 0)
.map((split, index) => (
<ul
className="grid grid-cols-1 content-start gap-4 lg:gap-6"
key={index}
>
{split.map(({ text, link }) => (
<li key={`${text}${link}`}>
<Link hoverColor="caramel" href={link}>
<Heading color="none" size="display2">
{text}
</Heading>
</Link>
</li>
))}
</ul>
))}
</ul>
))}
</div>
</Container>
<Separator />
<Container className="py-8 lg:py-10">
<div className="grid grid-cols-1 lg:grid-cols-4 gap-4 lg:gap-14">
{secondaryLinksSplit
.filter((split) => split.length > 0)
.map((secondaryLinks, index) => (
<ul key={index} className="grid grid-cols-1 gap-4 content-start">
{secondaryLinks.map(({ link, text }) => (
<li key={`${text}${link}`}>
<Link hoverColor="caramel" href={link}>
<Heading color="none" size={4}>
{text}
</Heading>
</Link>
</li>
</div>
</Container>
</>
)}
{secondaryLinks.length > 0 && (
<>
<Separator />
<Container className="py-8 lg:py-10">
<div className="grid grid-cols-1 lg:grid-cols-4 gap-4 lg:gap-14">
{secondaryLinksSplit
.filter((split) => split.length > 0)
.map((secondaryLinks, index) => (
<ul
key={index}
className="grid grid-cols-1 gap-4 content-start"
>
{secondaryLinks.map(({ link, text }) => (
<li key={`${text}${link}`}>
<Link hoverColor="caramel" href={link}>
<Heading color="none" size={4}>
{text}
</Heading>
</Link>
</li>
))}
</ul>
))}
</ul>
))}
</div>
</Container>
</div>
</Container>
</>
)}
{bottomBarLink && (
<>
<Separator />
Expand Down
Loading