willba-component-library 0.1.77 → 0.1.79

package/package.json

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

package/src/components/FilterBar/FilterBar.tsx

@@ -173,7 +173,7 @@ export default function FilterBar({
       {selectedFilter && (
         <div
           className={`will-filter-bar-container ${mode || 'dark'}`}
-          style={tabs && tabs.length === 1 && !isMobile ? { top: 66 } : {}}
+          style={(!tabs || tabs.length < 2) && !isMobile ? { top: 66 } : {}}
         >
           <CloseButton handleClose={() => handleSelectedFilter(false)} />
 

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

@@ -109,56 +109,21 @@ export const useFilterBar = ({
       }),
     }
 
-    if (tabs?.length === 1) {
-      const currentSearchParams = new URLSearchParams(window.location.search)
-      const updatedParams = new URLSearchParams()
+    const querySearchParams = new URLSearchParams()
 
-      for (const [key, value] of currentSearchParams.entries()) {
-        updatedParams.append(key, value)
-      }
-
-      for (const [key, value] of Object.entries(newParams)) {
-        if (value) {
-          updatedParams.set(key, value.toString())
-        } else {
-          updatedParams.delete(key)
-        }
-      }
-
-      const baseUrl = window.location.origin + window.location.pathname
-
-      const updatedUrl = `${baseUrl}?${updatedParams.toString()}`
-
-      handleSelectedFilter(false)
-
-      if (onSubmit && selectedPath === Pages.ROOMS) {
-        const updatedParamsObject: { [key: string]: string } = {}
-
-        updatedParams.forEach((value, key) => {
-          if (value) updatedParamsObject[key] = value
-        })
-
-        return onSubmit(updatedParamsObject)
-      }
-
-      return (window.location.href = updatedUrl)
-    } else {
-      const querySearchParams = new URLSearchParams()
-
-      for (const [key, value] of Object.entries(newParams)) {
-        if (value) {
-          querySearchParams.append(key, value.toString())
-        }
+    for (const [key, value] of Object.entries(newParams)) {
+      if (value) {
+        querySearchParams.append(key, value.toString())
       }
+    }
 
-      handleSelectedFilter(false)
+    handleSelectedFilter(false)
 
-      return onSubmit && selectedPath === Pages.ROOMS
-        ? onSubmit(newParams)
-        : (window.location.href = `${redirectUrl}/${selectedPath}${
-            querySearchParams ? `?${querySearchParams.toString()}` : ''
-          }`)
-    }
+    return onSubmit && selectedPath === Pages.ROOMS
+      ? onSubmit(newParams)
+      : (window.location.href = `${redirectUrl}/${selectedPath}${
+          querySearchParams ? `?${querySearchParams.toString()}` : ''
+        }`)
   }
 
   const handleResetFilters = () => {