Skip to content

Commit 953ad79

Browse files
Artur-sissbruecker
andauthored
fix: listen to 'vaadin-navigate' events (#7470)
* fix: listen to 'vaadin-navigate' events Flow will soon fire 'vaadin-navigate' instead of 'popstate' when doing server side navigation * add tests --------- Co-authored-by: Sascha Ißbrücker <sissbruecker@vaadin.com>
1 parent 9d54e95 commit 953ad79

2 files changed

Lines changed: 37 additions & 7 deletions

File tree

‎packages/side-nav/src/vaadin-side-nav-item.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,13 +208,15 @@ class SideNavItem extends SideNavChildrenMixin(DisabledMixin(ElementMixin(Themab
208208
this.__updateCurrent();
209209

210210
window.addEventListener('popstate', this.__boundUpdateCurrent);
211+
window.addEventListener('vaadin-navigate', this.__boundUpdateCurrent);
211212
window.addEventListener('side-nav-location-changed', this.__boundUpdateCurrent);
212213
}
213214

214215
/** @protected */
215216
disconnectedCallback() {
216217
super.disconnectedCallback();
217218
window.removeEventListener('popstate', this.__boundUpdateCurrent);
219+
window.removeEventListener('vaadin-navigate', this.__boundUpdateCurrent);
218220
window.removeEventListener('side-nav-location-changed', this.__boundUpdateCurrent);
219221
}
220222

‎packages/side-nav/test/navigation.test.js‎

Lines changed: 35 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,16 @@ import '../vaadin-side-nav.js';
66
describe('navigation', () => {
77
let sideNav, items;
88

9-
function navigate(url) {
9+
function navigateWithPopstateEvent(url) {
1010
history.pushState({}, '', url);
1111
window.dispatchEvent(new PopStateEvent('popstate'));
1212
}
1313

14+
function navigateWithVaadinNavigateEvent(url) {
15+
history.pushState({}, '', url);
16+
window.dispatchEvent(new CustomEvent('vaadin-navigate'));
17+
}
18+
1419
beforeEach(async () => {
1520
sideNav = fixtureSync(`
1621
<vaadin-side-nav>
@@ -26,22 +31,45 @@ describe('navigation', () => {
2631
await nextRender();
2732
});
2833

29-
it('should update current attribute on items when navigating', async () => {
30-
navigate('1');
34+
it('should update current attribute on items when navigating with popstate event', async () => {
35+
navigateWithPopstateEvent('1');
36+
await nextRender();
37+
38+
expect(items[0].hasAttribute('current')).to.be.true;
39+
expect(items[1].hasAttribute('current')).to.be.false;
40+
expect(items[2].hasAttribute('current')).to.be.false;
41+
42+
navigateWithPopstateEvent('2');
43+
await nextRender();
44+
45+
expect(items[0].hasAttribute('current')).to.be.false;
46+
expect(items[1].hasAttribute('current')).to.be.true;
47+
expect(items[2].hasAttribute('current')).to.be.false;
48+
49+
navigateWithPopstateEvent('21');
50+
await nextRender();
51+
52+
expect(items[0].hasAttribute('current')).to.be.false;
53+
expect(items[1].hasAttribute('current')).to.be.false;
54+
expect(items[2].hasAttribute('current')).to.be.true;
55+
});
56+
57+
it('should update current attribute on items when navigating with vaadin-navigate event', async () => {
58+
navigateWithVaadinNavigateEvent('1');
3159
await nextRender();
3260

3361
expect(items[0].hasAttribute('current')).to.be.true;
3462
expect(items[1].hasAttribute('current')).to.be.false;
3563
expect(items[2].hasAttribute('current')).to.be.false;
3664

37-
navigate('2');
65+
navigateWithVaadinNavigateEvent('2');
3866
await nextRender();
3967

4068
expect(items[0].hasAttribute('current')).to.be.false;
4169
expect(items[1].hasAttribute('current')).to.be.true;
4270
expect(items[2].hasAttribute('current')).to.be.false;
4371

44-
navigate('21');
72+
navigateWithVaadinNavigateEvent('21');
4573
await nextRender();
4674

4775
expect(items[0].hasAttribute('current')).to.be.false;
@@ -50,13 +78,13 @@ describe('navigation', () => {
5078
});
5179

5280
it('should not set expanded attribute on the current leaf item', async () => {
53-
navigate('1');
81+
navigateWithPopstateEvent('1');
5482
await nextRender();
5583
expect(items[0].hasAttribute('expanded')).to.be.false;
5684
});
5785

5886
it('should set expanded attribute on the current item with children', async () => {
59-
navigate('2');
87+
navigateWithPopstateEvent('2');
6088
await nextRender();
6189
expect(items[1].hasAttribute('expanded')).to.be.true;
6290
});

0 commit comments

Comments
 (0)