1 files changed, 16 insertions, 9 deletions

diff --git a/src/new_fields/RichTextField.ts b/src/new_fields/RichTextField.ts
index f0284b1b8..92b19b921 100644
--- a/src/new_fields/RichTextField.ts
+++ b/src/new_fields/RichTextField.ts
@@ -4,14 +4,14 @@ import { Deserializable } from "../client/util/SerializationHelper";
 import { Copy, ToScriptString } from "./FieldSymbols";
 import { scriptingGlobal } from "../client/util/Scripting";
 
-export const ToPlainText = Symbol("PlainText");
-export const FromPlainText = Symbol("PlainText");
+export const ToGoogleDocText = Symbol("PlainText");
+export const FromGoogleDocText = Symbol("PlainText");
 
 @scriptingGlobal
 @Deserializable("RichTextField")
 export class RichTextField extends ObjectField {
     @serializable(true)
-    Data: string;
+    readonly Data: string;
 
     constructor(data: string) {
         super();
@@ -26,24 +26,28 @@ export class RichTextField extends ObjectField {
         return `new RichTextField("${this.Data}")`;
     }
 
-    [ToPlainText]() {
+    [ToGoogleDocText]() {
         let content = JSON.parse(this.Data).doc.content;
         let paragraphs = content.filter((item: any) => item.type === "paragraph");
         let output = "";
         for (let i = 0; i < paragraphs.length; i++) {
             let paragraph = paragraphs[i];
+            let addNewLine = i > 0 ? paragraphs[i - 1].content : false;
             if (paragraph.content) {
                 output += paragraph.content.map((block: any) => block.text).join("");
             } else {
-                output += i > 0 && paragraphs[i - 1].content ? "\n\n" : "\n";
+                output += "\n";
             }
+            addNewLine && (output += "\n");
         }
         return output;
     }
 
-    [FromPlainText](plainText: string) {
+    [FromGoogleDocText](plainText: string) {
         let elements = plainText.split("\n");
+        !elements[elements.length - 1].length && elements.pop();
         let parsed = JSON.parse(this.Data);
+        let blankCount = 0;
         parsed.doc.content = elements.map(text => {
             let paragraph: any = { type: "paragraph" };
             if (text.length) {
@@ -52,15 +56,18 @@ export class RichTextField extends ObjectField {
                     marks: [],
                     text
                 }];
+            } else {
+                blankCount++;
             }
             return paragraph;
         });
+        let selection = plainText.length + 2 * blankCount;
         parsed.selection = {
             type: "text",
-            anchor: plainText.length,
-            head: plainText.length
+            anchor: selection,
+            head: selection
         };
-        this.Data = JSON.stringify(parsed);
+        return JSON.stringify(parsed);
     }
 
 }
\ No newline at end of file