From d55aeabb3ddb28c4aca1f8ebf794af001bede84f Mon Sep 17 00:00:00 2001
From: Daniel Lautzenheiser <lautzd@gmail.com>
Date: Mon, 19 Sep 2022 22:35:58 -0400
Subject: [PATCH] Move sync root

---
 .../src/components/App/App.js                 | 156 ++++++++++--------
 .../Editor/EditorPreviewPane/EditorPreview.js |  13 +-
 .../EditorPreviewContent.tsx                  |   2 +-
 .../EditorPreviewPane/EditorPreviewPane.js    |  13 +-
 4 files changed, 97 insertions(+), 87 deletions(-)

diff --git a/packages/netlify-cms-core/src/components/App/App.js b/packages/netlify-cms-core/src/components/App/App.js
index 28ce42ff..56a1154f 100644
--- a/packages/netlify-cms-core/src/components/App/App.js
+++ b/packages/netlify-cms-core/src/components/App/App.js
@@ -9,6 +9,7 @@ import { Route, Switch, Redirect } from 'react-router-dom';
 import { Notifs } from 'redux-notifications';
 import TopBarProgress from 'react-topbar-progress-indicator';
 import { Loader, colors } from 'netlify-cms-ui-default';
+import { ScrollSync } from 'react-scroll-sync';
 
 import { loginUser, logoutUser } from '../../actions/auth';
 import { currentBackend } from '../../backend';
@@ -33,10 +34,15 @@ TopBarProgress.config({
   barThickness: 2,
 });
 
+const AppRoot = styled.div`
+  width: 100%;
+  min-height: 100%;
+`;
+
 const AppWrapper = styled.div`
   width: 100%;
   min-height: 100%;
-`
+`;
 
 const AppMainContainer = styled.div`
   min-width: 1200px;
@@ -180,80 +186,84 @@ class App extends React.Component {
     const hasWorkflow = publishMode === EDITORIAL_WORKFLOW;
 
     return (
-      <AppWrapper className="cms-wrapper">
-        <Notifs CustomComponent={Toast} />
-        <Header
-          user={user}
-          collections={collections}
-          onCreateEntryClick={createNewEntry}
-          onLogoutClick={logoutUser}
-          openMediaLibrary={openMediaLibrary}
-          hasWorkflow={hasWorkflow}
-          displayUrl={config.display_url}
-          isTestRepo={config.backend.name === 'test-repo'}
-          showMediaButton={showMediaButton}
-        />
-        <AppMainContainer>
-          {isFetching && <TopBarProgress />}
-          <Switch>
-            <Redirect exact from="/" to={defaultPath} />
-            <Redirect exact from="/search/" to={defaultPath} />
-            <RouteInCollection
-              exact
+      <ScrollSync>
+        <AppRoot id="cms-root">
+          <AppWrapper className="cms-wrapper">
+            <Notifs CustomComponent={Toast} />
+            <Header
+              user={user}
               collections={collections}
-              path="/collections/:name/search/"
-              render={({ match }) => <Redirect to={`/collections/${match.params.name}`} />}
+              onCreateEntryClick={createNewEntry}
+              onLogoutClick={logoutUser}
+              openMediaLibrary={openMediaLibrary}
+              hasWorkflow={hasWorkflow}
+              displayUrl={config.display_url}
+              isTestRepo={config.backend.name === 'test-repo'}
+              showMediaButton={showMediaButton}
             />
-            <Redirect
-              // This happens on Identity + Invite Only + External Provider email not matching
-              // the registered user
-              from="/error=access_denied&error_description=Signups+not+allowed+for+this+instance"
-              to={defaultPath}
-            />
-            {hasWorkflow ? <Route path="/workflow" component={Workflow} /> : null}
-            <RouteInCollection
-              exact
-              collections={collections}
-              path="/collections/:name"
-              render={props => <Collection {...props} />}
-            />
-            <RouteInCollection
-              path="/collections/:name/new"
-              collections={collections}
-              render={props => <Editor {...props} newRecord />}
-            />
-            <RouteInCollection
-              path="/collections/:name/entries/*"
-              collections={collections}
-              render={props => <Editor {...props} />}
-            />
-            <RouteInCollection
-              path="/collections/:name/search/:searchTerm"
-              collections={collections}
-              render={props => <Collection {...props} isSearchResults isSingleSearchResult />}
-            />
-            <RouteInCollection
-              collections={collections}
-              path="/collections/:name/filter/:filterTerm*"
-              render={props => <Collection {...props} />}
-            />
-            <Route
-              path="/search/:searchTerm"
-              render={props => <Collection {...props} isSearchResults />}
-            />
-            <RouteInCollection
-              path="/edit/:name/:entryName"
-              collections={collections}
-              render={({ match }) => {
-                const { name, entryName } = match.params;
-                return <Redirect to={`/collections/${name}/entries/${entryName}`} />;
-              }}
-            />
-            <Route component={NotFoundPage} />
-          </Switch>
-          {useMediaLibrary ? <MediaLibrary /> : null}
-        </AppMainContainer>
-      </AppWrapper>
+            <AppMainContainer>
+              {isFetching && <TopBarProgress />}
+              <Switch>
+                <Redirect exact from="/" to={defaultPath} />
+                <Redirect exact from="/search/" to={defaultPath} />
+                <RouteInCollection
+                  exact
+                  collections={collections}
+                  path="/collections/:name/search/"
+                  render={({ match }) => <Redirect to={`/collections/${match.params.name}`} />}
+                />
+                <Redirect
+                  // This happens on Identity + Invite Only + External Provider email not matching
+                  // the registered user
+                  from="/error=access_denied&error_description=Signups+not+allowed+for+this+instance"
+                  to={defaultPath}
+                />
+                {hasWorkflow ? <Route path="/workflow" component={Workflow} /> : null}
+                <RouteInCollection
+                  exact
+                  collections={collections}
+                  path="/collections/:name"
+                  render={props => <Collection {...props} />}
+                />
+                <RouteInCollection
+                  path="/collections/:name/new"
+                  collections={collections}
+                  render={props => <Editor {...props} newRecord />}
+                />
+                <RouteInCollection
+                  path="/collections/:name/entries/*"
+                  collections={collections}
+                  render={props => <Editor {...props} />}
+                />
+                <RouteInCollection
+                  path="/collections/:name/search/:searchTerm"
+                  collections={collections}
+                  render={props => <Collection {...props} isSearchResults isSingleSearchResult />}
+                />
+                <RouteInCollection
+                  collections={collections}
+                  path="/collections/:name/filter/:filterTerm*"
+                  render={props => <Collection {...props} />}
+                />
+                <Route
+                  path="/search/:searchTerm"
+                  render={props => <Collection {...props} isSearchResults />}
+                />
+                <RouteInCollection
+                  path="/edit/:name/:entryName"
+                  collections={collections}
+                  render={({ match }) => {
+                    const { name, entryName } = match.params;
+                    return <Redirect to={`/collections/${name}/entries/${entryName}`} />;
+                  }}
+                />
+                <Route component={NotFoundPage} />
+              </Switch>
+              {useMediaLibrary ? <MediaLibrary /> : null}
+            </AppMainContainer>
+          </AppWrapper>
+        </AppRoot>
+      </ScrollSync>
     );
   }
 }
