@colisweb/rescript-toolkit 4.10.0 → 4.10.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colisweb/rescript-toolkit",
-  "version": "4.10.0",
+  "version": "4.10.2",
   "type": "module",
   "scripts": {
     "clean": "rescript clean",

package/src/ui/Toolkit__Ui_Layout.res

@@ -36,7 +36,7 @@ module App = {
     @react.component
     let make = (~toggleMenu, ~username=?, ~logoSrc=?, ~onLogoClick, ~logout=?) => {
       <div
-        className="bg-white h-16 border-b flex items-center px-1 justify-between fixed top-0 left-0 w-full z-40">
+        className="bg-white h-16 border-b flex items-center px-1 justify-between fixed top-0 left-0 w-full z-40 print:hidden">
         <div className="flex items-center px-1">
           <button
             onClick=toggleMenu className="text-neutral-800 hover:bg-neutral-300 rounded-full p-2">
@@ -108,7 +108,7 @@ module App = {
         <nav
           className={cx([
             "sidenav",
-            "lg:flex border-r px-2 py-3 fixed flex-col bg-white justify-between transition-all duration-300 ease-in-out z-40",
+            "lg:flex border-r px-2 py-3 fixed flex-col bg-white justify-between transition-all duration-300 ease-in-out z-40 print:hidden",
             isNavOpen ? "w-64 overflow-y-auto" : "w-16 hidden sidenav--closed",
           ])}>
           {children({onLinkClick, isNavOpen, openMenu})}

package/src/ui/Toolkit__Ui_WeekdayNavigation.res

@@ -2,7 +2,7 @@ open ReactIntl
 
 type rec state = {
   period: period,
-  selectedDay: option<Js.Date.t>,
+  selectedDay: Js.Date.t,
 }
 and period = {
   start: Js.Date.t,
@@ -12,7 +12,7 @@ and period = {
 type action =
   | PreviousPeriod
   | NextPeriod
-  | UpdateSelectedDay(option<Js.Date.t>)
+  | UpdateSelectedDay(Js.Date.t)
 
 let updateQueryParams = (state: state) => {
   RescriptReactRouter.replace(
@@ -45,11 +45,11 @@ let make = (
   ~selectedDay: option<Js.Date.t>=?,
   ~className="",
   ~counters: option<dayCounter>=?,
+  ~periodLength=7,
   ~children,
 ) => {
   let {isSm} = Toolkit__Hooks.useMediaQuery()
 
-  let periodLength = isSm ? 7 : 3
   let ({period, selectedDay}, dispatch) = ReactUpdate.useReducerWithMapState(
     (state, action) =>
       switch action {
@@ -60,9 +60,7 @@ let make = (
               start: state.period.start->DateFns.subDays(periodLength)->DateFns.startOfDay,
               end_: state.period.start->DateFns.subDays(1),
             },
-            selectedDay: state.selectedDay->Option.map(_ =>
-              state.period.start->DateFns.subDays(periodLength)->DateFns.startOfDay
-            ),
+            selectedDay: state.period.start->DateFns.subDays(periodLength)->DateFns.startOfDay,
           },
           ({state}) => {
             updateQueryParams(state)
@@ -77,7 +75,7 @@ let make = (
               start: state.period.end_->DateFns.addDays(1),
               end_: state.period.end_->DateFns.addDays(periodLength),
             },
-            selectedDay: state.selectedDay->Option.map(_ => state.period.end_->DateFns.addDays(1)),
+            selectedDay: state.period.end_->DateFns.addDays(1),
           },
           ({state}) => {
             updateQueryParams(state)
@@ -113,11 +111,9 @@ let make = (
           start,
           end_: start->DateFns.addDays(periodLength - 1),
         }),
-        selectedDay: selectedDay->Option.isSome
-          ? selectedDay
-          : isSm
-          ? None
-          : Some(startOfWeek->Option.getWithDefault(defaultPeriod.start)),
+        selectedDay: selectedDay->Option.getWithDefault(
+          startOfWeek->Option.getWithDefault(defaultPeriod.start),
+        ),
       }
     },
   )
@@ -142,8 +138,8 @@ let make = (
           let formattedDay =
             intl->Intl.formatDateWithOptions(day, dateTimeFormatOptions(~weekday=#long, ()))
 
-          let isSelected =
-            selectedDay->Option.mapWithDefault(false, sDay => DateFns.isSameDay(sDay, day))
+          let isSelected = DateFns.isSameDay(selectedDay, day)
+
           <React.Fragment key={i->Int.toString ++ "-day"}>
             {i == 0 || day->DateFns.isFirstDayOfMonth
               ? <p className="text-xs text-neutral-700 uppercase">
@@ -151,7 +147,7 @@ let make = (
                 </p>
               : React.null}
             <div
-              onClick={_ => dispatch(UpdateSelectedDay(isSm && isSelected ? None : Some(day)))}
+              onClick={_ => dispatch(UpdateSelectedDay(day))}
               className="flex flex-col items-stretch w-16 mx-1 font-display">
               <p
                 className={cx([