From 6c7e97e2aebf79307453bcee94522381ff4c7ba7 Mon Sep 17 00:00:00 2001
From: Sophie Zhang <sophie_zhang@brown.edu>
Date: Thu, 7 Dec 2023 00:16:32 -0500
Subject: font color fix

---
 src/client/views/PropertiesView.tsx                |  5 ++---
 .../views/nodes/formattedText/FormattedTextBox.tsx | 25 ++++++++++++++++++++--
 2 files changed, 25 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/client/views/PropertiesView.tsx b/src/client/views/PropertiesView.tsx
index e48574857..899cca4ec 100644
--- a/src/client/views/PropertiesView.tsx
+++ b/src/client/views/PropertiesView.tsx
@@ -1239,10 +1239,9 @@ export class PropertiesView extends React.Component<PropertiesViewProps> {
                                 style={{ display: 'flex', gap: '4px', backgroundColor: this.selectedStyle === i ? StrCast(Doc.UserDoc().userVariantColor) : '#00000000' }}
                                 onClick={() => this.styleCollection(i)}>
                                 <div style={{ width: '24px', height: '24px', backgroundColor: style.collectionBackgroundColor, borderRadius: '2px' }}></div>
-                                {ExtractColors.sortColors(style.documentsWithColors.map(doc => ExtractColors.hexToFinalColor(doc.color))).map(c => (
-                                    <div key={c.hex} style={{ width: '24px', height: '24px', backgroundColor: c.hex, borderRadius: '2px' }}></div>
+                                {ExtractColors.sortColors(style.documentsWithColors.map(doc => ExtractColors.hexToFinalColor(doc.color))).map((c, i) => (
+                                    <div key={i} style={{ width: '24px', height: '24px', backgroundColor: c.hex, borderRadius: '2px' }}></div>
                                 ))}
-                                {/* <FaRegHeart onClick={() => {}}/> */}
                             </div>
                         ))}
                     {this.loadingStyles && 'Generating styles...'}
diff --git a/src/client/views/nodes/formattedText/FormattedTextBox.tsx b/src/client/views/nodes/formattedText/FormattedTextBox.tsx
index 6535ac6de..5fdfbce99 100644
--- a/src/client/views/nodes/formattedText/FormattedTextBox.tsx
+++ b/src/client/views/nodes/formattedText/FormattedTextBox.tsx
@@ -73,6 +73,7 @@ import applyDevTools = require('prosemirror-dev-tools');
 import React = require('react');
 import { media_state } from '../AudioBox';
 import { setCORS } from 'google-translate-api-browser';
+import { isDarkMode } from '../../../util/reportManager/reportManagerUtils';
 // setting up cors-anywhere server address
 const translate = setCORS('http://cors-anywhere.herokuapp.com/');
 export const GoogleRef = 'googleDocId';
@@ -946,13 +947,12 @@ export class FormattedTextBox extends ViewBoxAnnotatableComponent<FieldViewProps
         try {
             let res = await gptAPICall((this.dataDoc.text as RichTextField)?.Text, GPTCallType.COMPLETION);
             if (!res) {
-                console.error('GPT call failed');
                 this.animateRes(0, 'Something went wrong.');
             } else {
                 this.animateRes(0, res);
             }
         } catch (err) {
-            console.error('GPT call failed');
+            console.error(err);
             this.animateRes(0, 'Something went wrong.');
         }
     });
@@ -1144,6 +1144,23 @@ export class FormattedTextBox extends ViewBoxAnnotatableComponent<FieldViewProps
     @computed get contentScaling() {
         return Doc.NativeAspect(this.rootDoc, this.dataDoc, false) ? this.props.NativeDimScaling?.() || 1 : 1;
     }
+
+    checkBackgroundColor() {
+        console.log('checking bg color');
+        if (isDarkMode(StrCast(this.rootDoc._backgroundColor))) {
+            console.log('in dark mode');
+            // set text to white
+            if (!this._editorView) return;
+            const tr = this._editorView?.state.tr;
+
+            tr.setSelection(TextSelection.create(tr.doc, 0, tr.doc.content.size));
+            tr.addMark(0, tr.doc.content.size, schema.marks.pFontColor.create({ color: '#ffffff' }));
+            this._editorView.dispatch(tr);
+        } else {
+            // leave as is
+        }
+    }
+
     componentDidMount() {
         !this.props.dontSelectOnLoad && this.props.setContentView?.(this); // this tells the DocumentView that this AudioBox is the "content" of the document.  this allows the DocumentView to indirectly call getAnchor() on the AudioBox when making a link.
         this._cachedLinks = LinkManager.Links(this.Document);
@@ -1166,6 +1183,10 @@ export class FormattedTextBox extends ViewBoxAnnotatableComponent<FieldViewProps
             ({ width, scrollHeight, layout_autoHeight }) => width && layout_autoHeight && this.resetNativeHeight(scrollHeight),
             { fireImmediately: true }
         );
+        this._disposers.width = reaction(
+            () => this.rootDoc._backgroundColor,
+            color => this.checkBackgroundColor()
+        );
         this._disposers.componentHeights = reaction(
             // set the document height when one of the component heights changes and layout_autoHeight is on
             () => ({ sidebarHeight: this.sidebarHeight, textHeight: this.textHeight, layout_autoHeight: this.layout_autoHeight, marginsHeight: this.layout_autoHeightMargins }),
-- 
cgit v1.2.3-70-g09d2