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

Jump to bottom

Make it work with semantic v3 #840

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Make it work with semantic v3 #840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07d1c45
Make it work with Semantic-UI-React v3.
avsd Mar 21, 2023
3171461
Linting fixes
avsd Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
274 changes: 140 additions & 134 deletions src/components/calendar/calendar.tsx
View file
Open in desktop
@@ -1,6 +1,6 @@
import cn from 'classnames';
import React, { Fragment, SyntheticEvent, useEffect, useRef } from 'react';
import { Ref, Segment } from 'semantic-ui-react';
import * as SemanticUiReact from 'semantic-ui-react';
import { Locale, RenderProps, SemanticDatepickerProps } from 'types';
import { getShortDate, getToday } from '../../utils';
import Button from '../button';
Expand Down Expand Up @@ -78,147 +78,153 @@ const Calendar: React.FC<CalendarProps> = ({
}
});

return (
<Ref innerRef={rootRef}>
<Segment
{...rootProps}
inverted={inverted}
className={cn('clndr-calendars-segment', {
'clndr-floating': !inline,
[pointings[pointing]]: !inline,
})}
const calendarInstance = (
<SemanticUiReact.Segment
{...rootProps}
{...(SemanticUiReact.Ref ? {} : { ref: rootRef })}
inverted={inverted}
className={cn('clndr-calendars-segment', {
'clndr-floating': !inline,
[pointings[pointing]]: !inline,
})}
>
<div
className="clndr-calendars-wrapper"
style={{ '--n': calendars.length } as React.CSSProperties}
>
<div
className="clndr-calendars-wrapper"
style={{ '--n': calendars.length } as React.CSSProperties}
>
{calendars.map((calendar, calendarIdx) => (
<div key={`${calendar.year}-${calendar.month}`}>
<div className="clndr-control">
<div style={styles.leftBtn}>
{calendarIdx === 0 && (
<Fragment>
<Button
icon="angle double left"
inverted={inverted}
title={previousYear}
type="button"
{...getBackProps({
calendars,
'aria-label': previousYear,
offset: 12,
onClick: onPressBtn,
})}
/>
<Button
icon="angle left"
inverted={inverted}
style={{ marginRight: 0 }}
title={previousMonth}
type="button"
{...getBackProps({
calendars,
'aria-label': previousMonth,
onClick: onPressBtn,
})}
/>
</Fragment>
)}
</div>
{calendars.map((calendar, calendarIdx) => (
<div key={`${calendar.year}-${calendar.month}`}>
<div className="clndr-control">
<div style={styles.leftBtn}>
{calendarIdx === 0 && (
<Fragment>
<Button
icon="angle double left"
inverted={inverted}
title={previousYear}
type="button"
{...getBackProps({
calendars,
'aria-label': previousYear,
offset: 12,
onClick: onPressBtn,
})}
/>
<Button
icon="angle left"
inverted={inverted}
style={{ marginRight: 0 }}
title={previousMonth}
type="button"
{...getBackProps({
calendars,
'aria-label': previousMonth,
onClick: onPressBtn,
})}
/>
</Fragment>
)}
</div>

<span title={`${months[calendar.month]} ${calendar.year}`}>
{months[calendar.month].slice(0, 3)} {calendar.year}
</span>
<span title={`${months[calendar.month]} ${calendar.year}`}>
{months[calendar.month].slice(0, 3)} {calendar.year}
</span>

<div style={styles.rightBtn}>
{calendarIdx === calendars.length - 1 && (
<Fragment>
<Button
icon="angle right"
inverted={inverted}
title={nextMonth}
type="button"
{...getForwardProps({
calendars,
'aria-label': nextMonth,
onClick: onPressBtn,
})}
/>
<Button
icon="angle double right"
inverted={inverted}
style={{ marginRight: 0 }}
title={nextYear}
type="button"
{...getForwardProps({
calendars,
'aria-label': nextYear,
offset: 12,
onClick: onPressBtn,
})}
/>
</Fragment>
)}
</div>
<div style={styles.rightBtn}>
{calendarIdx === calendars.length - 1 && (
<Fragment>
<Button
icon="angle right"
inverted={inverted}
title={nextMonth}
type="button"
{...getForwardProps({
calendars,
'aria-label': nextMonth,
onClick: onPressBtn,
})}
/>
<Button
icon="angle double right"
inverted={inverted}
style={{ marginRight: 0 }}
title={nextYear}
type="button"
{...getForwardProps({
calendars,
'aria-label': nextYear,
offset: 12,
onClick: onPressBtn,
})}
/>
</Fragment>
)}
</div>
<div className="clndr-days">
{weekdays.map((weekday) => (
<CalendarCell
key={`${calendar.year}-${calendar.month}-${weekday}`}
inverted={inverted}
aria-label={weekday}
title={weekday}
>
{weekday.slice(0, 2)}
</CalendarCell>
))}
{calendar.weeks.map((week) =>
week.map((dateObj, weekIdx) => {
const key = `${calendar.year}-${calendar.month}-${weekIdx}`;
</div>
<div className="clndr-days">
{weekdays.map((weekday) => (
<CalendarCell
key={`${calendar.year}-${calendar.month}-${weekday}`}
inverted={inverted}
aria-label={weekday}
title={weekday}
>
{weekday.slice(0, 2)}
</CalendarCell>
))}
{calendar.weeks.map((week) =>
week.map((dateObj, weekIdx) => {
const key = `${calendar.year}-${calendar.month}-${weekIdx}`;

if (!dateObj) {
return <CalendarCell key={key} inverted={inverted} />;
}
if (!dateObj) {
return <CalendarCell key={key} inverted={inverted} />;
}

const selectable =
dateObj.selectable && filterDate(dateObj.date);
const shortDate = getShortDate(dateObj.date);
const selectable =
dateObj.selectable && filterDate(dateObj.date);
const shortDate = getShortDate(dateObj.date);

return (
<CalendarCell
key={key}
{...dateObj}
{...getDateProps({
dateObj: { ...dateObj, selectable },
onClick: onPressBtn,
})}
data-testid={`datepicker-cell-${shortDate}`}
inverted={inverted}
selectable={selectable}
>
{dateObj.date.getDate()}
</CalendarCell>
);
})
)}
</div>
return (
<CalendarCell
key={key}
{...dateObj}
{...getDateProps({
dateObj: { ...dateObj, selectable },
onClick: onPressBtn,
})}
data-testid={`datepicker-cell-${shortDate}`}
inverted={inverted}
selectable={selectable}
>
{dateObj.date.getDate()}
</CalendarCell>
);
})
)}
</div>
))}
</div>
{showToday ? (
<TodayButton
inverted={inverted}
{...getToday(minDate, maxDate)}
{...getDateProps({
dateObj: getToday(minDate, maxDate),
onClick: onPressBtn,
})}
>
{todayButton}
</TodayButton>
) : null}
</Segment>
</Ref>
</div>
))}
</div>
{showToday ? (
<TodayButton
inverted={inverted}
{...getToday(minDate, maxDate)}
{...getDateProps({
dateObj: getToday(minDate, maxDate),
onClick: onPressBtn,
})}
>
{todayButton}
</TodayButton>
) : null}
</SemanticUiReact.Segment>
);
return SemanticUiReact.Ref ? (
<SemanticUiReact.Ref innerRef={rootRef}>
{calendarInstance}
</SemanticUiReact.Ref>
) : (
calendarInstance
);
};

Expand Down
2 changes: 1 addition & 1 deletion stories/data.ts
View file
Open in desktop
Expand Up @@ -33,7 +33,7 @@ const locale = <const>[

function arrayToMap<T extends string>(
arr: readonly T[]
): { [key in typeof arr[number]]: typeof arr[number] } {
): { [key in (typeof arr)[number]]: (typeof arr)[number] } {
return arr.reduce(
(acc, cur) => ({ ...acc, [cur]: cur }),
{} as { [key in T]: T }
Expand Down