ZenBrowserMirrors/components
1
0
Fork 0
mirror of https://github.com/zen-browser/components.git synced 2025-07-08 05:09:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix split/unsplit logic

Browse source
This commit is contained in:
brahim 2024-10-04 14:39:23 +02:00
parent 422adbb896
commit 894d856282
1 changed files with 20 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/ZenViewSplitter.mjs
View file

@ -3,7 +3,6 @@ class SplitNode {
* @type {number} * @type {number}
* @type * @type
*/ */
splitters = [];
widthInParent ; widthInParent ;
/** /**
* @type {number} * @type {number}
@ -176,8 +175,8 @@ var gZenViewSplitter = new class {
*/ */
_removeNodeSplitters(node, recursive ) { _removeNodeSplitters(node, recursive ) {
this.getSplitters(node)?.forEach(s => s.remove()); this.getSplitters(node)?.forEach(s => s.remove());
if (!recursive) return;
this._splitNodeToSplitters.delete(node); this._splitNodeToSplitters.delete(node);
if (!recursive) return;
if (node.children) node.children.forEach(c => this._removeNodeSplitters(c)); if (node.children) node.children.forEach(c => this._removeNodeSplitters(c));
} }
@ -338,7 +337,6 @@ var gZenViewSplitter = new class {
removeGroup(groupIndex) { removeGroup(groupIndex) {
if (this.currentView === groupIndex) { if (this.currentView === groupIndex) {
this.deactivateCurrentSplitView(); this.deactivateCurrentSplitView();
gBrowser.selectedBrowser.closest('.browserSidebarContainer').classList.add('deck-selected');
} }
for (const tab of this._data[groupIndex].tabs) { for (const tab of this._data[groupIndex].tabs) {
this.resetTabState(tab, true); this.resetTabState(tab, true);
@ -478,18 +476,21 @@ var gZenViewSplitter = new class {
const existingSplitTab = tabs.find((tab) => tab.splitView); const existingSplitTab = tabs.find((tab) => tab.splitView);
if (existingSplitTab) { if (existingSplitTab) {
const groupIndex = this._data.findIndex((group) => group.tabs.includes(existingSplitTab)); const groupIndex = this._data.findIndex((group) => group.tabs.includes(existingSplitTab));
if (groupIndex >= 0) { const group = this._data[groupIndex];
if (group.gridType === gridType) {
// Add any tabs that are not already in the group // Add any tabs that are not already in the group
for (const tab of tabs) { for (const tab of tabs) {
if (!this._data[groupIndex].tabs.includes(tab)) { if (!group.tabs.includes(tab)) {
this._data[groupIndex].tabs.push(tab); group.tabs.push(tab);
this.addTabToSplit(tab, this._data[groupIndex].layoutTree); this.addTabToSplit(tab, group.layoutTree);
} }
} }
this._data[groupIndex].gridType = gridType; } else {
this.applyGridLayout(this._data[groupIndex].layoutTree); group.gridType = gridType;
return; group.layoutTree = this.calculateLayoutTree(tabs, gridType);
} }
this.activateSplitView(group);
return;
} }
const splitData = { const splitData = {
@ -552,11 +553,12 @@ var gZenViewSplitter = new class {
* *
* @param {object} splitData - The split data. * @param {object} splitData - The split data.
*/ */
activateSplitView(splitData) { activateSplitView(splitData, reset = false) {
const oldView = this.currentView; const oldView = this.currentView;
const newView = this._data.indexOf(splitData); const newView = this._data.indexOf(splitData);
if (oldView >= 0 && oldView !== newView) this.deactivateCurrentSplitView(); if (oldView >= 0 && oldView !== newView) this.deactivateCurrentSplitView();
this.currentView = newView; this.currentView = newView;
if (reset) this.removeSplitters();
this.tabBrowserPanel.setAttribute('zen-split-view', 'true'); this.tabBrowserPanel.setAttribute('zen-split-view', 'true');
@ -691,7 +693,7 @@ var gZenViewSplitter = new class {
} }
removeSplitters() { removeSplitters() {
Array.from(this._splitNodeToSplitters.values()).forEach(e => e[0].remove()) Array.from(this._splitNodeToSplitters.values()).flatMap(v => v).forEach(e => e.remove());
this._splitNodeToSplitters.clear(); this._splitNodeToSplitters.clear();
} }
@ -799,8 +801,7 @@ var gZenViewSplitter = new class {
* @param {Element} container - The container element. * @param {Element} container - The container element.
*/ */
resetContainerStyle(container) { resetContainerStyle(container) {
container.removeAttribute('zen-split-active'); container.removeAttribute('zen-split');
container.classList.remove('deck-selected');
container.style.inset = ''; container.style.inset = '';
} }
@ -889,8 +890,10 @@ var gZenViewSplitter = new class {
if (gridType === 'unsplit') { if (gridType === 'unsplit') {
this.unsplitCurrentView(); this.unsplitCurrentView();
} else { } else {
this._data[this.currentView].gridType = gridType; const group = this._data[this.currentView];
this.updateSplitView(window.gBrowser.selectedTab); group.gridType = gridType;
group.layoutTree = this.calculateLayoutTree(group.tabs, gridType);
this.activateSplitView(group, true);
} }
panel.hidePopup(); panel.hidePopup();
} }
@ -900,14 +903,9 @@ var gZenViewSplitter = new class {
*/ */
unsplitCurrentView() { unsplitCurrentView() {
if (this.currentView < 0) return; if (this.currentView < 0) return;
this.removeGroup(this.currentView);
const currentTab = window.gBrowser.selectedTab; const currentTab = window.gBrowser.selectedTab;
const tabs = this._data[this.currentView].tabs;
// note: This MUST be an index loop, as we are removing tabs from the array
for (let i = tabs.length - 1; i >= 0; i--) {
this.handleTabClose({ target: tabs[i], forUnsplit: true });
}
window.gBrowser.selectedTab = currentTab; window.gBrowser.selectedTab = currentTab;
this.updateSplitViewButton(true);
} }
/** /**