willba-component-library 0.2.26 → 0.2.28

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "willba-component-library",
-  "version": "0.2.26",
+  "version": "0.2.28",
   "description": "A custom UI component library",
   "main": "lib/index.js",
   "module": "lib/index.esm.js",

package/src/components/FilterCalendar/FilterCalendar.tsx

@@ -45,7 +45,12 @@ export default function FilterCalendar({
     updateCalendar,
     setUpdateCalendar,
     initialCalendarRange,
-  } = useFilterCalendar({ onSubmit, setToggleCalendar, noActiveSelection })
+  } = useFilterCalendar({
+    onSubmit,
+    setToggleCalendar,
+    noActiveSelection,
+    toggleCalendar,
+  })
 
   // Display component after fully loaded
   useAwaitRender()

package/src/components/FilterCalendar/hooks/useFilterCalendar.ts

@@ -5,12 +5,14 @@ type Props = {
   onSubmit: (val: any) => void
   setToggleCalendar: (val: boolean) => void
   noActiveSelection?: boolean
+  toggleCalendar?: boolean
 }
 
 export const useFilterCalendar = ({
   onSubmit,
   setToggleCalendar,
   noActiveSelection,
+  toggleCalendar,
 }: Props) => {
   const [calendarRange, setCalendarRange] = useState<DateRange | undefined>()
   const [initialCalendarRange, setInitialCalendarRange] = useState<
@@ -28,17 +30,21 @@ export const useFilterCalendar = ({
     const endDateParam = urlSearchParams.get('endDate')
 
     if (startDateParam && endDateParam) {
-      noActiveSelection
-        ? setInitialCalendarRange({
-            from: new Date(startDateParam),
-            to: new Date(endDateParam),
-          })
-        : setCalendarRange({
-            from: new Date(startDateParam),
-            to: new Date(endDateParam),
-          })
+      if (noActiveSelection) {
+        console.log(startDateParam, endDateParam)
+        setCalendarRange(undefined)
+        setInitialCalendarRange({
+          from: new Date(startDateParam),
+          to: new Date(endDateParam),
+        })
+      } else {
+        setCalendarRange({
+          from: new Date(startDateParam),
+          to: new Date(endDateParam),
+        })
+      }
     }
-  }, [])
+  }, [toggleCalendar])
 
   const handleSubmit = () => {
     setToggleCalendar(false)

package/src/core/components/calendar/Calendar.tsx

@@ -160,16 +160,16 @@ export const Calendar = forwardRef<HTMLDivElement, CalendarTypes>(
       ) {
         calendarOverlappingDate.appendChild(calendarTooltipOverlappingDate)
       } else if (calendarRange && appendedOverlappingDateTooltip) {
-        appendedOverlappingDateTooltip.style.visibility = 'hidden'
+        appendedOverlappingDateTooltip.style.display = 'none'
       } else if (!calendarRange && appendedOverlappingDateTooltip) {
-        appendedOverlappingDateTooltip.style.visibility = 'visible'
+        appendedOverlappingDateTooltip.style.display = 'block'
       }
 
       return () => {
         tooltipClones.forEach((clone) => clone.remove())
         tooltipClonesCheckOut.forEach((clone) => clone.remove())
       }
-    }, [calendarRange, updateCalendar, overlappingDate])
+    }, [calendarRange, overlappingDate])
 
     return (
       <div className="will-filter-bar-calendar" ref={ref}>