fix(command): notice is always shown in corresponding target's window

close #252
PKM-er · Mar 19, 2024 · f5b7cdb · f5b7cdb
1 parent dcd2b49
commit f5b7cdb
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/apps/app/src/media-note/command/media.ts b/apps/app/src/media-note/command/media.ts
@@ -239,7 +239,14 @@ export function registerControlCommands(plugin: MxPlugin) {
             if (!player) return false;
             if (check && !check(player)) return false;
             if (checking) return true;
-            action(player);
+            if (player.el?.doc) {
+              const prevActiveDoc = window.activeDocument;
+              window.activeDocument = player.el.doc;
+              action(player);
+              window.activeDocument = prevActiveDoc;
+            } else {
+              action(player);
+            }
           },
         },
         plugin,

diff --git a/apps/app/src/media-note/command/note.ts b/apps/app/src/media-note/command/note.ts
@@ -139,11 +139,17 @@ export function registerNoteCommands(plugin: MxPlugin) {
           return;
         }
         if (checking) return true;
-        action(view, {
-          file: active.view.file,
-          editor: active.view.editor,
-          from: "player",
-        });
+        (async () => {
+          // keep notice in same window with note
+          const prevActiveDoc = window.activeDocument;
+          window.activeDocument = active.containerEl.doc;
+          await action(view, {
+            file: active.view.file,
+            editor: active.view.editor,
+            from: "player",
+          });
+          window.activeDocument = prevActiveDoc;
+        })();
       },
       noteCheckCallback: (checking, view, { isMediaNote, ...ctx }) => {
         let _view: Promise<MediaView>;
@@ -158,7 +164,9 @@ export function registerNoteCommands(plugin: MxPlugin) {
           plugin.app.workspace.revealLeaf(view.leaf);
           _view = Promise.resolve(view);
         }
-        _view.then((v) => action(v, { ...ctx, from: "note" }));
+        _view.then(async (v) => {
+          await action(v, { ...ctx, from: "note" });
+        });
       },
     };
   }