- {formLabel}
+
+ {formLabel}
+ {tooltip && (
+
+
+
+ )}
+
{description && {description}}
+ {tooltip && (
+
+ )}
{hasPreview && (
diff --git a/packages/extension/src/services/option/defaultSettings.ts b/packages/extension/src/services/option/defaultSettings.ts
index 8e8519c7..1f8533c1 100644
--- a/packages/extension/src/services/option/defaultSettings.ts
+++ b/packages/extension/src/services/option/defaultSettings.ts
@@ -56,6 +56,7 @@ export const emptySettings: SettingsType = {
shortcuts: { shortcuts: [] },
windowOption: {
sidePanelAutoHide: false,
+ popupAutoCloseDelay: 0,
},
}
@@ -158,6 +159,7 @@ export default {
},
windowOption: {
sidePanelAutoHide: false,
+ popupAutoCloseDelay: 0,
},
} as UserSettings
diff --git a/packages/extension/src/services/popupAutoClose.test.ts b/packages/extension/src/services/popupAutoClose.test.ts
new file mode 100644
index 00000000..a5159a2a
--- /dev/null
+++ b/packages/extension/src/services/popupAutoClose.test.ts
@@ -0,0 +1,208 @@
+import { describe, it, expect, vi, beforeEach, afterEach } from "vitest"
+
+// Mock all dependencies before importing PopupAutoClose
+vi.mock("@/services/settings/enhancedSettings", () => ({
+ enhancedSettings: {
+ getSection: vi.fn(),
+ },
+}))
+vi.mock("@/services/settings/settingsCache")
+vi.mock("@/services/chrome", () => ({
+ closeWindow: vi.fn(),
+}))
+vi.mock("@/services/windowStackManager", () => ({
+ WindowStackManager: {
+ removeWindow: vi.fn(),
+ },
+}))
+
+import { PopupAutoClose } from "./popupAutoClose"
+import { enhancedSettings } from "@/services/settings/enhancedSettings"
+import { closeWindow } from "@/services/chrome"
+import { WindowStackManager } from "@/services/windowStackManager"
+
+const mockEnhancedSettings = vi.mocked(enhancedSettings)
+const mockCloseWindow = vi.mocked(closeWindow)
+const mockWindowStackManager = vi.mocked(WindowStackManager)
+
+describe("PopupAutoClose", () => {
+ beforeEach(() => {
+ vi.clearAllMocks()
+ vi.useFakeTimers()
+ })
+
+ afterEach(() => {
+ vi.useRealTimers()
+ })
+
+ describe("cancelTimer", () => {
+ it("should cancel pending timer", () => {
+ // No error should be thrown even if no timer is set
+ expect(() => PopupAutoClose.cancelTimer()).not.toThrow()
+ })
+ })
+
+ describe("scheduleClose", () => {
+ it("should close windows immediately when delay is undefined", async () => {
+ const windows = [{ id: 100, commandId: "test", srcWindowId: 1 }]
+
+ mockEnhancedSettings.getSection.mockResolvedValue({
+ windowOption: {
+ popupAutoCloseDelay: undefined,
+ },
+ } as any)
+
+ await PopupAutoClose.scheduleClose(windows)
+
+ // Should close immediately without waiting for timer
+ expect(mockCloseWindow).toHaveBeenCalledWith(100, "onFocusChanged")
+ expect(mockWindowStackManager.removeWindow).toHaveBeenCalledWith(100)
+ })
+
+ it("should close windows immediately when delay is 0", async () => {
+ const windows = [{ id: 100, commandId: "test", srcWindowId: 1 }]
+
+ mockEnhancedSettings.getSection.mockResolvedValue({
+ windowOption: {
+ popupAutoCloseDelay: 0,
+ },
+ } as any)
+
+ await PopupAutoClose.scheduleClose(windows)
+
+ // Should close immediately without waiting for timer
+ expect(mockCloseWindow).toHaveBeenCalledWith(100, "onFocusChanged")
+ expect(mockWindowStackManager.removeWindow).toHaveBeenCalledWith(100)
+ })
+
+ it("should delay close when delay is set", async () => {
+ const delay = 1000
+ const windows = [{ id: 100, commandId: "test", srcWindowId: 1 }]
+
+ mockEnhancedSettings.getSection.mockResolvedValue({
+ windowOption: {
+ popupAutoCloseDelay: delay,
+ },
+ } as any)
+
+ await PopupAutoClose.scheduleClose(windows)
+
+ // Should not close immediately
+ expect(mockCloseWindow).not.toHaveBeenCalled()
+
+ // Advance timers
+ await vi.advanceTimersByTimeAsync(delay)
+
+ // Should close after delay
+ expect(mockCloseWindow).toHaveBeenCalledWith(100, "onFocusChanged")
+ expect(mockWindowStackManager.removeWindow).toHaveBeenCalledWith(100)
+ })
+
+ it("should close multiple windows", async () => {
+ const windows = [
+ { id: 100, commandId: "test1", srcWindowId: 1 },
+ { id: 101, commandId: "test2", srcWindowId: 1 },
+ ]
+
+ mockEnhancedSettings.getSection.mockResolvedValue({
+ windowOption: {
+ popupAutoCloseDelay: undefined,
+ },
+ } as any)
+
+ await PopupAutoClose.scheduleClose(windows)
+
+ // Should close all windows
+ expect(mockCloseWindow).toHaveBeenCalledTimes(2)
+ expect(mockCloseWindow).toHaveBeenCalledWith(100, "onFocusChanged")
+ expect(mockCloseWindow).toHaveBeenCalledWith(101, "onFocusChanged")
+ expect(mockWindowStackManager.removeWindow).toHaveBeenCalledTimes(2)
+ })
+
+ it("should do nothing when no windows to close", async () => {
+ await PopupAutoClose.scheduleClose([])
+
+ // Should not call enhancedSettings.getSection or closeWindow
+ expect(mockEnhancedSettings.getSection).not.toHaveBeenCalled()
+ expect(mockCloseWindow).not.toHaveBeenCalled()
+ })
+
+ it("should cancel existing timer before scheduling new one", async () => {
+ const delay = 1000
+ const windows1 = [{ id: 100, commandId: "test1", srcWindowId: 1 }]
+ const windows2 = [{ id: 101, commandId: "test2", srcWindowId: 1 }]
+
+ mockEnhancedSettings.getSection.mockResolvedValue({
+ windowOption: {
+ popupAutoCloseDelay: delay,
+ },
+ } as any)
+
+ // Schedule first close
+ await PopupAutoClose.scheduleClose(windows1)
+
+ // Advance time halfway
+ await vi.advanceTimersByTimeAsync(delay / 2)
+
+ // Schedule second close (should cancel first)
+ await PopupAutoClose.scheduleClose(windows2)
+
+ // Advance remaining time
+ await vi.advanceTimersByTimeAsync(delay / 2)
+
+ // First window should NOT be closed (timer was cancelled)
+ expect(mockCloseWindow).not.toHaveBeenCalledWith(100, "onFocusChanged")
+
+ // Second window should not be closed yet (only half time passed)
+ expect(mockCloseWindow).not.toHaveBeenCalled()
+
+ // Advance remaining time for second timer
+ await vi.advanceTimersByTimeAsync(delay / 2)
+
+ // Now second window should be closed
+ expect(mockCloseWindow).toHaveBeenCalledWith(101, "onFocusChanged")
+ })
+
+ it("should use custom reason when provided", async () => {
+ const windows = [{ id: 100, commandId: "test", srcWindowId: 1 }]
+
+ mockEnhancedSettings.getSection.mockResolvedValue({
+ windowOption: {
+ popupAutoCloseDelay: 0,
+ },
+ } as any)
+
+ await PopupAutoClose.scheduleClose(windows, "onHidden")
+
+ // Should close with custom reason
+ expect(mockCloseWindow).toHaveBeenCalledWith(100, "onHidden")
+ })
+
+ it("should handle errors and still clear timer", async () => {
+ const windows = [
+ { id: 100, commandId: "test1", srcWindowId: 1 },
+ { id: 101, commandId: "test2", srcWindowId: 1 },
+ ]
+
+ mockEnhancedSettings.getSection.mockResolvedValue({
+ windowOption: {
+ popupAutoCloseDelay: 0,
+ },
+ } as any)
+
+ // Make first closeWindow call fail
+ mockCloseWindow.mockRejectedValueOnce(new Error("Close failed"))
+
+ await expect(PopupAutoClose.scheduleClose(windows)).rejects.toThrow("Close failed")
+
+ // Timer should still be cleared - verify by scheduling another close
+ mockCloseWindow.mockResolvedValue(undefined)
+ const windows2 = [{ id: 102, commandId: "test3", srcWindowId: 1 }]
+
+ await PopupAutoClose.scheduleClose(windows2)
+
+ // Should work fine, proving timer was cleared
+ expect(mockCloseWindow).toHaveBeenCalledWith(102, "onFocusChanged")
+ })
+ })
+})
\ No newline at end of file
diff --git a/packages/extension/src/services/popupAutoClose.ts b/packages/extension/src/services/popupAutoClose.ts
new file mode 100644
index 00000000..a1d87bab
--- /dev/null
+++ b/packages/extension/src/services/popupAutoClose.ts
@@ -0,0 +1,74 @@
+import { enhancedSettings } from "@/services/settings/enhancedSettings"
+import { CACHE_SECTIONS } from "@/services/settings/settingsCache"
+import { closeWindow } from "@/services/chrome"
+import { WindowStackManager } from "@/services/windowStackManager"
+import type { WindowType } from "@/types"
+
+/**
+ * Valid reasons for closing popup windows
+ */
+export type CloseReason = "onFocusChanged" | "onHidden"
+
+/**
+ * Popup Auto-Close Manager
+ * Manages automatic closing of popup windows with configurable delay
+ */
+export class PopupAutoClose {
+ private static timer: ReturnType | null = null
+
+ /**
+ * Cancel any pending auto-close timer
+ */
+ static cancelTimer(): void {
+ if (this.timer !== null) {
+ clearTimeout(this.timer)
+ this.timer = null
+ }
+ }
+
+ /**
+ * Schedule popup windows to close with configured delay
+ * @param windowsToClose - Array of windows to close
+ * @param reason - Reason for closing (e.g., "onFocusChanged", "onHidden")
+ * @returns Promise that resolves when windows are closed or timer is set
+ */
+ static async scheduleClose(
+ windowsToClose: WindowType[],
+ reason: CloseReason = "onFocusChanged",
+ ): Promise {
+ // Cancel any existing timer first
+ this.cancelTimer()
+
+ // If no windows to close, nothing to do
+ if (windowsToClose.length === 0) {
+ return
+ }
+
+ // Get the auto-close delay setting
+ const userSettings = await enhancedSettings.getSection(
+ CACHE_SECTIONS.USER_SETTINGS,
+ )
+ const autoCloseDelay = userSettings.windowOption.popupAutoCloseDelay
+
+ // Define the close function
+ const closeWindows = async () => {
+ try {
+ for (const window of windowsToClose) {
+ await closeWindow(window.id, reason)
+ await WindowStackManager.removeWindow(window.id)
+ }
+ } finally {
+ this.timer = null
+ }
+ }
+
+ // Execute close based on delay setting
+ if (autoCloseDelay !== undefined && autoCloseDelay > 0) {
+ // Delayed close: Set timeout
+ this.timer = setTimeout(closeWindows, autoCloseDelay)
+ } else {
+ // Immediate close: No delay configured
+ await closeWindows()
+ }
+ }
+}
diff --git a/packages/extension/src/types/index.ts b/packages/extension/src/types/index.ts
index 230c9e9b..e7f3b96d 100644
--- a/packages/extension/src/types/index.ts
+++ b/packages/extension/src/types/index.ts
@@ -79,6 +79,7 @@ export type CopyOption = "default" | "text"
type WindowOption = {
sidePanelAutoHide: boolean
+ popupAutoCloseDelay?: number
}
type LinkCommandStartupMethod = {
diff --git a/packages/shared/tsconfig.tsbuildinfo b/packages/shared/tsconfig.tsbuildinfo
index b3c515d0..64f82187 100644
--- a/packages/shared/tsconfig.tsbuildinfo
+++ b/packages/shared/tsconfig.tsbuildinfo
@@ -1 +1 @@
-{"root":["./src/index.ts","./src/constants/index.ts","./src/constants/open-mode.ts","./src/types/command.ts","./src/types/common.ts","./src/types/index.ts","./src/utils/cn.ts","./src/utils/common.ts","./src/utils/index.ts","./src/utils/type-guards.ts"],"version":"5.6.3"}
\ No newline at end of file
+{"root":["./src/index.ts","./src/constants/index.ts","./src/constants/open-mode.ts","./src/types/command.ts","./src/types/common.ts","./src/types/index.ts","./src/utils/cn.ts","./src/utils/common.ts","./src/utils/index.ts","./src/utils/type-guards.ts"],"version":"5.9.2"}
\ No newline at end of file