Merge pull request #825 from ajnart/fix-calendar

🐛 Fix Calendar
This commit is contained in:
Thomas Camlong
2023-04-17 17:02:12 +09:00
committed by GitHub
3 changed files with 41 additions and 38 deletions

View File

@@ -70,7 +70,7 @@ export const WidgetsMenu = ({ integration, widget }: WidgetsMenuProps) => {
// Cast as the right type for the correct widget // Cast as the right type for the correct widget
widgetOptions: widgetDefinitionObject.options as any, widgetOptions: widgetDefinitionObject.options as any,
}, },
zIndex: 5, zIndex: 250,
}); });
}; };

View File

@@ -70,7 +70,7 @@ const DayIndicator = ({ color, medias, children, position }: DayIndicatorProps)
if (medias.length === 0) return children; if (medias.length === 0) return children;
return ( return (
<Indicator size={10} withBorder offset={5} color={color} position={position}> <Indicator size={10} withBorder offset={-5} color={color} position={position}>
{children} {children}
</Indicator> </Indicator>
); );

View File

@@ -65,7 +65,6 @@ function CalendarTile({ widget }: CalendarTileProps) {
}); });
return ( return (
<Group grow style={{ height: '100%' }}>
<Calendar <Calendar
defaultDate={new Date()} defaultDate={new Date()}
onPreviousMonth={setMonth} onPreviousMonth={setMonth}
@@ -74,11 +73,19 @@ function CalendarTile({ widget }: CalendarTileProps) {
locale={i18n?.resolvedLanguage ?? 'en'} locale={i18n?.resolvedLanguage ?? 'en'}
firstDayOfWeek={widget.properties.sundayStart ? 0 : 1} firstDayOfWeek={widget.properties.sundayStart ? 0 : 1}
hideWeekdays hideWeekdays
style={{ position: 'relative', top: -10 }}
date={month} date={month}
maxLevel="month"
hasNextLevel={false} hasNextLevel={false}
styles={{ styles={{
calendarHeader: {
maxWidth: 'inherit',
},
calendar: { calendar: {
height: '100%', height: '100%',
display: 'flex',
flexDirection: 'column',
width: '100%',
}, },
monthLevelGroup: { monthLevelGroup: {
height: '100%', height: '100%',
@@ -92,15 +99,11 @@ function CalendarTile({ widget }: CalendarTileProps) {
month: { month: {
flex: 1, flex: 1,
}, },
calendarHeader: {
maxWidth: 'inherit',
},
}} }}
renderDay={(date) => ( renderDay={(date) => (
<CalendarDay date={date} medias={getReleasedMediasForDate(medias, date, widget)} /> <CalendarDay date={date} medias={getReleasedMediasForDate(medias, date, widget)} />
)} )}
/> />
</Group>
); );
} }