From 695a757e1d5d3469a9871b0760c9dedeb073a489 Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Fri, 4 Oct 2024 21:45:42 -0400
Subject: from last

---
 .../collections/collectionSchema/SchemaCellField.tsx    | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'src/client/views/collections/collectionSchema/SchemaCellField.tsx')

diff --git a/src/client/views/collections/collectionSchema/SchemaCellField.tsx b/src/client/views/collections/collectionSchema/SchemaCellField.tsx
index 84e7b62bf..ce41b2758 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;
@@ -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;
         }
-- 
cgit v1.2.3-70-g09d2


From 2012b3ade1d4644115e3a59cf0a1deec07e23637 Mon Sep 17 00:00:00 2001
From: bobzel <zzzman@gmail.com>
Date: Fri, 4 Oct 2024 21:51:25 -0400
Subject: from last

---
 src/client/views/EditableView.tsx                                 | 1 -
 src/client/views/ScriptingRepl.tsx                                | 3 +--
 src/client/views/collections/collectionSchema/SchemaCellField.tsx | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'src/client/views/collections/collectionSchema/SchemaCellField.tsx')

diff --git a/src/client/views/EditableView.tsx b/src/client/views/EditableView.tsx
index 612ecee62..41079045b 100644
--- a/src/client/views/EditableView.tsx
+++ b/src/client/views/EditableView.tsx
@@ -239,7 +239,6 @@ export class EditableView extends ObservableReactComponent<EditableProps> {
     renderEditor() {
         return this._props.autosuggestProps ? (
             <Autosuggest
-                // eslint-disable-next-line react/jsx-props-no-spreading
                 {...this._props.autosuggestProps.autosuggestProps}
                 inputProps={{
                     className: 'editableView-input',
diff --git a/src/client/views/ScriptingRepl.tsx b/src/client/views/ScriptingRepl.tsx
index 2de867746..e413c13e2 100644
--- a/src/client/views/ScriptingRepl.tsx
+++ b/src/client/views/ScriptingRepl.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/no-array-index-key */
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { action, makeObservable, observable } from 'mobx';
 import { observer } from 'mobx-react';
@@ -182,7 +181,7 @@ export class ScriptingRepl extends ObservableReactComponent<object> {
                     this.maybeScrollToBottom();
                     return;
                 }
-                const result = undoable(() => script.run({}, e => this.commands.push({ command: this.commandString, result: e as string })), 'run:' + this.commandString)();
+                const result = undoable(() => script.run({}, err => this.commands.push({ command: this.commandString, result: err })), 'run:' + this.commandString)();
                 if (result.success) {
                     this.commands.push({ command: this.commandString, result: result.result });
                     this.commandsHistory.push(this.commandString);
diff --git a/src/client/views/collections/collectionSchema/SchemaCellField.tsx b/src/client/views/collections/collectionSchema/SchemaCellField.tsx
index ce41b2758..3924ed087 100644
--- a/src/client/views/collections/collectionSchema/SchemaCellField.tsx
+++ b/src/client/views/collections/collectionSchema/SchemaCellField.tsx
@@ -155,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;
-- 
cgit v1.2.3-70-g09d2

