Skip to content

Commit 460cf83

Browse files
authored
refactor: remove no longer used setNestedOverlay logic and tests (#9813)
1 parent 0104125 commit 460cf83

File tree

2 files changed

+0
-81
lines changed

2 files changed

+0
-81
lines changed

packages/overlay/src/vaadin-overlay-stack-mixin.js

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -53,23 +53,6 @@ export const isLastOverlay = (overlay, filter = (_overlay) => true) => {
5353
return overlay === filteredOverlays.pop();
5454
};
5555

56-
const overlayMap = new WeakMap();
57-
58-
/**
59-
* Stores the reference to the nested overlay for given parent,
60-
* or removes it when the nested overlay is null.
61-
* @param {HTMLElement} parent
62-
* @param {HTMLElement} nested
63-
* @protected
64-
*/
65-
export const setNestedOverlay = (parent, nested) => {
66-
if (nested != null) {
67-
overlayMap.set(parent, nested);
68-
} else {
69-
overlayMap.delete(parent);
70-
}
71-
};
72-
7356
/**
7457
* @polymerMixin
7558
*/
@@ -133,11 +116,6 @@ export const OverlayStackMixin = (superClass) =>
133116
// Update order of attached instances
134117
this._removeAttachedInstance();
135118
this._appendAttachedInstance();
136-
137-
// If there is a nested overlay, call `bringToFront()` for it as well.
138-
if (overlayMap.has(this)) {
139-
overlayMap.get(this).bringToFront();
140-
}
141119
}
142120

143121
/** @protected */

packages/overlay/test/multiple.test.js

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import { expect } from '@vaadin/chai-plugins';
22
import { click, escKeyDown, fixtureSync, nextRender } from '@vaadin/testing-helpers';
33
import sinon from 'sinon';
44
import '../src/vaadin-overlay.js';
5-
import { setNestedOverlay } from '../src/vaadin-overlay-stack-mixin.js';
65
import { createOverlay } from './helpers.js';
76

87
describe('multiple overlays', () => {
@@ -375,62 +374,4 @@ describe('multiple overlays', () => {
375374
});
376375
});
377376
});
378-
379-
describe('setNestedOverlay', () => {
380-
let overlays;
381-
382-
beforeEach(() => {
383-
overlays = Array.from(
384-
fixtureSync(`
385-
<div id="parent">
386-
<vaadin-overlay modeless></vaadin-overlay>
387-
<vaadin-overlay modeless></vaadin-overlay>
388-
<vaadin-overlay modeless></vaadin-overlay>
389-
</div>
390-
`).children,
391-
);
392-
overlays.forEach((el, idx) => {
393-
el.renderer = (root) => {
394-
if (!root.firstChild) {
395-
const btn = document.createElement('button');
396-
btn.textContent = `Overlay ${idx}`;
397-
root.appendChild(btn);
398-
}
399-
};
400-
el.opened = true;
401-
});
402-
});
403-
404-
afterEach(() => {
405-
overlays.forEach((el) => {
406-
el.opened = false;
407-
});
408-
});
409-
410-
it('should bring nested overlays to front recursively', () => {
411-
setNestedOverlay(overlays[0], overlays[1]);
412-
setNestedOverlay(overlays[1], overlays[2]);
413-
414-
const bringToFrontSpy1 = sinon.spy(overlays[1], 'bringToFront');
415-
const bringToFrontSpy2 = sinon.spy(overlays[2], 'bringToFront');
416-
417-
overlays[0].bringToFront();
418-
419-
expect(bringToFrontSpy1).to.be.calledOnce;
420-
expect(bringToFrontSpy2).to.be.calledOnce;
421-
expect(bringToFrontSpy2).to.be.calledAfter(bringToFrontSpy1);
422-
});
423-
424-
it('should not bring nested overlay to front when resetting', () => {
425-
setNestedOverlay(overlays[0], overlays[1]);
426-
427-
setNestedOverlay(overlays[0], null);
428-
429-
const bringToFrontSpy = sinon.spy(overlays[1], 'bringToFront');
430-
431-
overlays[0].bringToFront();
432-
433-
expect(bringToFrontSpy).to.be.not.called;
434-
});
435-
});
436377
});

0 commit comments

Comments
 (0)