Skip to content

Commit da57e4f

Browse files
mkszeppmkszepp
committed
Fix lint
1 parent 3c074a6 commit da57e4f

12 files changed

Lines changed: 176 additions & 60 deletions

File tree

‎ember-power-calendar/src/-private/utils.ts‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ export function publicActionsObject(
2525
| undefined,
2626
changeCenterTask: TaskForAsyncTaskFunction<
2727
unknown,
28-
(newCenter: Date, calendar: CalendarAPI, e: MouseEvent | KeyboardEvent) => Promise<void>
28+
(
29+
newCenter: Date,
30+
calendar: CalendarAPI,
31+
e: MouseEvent | KeyboardEvent,
32+
) => Promise<void>
2933
>,
3034
currentCenter: Date,
3135
): PowerCalendarActions {

‎ember-power-calendar/src/components/power-calendar-multiple.hbs‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,19 @@
1515
as |calendar|
1616
}}
1717
{{#let (element this.tagWithDefault) as |Tag|}}
18-
<Tag class="ember-power-calendar" role={{if @isDatePicker "dialog" "group"}} aria-modal={{if @isDatePicker "true"}} aria-label={{if @ariaLabel @ariaLabel (unless @ariaLabeledBy "Choose Multiple Dates")}} aria-labelledby={{@ariaLabeledBy}} ...attributes id={{calendar.uniqueId}}>
18+
<Tag
19+
class="ember-power-calendar"
20+
role={{if @isDatePicker "dialog" "group"}}
21+
aria-modal={{if @isDatePicker "true"}}
22+
aria-label={{if
23+
@ariaLabel
24+
@ariaLabel
25+
(unless @ariaLabeledBy "Choose Multiple Dates")
26+
}}
27+
aria-labelledby={{@ariaLabeledBy}}
28+
...attributes
29+
id={{calendar.uniqueId}}
30+
>
1931
{{#if (has-block)}}
2032
{{yield calendar}}
2133
{{else}}

‎ember-power-calendar/src/components/power-calendar-multiple/days.hbs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,15 @@
88
{{this.setup}}
99
...attributes
1010
>
11-
<div class="ember-power-calendar-row ember-power-calendar-weekdays" role="row">
11+
<div
12+
class="ember-power-calendar-row ember-power-calendar-weekdays"
13+
role="row"
14+
>
1215
{{#each this.weekdaysNames as |wdn|}}
13-
<div class="ember-power-calendar-weekday" role="columnheader">{{wdn}}</div>
16+
<div
17+
class="ember-power-calendar-weekday"
18+
role="columnheader"
19+
>{{wdn}}</div>
1420
{{/each}}
1521
</div>
1622
<div

‎ember-power-calendar/src/components/power-calendar-multiple/days.ts‎

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,15 @@ export default class PowerCalendarMultipleDaysComponent extends Component<PowerC
161161

162162
if (!day || !day?.isCurrentMonth) {
163163
if (this.args.calendar.actions.moveCenter) {
164-
if (e.key === 'ArrowUp' || e.key === 'ArrowRight' || e.key === 'ArrowDown' || e.key === 'ArrowLeft') {
165-
const currentDay = this.days.find(x => x.id === this.focusedId)?.date;
164+
if (
165+
e.key === 'ArrowUp' ||
166+
e.key === 'ArrowRight' ||
167+
e.key === 'ArrowDown' ||
168+
e.key === 'ArrowLeft'
169+
) {
170+
const currentDay = this.days.find(
171+
(x) => x.id === this.focusedId,
172+
)?.date;
166173

167174
if (currentDay) {
168175
let date = currentDay;
@@ -215,11 +222,7 @@ export default class PowerCalendarMultipleDaysComponent extends Component<PowerC
215222
this.didSetup = true;
216223

217224
if (this.args.isDatePicker) {
218-
scheduleOnce(
219-
'afterRender',
220-
this,
221-
this.initialFocus.bind(this),
222-
);
225+
scheduleOnce('afterRender', this, this.initialFocus.bind(this));
223226
}
224227
},
225228
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -228,20 +231,20 @@ export default class PowerCalendarMultipleDaysComponent extends Component<PowerC
228231
);
229232

230233
initialFocus() {
231-
const activeDay = this.days.find(x => x.isSelected && !x.isDisabled);
234+
const activeDay = this.days.find((x) => x.isSelected && !x.isDisabled);
232235

233236
if (activeDay) {
234237
this.focusedId = activeDay.id;
235238
} else {
236-
const todayDay = this.days.find(x => x.isToday && !x.isDisabled);
239+
const todayDay = this.days.find((x) => x.isToday && !x.isDisabled);
237240
if (todayDay) {
238241
this.focusedId = todayDay.id ?? '';
239242
} else {
240-
const firstSelectableDay = this.days.find(x => !x.isDisabled);
243+
const firstSelectableDay = this.days.find((x) => !x.isDisabled);
241244
if (firstSelectableDay) {
242245
this.focusedId = firstSelectableDay.id ?? '';
243246
} else {
244-
this.focusedId = this.days.find(x => !x.isCurrentMonth)?.id ?? '';
247+
this.focusedId = this.days.find((x) => !x.isCurrentMonth)?.id ?? '';
245248
}
246249
}
247250
}
@@ -250,12 +253,25 @@ export default class PowerCalendarMultipleDaysComponent extends Component<PowerC
250253
}
251254

252255
async focusDay(e: MouseEvent | KeyboardEvent, date: Date, step: number = 0) {
253-
if (dayIsDisabled(date, this.args.calendar, this.args.minDate, this.args.maxDate, this.args.disabledDates)) {
256+
if (
257+
dayIsDisabled(
258+
date,
259+
this.args.calendar,
260+
this.args.minDate,
261+
this.args.maxDate,
262+
this.args.disabledDates,
263+
)
264+
) {
254265
return;
255266
}
256267

257268
if (this.args.calendar.actions.moveCenter && step !== 0) {
258-
await this.args.calendar.actions.moveCenter(step, 'month', this.args.calendar, e);
269+
await this.args.calendar.actions.moveCenter(
270+
step,
271+
'month',
272+
this.args.calendar,
273+
e,
274+
);
259275
}
260276

261277
this.focusedId = formatDate(date, 'YYYY-MM-DD');

‎ember-power-calendar/src/components/power-calendar-range.hbs‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,19 @@
1515
as |calendar|
1616
}}
1717
{{#let (element this.tagWithDefault) as |Tag|}}
18-
<Tag class="ember-power-calendar" role={{if @isDatePicker "dialog" "group"}} aria-modal={{if @isDatePicker "true"}} aria-label={{if @ariaLabel @ariaLabel (unless @ariaLabeledBy "Choose Date Range")}} aria-labelledby={{@ariaLabeledBy}} ...attributes id={{calendar.uniqueId}}>
18+
<Tag
19+
class="ember-power-calendar"
20+
role={{if @isDatePicker "dialog" "group"}}
21+
aria-modal={{if @isDatePicker "true"}}
22+
aria-label={{if
23+
@ariaLabel
24+
@ariaLabel
25+
(unless @ariaLabeledBy "Choose Date Range")
26+
}}
27+
aria-labelledby={{@ariaLabeledBy}}
28+
...attributes
29+
id={{calendar.uniqueId}}
30+
>
1931
{{#if (has-block)}}
2032
{{yield calendar}}
2133
{{else}}

‎ember-power-calendar/src/components/power-calendar-range/days.hbs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,15 @@
88
{{this.setup}}
99
...attributes
1010
>
11-
<div class="ember-power-calendar-row ember-power-calendar-weekdays" role="row">
11+
<div
12+
class="ember-power-calendar-row ember-power-calendar-weekdays"
13+
role="row"
14+
>
1215
{{#each this.weekdaysNames as |wdn|}}
13-
<div class="ember-power-calendar-weekday" role="columnheader">{{wdn}}</div>
16+
<div
17+
class="ember-power-calendar-weekday"
18+
role="columnheader"
19+
>{{wdn}}</div>
1420
{{/each}}
1521
</div>
1622
<div

‎ember-power-calendar/src/components/power-calendar-range/days.ts‎

Lines changed: 44 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,7 @@ export default class PowerCalendarRangeDaysComponent extends Component<PowerCale
107107
let day = firstDay(this.currentCenter, this.localeStartOfWeek);
108108
const days: PowerCalendarDay[] = [];
109109
while (isBefore(day, theLastDay)) {
110-
days.push(
111-
this.buildDay(day, today, this.args.calendar),
112-
);
110+
days.push(this.buildDay(day, today, this.args.calendar));
113111
day = add(day, 1, 'day');
114112
}
115113
return days;
@@ -152,8 +150,15 @@ export default class PowerCalendarRangeDaysComponent extends Component<PowerCale
152150

153151
if (!day || !day?.isCurrentMonth) {
154152
if (this.args.calendar.actions.moveCenter) {
155-
if (e.key === 'ArrowUp' || e.key === 'ArrowRight' || e.key === 'ArrowDown' || e.key === 'ArrowLeft') {
156-
const currentDay = this.days.find(x => x.id === this.focusedId)?.date;
153+
if (
154+
e.key === 'ArrowUp' ||
155+
e.key === 'ArrowRight' ||
156+
e.key === 'ArrowDown' ||
157+
e.key === 'ArrowLeft'
158+
) {
159+
const currentDay = this.days.find(
160+
(x) => x.id === this.focusedId,
161+
)?.date;
157162

158163
if (currentDay) {
159164
let date = currentDay;
@@ -196,9 +201,20 @@ export default class PowerCalendarRangeDaysComponent extends Component<PowerCale
196201
async handleClick(e: MouseEvent) {
197202
const selectedDay = handleClick(e, this.days, this.args.calendar);
198203

199-
if (this.lastKeyDownWasSpace && selectedDay && (this.args.calendar.minRange ?? 0) > 0 && !this.args.calendar.selected?.end) {
200-
const focusDay = add(selectedDay.date, (this.args.calendar.minRange ?? 0) / DAY_IN_MS, 'day');
201-
const dayInCurrentCalendar = this.days.some(x => x.id === formatDate(focusDay, 'YYYY-MM-DD') && x.isCurrentMonth);
204+
if (
205+
this.lastKeyDownWasSpace &&
206+
selectedDay &&
207+
(this.args.calendar.minRange ?? 0) > 0 &&
208+
!this.args.calendar.selected?.end
209+
) {
210+
const focusDay = add(
211+
selectedDay.date,
212+
(this.args.calendar.minRange ?? 0) / DAY_IN_MS,
213+
'day',
214+
);
215+
const dayInCurrentCalendar = this.days.some(
216+
(x) => x.id === formatDate(focusDay, 'YYYY-MM-DD') && x.isCurrentMonth,
217+
);
202218

203219
await this.focusDay(e, focusDay, dayInCurrentCalendar ? 0 : 1);
204220
}
@@ -215,11 +231,7 @@ export default class PowerCalendarRangeDaysComponent extends Component<PowerCale
215231
this.didSetup = true;
216232

217233
if (this.args.isDatePicker) {
218-
scheduleOnce(
219-
'afterRender',
220-
this,
221-
this.initialFocus.bind(this),
222-
);
234+
scheduleOnce('afterRender', this, this.initialFocus.bind(this));
223235
}
224236
},
225237
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
@@ -228,20 +240,20 @@ export default class PowerCalendarRangeDaysComponent extends Component<PowerCale
228240
);
229241

230242
initialFocus() {
231-
const activeDay = this.days.find(x => x.isSelected && !x.isDisabled);
243+
const activeDay = this.days.find((x) => x.isSelected && !x.isDisabled);
232244

233245
if (activeDay) {
234246
this.focusedId = activeDay.id;
235247
} else {
236-
const todayDay = this.days.find(x => x.isToday && !x.isDisabled);
248+
const todayDay = this.days.find((x) => x.isToday && !x.isDisabled);
237249
if (todayDay) {
238250
this.focusedId = todayDay.id ?? '';
239251
} else {
240-
const firstSelectableDay = this.days.find(x => !x.isDisabled);
252+
const firstSelectableDay = this.days.find((x) => !x.isDisabled);
241253
if (firstSelectableDay) {
242254
this.focusedId = firstSelectableDay.id ?? '';
243255
} else {
244-
this.focusedId = this.days.find(x => !x.isCurrentMonth)?.id ?? '';
256+
this.focusedId = this.days.find((x) => !x.isCurrentMonth)?.id ?? '';
245257
}
246258
}
247259
}
@@ -250,12 +262,25 @@ export default class PowerCalendarRangeDaysComponent extends Component<PowerCale
250262
}
251263

252264
async focusDay(e: MouseEvent | KeyboardEvent, date: Date, step: number = 0) {
253-
if (dayIsDisabled(date, this.args.calendar, this.args.minDate, this.args.maxDate, this.args.disabledDates)) {
265+
if (
266+
dayIsDisabled(
267+
date,
268+
this.args.calendar,
269+
this.args.minDate,
270+
this.args.maxDate,
271+
this.args.disabledDates,
272+
)
273+
) {
254274
return;
255275
}
256276

257277
if (this.args.calendar.actions.moveCenter && step !== 0) {
258-
await this.args.calendar.actions.moveCenter(step, 'month', this.args.calendar, e);
278+
await this.args.calendar.actions.moveCenter(
279+
step,
280+
'month',
281+
this.args.calendar,
282+
e,
283+
);
259284
}
260285

261286
this.focusedId = formatDate(date, 'YYYY-MM-DD');

‎ember-power-calendar/src/components/power-calendar.hbs‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,19 @@
1717
as |calendar|
1818
}}
1919
{{#let (element this.tagWithDefault) as |Tag|}}
20-
<Tag class="ember-power-calendar" role={{if @isDatePicker "dialog" "group"}} aria-modal={{if @isDatePicker "true"}} aria-label={{if @ariaLabel @ariaLabel (unless @ariaLabeledBy "Choose Date")}} aria-labelledby={{@ariaLabeledBy}} ...attributes id={{calendar.uniqueId}}>
20+
<Tag
21+
class="ember-power-calendar"
22+
role={{if @isDatePicker "dialog" "group"}}
23+
aria-modal={{if @isDatePicker "true"}}
24+
aria-label={{if
25+
@ariaLabel
26+
@ariaLabel
27+
(unless @ariaLabeledBy "Choose Date")
28+
}}
29+
aria-labelledby={{@ariaLabeledBy}}
30+
...attributes
31+
id={{calendar.uniqueId}}
32+
>
2133
{{#if (has-block)}}
2234
{{yield calendar}}
2335
{{else}}

‎ember-power-calendar/src/components/power-calendar/days.hbs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,15 @@
88
{{this.setup}}
99
...attributes
1010
>
11-
<div class="ember-power-calendar-row ember-power-calendar-weekdays" role="row">
11+
<div
12+
class="ember-power-calendar-row ember-power-calendar-weekdays"
13+
role="row"
14+
>
1215
{{#each this.weekdaysNames as |wdn|}}
13-
<div class="ember-power-calendar-weekday" role="columnheader">{{wdn}}</div>
16+
<div
17+
class="ember-power-calendar-weekday"
18+
role="columnheader"
19+
>{{wdn}}</div>
1420
{{/each}}
1521
</div>
1622
<div

0 commit comments

Comments
 (0)