willba-component-library 0.1.17 → 0.1.19

package/package.json

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

package/src/components/FilterBar/FilterBar.tsx

@@ -25,13 +25,11 @@ export interface FilterBarProps {
   ageCategories?: AgeCategoryType[]
   redirectUrl: string
   palette?: Palette
-  currentPath?: string
 }
 
 export default function FilterBar({
   language,
   ageCategories = AGE_CATEGORIES_FALLBACK,
-  currentPath,
   redirectUrl = REDIRECT_URL_FALLBACK,
   palette,
 }: FilterBarProps) {
@@ -94,12 +92,12 @@ export default function FilterBar({
         <div className="will-filter-bar-tabs" ref={targetFilterBarRef}>
           <TabButton
             label={t('tabs.events')}
-            onClick={() => setSelectedPath('./events')}
+            onClick={() => setSelectedPath('/events')}
             active={selectedPath === '/events'}
           />
           <TabButton
             label={t('tabs.rooms')}
-            onClick={() => setSelectedPath('./rooms')}
+            onClick={() => setSelectedPath('/rooms')}
             active={selectedPath === '/rooms'}
           />
         </div>

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

@@ -86,15 +86,13 @@ export default function useFilterBar({ redirectUrl }: UseFilterBarPropsType) {
   }, [selectedFilter])
 
   useEffect(() => {
-    let currentPath = '/events' // Default path name
-
     if (typeof window !== 'undefined') {
-      // Get current path name
-      currentPath =
-        window.location.pathname.includes('/events') ||
-        window.location.pathname.includes('/rooms')
-          ? window.location.pathname
-          : '/events'
+      // Handle default selected tab
+      const currentPath = window.location.pathname.includes('/events')
+        ? '/events'
+        : window.location.pathname.includes('/rooms')
+        ? '/rooms'
+        : '/events'
 
       setSelectedPath(currentPath)
     }