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

fix: bump multi-calendar library #1615

Merged
merged 2 commits into from
Oct 4, 2024
+18 −9
Merged

fix: bump multi-calendar library #1615

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
20c6315
fix: bump ui library
kabaros Oct 3, 2024
2f77711
fix: failing test
kabaros Oct 4, 2024
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
2 changes: 1 addition & 1 deletion components/calendar/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@dhis2-ui/input": "9.12.0-alpha.4",
"@dhis2-ui/layer": "9.12.0-alpha.4",
"@dhis2-ui/popper": "9.12.0-alpha.4",
"@dhis2/multi-calendar-dates": "1.3.0",
"@dhis2/multi-calendar-dates": "2.0.0-alpha.1",
"@dhis2/prop-types": "^3.1.2",
"@dhis2/ui-constants": "9.12.0-alpha.4",
"@dhis2/ui-icons": "9.12.0-alpha.4",
Expand Down
2 changes: 1 addition & 1 deletion components/calendar/src/calendar-input/calendar-input.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ CalendarInput.defaultProps = {
CalendarInput.propTypes = {
/** the calendar to use such gregory, ethiopic, nepali - full supported list here: https://github.com/dhis2/multi-calendar-dates/blob/main/src/constants/calendars.ts */
calendar: PropTypes.any.isRequired,
/** Called with signature `(null)` \|\| `({ dateCalendarString: string, dateCalendar: Temporal.ZonedDateTime })` with `dateCalendarString` being the stringified date in the specified calendar in the format `yyyy-MM-dd` */
/** Called with signature `(null)` \|\| `({ dateCalendarString: string })` with `dateCalendarString` being the stringified date in the specified calendar in the format `yyyy-MM-dd` */
onDateSelect: PropTypes.func.isRequired,
/** the size of a single cell in the table forming the calendar */
cellSize: PropTypes.string,
Expand Down
6 changes: 3 additions & 3 deletions components/calendar/src/calendar/calendar-table-cell.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ export const CalendarTableCell = ({
const selectedDayBackgroundColor = colors.teal700

return (
<td data-test={day?.calendarDate} onClick={day.onClick}>
<td data-test={day?.dateValue} onClick={day.onClick}>
<button
name="day"
className={cx('day', {
isSelected: selectedDate === day?.calendarDate,
isSelected: selectedDate === day?.dateValue,
isToday: day.isToday,
otherMonth: !day.isInCurrentMonth,
})}
Expand Down Expand Up @@ -92,7 +92,7 @@ export const CalendarTableCell = ({
CalendarTableCell.propTypes = {
cellSize: PropTypes.string,
day: PropTypes.shape({
calendarDate: PropTypes.string,
dateValue: PropTypes.string,
isInCurrentMonth: PropTypes.bool,
isSelected: PropTypes.bool,
isToday: PropTypes.bool,
Expand Down
2 changes: 1 addition & 1 deletion components/calendar/src/calendar/calendar-table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const CalendarTable = ({
<CalendarTableCell
selectedDate={selectedDate}
day={day}
key={day?.calendarDate}
key={day?.dateValue}
cellSize={cellSize}
width={width}
unfocusable={unfocusable}
Expand Down
2 changes: 1 addition & 1 deletion components/calendar/src/calendar/calendar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Calendar.defaultProps = {
export const CalendarProps = {
/** the calendar to use such gregory, ethiopic, nepali - full supported list here: https://github.com/dhis2/multi-calendar-dates/blob/main/src/constants/calendars.ts */
calendar: PropTypes.any.isRequired,
/** Called with signature `(null)` \|\| `({ dateCalendarString: string, dateCalendar: Temporal.ZonedDateTime })` with `dateCalendarString` being the stringified date in the specified calendar in the format `yyyy-MM-dd` */
/** Called with signature `(null)` \|\| `({ dateCalendarString: string })` with `dateCalendarString` being the stringified date in the specified calendar in the format `yyyy-MM-dd` */
onDateSelect: PropTypes.func.isRequired,
/** the size of a single cell in the table forming the calendar */
cellSize: PropTypes.string,
Expand Down
2 changes: 1 addition & 1 deletion components/calendar/types/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export interface CalendarProps {
*/
calendar: CalendarPickerOptions['calendar']
/**
* Called with signature `(null)` \|\| `({ dateCalendarString: string, dateCalendar: Temporal.ZonedDateTime })` with `dateCalendarString` being the stringified date in the specified calendar in the format `yyyy-MM-dd`
* Called with signature `(null)` \|\| `({ dateCalendarString: string })` with `dateCalendarString` being the stringified date in the specified calendar in the format `yyyy-MM-dd`
*/
onDateSelect: CalendarPickerParam['onDateSelect']
/**
Expand Down
11 changes: 10 additions & 1 deletion yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2707,7 +2707,16 @@
i18next "^10.3"
moment "^2.24.0"

"@dhis2/[email protected]", "@dhis2/multi-calendar-dates@^1.2.3":
"@dhis2/[email protected]":
version "2.0.0-alpha.1"
resolved "https://registry.yarnpkg.com/@dhis2/multi-calendar-dates/-/multi-calendar-dates-2.0.0-alpha.1.tgz#5ae801160c044b1488704dcc13f6a4cc8cccb3e4"
integrity sha512-fPZ8E5ioAXPxfVQstkDOyyzBhbS5XxIUS/iUwaZxCU6Opw4CXVMBeABwQX7Y+ySTpPqGkTUYmnjhOwMlVapSng==
dependencies:
"@dhis2/d2-i18n" "^1.1.3"
"@js-temporal/polyfill" "0.4.3"
classnames "^2.3.2"

"@dhis2/multi-calendar-dates@^1.2.3":
version "1.3.0"
resolved "https://registry.yarnpkg.com/@dhis2/multi-calendar-dates/-/multi-calendar-dates-1.3.0.tgz#8e8943369662167b768cdaaba0a8f147875be50d"
integrity sha512-7NlKPX+UQ+HSta0Q2SJt6RfrKLxRTX9OIMcvtUouNXfVXuS+6xVxQc4Qil+1zcIT272y7NbUmC4Z7UE/cLI9tw==
Expand Down
Loading