mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-29 19:23:49 -05:00
Merge pull request #16268 from overleaf/ii-ide-page-prototype-review-panel-layout-to-left
[web] Review panel popovers GitOrigin-RevId: 4424abab97b197013063679bd8efcac001f458ad
This commit is contained in:
parent
ced8a923c0
commit
fbed0cb943
7 changed files with 46 additions and 5 deletions
|
@ -7,6 +7,7 @@ import useSocketListener from '@/features/ide-react/hooks/use-socket-listener'
|
|||
import useAsync from '@/shared/hooks/use-async'
|
||||
import useAbortController from '@/shared/hooks/use-abort-controller'
|
||||
import useScopeEventEmitter from '@/shared/hooks/use-scope-event-emitter'
|
||||
import useLayoutToLeft from '@/features/ide-react/context/review-panel/hooks/useLayoutToLeft'
|
||||
import { sendMB } from '../../../../../infrastructure/event-tracking'
|
||||
import {
|
||||
dispatchReviewPanelLayout as handleLayoutChange,
|
||||
|
@ -147,6 +148,7 @@ function useReviewPanelState(): ReviewPanelStateReactIde {
|
|||
const { showGenericMessageModal } = useModalsContext()
|
||||
const addCommentEmitter = useScopeEventEmitter('comment:start_adding')
|
||||
|
||||
const layoutToLeft = useLayoutToLeft('.ide-react-editor-panel')
|
||||
const [subView, setSubView] =
|
||||
useState<ReviewPanel.Value<'subView'>>('cur_file')
|
||||
const [isOverviewLoading, setIsOverviewLoading] =
|
||||
|
@ -1523,6 +1525,7 @@ function useReviewPanelState(): ReviewPanelStateReactIde {
|
|||
formattedProjectMembers,
|
||||
layoutSuspended,
|
||||
unsavedComment,
|
||||
layoutToLeft,
|
||||
}),
|
||||
[
|
||||
collapsed,
|
||||
|
@ -1550,6 +1553,7 @@ function useReviewPanelState(): ReviewPanelStateReactIde {
|
|||
formattedProjectMembers,
|
||||
layoutSuspended,
|
||||
unsavedComment,
|
||||
layoutToLeft,
|
||||
]
|
||||
)
|
||||
|
||||
|
|
|
@ -0,0 +1,32 @@
|
|||
import { useState, useEffect } from 'react'
|
||||
|
||||
function useLayoutToLeft(querySelector: string) {
|
||||
const [layoutToLeft, setLayoutToLeft] = useState(false)
|
||||
|
||||
useEffect(() => {
|
||||
if (!('ResizeObserver' in window)) return
|
||||
|
||||
const target = document.querySelector(querySelector)
|
||||
|
||||
if (!target) return
|
||||
|
||||
const handleResize = () => {
|
||||
const docWidth = document.documentElement.clientWidth
|
||||
const { right: rightEdge } = target.getBoundingClientRect()
|
||||
setLayoutToLeft(docWidth - rightEdge < 225)
|
||||
}
|
||||
|
||||
handleResize()
|
||||
|
||||
const observer = new ResizeObserver(handleResize)
|
||||
observer.observe(target)
|
||||
|
||||
return () => {
|
||||
observer.disconnect()
|
||||
}
|
||||
}, [querySelector])
|
||||
|
||||
return layoutToLeft
|
||||
}
|
||||
|
||||
export default useLayoutToLeft
|
|
@ -2,6 +2,5 @@ import { ReactScopeValueStore } from '@/features/ide-react/scope-value-store/rea
|
|||
|
||||
export default function populateReviewPanelScope(store: ReactScopeValueStore) {
|
||||
store.set('users', {})
|
||||
store.set('reviewPanel.layoutToLeft', false)
|
||||
store.set('addNewComment', () => {})
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import classNames from 'classnames'
|
||||
import { createPortal } from 'react-dom'
|
||||
import { useReviewPanelValueContext } from '@/features/source-editor/context/review-panel/review-panel-context'
|
||||
import { Coordinates } from '../hooks/use-indicator-hover'
|
||||
import useScopeValue from '@/shared/hooks/use-scope-value'
|
||||
|
||||
function EntryContainer({
|
||||
id,
|
||||
|
@ -11,7 +11,7 @@ function EntryContainer({
|
|||
}: React.ComponentProps<'div'> & {
|
||||
hoverCoords?: Coordinates | null
|
||||
}) {
|
||||
const [layoutToLeft] = useScopeValue<boolean>('reviewPanel.layoutToLeft')
|
||||
const { layoutToLeft } = useReviewPanelValueContext()
|
||||
|
||||
const container = (
|
||||
<div
|
||||
|
|
|
@ -18,7 +18,7 @@ type ReviewPanelViewProps = {
|
|||
}
|
||||
|
||||
function ReviewPanelView({ parentDomNode }: ReviewPanelViewProps) {
|
||||
const { subView, loadingThreads } = useReviewPanelValueContext()
|
||||
const { subView, loadingThreads, layoutToLeft } = useReviewPanelValueContext()
|
||||
const { reviewPanelOpen, miniReviewPanelVisible } = useLayoutContext()
|
||||
const { isReactIde } = useIdeContext()
|
||||
|
||||
|
@ -45,7 +45,7 @@ function ReviewPanelView({ parentDomNode }: ReviewPanelViewProps) {
|
|||
'rp-state-overview': subView === 'overview',
|
||||
'rp-size-mini': miniReviewPanelVisible,
|
||||
'rp-size-expanded': reviewPanelOpen,
|
||||
// 'rp-layout-left': reviewPanel.layoutToLeft,
|
||||
'rp-layout-left': layoutToLeft,
|
||||
'rp-loading-threads': loadingThreads,
|
||||
})}
|
||||
>
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
import { useState, useMemo, useCallback } from 'react'
|
||||
import useScopeValue from '../../../../../shared/hooks/use-scope-value'
|
||||
import useLayoutToLeft from '@/features/ide-react/context/review-panel/hooks/useLayoutToLeft'
|
||||
import { sendMB } from '../../../../../infrastructure/event-tracking'
|
||||
import { ReviewPanelState } from '../types/review-panel-state'
|
||||
import * as ReviewPanel from '../types/review-panel-state'
|
||||
|
@ -131,6 +132,8 @@ function useAngularReviewPanelState(): ReviewPanelState {
|
|||
'bulkRejectActions'
|
||||
)
|
||||
|
||||
const layoutToLeft = useLayoutToLeft('#editor')
|
||||
|
||||
const handleSetSubview = useCallback(
|
||||
(subView: SubView) => {
|
||||
setSubView(subView)
|
||||
|
@ -180,6 +183,7 @@ function useAngularReviewPanelState(): ReviewPanelState {
|
|||
formattedProjectMembers,
|
||||
layoutSuspended,
|
||||
unsavedComment,
|
||||
layoutToLeft,
|
||||
}),
|
||||
[
|
||||
collapsed,
|
||||
|
@ -207,6 +211,7 @@ function useAngularReviewPanelState(): ReviewPanelState {
|
|||
formattedProjectMembers,
|
||||
layoutSuspended,
|
||||
unsavedComment,
|
||||
layoutToLeft,
|
||||
]
|
||||
)
|
||||
|
||||
|
|
|
@ -48,6 +48,7 @@ export interface ReviewPanelState {
|
|||
>
|
||||
layoutSuspended: boolean
|
||||
unsavedComment: string
|
||||
layoutToLeft: boolean
|
||||
}
|
||||
updaterFns: {
|
||||
handleSetSubview: (subView: SubView) => void
|
||||
|
|
Loading…
Reference in a new issue