d

Author: iamEvanYT

src/main/browser/tabs/managers/tabs-container-manager.ts

@@ -16,6 +16,7 @@ export class TabsContainerManager extends TypedEventEmitter<TabsContainerManager
   public isDestroyed: boolean = false;
 
   private readonly browser: Browser;
+  private spaceContainerMap: Map<string, TabContainer> = new Map();
 
   constructor(browser: Browser) {
     super();
@@ -58,8 +59,6 @@ export class TabsContainerManager extends TypedEventEmitter<TabsContainerManager
 
     updateSpaces();
     spacesEmitter.on("changed", updateSpaces);
-
-    const favouritesContainer = new TabContainer(spaces[0]?.id ?? "");
   }
 
   /**
@@ -69,17 +68,32 @@ export class TabsContainerManager extends TypedEventEmitter<TabsContainerManager
    * @param {SpaceData & { id: string }} space - The space data including its ID
    */
   private _setupSpace(space: SpaceData & { id: string }): void {
-    const normalContainer = new TabContainer(space.id);
+    const spaceContainer = new TabContainer(space.id);
+    this.spaceContainerMap.set(space.id, spaceContainer);
 
     // Add tab group to the correct container on create
-    const browser = this.browser;
-    const tabOrchestrator = browser.tabs;
-    tabOrchestrator.tabGroupManager.on("tab-group-created", (tabGroup) => {
-      normalContainer.addChild({
-        type: "tab-group",
-        item: tabGroup
-      });
-    });
+    // const browser = this.browser;
+    // const tabOrchestrator = browser.tabs;
+    // tabOrchestrator.tabGroupManager.on("tab-group-created", (tabGroup) => {
+    //   spaceContainer.addChild({
+    //     type: "tab-group",
+    //     item: tabGroup
+    //   });
+    // });
+  }
+
+  /**
+   * Gets the tab container for a specific space
+   * @public
+   * @param {string} spaceId - The ID of the space to get the container for
+   * @returns {TabContainer} - The tab container for the space
+   */
+  public getSpaceContainer(spaceId: string): TabContainer {
+    const spaceContainer = this.spaceContainerMap.get(spaceId);
+    if (!spaceContainer) {
+      throw new Error(`Space container not found for spaceId: ${spaceId}`);
+    }
+    return spaceContainer;
   }
 
   /**

src/main/browser/tabs/objects/tab-containers/base.ts

@@ -2,6 +2,8 @@ import { TabGroup } from "@/browser/tabs/objects/tab-group";
 import { TabFolder } from "@/browser/tabs/objects/tab-containers/tab-folder";
 import { TypedEventEmitter } from "@/modules/typed-event-emitter";
 import { NormalTabGroup } from "@/browser/tabs/objects/tab-group/types/normal";
+import { TabbedBrowserWindow } from "@/browser/window";
+import { Browser } from "@/browser/browser";
 
 // Container Child //
 type TabGroupChild = {
@@ -35,6 +37,13 @@ export type ExportedTabsFolder = {
 // ExportedTabContainer would not be a child: it should only be the root container.
 type ExportedTabData = ExportedTabGroup | ExportedTabsFolder;
 
+// Tab Container Shared Data //
+export interface TabContainerSharedData {
+  browser: Browser;
+  window: TabbedBrowserWindow;
+  space: string;
+}
+
 // Base Tab Container //
 export type BaseTabContainerEvents = {
   "child-added": [child: ContainerChild];
@@ -47,34 +56,32 @@ export class BaseTabContainer<
 > extends TypedEventEmitter<TEvents> {
   public children: ContainerChild[];
 
-  constructor() {
+  public sharedData: TabContainerSharedData;
+
+  constructor(sharedData: TabContainerSharedData) {
     super();
 
     this.children = [];
+    this.sharedData = sharedData;
   }
 
-  public getAllTabGroups(): TabGroup[] {
-    const scanTabContainer = (container: BaseTabContainer): TabGroup[] => {
-      return container.children.flatMap((child) => {
-        if (child.type === "tab-group") {
-          return [child.item];
-        }
-        if (child.type === "tab-folder") {
-          return scanTabContainer(child.item);
-        }
-        return [];
-      });
-    };
-
-    return scanTabContainer(this);
-  }
+  // Modify Children //
 
-  public addChild(child: ContainerChild): void {
+  /**
+   * Add a child to the container.
+   * @param child - The child to add.
+   */
+  private addChild(child: ContainerChild): void {
     this.children.push(child);
     this.emit("child-added", child);
   }
 
