github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-14 20:40:17 -05:00
Code Issues Projects Releases Packages Wiki Activity

Move divider into overview-file component so that they don't render if file doesn't (#20882)

Browse source 
GitOrigin-RevId: fef584609fa06e6313323c27bc6f9ab9b9a6c815
This commit is contained in:
David 2024-10-10 14:50:50 +02:00 committed by Copybot
parent b1d1432183
commit def2f7f4fd
2 changed files with 42 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
services/web/frontend/js/features/review-panel-new/components/review-panel-overview-file.tsx
View file

@ -59,44 +59,47 @@ export const ReviewPanelOverviewFile: FC<{
}
return (
<div>
<Button
bsClass="review-panel-overview-file-header"
bsStyle={null}
onClick={toggleCollapsed}
>
<MaterialIcon
type={collapsed ? 'keyboard_arrow_right' : 'keyboard_arrow_down'}
/>
{doc.doc.name}
<div className="review-panel-overview-file-entry-count">
{numEntries}
</div>
</Button>
<>
<div>
<Button
bsClass="review-panel-overview-file-header"
bsStyle={null}
onClick={toggleCollapsed}
>
<MaterialIcon
type={collapsed ? 'keyboard_arrow_right' : 'keyboard_arrow_down'}
/>
{doc.doc.name}
<div className="review-panel-overview-file-entry-count">
{numEntries}
</div>
</Button>
{!collapsed && (
<div className="review-panel-overview-file-entries">
{changes.map(change => (
<ReviewPanelChange
key={change.id}
change={change}
aggregate={aggregates.get(change.id)}
editable={false}
docId={doc.doc.id}
hoverRanges={false}
/>
))}
{!collapsed && (
<div className="review-panel-overview-file-entries">
{changes.map(change => (
<ReviewPanelChange
key={change.id}
change={change}
aggregate={aggregates.get(change.id)}
editable={false}
docId={doc.doc.id}
hoverRanges={false}
/>
))}
{unresolvedComments.map(comment => (
<ReviewPanelComment
key={comment.id}
comment={comment}
docId={doc.doc.id}
hoverRanges={false}
/>
))}
</div>
)}
</div>
{unresolvedComments.map(comment => (
<ReviewPanelComment
key={comment.id}
comment={comment}
docId={doc.doc.id}
hoverRanges={false}
/>
))}
</div>
)}
</div>
<div className="review-panel-overfile-divider" />
</>
)
}

9
services/web/frontend/js/features/review-panel-new/components/review-panel-overview.tsx
View file

@ -1,4 +1,4 @@
import { FC, Fragment, useMemo } from 'react'
import { FC, useMemo } from 'react'
import { useFileTreeData } from '@/shared/context/file-tree-data-context'
import { Ranges, useRangesContext } from '../context/ranges-context'
import { useTranslation } from 'react-i18next'
@ -58,12 +58,7 @@ export const ReviewPanelOverview: FC = () => {
{docs.map(doc => {
const ranges = rangesForDocs.get(doc.doc.id)
return (
ranges && (
<Fragment key={doc.doc.id}>
<ReviewPanelOverviewFile doc={doc} ranges={ranges} />
<div className="review-panel-overfile-divider" />
</Fragment>
)
ranges && <ReviewPanelOverviewFile doc={doc} ranges={ranges} />
)
})}
</div>