resolve feedback

xola · Sep 23, 2024 · dd9056c · dd9056c
1 parent 475cb2c
commit dd9056c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/components/DatePicker/Day.jsx b/src/components/DatePicker/Day.jsx
@@ -7,6 +7,18 @@ import { Dot } from "../Dot/Dot";
 export const Day = ({ selectedDate, date, getContent, currentMonth, isLoading = true, disabled = false }) => {
     const isSameMonth = dayjs(currentMonth).isSame(date, "month");
 
+    if (getContent && isSameMonth) {
+        if (isLoading) {
+            return (
+                <div class="mr-2 flex animate-pulse items-center justify-center">
+                    <Dot className="ui-day-content pointer-events-none !cursor-not-allowed" color="secondary" />
+                </div>
+            );
+        }
+
+        return <DayContent selectedDate={selectedDate} date={date} getContent={getContent} />;
+    }
+
     if (isLoading) {
         return (
             <div class="mr-2 flex animate-pulse items-center justify-center">
@@ -15,10 +27,6 @@ export const Day = ({ selectedDate, date, getContent, currentMonth, isLoading =
         );
     }
 
-    if (getContent && isSameMonth) {
-        return <DayContent selectedDate={selectedDate} date={date} getContent={getContent} />;
-    }
-
     const isSameDay = selectedDate && dayjs(selectedDate).isSame(date, "day");
 
     return (

diff --git a/src/components/Dot/Dot.jsx b/src/components/Dot/Dot.jsx
@@ -15,7 +15,7 @@ const sizes = {
     small: "h-1 w-1",
     medium: "h-1.5 w-1.5",
     large: "h-2 w-2",
-    ["extra-large"]: "h-6 w-6",
+    ["extra-large"]: "h-8 w-8",
 };
 
 export const Dot = ({ color = "primary", size = "medium", className, ...rest }) => {