From 0dd2fe3d72f539a5973db4c52ab11a526f57c2cd Mon Sep 17 00:00:00 2001
From: Alexander Platov <sas_lord@mail.ru>
Date: Mon, 21 Aug 2023 09:35:53 +0300
Subject: [PATCH] Team Calendar UI fixes (#3609)

Signed-off-by: Alexander Platov <sas_lord@mail.ru>
---
 packages/theme/styles/_layouts.scss           |   1 +
 packages/theme/styles/button.scss             |  10 +-
 .../src/components/DayCalendar.svelte         | 377 +++++++++---------
 3 files changed, 195 insertions(+), 193 deletions(-)

diff --git a/packages/theme/styles/_layouts.scss b/packages/theme/styles/_layouts.scss
index b394a669ce..5c2b32fdd9 100644
--- a/packages/theme/styles/_layouts.scss
+++ b/packages/theme/styles/_layouts.scss
@@ -511,6 +511,7 @@ input.search {
 .mx-4 { margin: 0 1rem; }
 .mx-10 { margin: 0 2.5rem; }
 .mx-auto { margin: 0 auto; }
+.my-1 { margin: .25rem 0; }
 .my-2 { margin: .5rem 0; }
 .my-3 { margin: .75rem 0; }
 .my-4 { margin: 1rem 0; }
diff --git a/packages/theme/styles/button.scss b/packages/theme/styles/button.scss
index a74a1823e8..eed24f9beb 100644
--- a/packages/theme/styles/button.scss
+++ b/packages/theme/styles/button.scss
@@ -105,8 +105,10 @@
     }
     &:disabled { background-color: var(--theme-button-disabled); }
     &.selected {
-      background-color: var(--theme-button-hovered);
-      .btn-icon { color: var(--theme-caption-color); }
+      color: var(--theme-button-contrast-color);
+      background-color: var(--theme-accent-color);
+      .btn-icon { color: var(--theme-button-contrast-color); }
+      &:hover { color: var(--theme-button-contrast-color); }
     }
   }
   &.no-border {
@@ -196,10 +198,6 @@
   }
   &.regular, &.ghost {
     &:hover, &:active, &:focus { color: var(--theme-caption-color); }
-    &.selected {
-      color: var(--theme-button-contrast-color);
-      background-color: var(--theme-accent-color);
-    }
   }
   &.accented,
   &.brand,
diff --git a/plugins/calendar-resources/src/components/DayCalendar.svelte b/plugins/calendar-resources/src/components/DayCalendar.svelte
index 92add6af54..b85b91c546 100644
--- a/plugins/calendar-resources/src/components/DayCalendar.svelte
+++ b/plugins/calendar-resources/src/components/DayCalendar.svelte
@@ -181,10 +181,10 @@
         const index = grid[event.day].columns.findIndex(
           (col) => col.elements[col.elements.length - 1].dueDate <= event.date
         )
