From aa1dddc7ba1d1016945547f1abcac2b8891f6b50 Mon Sep 17 00:00:00 2001
From: Camille Moussu <66134347+Eriikah@users.noreply.github.com>
Date: Tue, 21 Oct 2025 12:16:30 +0200
Subject: [PATCH] Month view Revamp (#221)

Co-authored-by: Camille Moussu <cmoussu@linagora.com>
---
 src/components/Calendar/CustomCalendar.styl   | 94 ++++++++++++++++++-
 .../Calendar/handlers/viewHandlers.ts         | 84 ++++++++++++++---
 2 files changed, 162 insertions(+), 16 deletions(-)

diff --git a/src/components/Calendar/CustomCalendar.styl b/src/components/Calendar/CustomCalendar.styl
index 0a53be7..16dcdf4 100644
--- a/src/components/Calendar/CustomCalendar.styl
+++ b/src/components/Calendar/CustomCalendar.styl
@@ -40,9 +40,23 @@ span.fc-daygrid-day-number
   line-height 36px
   position relative
   width 48px
-  height 48px
   line-height 39px
 
+.fc-daygrid-day-frame .fc-daygrid-day-top .fc-daygrid-day-number
+  font-family Inter
+  font-size 12px
+  font-weight 500
+  line-height 16px
+  width 100%
+  text-align  center
+  padding 0
+
+.fc-daygrid-day-frame span.fc-daygrid-day-number:after
+  width 25px
+  height 25px
+  top -6px
+  left -6px
+
 .fc-daygrid-day-top .fc-daygrid-day-number:after,
 span.fc-daygrid-day-number:after
   content ""
@@ -195,6 +209,9 @@ tr:has(> td.fc-timegrid-divider.fc-cell-shaded)
 .fc .fc-scrollgrid-section td .fc-daygrid-day-frame
   border-bottom 1px solid #b8c1cc
 
+.fc-dayGridMonth-view .fc-scrollgrid-section td .fc-daygrid-day-frame
+    border-bottom none
+
 th.fc-col-header-cell.fc-day
   cursor pointer
 
@@ -231,3 +248,78 @@ tbody > tr.fc-scrollgrid-section:first-of-type .fc-scroller
 
 .fc .fc-timegrid-slot-minor 
   border-top-style: none
+
+/* FullCalendar "more" popover restyle */
+
+.fc-daygrid-day-events
+  display: flex
+  flex-direction: column
+  height 70%
+
+.fc-daygrid-day-bottom
+  position absolute
+  bottom 0
+  font-weight 500
+  font-size 12px
+  line-height 16px
+  letter-spacing 0.5px
+  color #6D7885
+
+.fc-more-popover
+  z-index 700 !important
+  border-radius 4px
+  background #fff
+  overflow hidden
+  font-family Inter
+  width 244px
+
+  .fc-popover-header
+    background #FCFCFC
+    justify-content space-between
+    width 244px
+    height 40px
+    padding 12px
+
+    .fc-popover-title
+      font-family Inter
+      font-weight 500
+      font-size 14px
+      color #243B55
+      line-height 20px
+      letter-spacing 0.1px
+
+    .fc-popover-close
+      color #605D62
+
+  .fc-popover-body
+    max-height 208px
+    overflow auto
+    padding 0 !important
+
+    .fc-more-popover-misc
+      height 0 !important
+      margin 0 !important
+      padding 0 !important
+    .fc-daygrid-event 
+      &:hover
+        background #f7f7f8
+      div
+        display flex
+        align-items center
+        padding 4px 6px 4px 12px
+        border-radius 8px
+        color #1C1B1F!important
+        background-color transparent!important
+        border none
+        color #334155
+        font-size 14px
+        font-weight 400
+        line-height 20px
+        letter-spacing 0.25px
+        vertical-align middle
+        transition background 0.15s ease, color 0.15s ease
+
+        span
+          white-space nowrap
+          overflow hidden
+          text-overflow ellipsis
diff --git a/src/components/Calendar/handlers/viewHandlers.ts b/src/components/Calendar/handlers/viewHandlers.ts
index 544c8ca..1a27a6d 100644
--- a/src/components/Calendar/handlers/viewHandlers.ts
+++ b/src/components/Calendar/handlers/viewHandlers.ts
@@ -158,21 +158,13 @@ export const createViewHandlers = (props: ViewHandlersProps) => {
           break;
       }
 
-      return React.createElement(
-        "div",
-        { style: { display: "flex", alignItems: "center" } },
-        isPrivate &&
-          React.createElement(LockIcon, {
-            "data-testid": "lock-icon",
-            fontSize: "small",
-            style: { marginRight: "4px" },
-          }),
-        Icon &&
-          React.createElement(Icon, {
-            fontSize: "small",
-            style: { marginRight: "4px" },
-          }),
-        React.createElement("span", { style: titleStyle }, event.title)
+      return RenderEventTitle(
+        titleStyle,
+        isPrivate,
+        Icon,
+        arg,
+        event,
+        calendar
       );
     } catch (e) {
       const message =
@@ -234,3 +226,65 @@ export const createViewHandlers = (props: ViewHandlersProps) => {
     handleEventDidMount,
   };
 };
+
+function RenderEventTitle(
+  titleStyle: React.CSSProperties,
+  isPrivate: boolean,
+  Icon: any,
+  arg: any,
+  event: any,
+  calendar: Calendars
+): React.ReactNode {
+  const isMonthView = arg.view.type === "dayGridMonth";
+  const startTime = event._instance.range.start.toLocaleTimeString(undefined, {
+    hour: "2-digit",
+    minute: "2-digit",
+  });
+
+  const icons: React.ReactNode[] = [];
+  if (isPrivate) {
+    icons.push(
+      React.createElement(LockIcon, {
+        "data-testid": "lock-icon",
+        fontSize: "small",
+        style: { marginRight: "4px" },
+      })
+    );
+  }
+  if (Icon) {
+    icons.push(
+      React.createElement(Icon, {
+        fontSize: "small",
+        style: { marginRight: "4px" },
+      })
+    );
+  }
+
+  const containerStyle: React.CSSProperties = isMonthView
+    ? {
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "center",
+        backgroundColor: calendar.color,
+        color: "white",
+        borderRadius: "4px",
+        border: "1px",
+        width: "100%",
+      }
+    : {
+        display: "flex",
+        alignItems: "center",
+      };
+
+  const contentText =
+    isMonthView && !event._def.extendedProps.allday
+      ? `${startTime} ${event.title}`
+      : event.title;
+
+  return React.createElement(
+    "div",
+    { style: containerStyle },
+    ...icons,
+    React.createElement("span", { style: titleStyle }, contentText)
+  );
+}