Merge branch 'nathan-starter' of https://github.com/brown-dash/Dash-Web into nathan-starter

1 files changed, 11 insertions, 10 deletions

diff --git a/src/client/views/collections/collectionSchema/SchemaCellField.tsx b/src/client/views/collections/collectionSchema/SchemaCellField.tsx
index dab494c0e..5a64ecc62 100644
--- a/src/client/views/collections/collectionSchema/SchemaCellField.tsx
+++ b/src/client/views/collections/collectionSchema/SchemaCellField.tsx
@@ -27,6 +27,7 @@ export interface SchemaCellFieldProps {
     oneLine?: boolean;
     Document: Doc;
     fieldKey: string;
+    // eslint-disable-next-line no-use-before-define
     refSelectModeInfo: { enabled: boolean; currEditing: SchemaCellField | undefined };
     highlightCells?: (text: string) => void;
     GetValue(): string | undefined;
@@ -154,8 +155,8 @@ export class SchemaCellField extends ObservableReactComponent<SchemaCellFieldPro
             }
         }
 
-        matches.forEach((match: string) => {
-            chunkedText = chunkedText.replace(match, this.generateSpan(match, cells.get(match)));
+        matches.forEach(m => {
+            chunkedText = chunkedText.replace(m, this.generateSpan(m, cells.get(m)));
         });
 
         return chunkedText;
@@ -301,13 +302,14 @@ export class SchemaCellField extends ObservableReactComponent<SchemaCellFieldPro
                 setTimeout(() => this.setupRefSelect(this.refSelectConditionMet), 0);
                 break;
             case ' ':
-                e.stopPropagation();
-                let cursorPos = 0;
-                if (this.cursorPosition !== null) cursorPos = this.cursorPosition + 1;
-                setTimeout(() => {
-                    this.setContent(this._unrenderedContent);
-                    setTimeout(() => this.setCursorPosition(cursorPos));
-                }, 0);
+                {
+                    e.stopPropagation();
+                    const cursorPos = this.cursorPosition !== null ? this.cursorPosition + 1 : 0;
+                    setTimeout(() => {
+                        this.setContent(this._unrenderedContent);
+                        setTimeout(() => this.setCursorPosition(cursorPos));
+                    }, 0);
+                }
                 break;
             case 'u': // for some reason 'u' otherwise exits the editor
                 e.stopPropagation();
@@ -318,7 +320,6 @@ export class SchemaCellField extends ObservableReactComponent<SchemaCellFieldPro
             case 'Control':
             case ':': // prettier-ignore
                 break;
-            // eslint-disable-next-line no-fallthrough
             default:
                 break;
         }