+        const intersects = grid[event.day].columns.filter((col) =>
+          checkIntersect(col.elements[col.elements.length - 1], event)
+        )
         if (index === -1) {
-          const intersects = grid[event.day].columns.filter((col) =>
-            checkIntersect(col.elements[col.elements.length - 1], event)
-          )
           const size = intersects.length + 1
           grid[event.day].columns.forEach((col) => {
             if (checkIntersect(col.elements[col.elements.length - 1], event)) {
@@ -195,9 +195,6 @@
             elements: [{ id: event._id, date: event.date, dueDate: event.dueDate, cols: size }]
           })
         } else {
-          const intersects = grid[event.day].columns.filter((col) =>
-            checkIntersect(col.elements[col.elements.length - 1], event)
-          )
           let maxCols = 1
           intersects.forEach((col) => {
             if (col.elements[col.elements.length - 1].cols > maxCols) {
@@ -454,47 +451,75 @@
   bind:divScroll={scroller}
   fade={{ multipler: { top: (showHeader ? 3.5 : 0) + styleAD / fontSize, bottom: 0 } }}
 >
-  <div
-    bind:this={container}
-    class="calendar-container"
-    style:--calendar-ad-height={styleAD + 'px'}
-    style:grid={`${showHeader ? '[header] 3.5rem ' : ''}[all-day] ${styleAD}px repeat(${
-      (displayedHours - startHour) * 2
-    }, [row-start] 2rem) / [time-col] 3.5rem repeat(${displayedDaysCount}, [col-start] 1fr)`}
-    use:resizeObserver={(element) => checkSizes(element)}
-  >
-    {#if showHeader}
-      <div class="sticky-header head center"><span class="zone">{getTimeZone()}</span></div>
-      {#each [...Array(displayedDaysCount).keys()] as dayOfWeek}
-        {@const day = getDay(weekMonday, dayOfWeek)}
-        <div class="sticky-header head title" class:center={displayedDaysCount > 1}>
-          <span class="day" class:today={areDatesEqual(todayDate, day)}>{day.getDate()}</span>
-          <span class="weekday">{getWeekDayName(day, weekFormat)}</span>
-        </div>
-      {/each}
-    {/if}
-
-    <div class="sticky-header allday-header text-sm content-dark-color" class:top={!showHeader}>
-      <Label label={calendar.string.AllDay} />
-      {#if (!minimizedAD && adMaxRow > maxAD) || (minimizedAD && adMaxRow > minAD)}
-        <ActionIcon
-          icon={shownAD ? IconUpOutline : IconDownOutline}
-          size={'small'}
-          action={() => {
-            shownAD = !shownAD
-          }}
-        />
-      {/if}
-    </div>
+  {#key newEvents}
     <div
-      class="sticky-header allday-container"
-      class:top={!showHeader}
-      style:grid-column={`col-start 1 / span ${displayedDaysCount}`}
+      bind:this={container}
+      class="calendar-container"
+      style:--calendar-ad-height={styleAD + 'px'}
+      style:grid={`${showHeader ? '[header] 3.5rem ' : ''}[all-day] ${styleAD}px repeat(${
+        (displayedHours - startHour) * 2
+      }, [row-start] 2rem) / [time-col] 3.5rem repeat(${displayedDaysCount}, [col-start] 1fr)`}
+      use:resizeObserver={(element) => checkSizes(element)}
     >
-      {#if shownHeightAD > maxHeightAD && shownAD}
-        <Scroller noFade={false}>
+      {#if showHeader}
+        <div class="sticky-header head center"><span class="zone">{getTimeZone()}</span></div>
+        {#each [...Array(displayedDaysCount).keys()] as dayOfWeek}
+          {@const day = getDay(weekMonday, dayOfWeek)}
+          <div class="sticky-header head title" class:center={displayedDaysCount > 1}>
+            <span class="day" class:today={areDatesEqual(todayDate, day)}>{day.getDate()}</span>
+            <span class="weekday">{getWeekDayName(day, weekFormat)}</span>
+          </div>
+        {/each}
+      {/if}
+
+      <div class="sticky-header allday-header text-sm content-dark-color" class:top={!showHeader}>
+        <Label label={calendar.string.AllDay} />
+        {#if (!minimizedAD && adMaxRow > maxAD) || (minimizedAD && adMaxRow > minAD)}
+          <ActionIcon
+            icon={shownAD ? IconUpOutline : IconDownOutline}
+            size={'small'}
+            action={() => {
+              shownAD = !shownAD
+            }}
+          />
+        {/if}
+      </div>
+      <div
+        class="sticky-header allday-container"
+        class:top={!showHeader}
+        style:grid-column={`col-start 1 / span ${displayedDaysCount}`}
+      >
+        {#if shownHeightAD > maxHeightAD && shownAD}
+          <Scroller noFade={false}>
+            {#key [styleAD, calendarWidth, displayedDaysCount, showHeader]}
+              <div style:min-height={`${shownHeightAD - cellBorder * 2}px`} />
+              {#each alldays as event, i}
+                {@const rect = getADRect(event._id)}
+                {@const ev = events.find((p) => p._id === event._id)}
+                {#if ev}
+                  <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
+                  <div
+                    class="calendar-element"
+                    style:top={`${rect.top}px`}
+                    style:height={`${rect.height}px`}
+                    style:left={`${rect.left}px`}
+                    style:width={`${rect.width}px`}
+                    style:opacity={rect.visibility === 0 ? 0.4 : 1}
+                    style:--mask-image={getMask(rect.visibility)}
+                    tabindex={500 + i}
+                  >
+                    <EventElement
+                      hourHeight={cellHeight}
+                      event={ev}
+                      size={{ width: rect.width, height: rect.height }}
+                    />
+                  </div>
+                {/if}
+              {/each}
+            {/key}
+          </Scroller>
+        {:else if shownAD}
           {#key [styleAD, calendarWidth, displayedDaysCount, showHeader]}
-            <div style:min-height={`${shownHeightAD - cellBorder * 2}px`} />
             {#each alldays as event, i}
               {@const rect = getADRect(event._id)}
               {@const ev = events.find((p) => p._id === event._id)}
@@ -515,157 +540,135 @@
               {/if}
             {/each}
           {/key}
-        </Scroller>
-      {:else if shownAD}
-        {#key [styleAD, calendarWidth, displayedDaysCount, showHeader]}
-          {#each alldays as event, i}
-            {@const rect = getADRect(event._id)}
-            {@const ev = events.find((p) => p._id === event._id)}
-            {#if ev}
-              <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
-              <div
-                class="calendar-element"
-                style:top={`${rect.top}px`}
-                style:height={`${rect.height}px`}
-                style:left={`${rect.left}px`}
-                style:width={`${rect.width}px`}
-                style:opacity={rect.visibility === 0 ? 0.4 : 1}
-                style:--mask-image={getMask(rect.visibility)}
-                tabindex={500 + i}
-              >
-                <EventElement hourHeight={cellHeight} event={ev} size={{ width: rect.width, height: rect.height }} />
-              </div>
-            {/if}
-          {/each}
-        {/key}
-      {:else}
-        {#key [styleAD, calendarWidth, displayedDaysCount, showHeader]}
-          {#each shortAlldays as event, i}
-            {@const rect = getADRect(event.id, event.day, event.fixRow)}
-            {@const ev = events.find((p) => p._id === event.id)}
-            {#if ev}
-              <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
-              <div
-                class="calendar-element"
-                style:top={`${rect.top}px`}
-                style:height={`${rect.height}px`}
-                style:left={`${rect.left}px`}
-                style:width={`${rect.width}px`}
-                style:opacity={rect.visibility === 0 ? 0.4 : 1}
-                style:--mask-image={getMask(rect.visibility)}
-                tabindex={500 + i}
-              >
-                <EventElement hourHeight={cellHeight} event={ev} size={{ width: rect.width, height: rect.height }} />
-              </div>
-            {/if}
-          {/each}
-          {#each moreCounts as more, day}
-            {@const addon = shortAlldays.length}
-            {#if more !== 0}
-              {@const rect = getMore(day)}
-              <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
-              <!-- svelte-ignore a11y-click-events-have-key-events -->
-              <div
-                class="calendar-element antiButton ghost medium accent cursor-pointer"
-                style:top={`${rect.top}px`}
-                style:height={`${heightAD}rem`}
-                style:left={`${rect.left}px`}
-                style:width={`${rect.width}px`}
-                style:padding-left={'1.25rem'}
-                style:--mask-image={'none'}
-                tabindex={500 + addon + day}
-                on:click={() => (shownAD = true)}
-              >
-                <Label label={ui.string.MoreCount} params={{ count: more }} />
-              </div>
-            {/if}
-          {/each}
-        {/key}
-      {/if}
-    </div>
-
-    {#each [...Array(displayedHours - startHour).keys()] as hourOfDay}
-      {#if hourOfDay === 0}
-        {#if showHeader}
-          <div class="clear-cell" />
         {:else}
-          <div class="sticky-header head center zm"><span class="zone mini">{getTimeZone()}</span></div>
+          {#key [styleAD, calendarWidth, displayedDaysCount, showHeader]}
+            {#each shortAlldays as event, i}
+              {@const rect = getADRect(event.id, event.day, event.fixRow)}
+              {@const ev = events.find((p) => p._id === event.id)}
+              {#if ev}
+                <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
+                <div
+                  class="calendar-element"
+                  style:top={`${rect.top}px`}
+                  style:height={`${rect.height}px`}
+                  style:left={`${rect.left}px`}
+                  style:width={`${rect.width}px`}
+                  style:opacity={rect.visibility === 0 ? 0.4 : 1}
+                  style:--mask-image={getMask(rect.visibility)}
+                  tabindex={500 + i}
+                >
+                  <EventElement hourHeight={cellHeight} event={ev} size={{ width: rect.width, height: rect.height }} />
+                </div>
+              {/if}
+            {/each}
+            {#each moreCounts as more, day}
+              {@const addon = shortAlldays.length}
+              {#if more !== 0}
+                {@const rect = getMore(day)}
+                <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
+                <!-- svelte-ignore a11y-click-events-have-key-events -->
+                <div
+                  class="calendar-element antiButton ghost medium accent cursor-pointer"
+                  style:top={`${rect.top}px`}
+                  style:height={`${heightAD}rem`}
+                  style:left={`${rect.left}px`}
+                  style:width={`${rect.width}px`}
+                  style:padding-left={'1.25rem'}
+                  style:--mask-image={'none'}
+                  tabindex={500 + addon + day}
+                  on:click={() => (shownAD = true)}
+                >
+                  <Label label={ui.string.MoreCount} params={{ count: more }} />
+                </div>
+              {/if}
+            {/each}
+          {/key}
         {/if}
-      {:else if hourOfDay < displayedHours - startHour}
-        <div
-          class="time-cell"
-          style:grid-column={'time-col 1 / col-start 1'}
-          style:grid-row={`row-start ${hourOfDay * 2} / row-start ${hourOfDay * 2 + 2}`}
-        >
-          {getTimeFormat(hourOfDay + startHour)}
-        </div>
-      {/if}
-      {#each [...Array(displayedDaysCount).keys()] as dayOfWeek}
-        {@const day = getDay(weekMonday, dayOfWeek)}
-        <!-- svelte-ignore a11y-click-events-have-key-events -->
-        <div
-          class="empty-cell"
-          style:width={`${colWidth}px`}
-          style:grid-column={`col-start ${dayOfWeek + 1} / ${dayOfWeek + 2}`}
-          style:grid-row={`row-start ${hourOfDay * 2 + 1} / row-start ${hourOfDay * 2 + 3}`}
-          on:dragenter={(e) => {
-            dispatch('dragenter', {
-              date: new Date(day.setHours(hourOfDay + startHour, 0, 0, 0))
-            })
-          }}
-          on:drop|preventDefault={(e) => {
-            dispatch('drop', {
-              day,
-              hour: hourOfDay + startHour,
-              date: new Date(day.setHours(hourOfDay + startHour, 0, 0, 0))
-            })
-          }}
-          on:click|stopPropagation={() => {
-            dispatch('create', {
-              date: new Date(day.setHours(hourOfDay + startHour, 0, 0, 0)),
-              withTime: true
-            })
-          }}
-        />
-      {/each}
-      {#if hourOfDay === displayedHours - startHour - 1}<div class="clear-cell" />{/if}
-    {/each}
+      </div>
 
-    {#key [styleAD, calendarWidth, displayedDaysCount, showHeader]}
-      {#each newEvents.filter((ev) => !ev.allDay) as event, i}
-        {@const rect = getRect(event)}
-        {@const ev = events.find((p) => p._id === event._id)}
-        {#if ev}
-          <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
+      {#each [...Array(displayedHours - startHour).keys()] as hourOfDay}
+        {#if hourOfDay === 0}
+          {#if showHeader}
+            <div class="clear-cell" />
+          {:else}
+            <div class="sticky-header head center zm"><span class="zone mini">{getTimeZone()}</span></div>
+          {/if}
+        {:else if hourOfDay < displayedHours - startHour}
           <div
-            class="calendar-element"
-            style:top={`${rect.top}px`}
-            style:bottom={`${rect.bottom}px`}
-            style:left={`${rect.left}px`}
-            style:right={`${rect.right}px`}
-            style:opacity={rect.visibility === 0 ? 0.4 : 1}
-            style:--mask-image={'none'}
-            tabindex={1000 + i}
+            class="time-cell"
+            style:grid-column={'time-col 1 / col-start 1'}
+            style:grid-row={`row-start ${hourOfDay * 2} / row-start ${hourOfDay * 2 + 2}`}
           >
-            <EventElement
-              event={ev}
-              hourHeight={cellHeight}
-              size={{
-                width: rect.width,
-                height: (calendarRect?.height ?? rect.top + rect.bottom) - rect.top - rect.bottom
-              }}
-              on:drop={(e) => {
-                dispatch('drop', {
-                  date: new Date(event.date)
-                })
-              }}
-              on:resize={() => (events = events)}
-            />
+            {getTimeFormat(hourOfDay + startHour)}
           </div>
         {/if}
+        {#each [...Array(displayedDaysCount).keys()] as dayOfWeek}
+          {@const day = getDay(weekMonday, dayOfWeek)}
+          <!-- svelte-ignore a11y-click-events-have-key-events -->
+          <div
+            class="empty-cell"
+            style:width={`${colWidth}px`}
+            style:grid-column={`col-start ${dayOfWeek + 1} / ${dayOfWeek + 2}`}
+            style:grid-row={`row-start ${hourOfDay * 2 + 1} / row-start ${hourOfDay * 2 + 3}`}
+            on:dragenter={(e) => {
+              dispatch('dragenter', {
+                date: new Date(day.setHours(hourOfDay + startHour, 0, 0, 0))
+              })
+            }}
+            on:drop|preventDefault={(e) => {
+              dispatch('drop', {
+                day,
+                hour: hourOfDay + startHour,
+                date: new Date(day.setHours(hourOfDay + startHour, 0, 0, 0))
+              })
+            }}
+            on:click|stopPropagation={() => {
+              dispatch('create', {
+                date: new Date(day.setHours(hourOfDay + startHour, 0, 0, 0)),
+                withTime: true
+              })
+            }}
+          />
+        {/each}
+        {#if hourOfDay === displayedHours - startHour - 1}<div class="clear-cell" />{/if}
       {/each}
-    {/key}
-  </div>
+
+      {#key [styleAD, calendarWidth, displayedDaysCount, showHeader]}
+        {#each newEvents.filter((ev) => !ev.allDay) as event, i}
+          {@const rect = getRect(event)}
+          {@const ev = events.find((p) => p._id === event._id)}
+          {#if ev}
+            <!-- svelte-ignore a11y-no-noninteractive-tabindex -->
+            <div
+              class="calendar-element"
+              style:top={`${rect.top}px`}
+              style:bottom={`${rect.bottom}px`}
+              style:left={`${rect.left}px`}
+              style:right={`${rect.right}px`}
+              style:opacity={rect.visibility === 0 ? 0.4 : 1}
+              style:--mask-image={'none'}
+              tabindex={1000 + i}
+            >
+              <EventElement
+                event={ev}
+                hourHeight={cellHeight}
+                size={{
+                  width: rect.width,
+                  height: (calendarRect?.height ?? rect.top + rect.bottom) - rect.top - rect.bottom
+                }}
+                on:drop={(e) => {
+                  dispatch('drop', {
+                    date: new Date(event.date)
+                  })
+                }}
+                on:resize={() => (events = events)}
+              />
+            </div>
+          {/if}
+        {/each}
+      {/key}
+    </div>
+  {/key}
 </Scroller>
 
 <style lang="scss">