diff --git a/packages/netlify-cms-core/src/components/Editor/EditorPreviewPane/EditorPreview.js b/packages/netlify-cms-core/src/components/Editor/EditorPreviewPane/EditorPreview.js
index a5d1132c..35bf04d7 100644
--- a/packages/netlify-cms-core/src/components/Editor/EditorPreviewPane/EditorPreview.js
+++ b/packages/netlify-cms-core/src/components/Editor/EditorPreviewPane/EditorPreview.js
@@ -2,6 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import styled from '@emotion/styled';
+import { ScrollSyncPane } from 'react-scroll-sync';
 
 function isVisible(field) {
   return field.get('widget') !== 'hidden';
@@ -26,11 +27,13 @@ export default class Preview extends React.Component {
       return null;
     }
     return (
-      <PreviewContainer>
-        {fields.filter(isVisible).map(field => (
-          <div key={field.get('name')}>{widgetFor(field.get('name'))}</div>
-        ))}
-      </PreviewContainer>
+      <ScrollSyncPane>
+        <PreviewContainer>
+          {fields.filter(isVisible).map(field => (
+            <div key={field.get('name')}>{widgetFor(field.get('name'))}</div>
+          ))}
+        </PreviewContainer>
+      </ScrollSyncPane>
     );
   }
 }
diff --git a/packages/netlify-cms-core/src/components/Editor/EditorPreviewPane/EditorPreviewContent.tsx b/packages/netlify-cms-core/src/components/Editor/EditorPreviewPane/EditorPreviewContent.tsx
index 5fe8d3fc..ec76d328 100644
--- a/packages/netlify-cms-core/src/components/Editor/EditorPreviewPane/EditorPreviewContent.tsx
+++ b/packages/netlify-cms-core/src/components/Editor/EditorPreviewPane/EditorPreviewContent.tsx
@@ -21,7 +21,7 @@ const StyledPreviewContent = styled.div`
 `;
 
 const PreviewContent = ({ previewComponent, previewProps }: PreviewContentProps) => {
-  const element = useMemo(() => document.getElementById('nc-root'), []);
+  const element = useMemo(() => document.getElementById('cms-root'), []);
 
   return useMemo(() => {
     if (!element) {
diff --git a/packages/netlify-cms-core/src/components/Editor/EditorPreviewPane/EditorPreviewPane.js b/packages/netlify-cms-core/src/components/Editor/EditorPreviewPane/EditorPreviewPane.js
index 3d9662f9..10915b2f 100644
--- a/packages/netlify-cms-core/src/components/Editor/EditorPreviewPane/EditorPreviewPane.js
+++ b/packages/netlify-cms-core/src/components/Editor/EditorPreviewPane/EditorPreviewPane.js
@@ -5,7 +5,6 @@ import { List, Map } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { lengths } from 'netlify-cms-ui-default';
 import { connect } from 'react-redux';
-import { ScrollSyncPane } from 'react-scroll-sync';
 
 import {
   resolveWidget,
@@ -232,13 +231,11 @@ export class PreviewPane extends React.Component {
 
     return (
       <ErrorBoundary config={config}>
-        <ScrollSyncPane>{/* attachTo={document.getElementById('control-pane')}>*/}
-          <PreviewPaneFrame id="preview-pane" head={styleEls} initialContent={initialContent}>
-            <EditorPreviewContent
-              {...{ previewComponent, previewProps: { ...previewProps, document, window } }}
-            />
-          </PreviewPaneFrame>
-        </ScrollSyncPane>
+        <PreviewPaneFrame id="preview-pane" head={styleEls} initialContent={initialContent}>
+          <EditorPreviewContent
+            {...{ previewComponent, previewProps: { ...previewProps, document, window } }}
+          />
+        </PreviewPaneFrame>
       </ErrorBoundary>
     );
   }