-  public removeChild(child: ContainerChild): boolean {
+  /**
+   * Remove a child from the container.
+   * @param child - The child to remove.
+   * @returns Whether the child was removed.
+   */
+  private removeChild(child: ContainerChild): boolean {
     const index = this.children.indexOf(child);
     if (index === -1) return false;
 
@@ -83,6 +90,12 @@ export class BaseTabContainer<
     return true;
   }
 
+  /**
+   * Move a child to a new index.
+   * @param from - The index to move from.
+   * @param to - The index to move to.
+   * @returns Whether the child was moved.
+   */
   public moveChild(from: number, to: number): boolean {
     if (from < 0 || from >= this.children.length || to < 0 || to >= this.children.length) {
       return false;
@@ -94,6 +107,8 @@ export class BaseTabContainer<
     return true;
   }
 
+  // Get Children //
+
   public findChildrenByType(type: "tab-group" | "tab-container"): ContainerChild[] {
     return this.children.filter((child) => child.type === type);
   }
@@ -106,22 +121,48 @@ export class BaseTabContainer<
     return this.children.length;
   }
 
+  // New Children //
+
+  public newTabFolder(name: string): TabFolder {
+    const folder = new TabFolder(name, this);
+    this.addChild({ type: "tab-folder", item: folder });
+    return folder;
+  }
+
   public newNormalTabGroup(): NormalTabGroup {
     const tabGroup = new NormalTabGroup({
-      browser: this.browser,
-      window: this.window,
-      space: this.space
+      browser: this.sharedData.browser,
+      window: this.sharedData.window,
+      space: this.sharedData.space
     });
     this.addChild({ type: "tab-group", item: tabGroup });
     return tabGroup;
   }
 
-  public createTabFolder(name: string): TabFolder {
-    const folder = new TabFolder(name);
-    this.addChild({ type: "tab-folder", item: folder });
-    return folder;
+  // Others //
+
+  /**
+   * Get all tab groups in the container.
+   * @returns All tab groups in the container.
+   */
+  public getAllTabGroups(): TabGroup[] {
+    const scanTabContainer = (container: BaseTabContainer): TabGroup[] => {
+      return container.children.flatMap((child) => {
+        if (child.type === "tab-group") {
+          return [child.item];
+        }
+        if (child.type === "tab-folder") {
+          return scanTabContainer(child.item);
+        }
+        return [];
+      });
+    };
+
+    return scanTabContainer(this);
   }
 
+  // Export //
+
   protected baseExport(): ExportedBaseTabContainer {
     return {
       type: "tab-container",

src/main/browser/tabs/objects/tab-containers/tab-container.ts

@@ -1,4 +1,4 @@
-import { BaseTabContainer, BaseTabContainerEvents, ExportedTabContainer } from "./base";
+import { BaseTabContainer, BaseTabContainerEvents, ExportedTabContainer, TabContainerSharedData } from "./base";
 
 type TabContainerEvents = BaseTabContainerEvents & {
   "space-changed": [spaceId: string];
@@ -7,8 +7,8 @@ type TabContainerEvents = BaseTabContainerEvents & {
 export class TabContainer extends BaseTabContainer<TabContainerEvents> {
   public spaceId: string;
 
-  constructor(spaceId: string) {
-    super();
+  constructor(spaceId: string, sharedData: TabContainerSharedData) {
+    super(sharedData);
     this.spaceId = spaceId;
   }
 

src/main/browser/tabs/objects/tab-containers/tab-folder.ts

@@ -2,10 +2,12 @@ import { BaseTabContainer, ExportedTabsFolder } from "./base";
 
 export class TabFolder extends BaseTabContainer {
   public name: string;
+  public parent: BaseTabContainer;
 
-  constructor(name: string) {
-    super();
+  constructor(name: string, parent: BaseTabContainer) {
+    super(parent.sharedData);
     this.name = name;
+    this.parent = parent;
   }
 
   public setName(name: string): void {

src/main/browser/tabs/objects/tab/controllers/bounds.ts

@@ -1,3 +1,9 @@
+/*
+TabBoundsController:
+- This controller is responsible for managing the bounds of the tab
+- Methods should be called by the Tab Container.
+*/
+
 import { Tab } from "@/browser/tabs/objects/tab";
 import { PageBounds } from "~/flow/types";
 

src/main/browser/tabs/objects/tab/controllers/context-menu.ts

@@ -1,3 +1,8 @@
+/*
+TabContextMenuController:
+- This controller is responsible for creating and controlling the context menu for the tab
+*/
+
 import { Tab } from "@/browser/tabs/objects/tab";
 import { Browser } from "@/browser/browser";
 import { TabbedBrowserWindow } from "@/browser/window";
@@ -46,12 +51,15 @@ function createTabContextMenu(browser: Browser, tab: Tab, profileId: string) {
 
       // Helper function to create a new tab
       const createNewTab = async (url: string, window?: TabbedBrowserWindow) => {
-        const tabbedWindow = tab.window.get();
-        const spaceId = tab.space.get();
+        // TODO: Implement this
+        console.log("createNewTab", url, window, profileId);
+
+        // const tabbedWindow = tab.window.get();
+        // const spaceId = tab.space.get();
 
-        const sourceTab = await browser.tabs.createTab(window ? window.id : tabbedWindow?.id, profileId, spaceId, url);
-        sourceTab.loadURL(url);
-        browser.tabs.setActiveTab(sourceTab);
+        // const sourceTab = await browser.tabs.createTab(window ? window.id : tabbedWindow?.id, profileId, spaceId, url);
+        // sourceTab.loadURL(url);
+        // browser.tabs.setActiveTab(sourceTab);
       };
 
       // Create all menu sections
@@ -288,10 +296,10 @@ function combineSections(
 }
 
 export class TabContextMenuController {
-  private readonly tab: Tab;
+  // private readonly tab: Tab;
 
   constructor(tab: Tab) {
-    this.tab = tab;
+    // this.tab = tab;
 
     tab.on("webview-attached", () => {
       const browser = tab.browser;

src/main/browser/tabs/objects/tab/controllers/data.ts

@@ -1,7 +1,6 @@
 /*
 TabDataController:
-- This controller stores all the data that needs to persist between browser restarts
-- Other datas will be stored in their respective controllers
+- This controller stores all the data that needs to be synced with the frontend
 */
 
 import { Tab } from "@/browser/tabs/objects/tab";
@@ -41,6 +40,7 @@ export class TabDataController {
 
     tab.on("webview-detached", () => this.onWebviewDetached());
 
+    // Wait for every controller to be ready
     setImmediate(() => this.refreshData());
   }
 
@@ -70,19 +70,19 @@ export class TabDataController {
     const pipActive = tab.pip.active;
     setProperty("pipActive", pipActive);
 
-    // Asleep
+    // asleep
     const asleep = tab.sleep.asleep;
     setProperty("asleep", asleep);
 
     /// From webview ///
 
     const webContents = tab.webview.webContents;
     if (webContents) {
-      // Title
+      // title
       const title = webContents.getTitle();
       setProperty("title", title);
 
-      // URL
+      // url
       const url = webContents.getURL();
       setProperty("url", url);
 
@@ -91,7 +91,7 @@ export class TabDataController {
       setProperty("isLoading", isLoading);
 
       // audible
-      const audible = webContents.isAudioMuted();
+      const audible = webContents.isCurrentlyAudible();
       setProperty("audible", audible);
 
       // muted
@@ -103,12 +103,12 @@ export class TabDataController {
 
     // Process changes
     if (changed) {
-      this.tab.emit("data-changed");
+      this.emitDataChanged();
     }
     return changed;
   }
 
-  public setupWebviewData(webContents: WebContents) {
+  public setupWebviewChangeHooks(webContents: WebContents) {
     // audible
     webContents.on("audio-state-changed", () => this.refreshData());
     webContents.on("media-started-playing", () => this.refreshData());
@@ -142,7 +142,6 @@ export class TabDataController {
       // from other controllers
       window: this.window,
       pipActive: this.pipActive,
-      asleep: this.asleep,
 
       // from navigation
       navHistory: navHistory,

src/main/browser/tabs/objects/tab/controllers/visiblity.ts

@@ -1,3 +1,9 @@
+/*
+TabVisiblityController:
+- This controller is responsible for managing the visiblity of the tab
+- Methods should be called by the Tab Container.
+*/
+
 import { Tab } from "@/browser/tabs/objects/tab";
 
 export class TabVisiblityController {

src/main/browser/tabs/objects/tab/controllers/webview.ts

@@ -77,7 +77,7 @@ export class TabWebviewController {
     });
 
     tab.navigation.setupWebviewNavigation(this.webContents);
-    tab.data.setupWebviewData(this.webContents);
+    tab.data.setupWebviewChangeHooks(this.webContents);
 
     tab.emit("webview-attached");
 

src/main/browser/tabs/objects/tab/controllers/window.ts

@@ -1,3 +1,9 @@
+/*
+TabWindowController:
+- This controller is responsible for managing the window of the tab
+- Methods should be called by the Tab Container.
+*/
+
 import { Tab } from "@/browser/tabs/objects/tab";
 import { TabbedBrowserWindow } from "@/browser/window";