From 3be60740341756cf3614fb77fc6f74ff1cc829b1 Mon Sep 17 00:00:00 2001 From: David <33458145+davidmcpowell@users.noreply.github.com> Date: Wed, 8 Jan 2025 14:58:25 +0000 Subject: [PATCH] Merge pull request #22738 from overleaf/dp-new-editor-pdf Drop in PdfPreview into new editor skeleton GitOrigin-RevId: c88806904bd2534690a1540d7e39c5f81ab65709 --- .../features/ide-redesign/components/main-layout.tsx | 11 +++++++---- .../frontend/js/features/pdf-preview/util/compiler.js | 2 +- .../bootstrap-5/pages/editor/ide-redesign.scss | 4 ++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/services/web/frontend/js/features/ide-redesign/components/main-layout.tsx b/services/web/frontend/js/features/ide-redesign/components/main-layout.tsx index 8d89e44977..553fe95ca6 100644 --- a/services/web/frontend/js/features/ide-redesign/components/main-layout.tsx +++ b/services/web/frontend/js/features/ide-redesign/components/main-layout.tsx @@ -1,6 +1,7 @@ import { Panel, PanelGroup } from 'react-resizable-panels' import classNames from 'classnames' import { HorizontalResizeHandle } from '@/features/ide-react/components/resize/horizontal-resize-handle' +import PdfPreview from '@/features/pdf-preview/components/pdf-preview' export default function MainLayout() { return ( @@ -41,10 +42,12 @@ export default function MainLayout() { resizable hitAreaMargins={{ coarse: 0, fine: 0 }} /> - -
- PDF -
+ + diff --git a/services/web/frontend/js/features/pdf-preview/util/compiler.js b/services/web/frontend/js/features/pdf-preview/util/compiler.js index 6aaf362adc..846991f56d 100644 --- a/services/web/frontend/js/features/pdf-preview/util/compiler.js +++ b/services/web/frontend/js/features/pdf-preview/util/compiler.js @@ -176,7 +176,7 @@ export default class DocumentCompiler { // if it contains "\documentclass" then use this as the root doc getRootDocOverrideId() { // only override when not in the root doc itself - if (this.currentDoc.doc_id !== this.projectRootDocId) { + if (this.currentDoc && this.currentDoc.doc_id !== this.projectRootDocId) { const snapshot = this.currentDoc.getSnapshot() if (snapshot && isMainFile(snapshot)) { diff --git a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/ide-redesign.scss b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/ide-redesign.scss index f312cc3a8a..4ca5ce3873 100644 --- a/services/web/frontend/stylesheets/bootstrap-5/pages/editor/ide-redesign.scss +++ b/services/web/frontend/stylesheets/bootstrap-5/pages/editor/ide-redesign.scss @@ -20,3 +20,7 @@ .ide-redesign-full-height { height: 100%; } + +.ide-redesign-pdf-container { + position: relative; +}