Fix issue #14: Display the Spaces windows on the appropriate, currently-active display.

codedread · codedread · commit 0f598327edc9 · 2025-09-09T23:14:38.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.1.6] - 2025-??-??
+
+### Changes
+
+- Fixed [issue #14](https://github.com/codedread/spaces/issues/14): Open Spaces windows on the currently-active display.
+- Increased unit test coverage from 8.11% to 8.72%.
+
+
 ## [1.1.5] - 2025-09-08
 
 ### Fixes
diff --git a/js/background/background.js b/js/background/background.js
@@ -4,6 +4,7 @@
 
 /* spaces
  * Copyright (C) 2015 Dean Oemcke
+ * Copyright (C) 2025 Jeff Schiller (Codedread)
  */
 
 import { dbService } from './dbService.js';
@@ -540,18 +541,18 @@ async function showSpacesOpenWindow(windowId, editMode) {
 
         // otherwise re-create it
     } else {
-        // TODO(codedread): Handle multiple displays and errors.
-        const displays = await chrome.system.display.getInfo();
-        let screen = displays[0].bounds;
-        const window = await chrome.windows.create(
-            {
-                type: 'popup',
-                url,
-                height: screen.height - 100,
-                width: Math.min(screen.width, 1000),
-                top: 0,
-                left: 0,
-            });
+        // Display on the left-hand side of the appropriate display.
+        const workArea = await getTargetDisplayWorkArea();
+        const windowHeight = Math.round(workArea.height * 0.9);
+        const windowWidth = Math.min(workArea.width - 100, 1000);
+        const window = await chrome.windows.create({
+            type: 'popup',
+            url,
+            height: windowHeight,
+            width: windowWidth,
+            top: workArea.top,
+            left: workArea.left,
+        });
         spacesOpenWindowId = window.id;
         await chrome.storage.local.set({spacesOpenWindowId: window.id});
     }
@@ -618,20 +619,19 @@ async function createOrShowSpacesPopupWindow(action, tabUrl) {
 
         // otherwise create it
     } else {
-        // TODO(codedread): Handle multiple displays and errors.
-        const displays = await chrome.system.display.getInfo();
-        let screen = displays[0].bounds;
-
-        const window = await chrome.windows.create(
-            {
-                type: 'popup',
-                url: popupUrl,
-                focused: true,
-                height: 450,
-                width: 310,
-                top: screen.height - 450,
-                left: screen.width - 310,
-            });
+        // Display in the lower-right corner of the appropriate display.
+        const workArea = await getTargetDisplayWorkArea();
+        const popupHeight = 450;
+        const popupWidth = 310;
+        const window = await chrome.windows.create({
+            type: 'popup',
+            url: popupUrl,
+            focused: true,
+            height: popupHeight,
+            width: popupWidth,
+            top: Math.round(workArea.top + workArea.height - popupHeight),
+            left: Math.round(workArea.left + workArea.width - popupWidth),
+        });
         spacesPopupWindowId = window.id;
         await chrome.storage.local.set({spacesPopupWindowId: window.id});
     }
@@ -863,18 +863,17 @@ async function handleLoadSession(sessionId, tabUrl) {
             return curTab.url;
         });
 
-        // TODO(codedread): Handle multiple displays and errors.
-        const displays = await chrome.system.display.getInfo();
-        let screen = displays[0].bounds;
-
-        const newWindow = await chrome.windows.create(
-            {
-                url: urls,
-                height: screen.height - 100,
-                width: screen.width - 100,
-                top: 0,
-                left: 0,
-            });
+        // Display new session over most of the appropriate display.
+        const workArea = await getTargetDisplayWorkArea();
+        const windowHeight = workArea.height - 100;
+        const windowWidth = workArea.width - 100;
+        const newWindow = await chrome.windows.create({
+            url: urls,
+            height: windowHeight,
+            width: windowWidth,
+            top: workArea.top,
+            left: workArea.left,
+        });
 
         // force match this new window to the session
         await spacesService.matchSessionToWindow(session, newWindow);
@@ -1255,5 +1254,36 @@ function moveTabToWindow(tab, windowId) {
     spacesService.queueWindowEvent(windowId);
 }
 
+/**
+ * Determines the most appropriate display to show a new window on.
+ * It prefers the display containing the currently focused Chrome window.
+ * If no window is focused, it falls back to the primary display.
+ * @returns {Promise<chrome.system.display.Bounds>} A promise that resolves to the work area bounds of the target display.
+ */
+async function getTargetDisplayWorkArea() {
+    const [displays, currentWindow] = await Promise.all([
+        chrome.system.display.getInfo(),
+        chrome.windows.getCurrent().catch(() => null) // Catch if no window is focused
+    ]);
+
+    let targetDisplay = displays.find(d => d.isPrimary) || displays[0]; // Default to primary
+
+    // Find the display that contains the center of the current window
+    if (currentWindow) {
+        const windowCenterX = currentWindow.left + currentWindow.width / 2;
+        const windowCenterY = currentWindow.top + currentWindow.height / 2;
+        const activeDisplay = displays.find(display => {
+            const d = display.workArea;
+            return windowCenterX >= d.left && windowCenterX < (d.left + d.width) &&
+                   windowCenterY >= d.top && windowCenterY < (d.top + d.height);
+        });
+        if (activeDisplay) {
+            targetDisplay = activeDisplay;
+        }
+    }
+
+    return targetDisplay.workArea;
+}
+
 // Exports for testing.
