fix(app): fix webpage and iframe view not compat with history; open n…

…ew leaf to new split by default
PKM-er · Jan 11, 2024 · 0a4fe8a · 0a4fe8a
1 parent c0c140d
commit 0a4fe8a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/apps/app/src/media-view/base.tsx b/apps/app/src/media-view/base.tsx
@@ -63,6 +63,7 @@ export abstract class MediaRemoteView
   store;
   scope: Scope;
   root: ReactDOM.Root | null = null;
+  navigation = true;
   protected _title = "";
   protected _sourceType = "";
 

diff --git a/apps/app/src/media-view/file-view.tsx b/apps/app/src/media-view/file-view.tsx
@@ -19,6 +19,9 @@ abstract class MediaFileView
   implements PlayerComponent
 {
   allowNoFile = false;
+  // inherit from EditableFileView, no need to set explicitly
+  // navigation = true
+
   // no need to manage scope manually,
   // as it's implicitly called and handled by the WorkspaceLeaf
   store;

diff --git a/apps/app/src/mx-main.ts b/apps/app/src/mx-main.ts
@@ -86,7 +86,9 @@ export default class MxPlugin extends Plugin {
             const leaf = existingPlayerLeaves[0];
             leaf.setEphemeralState({ subpath: hash });
           } else {
-            const leaf = this.app.workspace.getLeaf(newLeaf);
+            let leaf;
+            if (newLeaf) leaf = this.app.workspace.getLeaf("split", "vertical");
+            else leaf = this.app.workspace.getLeaf(false);
             await leaf.setViewState(
               {
                 type: MEDIA_EMBED_VIEW_TYPE,
@@ -117,8 +119,11 @@ export default class MxPlugin extends Plugin {
         const { hash } = matchResult;
         leaf.setEphemeralState({ subpath: hash });
       } else {
-        const leaf = this.app.workspace.getLeaf(newLeaf);
+        let leaf;
+        if (newLeaf) leaf = this.app.workspace.getLeaf("split", "vertical");
+        else leaf = this.app.workspace.getLeaf(false);
         const { hash, url } = matchResult;
+        // const view = await leaf.open(new MediaWebpageView(leaf, this));
         await leaf.setViewState(
           {
             type: MEDIA_WEBPAGE_VIEW_TYPE,