From 5c6e5f7361f8d51f1ef6a07deff08a388c2e82c3 Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Tue, 27 May 2025 21:03:40 +0200
Subject: [PATCH] fix: Fixed import mods button not working, b=(no-bug),
 c=mods, split-view

---
 src/zen/mods/actors/ZenModsMarketplaceChild.sys.mjs | 3 ++-
 src/zen/split-view/ZenViewSplitter.mjs              | 9 +++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/zen/mods/actors/ZenModsMarketplaceChild.sys.mjs b/src/zen/mods/actors/ZenModsMarketplaceChild.sys.mjs
index 060ea07ef..2690ecae5 100644
--- a/src/zen/mods/actors/ZenModsMarketplaceChild.sys.mjs
+++ b/src/zen/mods/actors/ZenModsMarketplaceChild.sys.mjs
@@ -133,7 +133,8 @@ export class ZenModsMarketplaceChild extends JSWindowActorChild {
 
       modId = button.getAttribute('zen-theme-id');
     } else {
-      modId = event.themeId;
+      // Backwards compatibility is... Interesting
+      modId = event.themeId ?? event.modId ?? event.id;
     }
 
     this.sendAsyncMessage('ZenModsMarketplace:InstallMod', { modId });
diff --git a/src/zen/split-view/ZenViewSplitter.mjs b/src/zen/split-view/ZenViewSplitter.mjs
index f1b820cad..ffa68222f 100644
--- a/src/zen/split-view/ZenViewSplitter.mjs
+++ b/src/zen/split-view/ZenViewSplitter.mjs
@@ -1674,6 +1674,15 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
           if (splitGroup && (!draggedTab.group || draggedTab.group !== splitGroup)) {
             this._moveTabsToContainer([draggedTab], droppedOnTab);
             gBrowser.moveTabToGroup(draggedTab, splitGroup);
+            if (hoverSide === 'left' || hoverSide === 'top') {
+              try {
+                splitGroup.tabs[0].before(draggedTab);
+              } catch (e) {
+                console.warn(
+                  `Failed to move tab ${draggedTab.id} before ${splitGroup.tabs[0].id}: ${e}`
+                );
+              }
+            }
           }
 
           const droppedOnSplitNode = this.getSplitNodeFromTab(droppedOnTab);