Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
frontend
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
vicotor
frontend
Commits
38154f89
Commit
38154f89
authored
May 22, 2024
by
Max Alekseenko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
replace hook with function
parent
36cf355a
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
22 deletions
+17
-22
NavLink.tsx
ui/snippets/navigation/NavLink.tsx
+2
-2
NavLinkGroupDesktop.tsx
ui/snippets/navigation/NavLinkGroupDesktop.tsx
+2
-2
NavLinkGroupMobile.tsx
ui/snippets/navigation/NavLinkGroupMobile.tsx
+2
-2
useHighlightedRoute.ts
ui/snippets/navigation/useHighlightedRoute.ts
+0
-16
utils.ts
ui/snippets/navigation/utils.ts
+11
-0
No files found.
ui/snippets/navigation/NavLink.tsx
View file @
38154f89
...
@@ -13,8 +13,8 @@ import IconSvg from 'ui/shared/IconSvg';
...
@@ -13,8 +13,8 @@ import IconSvg from 'ui/shared/IconSvg';
import
LightningLabel
,
{
LIGHTNING_LABEL_CLASS_NAME
}
from
'
./LightningLabel
'
;
import
LightningLabel
,
{
LIGHTNING_LABEL_CLASS_NAME
}
from
'
./LightningLabel
'
;
import
NavLinkIcon
from
'
./NavLinkIcon
'
;
import
NavLinkIcon
from
'
./NavLinkIcon
'
;
import
useColors
from
'
./useColors
'
;
import
useColors
from
'
./useColors
'
;
import
useHighlightedRoute
from
'
./useHighlightedRoute
'
;
import
useNavLinkStyleProps
from
'
./useNavLinkStyleProps
'
;
import
useNavLinkStyleProps
from
'
./useNavLinkStyleProps
'
;
import
{
checkRouteHighlight
}
from
'
./utils
'
;
type
Props
=
{
type
Props
=
{
item
:
NavItem
;
item
:
NavItem
;
...
@@ -36,7 +36,7 @@ const NavLink = ({ item, isCollapsed, px, className, onClick, disableActiveState
...
@@ -36,7 +36,7 @@ const NavLink = ({ item, isCollapsed, px, className, onClick, disableActiveState
const
isXLScreen
=
useBreakpointValue
({
base
:
false
,
xl
:
true
});
const
isXLScreen
=
useBreakpointValue
({
base
:
false
,
xl
:
true
});
const
href
=
isInternalLink
?
route
(
item
.
nextRoute
)
:
item
.
url
;
const
href
=
isInternalLink
?
route
(
item
.
nextRoute
)
:
item
.
url
;
const
isHighlighted
=
useHighlightedRoute
(
item
);
const
isHighlighted
=
checkRouteHighlight
(
item
);
const
content
=
(
const
content
=
(
<
Link
<
Link
...
...
ui/snippets/navigation/NavLinkGroupDesktop.tsx
View file @
38154f89
...
@@ -18,8 +18,8 @@ import IconSvg from 'ui/shared/IconSvg';
...
@@ -18,8 +18,8 @@ import IconSvg from 'ui/shared/IconSvg';
import
LightningLabel
from
'
./LightningLabel
'
;
import
LightningLabel
from
'
./LightningLabel
'
;
import
NavLink
from
'
./NavLink
'
;
import
NavLink
from
'
./NavLink
'
;
import
NavLinkIcon
from
'
./NavLinkIcon
'
;
import
NavLinkIcon
from
'
./NavLinkIcon
'
;
import
useHighlightedRoute
from
'
./useHighlightedRoute
'
;
import
useNavLinkStyleProps
from
'
./useNavLinkStyleProps
'
;
import
useNavLinkStyleProps
from
'
./useNavLinkStyleProps
'
;
import
{
checkRouteHighlight
}
from
'
./utils
'
;
type
Props
=
{
type
Props
=
{
item
:
NavGroupItem
;
item
:
NavGroupItem
;
...
@@ -31,7 +31,7 @@ const NavLinkGroupDesktop = ({ item, isCollapsed }: Props) => {
...
@@ -31,7 +31,7 @@ const NavLinkGroupDesktop = ({ item, isCollapsed }: Props) => {
const
styleProps
=
useNavLinkStyleProps
({
isCollapsed
,
isExpanded
,
isActive
:
item
.
isActive
});
const
styleProps
=
useNavLinkStyleProps
({
isCollapsed
,
isExpanded
,
isActive
:
item
.
isActive
});
const
isHighlighted
=
useHighlightedRoute
(
item
.
subItems
);
const
isHighlighted
=
checkRouteHighlight
(
item
.
subItems
);
return
(
return
(
<
Box
as=
"li"
listStyleType=
"none"
w=
"100%"
>
<
Box
as=
"li"
listStyleType=
"none"
w=
"100%"
>
...
...
ui/snippets/navigation/NavLinkGroupMobile.tsx
View file @
38154f89
...
@@ -12,8 +12,8 @@ import IconSvg from 'ui/shared/IconSvg';
...
@@ -12,8 +12,8 @@ import IconSvg from 'ui/shared/IconSvg';
import
LightningLabel
from
'
./LightningLabel
'
;
import
LightningLabel
from
'
./LightningLabel
'
;
import
NavLinkIcon
from
'
./NavLinkIcon
'
;
import
NavLinkIcon
from
'
./NavLinkIcon
'
;
import
useHighlightedRoute
from
'
./useHighlightedRoute
'
;
import
useNavLinkStyleProps
from
'
./useNavLinkStyleProps
'
;
import
useNavLinkStyleProps
from
'
./useNavLinkStyleProps
'
;
import
{
checkRouteHighlight
}
from
'
./utils
'
;
type
Props
=
{
type
Props
=
{
item
:
NavGroupItem
;
item
:
NavGroupItem
;
...
@@ -24,7 +24,7 @@ type Props = {
...
@@ -24,7 +24,7 @@ type Props = {
const
NavLinkGroup
=
({
item
,
onClick
,
isExpanded
}:
Props
)
=>
{
const
NavLinkGroup
=
({
item
,
onClick
,
isExpanded
}:
Props
)
=>
{
const
styleProps
=
useNavLinkStyleProps
({
isActive
:
item
.
isActive
,
isExpanded
});
const
styleProps
=
useNavLinkStyleProps
({
isActive
:
item
.
isActive
,
isExpanded
});
const
isHighlighted
=
useHighlightedRoute
(
item
.
subItems
);
const
isHighlighted
=
checkRouteHighlight
(
item
.
subItems
);
return
(
return
(
<
Box
as=
"li"
listStyleType=
"none"
w=
"100%"
onClick=
{
onClick
}
>
<
Box
as=
"li"
listStyleType=
"none"
w=
"100%"
onClick=
{
onClick
}
>
...
...
ui/snippets/navigation/useHighlightedRoute.ts
deleted
100644 → 0
View file @
36cf355a
import
type
{
NavItem
}
from
'
types/client/navigation-items
'
;
import
config
from
'
configs/app
'
;
import
{
isInternalItem
}
from
'
lib/hooks/useNavItems
'
;
export
default
function
useHighlightedRoute
(
item
:
NavItem
|
Array
<
NavItem
>
|
Array
<
Array
<
NavItem
>>
)
{
function
checkForLightningLabel
(
item
:
NavItem
|
Array
<
NavItem
>
|
Array
<
Array
<
NavItem
>>
):
boolean
{
if
(
Array
.
isArray
(
item
))
{
return
item
.
some
((
subItem
)
=>
checkForLightningLabel
(
subItem
));
}
return
isInternalItem
(
item
)
&&
(
config
.
UI
.
sidebar
.
highlightedRoutes
.
includes
(
item
.
nextRoute
.
pathname
));
}
return
checkForLightningLabel
(
item
);
}
ui/snippets/navigation/utils.ts
0 → 100644
View file @
38154f89
import
type
{
NavItem
}
from
'
types/client/navigation-items
'
;
import
config
from
'
configs/app
'
;
import
{
isInternalItem
}
from
'
lib/hooks/useNavItems
'
;
export
function
checkRouteHighlight
(
item
:
NavItem
|
Array
<
NavItem
>
|
Array
<
Array
<
NavItem
>>
):
boolean
{
if
(
Array
.
isArray
(
item
))
{
return
item
.
some
((
subItem
)
=>
checkRouteHighlight
(
subItem
));
}
return
isInternalItem
(
item
)
&&
(
config
.
UI
.
sidebar
.
highlightedRoutes
.
includes
(
item
.
nextRoute
.
pathname
));
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment