willba-component-library 0.1.22 → 0.1.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "willba-component-library",
-  "version": "0.1.22",
+  "version": "0.1.24",
   "description": "A stroybook 6 with TypeScript demo",
   "main": "lib/index.js",
   "module": "lib/index.esm.js",

package/src/components/FilterBar/FilterBar.stories.tsx

@@ -20,24 +20,18 @@ export const Primary: Story = {
       {
         id: '2',
         name: 'Alle 6 vuotiaat',
-        minAge: null,
-        maxAge: 6,
         minVal: 0,
         sortOrder: 3,
       },
       {
         id: '3',
         name: '6-16 vuotiaat',
-        minAge: 6,
-        maxAge: 17,
         minVal: 0,
         sortOrder: 2,
       },
       {
         id: '1',
         name: 'Aikuiset',
-        minAge: 17,
-        maxAge: null,
         minVal: 2,
         sortOrder: 1,
       },

package/src/components/FilterBar/FilterBar.tsx

@@ -42,6 +42,7 @@ export default function FilterBar({
 
     setRerenderKey((prevKey) => prevKey + 1)
   }, [language])
+
   const { t } = useTranslation('filterBar')
 
   // Filters
@@ -162,16 +163,12 @@ const AGE_CATEGORIES_FALLBACK = [
     id: '1',
     name: 'Adults',
     sortOrder: 1,
-    minAge: null,
-    maxAge: 6,
     minVal: 0,
   },
   {
     id: '2',
     name: 'Kids',
     sortOrder: 2,
-    minAge: 6,
-    maxAge: 17,
     minVal: 0,
   },
 ]

package/src/components/FilterBar/FilterBarTypes.ts

@@ -5,22 +5,20 @@ export interface AgeCategoryCount {
 export interface AgeCategoryType {
   id: string
   name: string
-  minAge: number | null
-  maxAge: number | null
   minVal: number
   sortOrder: number
 }
 
 export interface GuestsPropsType {
   ageCategories: AgeCategoryType[]
-  updateGuestsCount: (arg1: number, arg2: number) => void
+  updateGuestsCount: (arg1: string, arg2: number) => void
   ageCategoryCounts: AgeCategoryCount | {}
 }
 
 export interface GuestsCountPropsType {
   label: string
   id: number
-  updateGuestsCount: (arg1: number, arg2: number) => void
+  updateGuestsCount: (arg1: string, arg2: number) => void
   count: number
   minVal: number
   sortOrder: number

package/src/components/FilterBar/components/guests/GuestCount/GuestCount.tsx

@@ -14,12 +14,12 @@ export default function GuestCount({
 }: GuestsCountPropsType) {
   const handleDecrement = () => {
     if (count > minVal) {
-      updateGuestsCount(id, count - 1)
+      updateGuestsCount(`guests-${id}`, count - 1)
     }
   }
 
   const handleIncrement = () => {
-    updateGuestsCount(id, count + 1)
+    updateGuestsCount(`guests-${id}`, count + 1)
   }
 
   return (

package/src/components/FilterBar/components/guests/Guests.tsx

@@ -24,8 +24,9 @@ export default function Guests({
             sortOrder={category.sortOrder}
             updateGuestsCount={updateGuestsCount}
             count={
-              (ageCategoryCounts as AgeCategoryCount)[category.id] ||
-              category.minVal
+              (ageCategoryCounts as AgeCategoryCount)[
+                `guests-${category.id}`
+              ] || category.minVal
             }
           />
         ))}

package/src/components/FilterBar/hooks/useFilterBar.tsx

@@ -19,7 +19,8 @@ export default function useFilterBar({ redirectUrl }: UseFilterBarPropsType) {
     {}
   )
 
-  const updateGuestsCount = (id: number, newCount: number) => {
+  const updateGuestsCount = (id: string, newCount: number) => {
+    console.log(ageCategoryCounts)
     setAgeCategoryCounts((prevCounts) => ({
       ...prevCounts,
       [id]: newCount,
@@ -62,7 +63,7 @@ export default function useFilterBar({ redirectUrl }: UseFilterBarPropsType) {
         : '',
       endDate: calendarRange?.to ? format(calendarRange.to, 'yyyy-MM-dd') : '',
       categories,
-      //ageCategoryCounts: JSON.stringify(ageCategoryCounts),
+      ageCategoryCounts: JSON.stringify(ageCategoryCounts),
     }
 
     for (const [key, value] of Object.entries(params)) {