diff --git a/docs/api/web-contents.md b/docs/api/web-contents.md index 7d286b51a5..9825227858 100644 --- a/docs/api/web-contents.md +++ b/docs/api/web-contents.md @@ -65,28 +65,28 @@ for all windows, webviews, opened devtools, and devtools extension background pa ### `webContents.getFocusedWebContents()` -Returns `WebContents` | null - The web contents that is focused in this application, otherwise +Returns `WebContents | null` - The web contents that is focused in this application, otherwise returns `null`. ### `webContents.fromId(id)` * `id` Integer -Returns `WebContents` | undefined - A WebContents instance with the given ID, or +Returns `WebContents | undefined` - A WebContents instance with the given ID, or `undefined` if there is no WebContents associated with the given ID. ### `webContents.fromFrame(frame)` * `frame` WebFrameMain -Returns `WebContents` | undefined - A WebContents instance with the given WebFrameMain, or +Returns `WebContents | undefined` - A WebContents instance with the given WebFrameMain, or `undefined` if there is no WebContents associated with the given WebFrameMain. ### `webContents.fromDevToolsTargetId(targetId)` * `targetId` string - The Chrome DevTools Protocol [TargetID](https://chromedevtools.github.io/devtools-protocol/tot/Target/#type-TargetID) associated with the WebContents instance. -Returns `WebContents` | undefined - A WebContents instance with the given TargetID, or +Returns `WebContents | undefined` - A WebContents instance with the given TargetID, or `undefined` if there is no WebContents associated with the given TargetID. When communicating with the [Chrome DevTools Protocol](https://chromedevtools.github.io/devtools-protocol/), diff --git a/spec/api-web-contents-spec.ts b/spec/api-web-contents-spec.ts index 486aa9735d..4d3111117d 100644 --- a/spec/api-web-contents-spec.ts +++ b/spec/api-web-contents-spec.ts @@ -492,16 +492,16 @@ describe('webContents module', () => { ifit(!(process.platform === 'win32' && process.arch === 'arm64'))('returns the focused web contents', async () => { const w = new BrowserWindow({ show: true }); await w.loadFile(path.join(__dirname, 'fixtures', 'blank.html')); - expect(webContents.getFocusedWebContents().id).to.equal(w.webContents.id); + expect(webContents.getFocusedWebContents()?.id).to.equal(w.webContents.id); const devToolsOpened = once(w.webContents, 'devtools-opened'); w.webContents.openDevTools(); await devToolsOpened; - expect(webContents.getFocusedWebContents().id).to.equal(w.webContents.devToolsWebContents!.id); + expect(webContents.getFocusedWebContents()?.id).to.equal(w.webContents.devToolsWebContents!.id); const devToolsClosed = once(w.webContents, 'devtools-closed'); w.webContents.closeDevTools(); await devToolsClosed; - expect(webContents.getFocusedWebContents().id).to.equal(w.webContents.id); + expect(webContents.getFocusedWebContents()?.id).to.equal(w.webContents.id); }); it('does not crash when called on a detached dev tools window', async () => { diff --git a/spec/chromium-spec.ts b/spec/chromium-spec.ts index 4d69961cee..c4e14fdb14 100644 --- a/spec/chromium-spec.ts +++ b/spec/chromium-spec.ts @@ -1945,7 +1945,7 @@ describe('chromium features', () => { await w1.loadFile(path.join(__dirname, 'fixtures', 'blank.html')); await w2.loadFile(path.join(__dirname, 'fixtures', 'blank.html')); await w3.loadFile(path.join(__dirname, 'fixtures', 'blank.html')); - expect(webContents.getFocusedWebContents().id).to.equal(w2.webContents.id); + expect(webContents.getFocusedWebContents()?.id).to.equal(w2.webContents.id); let focus = false; focus = await w1.webContents.executeJavaScript( 'document.hasFocus()'