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

feat: stickyなヘッダーをなくした (一番上のfixedなヘッダーのみ) #939

Merged
merged 5 commits into from
Jul 30, 2024
+106 −106
Merged

feat: stickyなヘッダーをなくした (一番上のfixedなヘッダーのみ) #939

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
a5fec88
feat: stickyなヘッダーをなくした (一番上のfixedなヘッダーのみ)
cp-20 Jul 22, 2024
075db27
appsでの仮想スクロールが働くように
eyemono-moe Jul 23, 2024
b6c3158
wip: scrollbarGutter: 'stable' 消した
cp-20 Jul 25, 2024
d3f8a2f
wip: アプリやリポジトリの表示がはみ出ないように
cp-20 Jul 30, 2024
a00d927
Merge branch 'main' into fix/sticky-header
cp-20 Jul 30, 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
2 changes: 1 addition & 1 deletion dashboard/src/components/layouts/WithHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const Body = styled('div', {
base: {
width: '100%',
height: '100%',
overflowY: 'hidden',
overflowY: 'auto',
},
})

Expand Down
6 changes: 2 additions & 4 deletions dashboard/src/components/layouts/WithNav.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ const Container = styled('div', {
width: '100%',
height: '100%',
display: 'grid',
gridTemplateColumns: '1fr',
gridTemplateRows: 'auto 1fr',
gridTemplateColumns: 'minmax(0, 1fr)',
gridTemplateRows: 'max-content 1fr',
},
})
const Navs = styled('div', {
Expand All @@ -22,8 +22,6 @@ const Body = styled('div', {
base: {
position: 'relative',
width: '100%',
height: '100%',
overflowY: 'hidden',
eyemono-moe marked this conversation as resolved.
Show resolved Hide resolved
cp-20 marked this conversation as resolved.
Show resolved Hide resolved
cp-20 marked this conversation as resolved.
Show resolved Hide resolved
},
})
const TabContainer = styled('div', {
Expand Down
203 changes: 103 additions & 100 deletions dashboard/src/pages/apps.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@ import { colorVars, media } from '../theme'
const MainView = styled('div', {
base: {
position: 'relative',
display: 'flex',
flexDirection: 'column',
width: '100%',
height: '100%',
overflowY: 'auto',
padding: '0 max(calc(50% - 500px), 32px)',
background: colorVars.semantic.ui.background,

Expand All @@ -43,16 +44,12 @@ const MainView = styled('div', {
})
const FilterContainer = styled('div', {
base: {
position: 'sticky',
width: '100%',
top: '0',
left: '0',
padding: '40px 0 32px',
zIndex: 1,
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
background: `linear-gradient(0deg, rgba(255,255,255,0), ${colorVars.semantic.ui.background} 20px)`,
},
})
const Repositories = styled('div', {
Expand Down Expand Up @@ -187,7 +184,10 @@ const AppsList: Component<{
count: filteredRepos().length,
getScrollElement: () => props.parentRef,
estimateSize: (i) => 76 + 16 + filteredRepos()[i].apps.length * 80,
// scrollParentRef内に高さ120pxのFilterContainerが存在するため、この分を設定
scrollMargin: 120,
paddingEnd: 72,
gap: 16,
}),
)

Expand All @@ -199,41 +199,42 @@ const AppsList: Component<{
width: '100%',
height: `${virtualizer().getTotalSize()}px`,
position: 'relative',
// scrollParentRef内に高さ120pxのFilterContainerが存在するため、この分を減算
transform: `translateY(${-virtualizer().options.scrollMargin}px)`,
}}
>
<div
style={{
position: 'absolute',
top: 0,
left: 0,
width: '100%',
transform: `translateY(${items()?.[0]?.start ?? 0}px)`,
}}
<For
each={items() ?? []}
fallback={
<List.Container>
<List.PlaceHolder>
<MaterialSymbols displaySize={80}>search</MaterialSymbols>
No Apps Found
</List.PlaceHolder>
</List.Container>
}
>
<For
each={items() ?? []}
fallback={
<List.Container>
<List.PlaceHolder>
<MaterialSymbols displaySize={80}>search</MaterialSymbols>
No Apps Found
</List.PlaceHolder>
</List.Container>
}
>
{(vRow) => (
<div data-index={vRow.index} ref={(el) => queueMicrotask(() => virtualizer().measureElement(el))}>
<div style={{ 'padding-bottom': '16px' }}>
<RepositoryList
repository={filteredRepos()[vRow.index].repo}
apps={filteredRepos()[vRow.index].apps}
commits={commits()}
/>
</div>
</div>
)}
</For>
</div>
{(vRow) => (
<div
data-index={vRow.index}
ref={(el) => queueMicrotask(() => virtualizer().measureElement(el))}
style={{
position: 'absolute',
top: 0,
left: 0,
width: '100%',
height: `${items()[vRow.index]}px`,
transform: `translateY(${vRow.start}px)`,
}}
>
<RepositoryList
repository={filteredRepos()[vRow.index].repo}
apps={filteredRepos()[vRow.index].apps}
commits={commits()}
/>
</div>
)}
</For>
</div>
)
}
Expand Down Expand Up @@ -264,72 +265,74 @@ export default () => {
const [scrollParentRef, setScrollParentRef] = createSignal<HTMLDivElement>()

return (
<WithNav.Container>
<Title>Apps - NeoShowcase</Title>
<WithNav.Navs>
<AppsNav />
<WithNav.Tabs>
<For each={scopeItems(user()?.admin)}>
{(s) => (
<TabRound state={s.value === scope() ? 'active' : 'default'} onClick={() => setScope(s.value)}>
<MaterialSymbols>deployed_code</MaterialSymbols>
{s.label}
</TabRound>
)}
</For>
<A href="/apps/new" style={{ 'margin-left': 'auto' }}>
<Button variants="primary" size="medium" leftIcon={<MaterialSymbols>add</MaterialSymbols>}>
Add New App
</Button>
</A>
</WithNav.Tabs>
</WithNav.Navs>
<WithNav.Body>
<MainView ref={setScrollParentRef}>
<FilterContainer>
<TextField
placeholder="Search"
value={query()}
onInput={(e) => setQuery(e.currentTarget.value)}
leftIcon={<MaterialSymbols>search</MaterialSymbols>}
rightIcon={
<AppsFilter
<div style={{ 'overflow-y': 'auto', height: '100%' }} ref={setScrollParentRef}>
<WithNav.Container>
<Title>Apps - NeoShowcase</Title>
<WithNav.Navs>
<AppsNav />
<WithNav.Tabs>
<For each={scopeItems(user()?.admin)}>
{(s) => (
<TabRound state={s.value === scope() ? 'active' : 'default'} onClick={() => setScope(s.value)}>
<MaterialSymbols>deployed_code</MaterialSymbols>
{s.label}
</TabRound>
)}
</For>
<A href="/apps/new" style={{ 'margin-left': 'auto' }}>
<Button variants="primary" size="medium" leftIcon={<MaterialSymbols>add</MaterialSymbols>}>
Add New App
</Button>
</A>
</WithNav.Tabs>
</WithNav.Navs>
<WithNav.Body>
<MainView>
<FilterContainer>
<TextField
placeholder="Search"
value={query()}
onInput={(e) => setQuery(e.currentTarget.value)}
leftIcon={<MaterialSymbols>search</MaterialSymbols>}
rightIcon={
<AppsFilter
statuses={statuses()}
setStatues={setStatuses}
origin={origin()}
setOrigin={setOrigin}
sort={sort()}
setSort={setSort}
includeNoApp={includeNoApp()}
setIncludeNoApp={setIncludeNoApp}
/>
}
/>
</FilterContainer>
<Suspense
fallback={
<Repositories>
<RepositoryList apps={[undefined]} />
<RepositoryList apps={[undefined]} />
<RepositoryList apps={[undefined]} />
<RepositoryList apps={[undefined]} />
</Repositories>
}
>
<SuspenseContainer isPending={isPending()}>
<AppsList
scope={scope()}
statuses={statuses()}
setStatues={setStatuses}
origin={origin()}
setOrigin={setOrigin}
origins={origin()}
query={query()}
sort={sort()}
setSort={setSort}
includeNoApp={includeNoApp()}
setIncludeNoApp={setIncludeNoApp}
parentRef={scrollParentRef()!}
/>
}
/>
</FilterContainer>
<Suspense
fallback={
<Repositories>
<RepositoryList apps={[undefined]} />
<RepositoryList apps={[undefined]} />
<RepositoryList apps={[undefined]} />
<RepositoryList apps={[undefined]} />
</Repositories>
}
>
<SuspenseContainer isPending={isPending()}>
<AppsList
scope={scope()}
statuses={statuses()}
origins={origin()}
query={query()}
sort={sort()}
includeNoApp={includeNoApp()}
parentRef={scrollParentRef()!}
/>
</SuspenseContainer>
</Suspense>
</MainView>
</WithNav.Body>
</WithNav.Container>
</SuspenseContainer>
</Suspense>
</MainView>
</WithNav.Body>
</WithNav.Container>
</div>
)
}
1 change: 0 additions & 1 deletion dashboard/src/pages/apps/[id]/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ const Container = styled('div', {
width: '100%',
height: '100%',
overflowY: 'auto',
scrollbarGutter: 'stable',
},
})
const MainViewContainer = styled('div', {
Expand Down
Loading