mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: enable BrowserWindow.id access post-destruction (#38241)

Browse source 
fix: enable BrowserWindow id access post-destruction
This commit is contained in:
Shelley Vohr 2023-05-16 09:29:00 +02:00 committed by GitHub
parent 042663e190
commit 9bd9d312f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/browser/api/browser-window.ts
View file

@ -12,6 +12,14 @@ BrowserWindow.prototype._init = function (this: BWT) {
// Avoid recursive require. // Avoid recursive require.
const { app } = require('electron'); const { app } = require('electron');
// Set ID at constructon time so it's accessible after
// underlying window destruction.
const id = this.id;
Object.defineProperty(this, 'id', {
value: id,
writable: false
});
const nativeSetBounds = this.setBounds; const nativeSetBounds = this.setBounds;
this.setBounds = (bounds, ...opts) => { this.setBounds = (bounds, ...opts) => {
bounds = { bounds = {

7
spec/api-browser-window-spec.ts
View file

@ -126,6 +126,13 @@ describe('BrowserWindow module', () => {
w.webContents.on('destroyed', () => w.close()); w.webContents.on('destroyed', () => w.close());
}); });
it('should allow access to id after destruction', async () => {
const closed = once(w, 'closed');
w.destroy();
await closed;
expect(w.id).to.be.a('number');
});
it('should emit unload handler', async () => { it('should emit unload handler', async () => {
await w.loadFile(path.join(fixtures, 'api', 'unload.html')); await w.loadFile(path.join(fixtures, 'api', 'unload.html'));
const closed = once(w, 'closed'); const closed = once(w, 'closed');