-export { cleanParameter };
+export { cleanParameter, getTargetDisplayWorkArea };
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
     "name": "Spaces",
     "description": "Intuitive tab management",
-    "version": "1.1.5",
+    "version": "1.1.6.0",
     "permissions": [
         "contextMenus",
         "favicon",
diff --git a/tests/getTargetDisplayWorkArea.test.js b/tests/getTargetDisplayWorkArea.test.js
@@ -0,0 +1,99 @@
+import { getTargetDisplayWorkArea } from '../js/background/background.js';
+import { setupChromeMocks, jest } from './helpers.js';
+
+setupChromeMocks();
+
+// Mock data for displays
+const mockDisplays = [
+    {
+        id: 'primary-display',
+        isPrimary: true,
+        workArea: { top: 24, left: 0, width: 1920, height: 1056 },
+        bounds: { top: 0, left: 0, width: 1920, height: 1080 },
+    },
+    {
+        id: 'secondary-display',
+        isPrimary: false,
+        workArea: { top: 0, left: 1920, width: 1280, height: 800 },
+        bounds: { top: 0, left: 1920, width: 1280, height: 800 },
+    },
+];
+
+// Mock data for windows positioned on different displays
+const mockWindowOnPrimary = {
+    id: 101,
+    left: 100,
+    top: 100,
+    width: 800,
+    height: 600,
+}; // Center: (500, 400) -> on primary
+
+const mockWindowOnSecondary = {
+    id: 102,
+    left: 2000,
+    top: 100,
+    width: 800,
+    height: 600,
+}; // Center: (2400, 400) -> on secondary
+
+describe('getTargetDisplayWorkArea', () => {
+    beforeEach(() => {
+        // Clear all mocks before each test to ensure isolation
+        jest.clearAllMocks();
+    });
+
+    test('should return primary display work area when no window is focused', async () => {
+        chrome.system.display.getInfo.mockResolvedValue(mockDisplays);
+        chrome.windows.getCurrent.mockRejectedValue(new Error('No focused window'));
+
+        const workArea = await getTargetDisplayWorkArea();
+
+        expect(workArea).toEqual(mockDisplays[0].workArea);
+        expect(chrome.system.display.getInfo).toHaveBeenCalledTimes(1);
+        expect(chrome.windows.getCurrent).toHaveBeenCalledTimes(1);
+    });
+
+    test('should return primary display work area when focused window is on primary display', async () => {
+        chrome.system.display.getInfo.mockResolvedValue(mockDisplays);
+        chrome.windows.getCurrent.mockResolvedValue(mockWindowOnPrimary);
+
+        const workArea = await getTargetDisplayWorkArea();
+
+        expect(workArea).toEqual(mockDisplays[0].workArea);
+    });
+
+    test('should return secondary display work area when focused window is on secondary display', async () => {
+        chrome.system.display.getInfo.mockResolvedValue(mockDisplays);
+        chrome.windows.getCurrent.mockResolvedValue(mockWindowOnSecondary);
+
+        const workArea = await getTargetDisplayWorkArea();
+
+        expect(workArea).toEqual(mockDisplays[1].workArea);
+    });
+
+    test('should return the only display work area in a single-monitor setup', async () => {
+        const singleDisplay = [mockDisplays[0]];
+        chrome.system.display.getInfo.mockResolvedValue(singleDisplay);
+        chrome.windows.getCurrent.mockResolvedValue(mockWindowOnPrimary);
+
+        const workArea = await getTargetDisplayWorkArea();
+
+        expect(workArea).toEqual(singleDisplay[0].workArea);
+    });
+
+    test('should fall back to primary display if focused window is not on any known display', async () => {
+        const windowOffScreen = {
+            id: 103,
+            left: -5000,
+            top: -5000,
+            width: 800,
+            height: 600,
+        };
+        chrome.system.display.getInfo.mockResolvedValue(mockDisplays);
+        chrome.windows.getCurrent.mockResolvedValue(windowOffScreen);
+
+        const workArea = await getTargetDisplayWorkArea();
+
+        expect(workArea).toEqual(mockDisplays[0].workArea);
+    });
+});
diff --git a/tests/helpers.js b/tests/helpers.js
@@ -15,11 +15,16 @@ export const setupChromeMocks = () => {
         runtime: {
             sendMessage: jest.fn(),
         },
-        windows: {
-            getCurrent: jest.fn(),
+        system: {
+            display: {
+                getInfo: jest.fn(),
+            },
         },
         tabs: {
             query: jest.fn(),
+        },
+        windows: {
+            getCurrent: jest.fn(),
         }
     };
 };

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "Spaces",`
`3`	`3`	`"description": "Intuitive tab management",`
`4`		`- "version": "1.1.5",`
	`4`	`+ "version": "1.1.6.0",`
`5`	`5`	`"permissions": [`
`6`	`6`	`"contextMenus",`
`7`	`7`	`"favicon",`