From a789d585e4b7dd096fd8a06f67294f9e215028a5 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 14 Apr 2021 13:04:55 +0200
Subject: [PATCH 1/3] Fix scrollbar issues in calendar

---
 www/calendar/app-calendar.less | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/www/calendar/app-calendar.less b/www/calendar/app-calendar.less
index bc0f47a48..ccb4564ab 100644
--- a/www/calendar/app-calendar.less
+++ b/www/calendar/app-calendar.less
@@ -24,6 +24,23 @@
         .tui-full-calendar-layout {
             background-color: @cp_sidebar-right-bg !important;
             color: @cryptpad_text_col;
+            display: flex;
+            flex-flow: column;
+            .tui-full-calendar-week-container {
+                min-height: 0;
+                display: flex;
+                flex-flow: column;
+                .tui-full-calendar-vlayout-area {
+                    display: flex;
+                    flex-flow: column;
+                    flex: 1;
+                    min-height: 0;
+                    & > div:last-child {
+                        flex: 1;
+                        min-height: 0;
+                    }
+                }
+            }
             .tui-full-calendar-month {
                 .tui-full-calendar-weekday-schedule-time .tui-full-calendar-weekday-schedule-title {
                     color: @cryptpad_text_col !important; // XXX

From e6fba318845f74d89fed5209e20cf1d58559510d Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 14 Apr 2021 15:18:05 +0200
Subject: [PATCH 2/3] Close calendar popup with Esc

---
 www/calendar/inner.js        | 6 ++++++
 www/common/outer/calendar.js | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/www/calendar/inner.js b/www/calendar/inner.js
index 6b9f95685..0a0ca209b 100644
--- a/www/calendar/inner.js
+++ b/www/calendar/inner.js
@@ -733,6 +733,12 @@ Messages.calendar_allDay = "All day";
             });
         });
 
+        $('body').on('keydown', function (e) {
+            if (e.which === 27) {
+                $('.tui-full-calendar-floating-layer').hide();
+            }
+        });
+
         updateDateRange();
 
         renderCalendar();
diff --git a/www/common/outer/calendar.js b/www/common/outer/calendar.js
index bedf74676..b9f25462c 100644
--- a/www/common/outer/calendar.js
+++ b/www/common/outer/calendar.js
@@ -138,7 +138,6 @@ ctx.calendars[channel] = {
         var teamId = cfg.storeId;
         var data = cfg.data;
         var channel = data.channel;
-        console.error(cfg);
         if (!channel) { return; }
 
         var c = ctx.calendars[channel];

From dfff667a6e0f47f9db18a7d7e86dd36177b01b8a Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 14 Apr 2021 15:51:36 +0200
Subject: [PATCH 3/3] Add tab title to calendar

---
 www/calendar/inner.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/www/calendar/inner.js b/www/calendar/inner.js
index 0a0ca209b..f74f3cfaf 100644
--- a/www/calendar/inner.js
+++ b/www/calendar/inner.js
@@ -846,6 +846,8 @@ Messages.calendar_allDay = "All day";
         var privateData = metadataMgr.getPrivateData();
         var user = metadataMgr.getUserData();
 
+        common.setTabTitle(Messages.calendar);
+
         // Fix flatpickr selection
         var MutationObserver = window.MutationObserver;
         var onFlatPickr = function (el) {