From 3a9587797d447b39a76904d63b126e76551992ce Mon Sep 17 00:00:00 2001 From: David <33458145+davidmcpowell@users.noreply.github.com> Date: Thu, 20 Feb 2025 10:54:31 +0000 Subject: [PATCH] Merge pull request #23710 from overleaf/dp-remove-file-tree-workaround Remove pre-filetree work around for new editor GitOrigin-RevId: 7b34e4e298324ad217b603b48abbfbfa78d21804 --- .../ide-redesign/components/editor.tsx | 37 ------------------- 1 file changed, 37 deletions(-) diff --git a/services/web/frontend/js/features/ide-redesign/components/editor.tsx b/services/web/frontend/js/features/ide-redesign/components/editor.tsx index 12e6e3b4fb..d8f5fa4df4 100644 --- a/services/web/frontend/js/features/ide-redesign/components/editor.tsx +++ b/services/web/frontend/js/features/ide-redesign/components/editor.tsx @@ -7,46 +7,9 @@ import { useFileTreeOpenContext } from '@/features/ide-react/context/file-tree-o import useScopeValue from '@/shared/hooks/use-scope-value' import classNames from 'classnames' import SourceEditor from '@/features/source-editor/components/source-editor' -import { useProjectContext } from '@/shared/context/project-context' -import { useFileTreeData } from '@/shared/context/file-tree-data-context' -import { useEffect, useRef } from 'react' -import { findInTree } from '@/features/file-tree/util/find-in-tree' - -// FIXME: This is only needed until we have a working file tree. This hook does -// the minimal amount of work to load the initial document. -const useWorkaroundForOpeningInitialDocument = () => { - const { _id: projectId } = useProjectContext() - const { fileTreeData, setSelectedEntities } = useFileTreeData() - const isReady = Boolean(projectId && fileTreeData) - const { handleFileTreeInit, handleFileTreeSelect } = useFileTreeOpenContext() - const { currentDocumentId } = useEditorManagerContext() - - useEffect(() => { - if (isReady) handleFileTreeInit() - }, [isReady, handleFileTreeInit]) - - const alreadyOpenedFile = useRef(false) - useEffect(() => { - if (isReady && currentDocumentId && !alreadyOpenedFile.current) { - alreadyOpenedFile.current = true - const doc = findInTree(fileTreeData, currentDocumentId) - if (doc) { - handleFileTreeSelect([doc]) - setSelectedEntities([doc]) - } - } - }, [ - isReady, - currentDocumentId, - fileTreeData, - handleFileTreeSelect, - setSelectedEntities, - ]) -} export const Editor = () => { const [editor] = useScopeValue('editor') - useWorkaroundForOpeningInitialDocument() const { selectedEntityCount, openEntity } = useFileTreeOpenContext() const { currentDocumentId } = useEditorManagerContext()