Skip to content

Commit 3636505

Browse files
authored
fix(nav): remove HStack before Breadcrumb (#131)
* fix(nav): remove HStack before Breadcrumb * chore(nav): organize imports
1 parent d428243 commit 3636505

File tree

1 file changed

+40
-43
lines changed

1 file changed

+40
-43
lines changed

src/pages/home/Nav.tsx

Lines changed: 40 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import {
44
BreadcrumbLink,
55
BreadcrumbProps,
66
BreadcrumbSeparator,
7-
HStack,
87
} from "@hope-ui/solid"
98
import { Link } from "@solidjs/router"
109
import { createMemo, For, Show } from "solid-js"
@@ -49,47 +48,45 @@ export const Nav = () => {
4948
})
5049

5150
return (
52-
<HStack background="$background" class="nav" w="$full">
53-
<Breadcrumb {...stickyProps} flexGrow="1">
54-
<For each={paths()}>
55-
{(name, i) => {
56-
const isLast = createMemo(() => i() === paths().length - 1)
57-
const path = paths()
58-
.slice(0, i() + 1)
59-
.join("/")
60-
const href = encodePath(path)
61-
let text = () => name
62-
if (text() === "") {
63-
text = () => getSetting("home_icon") + t("manage.sidemenu.home")
64-
}
65-
return (
66-
<BreadcrumbItem class="nav-item">
67-
<BreadcrumbLink
68-
class="nav-link"
69-
css={{
70-
wordBreak: "break-all",
71-
}}
72-
color="unset"
73-
_hover={{ backgroundColor: hoverColor(), color: "unset" }}
74-
_active={{ transform: "scale(.95)", transition: "0.1s" }}
75-
cursor="pointer"
76-
p="$1"
77-
rounded="$lg"
78-
currentPage={isLast()}
79-
as={isLast() ? undefined : Link}
80-
href={joinBase(href)}
81-
onMouseEnter={() => setPathAs(path)}
82-
>
83-
{text()}
84-
</BreadcrumbLink>
85-
<Show when={!isLast()}>
86-
<BreadcrumbSeparator class="nav-separator" />
87-
</Show>
88-
</BreadcrumbItem>
89-
)
90-
}}
91-
</For>
92-
</Breadcrumb>
93-
</HStack>
51+
<Breadcrumb {...stickyProps} background="$background" class="nav" w="$full">
52+
<For each={paths()}>
53+
{(name, i) => {
54+
const isLast = createMemo(() => i() === paths().length - 1)
55+
const path = paths()
56+
.slice(0, i() + 1)
57+
.join("/")
58+
const href = encodePath(path)
59+
let text = () => name
60+
if (text() === "") {
61+
text = () => getSetting("home_icon") + t("manage.sidemenu.home")
62+
}
63+
return (
64+
<BreadcrumbItem class="nav-item">
65+
<BreadcrumbLink
66+
class="nav-link"
67+
css={{
68+
wordBreak: "break-all",
69+
}}
70+
color="unset"
71+
_hover={{ backgroundColor: hoverColor(), color: "unset" }}
72+
_active={{ transform: "scale(.95)", transition: "0.1s" }}
73+
cursor="pointer"
74+
p="$1"
75+
rounded="$lg"
76+
currentPage={isLast()}
77+
as={isLast() ? undefined : Link}
78+
href={joinBase(href)}
79+
onMouseEnter={() => setPathAs(path)}
80+
>
81+
{text()}
82+
</BreadcrumbLink>
83+
<Show when={!isLast()}>
84+
<BreadcrumbSeparator class="nav-separator" />
85+
</Show>
86+
</BreadcrumbItem>
87+
)
88+
}}
89+
</For>
90+
</Breadcrumb>
9491
)
9592
}

0 commit comments

Comments
 (0)