@vaadin/dialog 25.2.5 → 25.2.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +11 -11
- package/src/vaadin-dialog-base-mixin.js +4 -3
- package/src/vaadin-dialog-overlay.js +24 -0
- package/web-types.json +1 -1
- package/web-types.lit.json +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vaadin/dialog",
|
|
3
|
-
"version": "25.2.
|
|
3
|
+
"version": "25.2.6",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -37,19 +37,19 @@
|
|
|
37
37
|
],
|
|
38
38
|
"dependencies": {
|
|
39
39
|
"@open-wc/dedupe-mixin": "^1.3.0",
|
|
40
|
-
"@vaadin/component-base": "~25.2.
|
|
41
|
-
"@vaadin/lit-renderer": "~25.2.
|
|
42
|
-
"@vaadin/overlay": "~25.2.
|
|
43
|
-
"@vaadin/vaadin-themable-mixin": "~25.2.
|
|
40
|
+
"@vaadin/component-base": "~25.2.6",
|
|
41
|
+
"@vaadin/lit-renderer": "~25.2.6",
|
|
42
|
+
"@vaadin/overlay": "~25.2.6",
|
|
43
|
+
"@vaadin/vaadin-themable-mixin": "~25.2.6",
|
|
44
44
|
"lit": "^3.0.0"
|
|
45
45
|
},
|
|
46
46
|
"devDependencies": {
|
|
47
|
-
"@vaadin/a11y-base": "~25.2.
|
|
48
|
-
"@vaadin/aura": "~25.2.
|
|
49
|
-
"@vaadin/chai-plugins": "~25.2.
|
|
50
|
-
"@vaadin/test-runner-commands": "~25.2.
|
|
47
|
+
"@vaadin/a11y-base": "~25.2.6",
|
|
48
|
+
"@vaadin/aura": "~25.2.6",
|
|
49
|
+
"@vaadin/chai-plugins": "~25.2.6",
|
|
50
|
+
"@vaadin/test-runner-commands": "~25.2.6",
|
|
51
51
|
"@vaadin/testing-helpers": "^2.0.0",
|
|
52
|
-
"@vaadin/vaadin-lumo-styles": "~25.2.
|
|
52
|
+
"@vaadin/vaadin-lumo-styles": "~25.2.6",
|
|
53
53
|
"sinon": "^22.0.0"
|
|
54
54
|
},
|
|
55
55
|
"customElements": "custom-elements.json",
|
|
@@ -57,5 +57,5 @@
|
|
|
57
57
|
"web-types.json",
|
|
58
58
|
"web-types.lit.json"
|
|
59
59
|
],
|
|
60
|
-
"gitHead": "
|
|
60
|
+
"gitHead": "c352225ff025e6163c5e290d6028a42003696441"
|
|
61
61
|
}
|
|
@@ -198,10 +198,11 @@ export const DialogBaseMixin = (superClass) =>
|
|
|
198
198
|
}
|
|
199
199
|
|
|
200
200
|
/** @private */
|
|
201
|
-
_bringOverlayToFront() {
|
|
202
|
-
if (this.modeless) {
|
|
203
|
-
|
|
201
|
+
_bringOverlayToFront(event) {
|
|
202
|
+
if (!this.modeless) {
|
|
203
|
+
return;
|
|
204
204
|
}
|
|
205
|
+
this._overlayElement.bringToFront(event);
|
|
205
206
|
}
|
|
206
207
|
|
|
207
208
|
/** @private */
|
|
@@ -7,6 +7,7 @@ import { html, LitElement } from 'lit';
|
|
|
7
7
|
import { defineCustomElement } from '@vaadin/component-base/src/define.js';
|
|
8
8
|
import { DirMixin } from '@vaadin/component-base/src/dir-mixin.js';
|
|
9
9
|
import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
|
|
10
|
+
import { getOverlaysOnTop, isNestedOverlay } from '@vaadin/overlay/src/vaadin-overlay-stack-mixin.js';
|
|
10
11
|
import { LumoInjectionMixin } from '@vaadin/vaadin-themable-mixin/lumo-injection-mixin.js';
|
|
11
12
|
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
|
|
12
13
|
import { dialogOverlayStyles } from './styles/vaadin-dialog-overlay-base-styles.js';
|
|
@@ -55,6 +56,29 @@ export class DialogOverlay extends DialogOverlayMixin(
|
|
|
55
56
|
</div>
|
|
56
57
|
`;
|
|
57
58
|
}
|
|
59
|
+
|
|
60
|
+
/**
|
|
61
|
+
* @param {Event} event
|
|
62
|
+
* @protected
|
|
63
|
+
* @override
|
|
64
|
+
*/
|
|
65
|
+
bringToFront(event) {
|
|
66
|
+
if (event instanceof Event) {
|
|
67
|
+
const path = event.composedPath();
|
|
68
|
+
|
|
69
|
+
// Do not bring overlay to front if this method is called
|
|
70
|
+
// on event that originates from a nested dialog content.
|
|
71
|
+
const isNestedDialogEvent = getOverlaysOnTop(this).some(
|
|
72
|
+
(overlay) => path.includes(overlay) && isNestedOverlay(this, overlay) && overlay instanceof DialogOverlay,
|
|
73
|
+
);
|
|
74
|
+
|
|
75
|
+
if (isNestedDialogEvent) {
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
super.bringToFront();
|
|
81
|
+
}
|
|
58
82
|
}
|
|
59
83
|
|
|
60
84
|
defineCustomElement(DialogOverlay);
|
package/web-types.json
CHANGED