Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(sbb-calendar): fix month selection on wide view #3192

Merged
merged 1 commit into from
Nov 4, 2024
Merged

fix(sbb-calendar): fix month selection on wide view #3192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 43 additions & 1 deletion src/elements/calendar/calendar.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { assert, expect } from '@open-wc/testing';
import { sendKeys } from '@web/test-runner-commands';
import { SbbBreakpointMediumMin } from '@sbb-esta/lyne-design-tokens';
import { sendKeys, setViewport } from '@web/test-runner-commands';
import { html } from 'lit/static-html.js';

import type { SbbSecondaryButtonElement } from '../button/secondary-button.js';
Expand Down Expand Up @@ -209,6 +210,47 @@ describe(`sbb-calendar`, () => {
expect(dayCells.length).to.be.equal(31);
});

it('changes to year and month selection views if wide', async () => {
await setViewport({ width: SbbBreakpointMediumMin, height: 1000 });
element.wide = true;

await waitForLitRender(element);

// Open year selection
element
.shadowRoot!.querySelector<HTMLButtonElement>('button#sbb-calendar__date-selection')!
.click();

await waitForTransition();
await waitForLitRender(element);

const selectedYear: HTMLElement = Array.from(
element.shadowRoot!.querySelectorAll<HTMLTableCellElement>('.sbb-calendar__table-year'),
).find((e) => e.innerText === '2063')!;
const yearButton: HTMLElement = selectedYear.querySelector('button')!;

// Open month selection
yearButton.click();

await waitForLitRender(element);
await waitForTransition();

// Click last available month on right side
element
.shadowRoot!.querySelector<HTMLButtonElement>('button[aria-label="December 2062"]')!
.click();

await waitForLitRender(element);
await waitForTransition();

// Day view should be opened with December 2062
expect(
element
.shadowRoot!.querySelector<HTMLButtonElement>('button#sbb-calendar__date-selection')!
.innerText.trim(),
).to.be.equal('December 2062');
});

it('renders with min and max', async () => {
const page: HTMLElement = await fixture(
html`<sbb-calendar
Expand Down
10 changes: 5 additions & 5 deletions src/elements/calendar/calendar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,7 +1029,7 @@ class SbbCalendarElement<T = Date> extends SbbHydrationMixin(LitElement) {
</div>
<div class="sbb-calendar__table-container sbb-calendar__table-month-view">
${this._createMonthTable(this._months, this._chosenYear!)}
${this._wide ? this._createMonthTable(this._months, this._chosenYear! + 1, true) : nothing}
${this._wide ? this._createMonthTable(this._months, this._chosenYear! + 1) : nothing}
</div>
`;
}
Expand All @@ -1050,7 +1050,7 @@ class SbbCalendarElement<T = Date> extends SbbHydrationMixin(LitElement) {
}

/** Creates the table for the month selection view. */
private _createMonthTable(months: Month[][], year: number, shiftRight = false): TemplateResult {
private _createMonthTable(months: Month[][], year: number): TemplateResult {
return html`
<table
class="sbb-calendar__table"
Expand Down Expand Up @@ -1097,7 +1097,7 @@ class SbbCalendarElement<T = Date> extends SbbHydrationMixin(LitElement) {
'sbb-calendar__crossed-out': !isOutOfRange && isFilteredOut,
'sbb-calendar__selected': selected,
})}
@click=${() => this._onMonthSelection(month.monthValue, year, shiftRight)}
@click=${() => this._onMonthSelection(month.monthValue, year)}
?disabled=${isOutOfRange || isFilteredOut}
aria-label=${`${month.longValue} ${this._chosenYear}`}
aria-pressed=${selected}
Expand All @@ -1119,8 +1119,8 @@ class SbbCalendarElement<T = Date> extends SbbHydrationMixin(LitElement) {
}

/** Select the month and change the view to day selection. */
private _onMonthSelection(month: number, year: number, shiftRight: boolean): void {
this._chosenMonth = shiftRight ? month + 1 : month;
private _onMonthSelection(month: number, year: number): void {
this._chosenMonth = month;
this._nextCalendarView = 'day';
this._init(
this._dateAdapter.createDate(
Expand Down
Loading