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

Merge pull request #20638 from overleaf/dk-review-subview-mini

Browse source 
Always use current file sub view when review panel is collapsed

GitOrigin-RevId: 536476a11a9e54c79c2fe930d74639c6e676870e
This commit is contained in:
David 2024-09-26 15:14:51 +01:00 committed by Copybot
parent 8c09b5866a
commit dae40941ee
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
import { FC, memo, useState } from 'react' import { FC, memo, useMemo, useState } from 'react'
import ReviewPanelTabs from './review-panel-tabs' import ReviewPanelTabs from './review-panel-tabs'
import ReviewPanelHeader from './review-panel-header' import ReviewPanelHeader from './review-panel-header'
import ReviewPanelCurrentFile from './review-panel-current-file' import ReviewPanelCurrentFile from './review-panel-current-file'
@ -9,13 +9,17 @@ import { useReviewPanelStyles } from '@/features/review-panel-new/hooks/use-revi
export type SubView = 'cur_file' | 'overview' export type SubView = 'cur_file' | 'overview'
const ReviewPanel: FC<{ mini?: boolean }> = ({ mini = false }) => { const ReviewPanel: FC<{ mini?: boolean }> = ({ mini = false }) => {
const [subView, setSubView] = useState<SubView>('cur_file') const [choosenSubView, setSubView] = useState<SubView>('cur_file')
const activeSubView = useMemo(
() => (mini ? 'cur_file' : choosenSubView),
[choosenSubView, mini]
)
const style = useReviewPanelStyles(mini) const style = useReviewPanelStyles(mini)
const className = classnames('review-panel-new', 'review-panel-container', { const className = classnames('review-panel-new', 'review-panel-container', {
'review-panel-mini': mini, 'review-panel-mini': mini,
'review-panel-subview-overview': subView === 'overview', 'review-panel-subview-overview': activeSubView === 'overview',
}) })
return ( return (
@ -23,11 +27,11 @@ const ReviewPanel: FC<{ mini?: boolean }> = ({ mini = false }) => {
<div className="review-panel-inner"> <div className="review-panel-inner">
{!mini && <ReviewPanelHeader />} {!mini && <ReviewPanelHeader />}
{subView === 'cur_file' && <ReviewPanelCurrentFile />} {activeSubView === 'cur_file' && <ReviewPanelCurrentFile />}
{subView === 'overview' && <ReviewPanelOverview />} {activeSubView === 'overview' && <ReviewPanelOverview />}
<div className="review-panel-footer"> <div className="review-panel-footer">
<ReviewPanelTabs subView={subView} setSubView={setSubView} /> <ReviewPanelTabs subView={activeSubView} setSubView={setSubView} />
</div> </div>
</div> </div>
</div> </div>