Don't patch workspace prototype

mgmeyers · Apr 30, 2024 · d485c98 · d485c98
1 parent 2d116ef
commit d485c98
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/components/Editor/MarkdownEditor.tsx b/src/components/Editor/MarkdownEditor.tsx
@@ -120,12 +120,12 @@ export function MarkdownEditor({
             EditorView.domEventHandlers({
               focus: (evt) => {
                 view.activeEditor = this.owner;
-                this.app.workspace.activeEditor = this.owner;
                 if (Platform.isMobile) {
                   view.contentEl.addClass('is-mobile-editing');
                 }
 
                 evt.win.setTimeout(() => {
+                  this.app.workspace.activeEditor = this.owner;
                   if (Platform.isMobile) {
                     this.app.mobileToolbar.update();
                   }

diff --git a/src/main.ts b/src/main.ts
@@ -6,7 +6,6 @@ import {
   TFile,
   TFolder,
   ViewState,
-  Workspace,
   WorkspaceLeaf,
   debounce,
 } from 'obsidian';
@@ -753,15 +752,16 @@ export default class KanbanPlugin extends Plugin {
     });
 
     this.register(
-      around(Workspace.prototype, {
+      around(this.app.workspace, {
         // eslint-disable-next-line @typescript-eslint/ban-ts-comment
         // @ts-ignore
         setActiveLeaf(next) {
           return function (...args) {
             next.apply(this, args);
             const leaf = args[0];
+            if (!leaf) return;
             if (!this.isAttached(leaf)) return;
-            if (leaf?.view instanceof KanbanView && leaf.view.activeEditor) {
+            if (leaf.view instanceof KanbanView && leaf.view.activeEditor) {
               this.activeEditor = leaf.view.activeEditor;
             }
           };