Skip to content

Commit f053392

Browse files
authored
Merge branch 'master' into rkaraivanov/tooltip
2 parents 776dc8d + d3cc33c commit f053392

File tree

6 files changed

+33
-13
lines changed

6 files changed

+33
-13
lines changed

src/components/calendar/calendar-rendering.spec.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,16 @@ describe('Calendar Rendering', () => {
2525
await expect(calendar).shadowDom.to.be.accessible();
2626
});
2727

28+
it('passes the a11y audit when a week of hidden days is rendered - issue #1636', async () => {
29+
const aprilFirst2025 = new CalendarDay({ year: 2025, month: 3, date: 1 });
30+
calendar.activeDate = aprilFirst2025.native;
31+
calendar.visibleMonths = 2;
32+
await elementUpdated(calendar);
33+
34+
await expect(calendar).dom.to.be.accessible();
35+
await expect(calendar).shadowDom.to.be.accessible();
36+
});
37+
2838
it('renders the calendar successfully', async () => {
2939
const today = CalendarDay.today.native;
3040
const day = new Intl.DateTimeFormat('en', { weekday: 'short' }).format(

src/components/calendar/days-view/days-view.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -481,8 +481,12 @@ export default class IgcDaysViewComponent extends EventEmitterMixin<
481481
const last = weeks.length - 1;
482482

483483
for (const [idx, week] of weeks.entries()) {
484+
let hidden = false;
485+
if (idx === 0 || idx === last) {
486+
hidden = week.every((day) => this.getDayProperties(day, today).hidden);
487+
}
484488
yield html`
485-
<div role="row" part="days-row">
489+
<div role="row" part="days-row" aria-hidden=${hidden}>
486490
${this.showWeekNumbers
487491
? this.renderWeekNumber(week[0], idx === last)
488492
: nothing}

src/components/date-picker/themes/shared/date-picker.fluent.scss

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ $theme: $fluent;
2626
min-height: #{sizable(rem(40px), rem(48px), rem(54px))};
2727
}
2828

29-
:host(:focus-within) {
30-
[part='label'] {
31-
color: color(gray, 800);
32-
}
33-
}
34-
3529
:host([required]) {
3630
[part='label']::after {
3731
color: var-get($theme, 'error-secondary-color');

src/components/input/themes/shared/input.fluent.scss

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,6 @@ $focused-height: calc(var-get($theme, 'size') - #{($focused-border-width * 2)});
8383
}
8484

8585
:host(:focus-within) {
86-
[part='label'] {
87-
color: color(gray, 800);
88-
}
89-
9086
[part^='container'] {
9187
border-color: var-get($theme, 'focused-border-color');
9288
border-width: #{$focused-border-width};
@@ -110,10 +106,26 @@ $focused-height: calc(var-get($theme, 'size') - #{($focused-border-width * 2)});
110106
}
111107
}
112108

109+
:host([type='search']) {
110+
[part='prefix'] {
111+
background: var(--ig-input-group-input-prefix-background, transparent);
112+
color: var(--ig-input-group-input-prefix-color, var(--ig-primary-500));
113+
}
114+
115+
[part='suffix'] {
116+
background: var(--ig-input-group-input-suffix-background, transparent);
117+
color: var(--ig-input-group-input-suffix-color, var(--ig-primary-500));
118+
}
119+
}
120+
113121
:host([type='search']:focus-within) {
114122
[part='prefix'] {
115123
display: none;
116124
}
125+
126+
[part='suffix'] {
127+
color: var(--ig-input-group-input-suffix-color--focused, var(--ig-gray-900));
128+
}
117129
}
118130

119131
:host([required]) {

src/components/textarea/themes/shared/textarea.common.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ $theme: $base;
1919

2020
[part~='filled'] {
2121
[part~='input'] {
22-
color: var-get($theme, 'input-prefix-color--filled');
22+
color: var-get($theme, 'filled-text-color');
2323
}
2424

2525
[part~='prefix'] {

src/components/textarea/themes/shared/textarea.fluent.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ $theme: $fluent;
6464
transform-origin: top left;
6565
margin-top: 0;
6666
height: auto;
67-
margin-block-end: rem(4px);
67+
margin-block-end: rem(5px);
6868
}
6969

7070
:host([invalid]) {

0 commit comments

Comments
 (0)