@vaadin/dialog 25.0.4 → 25.0.5

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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vaadin/dialog",
3
- "version": "25.0.4",
3
+ "version": "25.0.5",
4
4
  "publishConfig": {
5
5
  "access": "public"
6
6
  },
@@ -36,24 +36,24 @@
36
36
  ],
37
37
  "dependencies": {
38
38
  "@open-wc/dedupe-mixin": "^1.3.0",
39
- "@vaadin/component-base": "~25.0.4",
40
- "@vaadin/lit-renderer": "~25.0.4",
41
- "@vaadin/overlay": "~25.0.4",
42
- "@vaadin/vaadin-themable-mixin": "~25.0.4",
39
+ "@vaadin/component-base": "~25.0.5",
40
+ "@vaadin/lit-renderer": "~25.0.5",
41
+ "@vaadin/overlay": "~25.0.5",
42
+ "@vaadin/vaadin-themable-mixin": "~25.0.5",
43
43
  "lit": "^3.0.0"
44
44
  },
45
45
  "devDependencies": {
46
- "@vaadin/a11y-base": "~25.0.4",
47
- "@vaadin/aura": "~25.0.4",
48
- "@vaadin/chai-plugins": "~25.0.4",
49
- "@vaadin/test-runner-commands": "~25.0.4",
46
+ "@vaadin/a11y-base": "~25.0.5",
47
+ "@vaadin/aura": "~25.0.5",
48
+ "@vaadin/chai-plugins": "~25.0.5",
49
+ "@vaadin/test-runner-commands": "~25.0.5",
50
50
  "@vaadin/testing-helpers": "^2.0.0",
51
- "@vaadin/vaadin-lumo-styles": "~25.0.4",
51
+ "@vaadin/vaadin-lumo-styles": "~25.0.5",
52
52
  "sinon": "^21.0.0"
53
53
  },
54
54
  "web-types": [
55
55
  "web-types.json",
56
56
  "web-types.lit.json"
57
57
  ],
58
- "gitHead": "17170982c3efa1d426af4fabb70ea36b70151347"
58
+ "gitHead": "f9de924c232acc7b113e9f7f48368e8ca8105f81"
59
59
  }
@@ -138,7 +138,7 @@ const dialogResizableOverlay = css`
138
138
  }
139
139
 
140
140
  [part='header'],
141
- :host(:not([has-header])) [part='content'] {
141
+ :host(:not([has-title], [has-header])) [part='content'] {
142
142
  border-top-left-radius: inherit;
143
143
  border-top-right-radius: inherit;
144
144
  }
@@ -64,6 +64,12 @@ export const DialogDraggableMixin = (superClass) =>
64
64
  return;
65
65
  }
66
66
 
67
+ // Don't initiate drag if a nested dialog already handled this event.
68
+ // This prevents dragging both dialogs simultaneously.
69
+ if (e.defaultPrevented) {
70
+ return;
71
+ }
72
+
67
73
  if (this.draggable && (e.button === 0 || e.touches)) {
68
74
  const resizerContainer = this.$.overlay.$.resizerContainer;
69
75
  const isResizerContainer = e.target === resizerContainer;
@@ -83,9 +89,8 @@ export const DialogDraggableMixin = (superClass) =>
83
89
  });
84
90
 
85
91
  if ((isResizerContainer && !isResizerContainerScrollbar) || isContentPart || isDraggable) {
86
- if (!isDraggable) {
87
- e.preventDefault();
88
- }
92
+ // Signal that we're handling this drag event, so parent dialogs won't also drag
93
+ e.preventDefault();
89
94
  this._originalBounds = this.$.overlay.getBounds();
90
95
  const event = getMouseOrFirstTouchEvent(e);
91
96
  this._originalMouseCoords = { top: event.pageY, left: event.pageX };
package/web-types.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "$schema": "https://json.schemastore.org/web-types",
3
3
  "name": "@vaadin/dialog",
4
- "version": "25.0.4",
4
+ "version": "25.0.5",
5
5
  "description-markup": "markdown",
6
6
  "contributions": {
7
7
  "html": {
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "$schema": "https://json.schemastore.org/web-types",
3
3
  "name": "@vaadin/dialog",
4
- "version": "25.0.4",
4
+ "version": "25.0.5",
5
5
  "description-markup": "markdown",
6
6
  "framework": "lit",
7
7
  "framework-config": {