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
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;
return (
<Indicator size={10} withBorder offset={5} color={color} position={position}>
<Indicator size={10} withBorder offset={-5} color={color} position={position}>
{children}
</Indicator>
);

View File

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