More fixes #3

facebook · Apr 9, 2022 · 6e8bcd5 · 6e8bcd5
1 parent 58bf5fe
commit 6e8bcd5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/packages/outline/src/OutlineEditor.js b/packages/outline/src/OutlineEditor.js
@@ -101,7 +101,11 @@ export class OutlineEditor {
       this._keyToDOMMap.delete('root');
     } else {
       this._keyToDOMMap.set('root', editorElement);
-      updateViewModel(this._viewModel, this);
+      const pendingViewModel = this._pendingViewModel
+      if (pendingViewModel !== null) {
+        this._pendingViewModel = null;
+        updateViewModel(pendingViewModel, this);
+      }
     }
   }
   getElementByKey(key: NodeKey): HTMLElement {

diff --git a/packages/outline/src/OutlineView.js b/packages/outline/src/OutlineView.js
@@ -131,11 +131,13 @@ export function updateViewModel(
   viewModel: ViewModel,
   editor: OutlineEditor,
 ): void {
+  if (editor._editorElement === null) {
+    this._pendingViewModel = viewModel;
+    return;
+  }
   const previousActiveViewModel = activeViewModel;
   activeViewModel = viewModel;
-  if (editor._editorElement !== null) {
-    reconcileViewModel(viewModel, editor);
-  }
+  reconcileViewModel(viewModel, editor);
   activeViewModel = previousActiveViewModel;
   if (viewModel.selection === null) {
     viewModel.selection = editor._viewModel.selection;