Skip to content

Commit 2b8cfd2

Browse files
committed
Merge remote-tracking branch 'origin/main' into mdl/detail-auto-size
# Conflicts: # packages/master-detail-layout/ARCHITECTURE.md # packages/master-detail-layout/src/vaadin-master-detail-layout.js # packages/master-detail-layout/test/dom/__snapshots__/master-detail-layout.test.snap.js # packages/master-detail-layout/test/dom/master-detail-layout.test.js # packages/master-detail-layout/test/master-detail-layout.test.js
2 parents 2844d39 + f49bb0d commit 2b8cfd2

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

packages/master-detail-layout/test/dom/__snapshots__/master-detail-layout.test.snap.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* @web/test-runner snapshot v1 */
22
export const snapshots = {};
33

4-
snapshots["vaadin-master-detail-layout host default"] =
4+
snapshots["vaadin-master-detail-layout host default"] =
55
`<vaadin-master-detail-layout
66
expand="master"
77
orientation="horizontal"
@@ -14,7 +14,7 @@ snapshots["vaadin-master-detail-layout host default"] =
1414
`;
1515
/* end snapshot vaadin-master-detail-layout host default */
1616

17-
snapshots["vaadin-master-detail-layout host masterSize"] =
17+
snapshots["vaadin-master-detail-layout host masterSize"] =
1818
`<vaadin-master-detail-layout
1919
expand="master"
2020
orientation="horizontal"
@@ -28,7 +28,7 @@ snapshots["vaadin-master-detail-layout host masterSize"] =
2828
`;
2929
/* end snapshot vaadin-master-detail-layout host masterSize */
3030

31-
snapshots["vaadin-master-detail-layout host detailSize"] =
31+
snapshots["vaadin-master-detail-layout host detailSize"] =
3232
`<vaadin-master-detail-layout
3333
expand="master"
3434
orientation="horizontal"
@@ -42,7 +42,7 @@ snapshots["vaadin-master-detail-layout host detailSize"] =
4242
`;
4343
/* end snapshot vaadin-master-detail-layout host detailSize */
4444

45-
snapshots["vaadin-master-detail-layout host masterSize and detailSize"] =
45+
snapshots["vaadin-master-detail-layout host masterSize and detailSize"] =
4646
`<vaadin-master-detail-layout
4747
expand="master"
4848
orientation="horizontal"
@@ -56,7 +56,7 @@ snapshots["vaadin-master-detail-layout host masterSize and detailSize"] =
5656
`;
5757
/* end snapshot vaadin-master-detail-layout host masterSize and detailSize */
5858

59-
snapshots["vaadin-master-detail-layout shadow default"] =
59+
snapshots["vaadin-master-detail-layout shadow default"] =
6060
`<div
6161
id="backdrop"
6262
part="backdrop"
@@ -94,7 +94,7 @@ snapshots["vaadin-master-detail-layout shadow default"] =
9494
`;
9595
/* end snapshot vaadin-master-detail-layout shadow default */
9696

97-
snapshots["vaadin-master-detail-layout detail default"] =
97+
snapshots["vaadin-master-detail-layout detail default"] =
9898
`<vaadin-master-detail-layout
9999
expand="master"
100100
has-detail=""
@@ -113,14 +113,15 @@ snapshots["vaadin-master-detail-layout detail default"] =
113113
`;
114114
/* end snapshot vaadin-master-detail-layout detail default */
115115

116-
snapshots["vaadin-master-detail-layout detail overflow"] =
116+
snapshots["vaadin-master-detail-layout detail overflow"] =
117117
`<vaadin-master-detail-layout
118118
expand="master"
119119
has-detail=""
120120
master-size="300px"
121121
orientation="horizontal"
122+
overlay=""
122123
overlay-containment="layout"
123-
style="--_master-size: 300px; --_detail-size: 300px;"
124+
style="--_master-size: 300px; --_detail-size: 300px; --_detail-cached-size: 49px; width: 400px;"
124125
>
125126
<div>
126127
Master content
@@ -132,7 +133,7 @@ snapshots["vaadin-master-detail-layout detail overflow"] =
132133
`;
133134
/* end snapshot vaadin-master-detail-layout detail overflow */
134135

135-
snapshots["vaadin-master-detail-layout detail hidden"] =
136+
snapshots["vaadin-master-detail-layout detail hidden"] =
136137
`<vaadin-master-detail-layout
137138
expand="master"
138139
master-size="300px"
@@ -153,7 +154,7 @@ snapshots["vaadin-master-detail-layout detail hidden"] =
153154
`;
154155
/* end snapshot vaadin-master-detail-layout detail hidden */
155156

156-
snapshots["vaadin-master-detail-layout detail removed"] =
157+
snapshots["vaadin-master-detail-layout detail removed"] =
157158
`<vaadin-master-detail-layout
158159
expand="master"
159160
master-size="300px"
@@ -168,7 +169,7 @@ snapshots["vaadin-master-detail-layout detail removed"] =
168169
`;
169170
/* end snapshot vaadin-master-detail-layout detail removed */
170171

171-
snapshots["vaadin-master-detail-layout detail placeholder default"] =
172+
snapshots["vaadin-master-detail-layout detail placeholder default"] =
172173
`<vaadin-master-detail-layout
173174
expand="master"
174175
has-detail-placeholder=""
@@ -187,14 +188,14 @@ snapshots["vaadin-master-detail-layout detail placeholder default"] =
187188
`;
188189
/* end snapshot vaadin-master-detail-layout detail placeholder default */
189190

190-
snapshots["vaadin-master-detail-layout detail placeholder overflow"] =
191+
snapshots["vaadin-master-detail-layout detail placeholder overflow"] =
191192
`<vaadin-master-detail-layout
192193
expand="master"
193194
has-detail-placeholder=""
194195
master-size="300px"
195196
orientation="horizontal"
196197
overlay-containment="layout"
197-
style="--_master-size: 300px; --_detail-size: 300px;"
198+
style="--_master-size: 300px; --_detail-size: 300px; --_detail-cached-size: 76px; width: 400px;"
198199
>
199200
<div>
200201
Master content
@@ -206,7 +207,7 @@ snapshots["vaadin-master-detail-layout detail placeholder overflow"] =
206207
`;
207208
/* end snapshot vaadin-master-detail-layout detail placeholder overflow */
208209

209-
snapshots["vaadin-master-detail-layout detail placeholder removed"] =
210+
snapshots["vaadin-master-detail-layout detail placeholder removed"] =
210211
`<vaadin-master-detail-layout
211212
expand="master"
212213
master-size="300px"
@@ -220,4 +221,3 @@ snapshots["vaadin-master-detail-layout detail placeholder removed"] =
220221
</vaadin-master-detail-layout>
221222
`;
222223
/* end snapshot vaadin-master-detail-layout detail placeholder removed */
223-

packages/master-detail-layout/test/dom/master-detail-layout.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ describe('vaadin-master-detail-layout', () => {
7171
});
7272

7373
it('overflow', async () => {
74-
layout.width = '400px';
74+
layout.style.width = '400px';
7575
layout.detailSize = '300px';
7676
await onceResized(layout);
7777
await expect(layout).dom.to.equalSnapshot();
@@ -106,7 +106,7 @@ describe('vaadin-master-detail-layout', () => {
106106
});
107107

108108
it('overflow', async () => {
109-
layout.width = '400px';
109+
layout.style.width = '400px';
110110
layout.detailSize = '300px';
111111
await onceResized(layout);
112112
await expect(layout).dom.to.equalSnapshot();

0 commit comments

Comments
 (0)