Updates to Ui.Calendar

- Fix spacing of header items to be in center of the rows. - Allow the days to fill their cells. - Comapre selected days with normalization. - Allow showing multiple selected days.
mint-lang · Jun 29, 2021 · 92b952d · 92b952d
1 parent aa6ead8
commit 92b952d
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 9 deletions.
diff --git a/source/Calendar.Cell.mint b/source/Calendar.Cell.mint
@@ -15,6 +15,9 @@ component Ui.Calendar.Cell {
   /* Whether or not the cell is active (selectable). */
   property active : Bool = false
 
+  /* Whether or not the component is readonly. */
+  property readonly : Bool = false
+
   /* The day. */
   property day : Time
 
@@ -28,16 +31,18 @@ component Ui.Calendar.Cell {
     display: flex;
 
     cursor: pointer;
-    height: 2em;
-    width: 2em;
+    min-height: 2em;
+    min-width: 2em;
+    height: 100%;
+    width: 100%;
 
     if (active) {
       opacity: 1;
     } else {
       opacity: 0.2;
     }
 
-    if (disabled) {
+    if (disabled || readonly) {
       pointer-events: none;
     }
 

diff --git a/source/Calendar.mint b/source/Calendar.mint
@@ -6,6 +6,9 @@ component Ui.Calendar {
   /* The change event handler. */
   property onChange : Function(Time, Promise(Never, Void)) = Promise.never1
 
+  /* The days to highlight as selected. */
+  property selectedDays : Set(Time) = Set.empty()
+
   /* Whether or not to trigger the `onMonthChange` event if clicking on a day in an other month. */
   property changeMonthOnSelect : Bool = false
 
@@ -24,6 +27,9 @@ component Ui.Calendar {
   /* Whether or not the component is disabled. */
   property disabled : Bool = false
 
+  /* Whether or not the component is readonly. */
+  property readonly : Bool = false
+
   /* Styles for the base. */
   style base {
     -moz-user-select: none;
@@ -53,6 +59,8 @@ component Ui.Calendar {
   /* Style for the table. */
   style table {
     grid-template-columns: repeat(7, 1fr);
+    justify-items: center;
+    align-items: center;
     grid-gap: 0.3125em;
     display: grid;
     width: 100%;
@@ -88,7 +96,7 @@ component Ui.Calendar {
 
   /* Style for the day names. */
   style dayNames {
-    justify-content: space-between;
+    justify-content: space-around;
     white-space: nowrap;
     display: flex;
     line-height: 1;
@@ -185,11 +193,30 @@ component Ui.Calendar {
             }
 
           for (cell of actualDays) {
-            <Ui.Calendar.Cell
-              active={Array.any((item : Time) : Bool { cell == item }, range)}
-              onClick={handleCellClick}
-              selected={day == cell}
-              day={cell}/>
+            try {
+              normalizedDay =
+                Time.startOf("day", day)
+
+              normalizedCell =
+                Time.startOf("day", cell)
+
+              normalizedDays =
+                Set.map(Time.startOf("day"), selectedDays)
+
+              selected =
+                if (Set.size(normalizedDays) == 0) {
+                  normalizedDay == normalizedCell
+                } else {
+                  Set.has(normalizedCell, normalizedDays)
+                }
+
+              <Ui.Calendar.Cell
+                active={Array.any((item : Time) : Bool { normalizedCell == item }, range)}
+                onClick={handleCellClick}
+                day={normalizedCell}
+                selected={selected}
+                readonly={readonly}/>
+            }
           }
         }
       </div>