Record your screen, ship a demo. Free and open-source, GPU-accelerated, no watermarks, no subscriptions. Windows, macOS, Linux. Actively maintained.
TypeScript cross-platformelectronffmpegopen-sourceproduct-demorustscreen-capturescreen-recorderscreen-recordingscreen-studioscreencastspeech-to-texttypescriptvideo-editingvideo-editorwaylandwgpuwhisper
fix(dialogs): own the project panels opened through the native bridge
Etienne Lescotfd949c81c1a0
diff --git a/electron/ipc/nativeBridge.ts b/electron/ipc/nativeBridge.tsindex 703e67309..24cfb43c4 100644--- a/electron/ipc/nativeBridge.ts+++ b/electron/ipc/nativeBridge.ts@@ -1,4 +1,4 @@-import { ipcMain, shell } from "electron";+import { BrowserWindow, ipcMain, shell } from "electron";import type { AiEditionChatEvent } from "../../src/native/contracts";import {NATIVE_BRIDGE_CHANNEL,@@ -33,8 +33,12 @@ export interface NativeBridgeContext {projectData: unknown,suggestedName?: string,existingProjectPath?: string,+ parent?: BrowserWindow | null,+ ) => Promise<ProjectFileResult>;+ loadProjectFile: (+ projectFolder?: string,+ parent?: BrowserWindow | null,) => Promise<ProjectFileResult>;- loadProjectFile: (projectFolder?: string) => Promise<ProjectFileResult>;loadCurrentProjectFile: () => Promise<ProjectFileResult>;loadProjectFileFromPath: (path: string) => Promise<ProjectFileResult>;setCurrentVideoPath: (path: string) => ProjectPathResult | Promise<ProjectPathResult>;@@ -283,12 +287,16 @@ export function registerNativeBridgeHandlers(context: NativeBridgeContext) {request.payload.projectData,request.payload.suggestedName,request.payload.existingProjectPath,+ BrowserWindow.fromWebContents(event.sender),),);case "loadProjectFile":return createSuccessResponse(requestId,- await projectService.loadProjectFile(request.payload?.projectFolder),+ await projectService.loadProjectFile(+ request.payload?.projectFolder,+ BrowserWindow.fromWebContents(event.sender),+ ),);case "loadCurrentProjectFile":return createSuccessResponse(diff --git a/electron/native-bridge/services/projectService.test.ts b/electron/native-bridge/services/projectService.test.tsnew file mode 100644index 000000000..c5ed97edc--- /dev/null+++ b/electron/native-bridge/services/projectService.test.ts@@ -0,0 +1,41 @@+import type { BrowserWindow } from "electron";+import { describe, expect, it, vi } from "vitest";+import type { NativeBridgeState } from "../store";+import { ProjectService } from "./projectService";++function makeService() {+ const ok = { success: true } as never;+ const options = {+ store: { setProjectContext: vi.fn() } as unknown as NativeBridgeState,+ getCurrentProjectPath: () => null,+ getCurrentVideoPath: () => null,+ saveProjectFile: vi.fn(async () => ok),+ loadProjectFile: vi.fn(async () => ok),+ loadCurrentProjectFile: vi.fn(async () => ok),+ loadProjectFileFromPath: vi.fn(async () => ok),+ setCurrentVideoPath: vi.fn(),+ getCurrentVideoPathResult: vi.fn(),+ clearCurrentVideoPath: vi.fn(),+ };+ return { service: new ProjectService(options), options };+}++describe("ProjectService file panels (#743)", () => {+ it("passes the requesting window through, so the save panel is owned by it", async () => {+ const { service, options } = makeService();+ const editor = {} as BrowserWindow;++ await service.saveProjectFile({}, "name", undefined, editor);++ expect(options.saveProjectFile).toHaveBeenCalledWith({}, "name", undefined, editor);+ });++ it("passes the requesting window through to the open panel", async () => {+ const { service, options } = makeService();+ const editor = {} as BrowserWindow;++ await service.loadProjectFile("/folder", editor);++ expect(options.loadProjectFile).toHaveBeenCalledWith("/folder", editor);+ });+});diff --git a/electron/native-bridge/services/projectService.ts b/electron/native-bridge/services/projectService.tsindex 88d3359d7..9b4a00351 100644--- a/electron/native-bridge/services/projectService.ts+++ b/electron/native-bridge/services/projectService.ts@@ -1,3 +1,4 @@+import type { BrowserWindow } from "electron";import type {ProjectContext,ProjectFileResult,@@ -13,8 +14,12 @@ interface ProjectServiceOptions {projectData: unknown,suggestedName?: string,existingProjectPath?: string,+ parent?: BrowserWindow | null,+ ) => Promise<ProjectFileResult>;+ loadProjectFile: (+ projectFolder?: string,+ parent?: BrowserWindow | null,) => Promise<ProjectFileResult>;- loadProjectFile: (projectFolder?: string) => Promise<ProjectFileResult>;loadCurrentProjectFile: () => Promise<ProjectFileResult>;loadProjectFileFromPath: (path: string) => Promise<ProjectFileResult>;setCurrentVideoPath: (path: string) => ProjectPathResult | Promise<ProjectPathResult>;@@ -39,18 +44,20 @@ export class ProjectService {projectData: unknown,suggestedName?: string,existingProjectPath?: string,+ parent?: BrowserWindow | null,) {const result = await this.options.saveProjectFile(projectData,suggestedName,existingProjectPath,+ parent,);this.getCurrentContext();return result;}- async loadProjectFile(projectFolder?: string) {- const result = await this.options.loadProjectFile(projectFolder);+ async loadProjectFile(projectFolder?: string, parent?: BrowserWindow | null) {+ const result = await this.options.loadProjectFile(projectFolder, parent);this.getCurrentContext();return result;}