Merge branch 'master' into joanne-tutorialagent

1 files changed, 29 insertions, 2 deletions

diff --git a/src/fields/RichTextField.ts b/src/fields/RichTextField.ts
index 63ae61c2f..68a3737bf 100644
--- a/src/fields/RichTextField.ts
+++ b/src/fields/RichTextField.ts
@@ -25,7 +25,7 @@ export class RichTextField extends ObjectField {
     }
 
     Empty() {
-        return !(this.Text || this.Data.toString().includes('dashField') || this.Data.toString().includes('align'));
+        return !(this.Text || this.Data.toString().includes('dashField') || this.Data.toString().includes('dashDoc') || this.Data.toString().includes('align'));
     }
 
     [Copy]() {
@@ -42,7 +42,8 @@ export class RichTextField extends ObjectField {
         return this.Text;
     }
 
-    // AARAV ADD=
+    // AARAV ADD
+
     static ToProsemirrorDoc = (content: Record<string, unknown>[], selection: Record<string, unknown>) => ({
         doc: {
             type: 'doc',
@@ -86,7 +87,33 @@ export class RichTextField extends ObjectField {
             { type: 'text', anchor: 2 + plaintext.length - (selectBack ?? 0), head: 2 + plaintext.length }
         );
 
+    // AARAV ADD
+
+    // takes in text segments instead of single text field
+    private static ToProsemirrorSegmented = (textSegments: { text: string; styles?: { bold?: boolean; italic?: boolean; fontSize?: number; color?: string } }[], imgDocId?: string, selectBack?: number) =>
+        RichTextField.ToProsemirrorDoc(
+            textSegments.map(seg => ({
+                type: 'paragraph', // Each segment becomes its own paragraph
+                content: [...RichTextField.ToProsemirrorTextContent(seg.text, seg.styles), ...(imgDocId ? RichTextField.ToProsemirrorDashDocContent(imgDocId) : [])],
+            })),
+            (textLen => ({
+                type: 'text',
+                anchor: textLen - (selectBack ?? 0),
+                head: textLen,
+            }))(2 * textSegments.length + textSegments.map(seg => seg.text).join('').length - 1)
+            // selection/doc end = text length + 2 for each paragraph. subtract 1 to set selection inside of end of last paragraph
+        );
+
+    // AARAV ADD ||
+
     public static textToRtf(text: string, imgDocId?: string, styles?: { bold?: boolean; italic?: boolean; fontSize?: number; color?: string }, selectBack?: number) {
         return new RichTextField(JSON.stringify(RichTextField.ToProsemirror(text, imgDocId, styles, selectBack)), text);
     }
+
+    // AARAV ADD
+    public static textToRtfFormat(textSegments: { text: string; styles?: { bold?: boolean; italic?: boolean; fontSize?: number; color?: string } }[], imgDocId?: string, selectBack?: number) {
+        return new RichTextField(JSON.stringify(RichTextField.ToProsemirrorSegmented(textSegments, imgDocId, selectBack)), textSegments.map(seg => seg.text).join(''));
+    }
+
+    // AARAV ADD
 }