cleaned up server list add/rem.

1 files changed, 20 insertions, 18 deletions

diff --git a/src/client/views/nodes/formattedText/FormattedTextBox.tsx b/src/client/views/nodes/formattedText/FormattedTextBox.tsx
index 478039ffa..e21902fdd 100644
--- a/src/client/views/nodes/formattedText/FormattedTextBox.tsx
+++ b/src/client/views/nodes/formattedText/FormattedTextBox.tsx
@@ -59,7 +59,7 @@ import { LinkInfo } from '../LinkDocPreview';
 import { OpenWhere } from '../OpenWhere';
 import './FormattedTextBox.scss';
 import { findLinkMark, FormattedTextBoxComment } from './FormattedTextBoxComment';
-import { buildKeymap, KeyMap, updateBullets } from './ProsemirrorExampleTransfer';
+import { buildKeymap, updateBullets } from './ProsemirrorExampleTransfer';
 import { removeMarkWithAttrs } from './prosemirrorPatches';
 import { RichTextMenu, RichTextMenuPlugin } from './RichTextMenu';
 import { RichTextRules } from './RichTextRules';
@@ -75,6 +75,21 @@ export class FormattedTextBox extends ViewBoxAnnotatableComponent<FormattedTextB
     public static LayoutString(fieldStr: string) {
         return FieldView.LayoutString(FormattedTextBox, fieldStr);
     }
+    public static MakeConfig(rules?: RichTextRules, props?: FormattedTextBoxProps) {
+        const keymapping = buildKeymap(schema, props ?? {});
+        return {
+            schema,
+            plugins: [
+                inputRules(rules?.inpRules ?? { rules: [] }),
+                ...(props ? [FormattedTextBox.richTextMenuPlugin(props)] : []),
+                history(),
+                keymap(keymapping),
+                keymap(baseKeymap),
+                new Plugin({ props: { attributes: { class: 'ProseMirror-example-setup-style' } } }),
+                new Plugin({ view: () => new FormattedTextBoxComment() }),
+            ],
+        };
+    }
     private static nodeViews: (self: FormattedTextBox) => { [key: string]: NodeViewConstructor };
     /**
      * Initialize the class with all the plugin node view components
@@ -108,7 +123,6 @@ export class FormattedTextBox extends ViewBoxAnnotatableComponent<FormattedTextB
     private _recordingStart: number = 0;
     private _ignoreScroll = false;
     private _focusSpeed: Opt<number>;
-    private _keymap: KeyMap | undefined = undefined;
     private _rules: RichTextRules | undefined;
     private _forceUncollapse = true; // if the cursor doesn't move between clicks, then the selection will disappear for some reason.  This flags the 2nd click as happening on a selection which allows bullet points to toggle
     private _break = true;
@@ -128,20 +142,8 @@ export class FormattedTextBox extends ViewBoxAnnotatableComponent<FormattedTextB
     @computed get titleHeight()                { return this._props.styleProvider?.(this.layoutDoc, this._props, StyleProp.HeaderMargin) as number || 0; } // prettier-ignore
     @computed get layout_autoHeightMargins()   { return this.titleHeight + NumCast(this.layoutDoc._layout_autoHeightMargins); } // prettier-ignore
     @computed get config() {
-        this._keymap = buildKeymap(schema, this._props);
         this._rules = new RichTextRules(this.Document, this);
-        return {
-            schema,
-            plugins: [
-                inputRules(this._rules.inpRules),
-                this.richTextMenuPlugin(),
-                history(),
-                keymap(this._keymap),
-                keymap(baseKeymap),
-                new Plugin({ props: { attributes: { class: 'ProseMirror-example-setup-style' } } }),
-                new Plugin({ view: () => new FormattedTextBoxComment() }),
-            ],
-        };
+        return FormattedTextBox.MakeConfig(this._rules, this._props);
     }
 
     public get EditorView() {
@@ -1380,11 +1382,11 @@ export class FormattedTextBox extends ViewBoxAnnotatableComponent<FormattedTextB
         return true;
     }
 
-    richTextMenuPlugin() {
+    static richTextMenuPlugin(props: FormattedTextBoxProps) {
         return new Plugin({
             view: action((newView: EditorView) => {
-                this._props.rootSelected?.() && RichTextMenu.Instance && (RichTextMenu.Instance.view = newView);
-                return new RichTextMenuPlugin({ editorProps: this._props });
+                props?.rootSelected?.() && RichTextMenu.Instance && (RichTextMenu.Instance.view = newView);
+                return new RichTextMenuPlugin({ editorProps: props });
             }),
         });
     }