Merge pull request #124 from Deep-Consulting-Solutions/cal-improvemen…

…ts-22 fix: mountCount issues
Deep-Consulting-Solutions · Dec 11, 2024 · d0ed58e · d0ed58e
2 parents d3c690c + 7fea0b5
commit d0ed58e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/packages/atoms/booker/wrappers/BookerWebWrapper.tsx b/packages/atoms/booker/wrappers/BookerWebWrapper.tsx
@@ -51,7 +51,6 @@ export const BookerWebWrapper = (props: BookerWebWrapperAtomProps) => {
     org: props.entity.orgSlug,
   });
 
-  const [bookerState, _] = useBookerStore((state) => [state.state, state.setState], shallow);
   const [dayCount] = useBookerStore((state) => [state.dayCount, state.setDayCount], shallow);
   const { data: session } = useSession();
   const routerQuery = useRouterQuery();
@@ -100,13 +99,17 @@ export const BookerWebWrapper = (props: BookerWebWrapperAtomProps) => {
   });
   const slots = useSlots(event);
 
-  const monthCount =
-    ((bookerLayout.layout !== BookerLayouts.WEEK_VIEW && bookerState === "selecting_time") ||
-      bookerLayout.layout === BookerLayouts.COLUMN_VIEW) &&
-    dayjs(date).add(1, "month").month() !==
-      dayjs(date).add(bookerLayout.columnViewExtraDays.current, "day").month()
-      ? 2
-      : undefined;
+  const monthCount = useMemo(() => {
+    if (
+      bookerLayout.layout === BookerLayouts.COLUMN_VIEW &&
+      dayjs(date).add(1, "month").month() !==
+        dayjs(date).add(bookerLayout.columnViewExtraDays.current, "day").month()
+    ) {
+      return 2;
+    }
+
+    return undefined;
+  }, [bookerLayout.columnViewExtraDays, bookerLayout.layout, date]);
   /**
    * Prioritize dateSchedule load
    * Component will render but use data already fetched from here, and no duplicate requests will be made

diff --git a/packages/features/calendars/DatePicker.tsx b/packages/features/calendars/DatePicker.tsx
@@ -422,8 +422,7 @@ const Days = ({
                     <DayComponent
                       date={day}
                       onClick={() => {
-                        const dayIsInNextMonth = day?.month() === browsingDate.add(1, "month").month();
-                        props.onChange(day, dayIsInNextMonth);
+                        props.onChange(day);
                       }}
                       disabled={disabled}
                       active={isActive(day)}