changes from review

actualbudget · Nov 18, 2024 · 7cdbbe8 · 7cdbbe8
1 parent de725e3
commit 7cdbbe8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/packages/desktop-client/src/components/reports/graphs/CalendarGraph.tsx b/packages/desktop-client/src/components/reports/graphs/CalendarGraph.tsx
@@ -121,8 +121,7 @@ export function CalendarGraph({
                 <View>
                   <View style={{ marginBottom: 10 }}>
                     <strong>
-                      {t('Day:') + ' '}
-                      {format(day.date, 'dd')}
+                      {format(day.date, 'MMM dd')}
                     </strong>
                   </View>
                   <View style={{ lineHeight: 1.5 }}>

diff --git a/packages/desktop-client/src/components/reports/reports/CalendarCard.tsx b/packages/desktop-client/src/components/reports/reports/CalendarCard.tsx
@@ -262,7 +262,13 @@ export function CalendarCard({
             height: '100%',
             margin: 6,
             overflowX:
-              isNarrowWidth && cardOrientation === 'row' ? 'auto' : 'hidden',
+              cardOrientation === 'row'
+                ? isNarrowWidth
+                  ? 'auto'
+                  : data?.calendarData.length > 6
+                    ? 'auto'
+                    : 'hidden'
+                : 'hidden',
             ...styles.horizontalScrollbar,
           }}
         >
@@ -275,8 +281,12 @@ export function CalendarCard({
               textAlign: 'left',
               marginBottom: isNarrowWidth ? 4 : 0,
               width:
-                isNarrowWidth && cardOrientation === 'row' && data?.calendarData
-                  ? `${data.calendarData.length * 100}%`
+                cardOrientation === 'row'
+                  ? isNarrowWidth
+                    ? `${data?.calendarData.length * 100}%`
+                    : data?.calendarData.length > 6
+                      ? `${100 + ((data?.calendarData.length - 6) % 6) * 17}%`
+                      : 'auto'
                   : 'auto',
             }}
           >