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
1170ca50
Commit
1170ca50
authored
Sep 23, 2022
by
tom
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'tabs' of github.com:blockscout/frontend into tx-mobile-view
parents
d99da119
16ec3c3a
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
36 additions
and
11 deletions
+36
-11
global.ts
theme/global.ts
+1
-0
RoutedTabs.tsx
ui/shared/RoutedTabs/RoutedTabs.tsx
+24
-4
useAdaptiveTabs.tsx
ui/shared/RoutedTabs/useAdaptiveTabs.tsx
+11
-7
No files found.
theme/global.ts
View file @
1170ca50
...
@@ -7,6 +7,7 @@ const global = (props: StyleFunctionProps) => ({
...
@@ -7,6 +7,7 @@ const global = (props: StyleFunctionProps) => ({
body
:
{
body
:
{
bg
:
mode
(
'
white
'
,
'
black
'
)(
props
),
bg
:
mode
(
'
white
'
,
'
black
'
)(
props
),
...
getDefaultTransitionProps
(),
...
getDefaultTransitionProps
(),
'
-webkit-tap-highlight-color
'
:
'
transparent
'
,
},
},
form
:
{
form
:
{
w
:
'
100%
'
,
w
:
'
100%
'
,
...
...
ui/shared/RoutedTabs/RoutedTabs.tsx
View file @
1170ca50
...
@@ -11,6 +11,7 @@ import React from 'react';
...
@@ -11,6 +11,7 @@ import React from 'react';
import
type
{
RoutedTab
}
from
'
./types
'
;
import
type
{
RoutedTab
}
from
'
./types
'
;
import
useIsMobile
from
'
lib/hooks/useIsMobile
'
;
import
{
link
}
from
'
lib/link/link
'
;
import
{
link
}
from
'
lib/link/link
'
;
import
RoutedTabsMenu
from
'
./RoutedTabsMenu
'
;
import
RoutedTabsMenu
from
'
./RoutedTabsMenu
'
;
...
@@ -30,9 +31,10 @@ interface Props {
...
@@ -30,9 +31,10 @@ interface Props {
const
RoutedTabs
=
({
tabs
,
defaultActiveTab
}:
Props
)
=>
{
const
RoutedTabs
=
({
tabs
,
defaultActiveTab
}:
Props
)
=>
{
const
defaultIndex
=
tabs
.
findIndex
(({
routeName
})
=>
routeName
===
defaultActiveTab
);
const
defaultIndex
=
tabs
.
findIndex
(({
routeName
})
=>
routeName
===
defaultActiveTab
);
const
isMobile
=
useIsMobile
();
const
[
activeTab
,
setActiveTab
]
=
React
.
useState
<
number
>
(
defaultIndex
);
const
[
activeTab
,
setActiveTab
]
=
React
.
useState
<
number
>
(
defaultIndex
);
const
{
tabsCut
,
tabs
WithMenu
,
tabsRefs
,
listRef
}
=
useAdaptiveTabs
(
tabs
);
const
{
tabsCut
,
tabs
List
,
tabsRefs
,
listRef
}
=
useAdaptiveTabs
(
tabs
,
isMobile
);
const
router
=
useRouter
();
const
router
=
useRouter
();
...
@@ -49,8 +51,25 @@ const RoutedTabs = ({ tabs, defaultActiveTab }: Props) => {
...
@@ -49,8 +51,25 @@ const RoutedTabs = ({ tabs, defaultActiveTab }: Props) => {
return
(
return
(
<
Tabs
variant=
"soft-rounded"
colorScheme=
"blue"
isLazy
onChange=
{
handleTabChange
}
index=
{
activeTab
}
>
<
Tabs
variant=
"soft-rounded"
colorScheme=
"blue"
isLazy
onChange=
{
handleTabChange
}
index=
{
activeTab
}
>
<
TabList
marginBottom=
{
{
base
:
6
,
lg
:
8
}
}
flexWrap=
"nowrap"
whiteSpace=
"nowrap"
ref=
{
listRef
}
>
<
TabList
{
tabsWithMenu
.
map
((
tab
,
index
)
=>
{
marginBottom=
{
{
base
:
6
,
lg
:
8
}
}
flexWrap=
"nowrap"
whiteSpace=
"nowrap"
ref=
{
listRef
}
overflowY=
"hidden"
overflowX=
{
isMobile
?
'
auto
'
:
undefined
}
overscrollBehaviorX=
"contain"
css=
{
{
'
scroll-snap-type
'
:
'
x mandatory
'
,
// hide scrollbar
'
&::-webkit-scrollbar
'
:
{
/* Chromiums */
display
:
'
none
'
,
},
'
-ms-overflow-style
'
:
'
none
'
,
/* IE and Edge */
'
scrollbar-width
'
:
'
none
'
,
/* Firefox */
}
}
>
{
tabsList
.
map
((
tab
,
index
)
=>
{
if
(
!
tab
.
routeName
)
{
if
(
!
tab
.
routeName
)
{
return
(
return
(
<
RoutedTabsMenu
<
RoutedTabsMenu
...
@@ -77,6 +96,7 @@ const RoutedTabs = ({ tabs, defaultActiveTab }: Props) => {
...
@@ -77,6 +96,7 @@ const RoutedTabs = ({ tabs, defaultActiveTab }: Props) => {
key=
{
tab
.
routeName
}
key=
{
tab
.
routeName
}
ref=
{
tabsRefs
[
index
]
}
ref=
{
tabsRefs
[
index
]
}
{
...
(
index
<
tabsCut
?
{}
:
hiddenItemStyles
)
}
{
...
(
index
<
tabsCut
?
{}
:
hiddenItemStyles
)
}
scrollSnapAlign=
"start"
>
>
{
tab
.
title
}
{
tab
.
title
}
</
Tab
>
</
Tab
>
...
@@ -84,7 +104,7 @@ const RoutedTabs = ({ tabs, defaultActiveTab }: Props) => {
...
@@ -84,7 +104,7 @@ const RoutedTabs = ({ tabs, defaultActiveTab }: Props) => {
})
}
})
}
</
TabList
>
</
TabList
>
<
TabPanels
>
<
TabPanels
>
{
tabs
WithMenu
.
map
((
tab
)
=>
<
TabPanel
padding=
{
0
}
key=
{
tab
.
routeName
}
>
{
tab
.
component
}
</
TabPanel
>)
}
{
tabs
List
.
map
((
tab
)
=>
<
TabPanel
padding=
{
0
}
key=
{
tab
.
routeName
}
>
{
tab
.
component
}
</
TabPanel
>)
}
</
TabPanels
>
</
TabPanels
>
</
Tabs
>
</
Tabs
>
);
);
...
...
ui/shared/RoutedTabs/useAdaptiveTabs.tsx
View file @
1170ca50
...
@@ -5,10 +5,10 @@ import type { RoutedTab } from './types';
...
@@ -5,10 +5,10 @@ import type { RoutedTab } from './types';
import
{
menuButton
}
from
'
./utils
'
;
import
{
menuButton
}
from
'
./utils
'
;
export
default
function
useAdaptiveTabs
(
tabs
:
Array
<
RoutedTab
>
)
{
export
default
function
useAdaptiveTabs
(
tabs
:
Array
<
RoutedTab
>
,
disabled
?:
boolean
)
{
// to avoid flickering we set initial value to 0
// to avoid flickering we set initial value to 0
// so there will be no displayed tabs initially
// so there will be no displayed tabs initially
const
[
tabsCut
,
setTabsCut
]
=
React
.
useState
(
0
);
const
[
tabsCut
,
setTabsCut
]
=
React
.
useState
(
disabled
?
tabs
.
length
:
0
);
const
[
tabsRefs
,
setTabsRefs
]
=
React
.
useState
<
Array
<
React
.
RefObject
<
HTMLButtonElement
>>>
([]);
const
[
tabsRefs
,
setTabsRefs
]
=
React
.
useState
<
Array
<
React
.
RefObject
<
HTMLButtonElement
>>>
([]);
const
listRef
=
React
.
useRef
<
HTMLDivElement
>
(
null
);
const
listRef
=
React
.
useRef
<
HTMLDivElement
>
(
null
);
...
@@ -40,12 +40,16 @@ export default function useAdaptiveTabs(tabs: Array<RoutedTab>) {
...
@@ -40,12 +40,16 @@ export default function useAdaptiveTabs(tabs: Array<RoutedTab>) {
return
visibleNum
;
return
visibleNum
;
},
[
tabs
.
length
,
tabsRefs
]);
},
[
tabs
.
length
,
tabsRefs
]);
const
tabsWithMenu
=
React
.
useMemo
(()
=>
{
const
tabsList
=
React
.
useMemo
(()
=>
{
if
(
disabled
)
{
return
tabs
;
}
return
[
...
tabs
,
menuButton
];
return
[
...
tabs
,
menuButton
];
},
[
tabs
]);
},
[
tabs
,
disabled
]);
React
.
useEffect
(()
=>
{
React
.
useEffect
(()
=>
{
setTabsRefs
(
tabsWithMenu
.
map
((
_
,
index
)
=>
tabsRefs
[
index
]
||
React
.
createRef
()));
!
disabled
&&
setTabsRefs
(
tabsList
.
map
((
_
,
index
)
=>
tabsRefs
[
index
]
||
React
.
createRef
()));
// imitate componentDidMount
// imitate componentDidMount
// eslint-disable-next-line react-hooks/exhaustive-deps
// eslint-disable-next-line react-hooks/exhaustive-deps
},
[]);
},
[]);
...
@@ -75,9 +79,9 @@ export default function useAdaptiveTabs(tabs: Array<RoutedTab>) {
...
@@ -75,9 +79,9 @@ export default function useAdaptiveTabs(tabs: Array<RoutedTab>) {
return
React
.
useMemo
(()
=>
{
return
React
.
useMemo
(()
=>
{
return
{
return
{
tabsCut
,
tabsCut
,
tabs
WithMenu
,
tabs
List
,
tabsRefs
,
tabsRefs
,
listRef
,
listRef
,
};
};
},
[
tabs
WithMenu
,
tabsCut
,
tabsRefs
,
listRef
]);
},
[
tabs
List
,
tabsCut
,
tabsRefs
,
listRef
]);
}
}
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