From bf3adbc812e949b63bd17e842bd1aae912b9dcaa Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Tue, 19 Oct 2021 00:38:06 +0200
Subject: [PATCH] Svelte Editor hotfixes (#1436)

* Fix white on white text in light mode

* Reflect rename to FieldsEditor in class name

* Fix adjusting fields ending in an endless loop
---
 ts/editor/FieldsEditor.svelte     | 4 ++--
 ts/editor/OldEditorAdapter.svelte | 6 +++++-
 ts/editor/RichTextInput.svelte    | 7 +++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ts/editor/FieldsEditor.svelte b/ts/editor/FieldsEditor.svelte
index 69b78cae2..b71ee9e79 100644
--- a/ts/editor/FieldsEditor.svelte
+++ b/ts/editor/FieldsEditor.svelte
@@ -2,12 +2,12 @@
 Copyright: Ankitects Pty Ltd and contributors
 License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
 -->
-<div class="multi-root-editor">
+<div class="fields-editor">
     <slot />
 </div>
 
 <style lang="scss">
-    .multi-root-editor {
+    .fields-editor {
         position: relative;
         display: flex;
         flex-direction: column;
diff --git a/ts/editor/OldEditorAdapter.svelte b/ts/editor/OldEditorAdapter.svelte
index 8db3cf54f..85d2c1df4 100644
--- a/ts/editor/OldEditorAdapter.svelte
+++ b/ts/editor/OldEditorAdapter.svelte
@@ -83,7 +83,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             newStore.subscribe((value) => updateField(i, value));
         }
 
-        for (let i = fieldStores.length; i > newFieldNames.length; i++) {
+        for (
+            let i = fieldStores.length;
+            i > newFieldNames.length;
+            i = fieldStores.length
+        ) {
             fieldStores.pop();
         }
 
diff --git a/ts/editor/RichTextInput.svelte b/ts/editor/RichTextInput.svelte
index 535290303..f0e5457b2 100644
--- a/ts/editor/RichTextInput.svelte
+++ b/ts/editor/RichTextInput.svelte
@@ -34,7 +34,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import SetContext from "./SetContext.svelte";
     import ContentEditable from "../editable/ContentEditable.svelte";
 
-    import { onMount, getAllContexts } from "svelte";
+    import { onMount, getContext, getAllContexts } from "svelte";
     import {
         nodeIsElement,
         nodeContainsInlineContent,
@@ -48,6 +48,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     import { wrapInternal } from "../lib/wrap";
     import { nodeStore } from "../sveltelib/node-store";
     import type { DecoratedElement } from "../editable/decorated";
+    import { nightModeKey } from "../components/context-keys";
 
     export let hidden: boolean;
 
@@ -222,10 +223,12 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
             unsubscribeToEditingArea();
         };
     });
+
+    const nightMode = getContext<boolean>(nightModeKey);
 </script>
 
 <RichTextStyles
-    color="white"
+    color={nightMode ? "white" : "black"}
     let:attachToShadow={attachStyles}
     let:promise={stylesPromise}
     let:stylesDidLoad