Skip to content

Commit 54decd0

Browse files
authored
fix: use correct styles for week numbers (#3544)
1 parent 7522cf1 commit 54decd0

8 files changed

Lines changed: 45 additions & 27 deletions

File tree

‎packages/date-picker/src/vaadin-month-calendar.js‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,19 +42,11 @@ class MonthCalendar extends FocusMixin(ThemableMixin(PolymerElement)) {
4242
display: flex;
4343
}
4444
45-
[part='week-numbers'] {
46-
display: flex;
47-
flex-direction: column;
48-
justify-content: space-between;
49-
flex-shrink: 0;
50-
}
51-
5245
[part='date'] {
5346
outline: none;
5447
}
5548
5649
[part='week-number'][hidden],
57-
[part='week-numbers'][hidden],
5850
[part='weekday'][hidden] {
5951
display: none;
6052
}
@@ -69,7 +61,7 @@ class MonthCalendar extends FocusMixin(ThemableMixin(PolymerElement)) {
6961
}
7062
7163
[part='weekday']:empty,
72-
[part='week-numbers'] {
64+
[part='week-number'] {
7365
width: 12.5%;
7466
flex-shrink: 0;
7567
}

‎packages/date-picker/test/visual/lumo/date-picker.test.js‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,26 @@ describe('date-picker', () => {
9999
await visualDiff(div, `${dir}-prefix`);
100100
});
101101

102-
it('dropdown', async () => {
103-
element.value = '2000-01-01';
104-
element.opened = true;
105-
div.style.height = element.offsetHeight + element.$.overlay.$.overlay.offsetHeight + 'px';
106-
div.style.width = element.$.overlay.$.overlay.offsetWidth + 'px';
107-
await visualDiff(div, `${dir}-dropdown`);
102+
describe('dropdown', () => {
103+
function openOverlay() {
104+
element.opened = true;
105+
div.style.height = element.offsetHeight + element.$.overlay.$.overlay.offsetHeight + 'px';
106+
div.style.width = element.$.overlay.$.overlay.offsetWidth + 'px';
107+
}
108+
109+
it('default', async () => {
110+
element.value = '2000-01-01';
111+
openOverlay();
112+
await visualDiff(div, `${dir}-dropdown`);
113+
});
114+
115+
it('week numbers', async () => {
116+
element.value = '2000-01-01';
117+
element.showWeekNumbers = true;
118+
element.i18n.firstDayOfWeek = 1;
119+
openOverlay();
120+
await visualDiff(div, `${dir}-week-numbers`);
121+
});
108122
});
109123
});
110124
});
32.2 KB
Loading
31.9 KB
Loading

‎packages/date-picker/test/visual/material/date-picker.test.js‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,26 @@ describe('date-picker', () => {
9999
await visualDiff(div, `${dir}-prefix`);
100100
});
101101

102-
it('dropdown', async () => {
103-
element.value = '2000-01-01';
104-
element.opened = true;
105-
div.style.height = element.offsetHeight + element.$.overlay.$.overlay.offsetHeight + 'px';
106-
div.style.width = element.$.overlay.$.overlay.offsetWidth + 'px';
107-
await visualDiff(div, `${dir}-dropdown`);
102+
describe('dropdown', () => {
103+
function openOverlay() {
104+
element.opened = true;
105+
div.style.height = element.offsetHeight + element.$.overlay.$.overlay.offsetHeight + 'px';
106+
div.style.width = element.$.overlay.$.overlay.offsetWidth + 'px';
107+
}
108+
109+
it('default', async () => {
110+
element.value = '2000-01-01';
111+
openOverlay();
112+
await visualDiff(div, `${dir}-dropdown`);
113+
});
114+
115+
it('week numbers', async () => {
116+
element.value = '2000-01-01';
117+
element.showWeekNumbers = true;
118+
element.i18n.firstDayOfWeek = 1;
119+
openOverlay();
120+
await visualDiff(div, `${dir}-week-numbers`);
121+
});
108122
});
109123
});
110124
});
35.2 KB
Loading
35.4 KB
Loading

‎packages/date-picker/theme/lumo/vaadin-month-calendar-styles.js‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ registerStyles(
3333
3434
[part='weekdays'],
3535
[part='weekday'],
36-
[part='week-numbers'] {
36+
[part='week-number'] {
3737
font-size: var(--lumo-font-size-xxs);
3838
line-height: 1;
3939
color: var(--lumo-secondary-text-color);
@@ -43,9 +43,8 @@ registerStyles(
4343
margin-bottom: var(--lumo-space-s);
4444
}
4545
46-
/* TODO should have part="week-number" for the cell in weekdays-container */
4746
[part='weekday']:empty,
48-
[part='week-numbers'] {
47+
[part='week-number'] {
4948
width: var(--lumo-size-xs);
5049
}
5150
@@ -107,8 +106,7 @@ registerStyles(
107106
}
108107
}
109108
110-
/* TODO should not rely on the role attribute */
111-
[part='date'][role='button']:not([disabled]):not([selected]):hover::before {
109+
[part='date']:not(:empty):not([disabled]):not([selected]):hover::before {
112110
background-color: var(--lumo-primary-color-10pct);
113111
}
114112
@@ -130,7 +128,7 @@ registerStyles(
130128
display: none;
131129
}
132130
133-
[part='date'][role='button']:not([disabled]):active::before {
131+
[part='date']:not(:empty):not([disabled]):active::before {
134132
display: block;
135133
}
136134

0 commit comments

Comments
 (0)