@bitrise/bitkit 13.320.0 → 13.322.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bitrise/bitkit",
   "description": "Bitrise React component library",
-  "version": "13.320.0",
+  "version": "13.322.0",
   "repository": {
     "type": "git",
     "url": "git+ssh://git@github.com/bitrise-io/bitkit.git"

package/src/Components/Filter/Mobile/Filter.tsx

@@ -9,6 +9,7 @@ import FilterForm from './FilterForm';
 
 const Filter = ({ isLoading, showAdd = true }: FilterProps) => {
   const {
+    data,
     isPopoverOpen,
     onClearFilters,
     selectedCategory,
@@ -18,7 +19,11 @@ const Filter = ({ isLoading, showAdd = true }: FilterProps) => {
     state,
   } = useFilterContext();
 
-  const count = Object.values(state).filter((item) => item?.length > 0).length;
+  const isAllOptionForSwitch = (category: string) => {
+    return data[category].type === 'switch' && state[category]?.[0] === 'all';
+  };
+
+  const count = Object.entries(state).filter(([name, item]) => item?.length > 0 && !isAllOptionForSwitch(name)).length;
 
   return (
     <>

package/src/Components/Filter/Mobile/FilterForm.tsx

@@ -1,4 +1,4 @@
-import { useRef } from 'react';
+import { useEffect, useRef } from 'react';
 import ProgressSpinner from '../../ProgressSpinner/ProgressSpinner';
 import Divider from '../../Divider/Divider';
 import SearchInput from '../../SearchInput/SearchInput';
@@ -66,8 +66,16 @@ const FilterForm = ({ isOpen, onClose, selectedCategory }: FilterFormProps) => {
     onChange,
   });
 
+  useEffect(() => {
+    if (isOpen) {
+      onSearchChange('');
+    }
+  }, [isOpen]);
+
+  const adjustedItems = type === 'switch' ? items.filter((item) => item !== 'all') : items;
+
   const { isScrollable } = useIsScrollable({
-    items,
+    items: adjustedItems,
     hasNotFilteredOption,
     ref: bodyRef,
   });
@@ -198,7 +206,7 @@ const FilterForm = ({ isOpen, onClose, selectedCategory }: FilterFormProps) => {
               currentOptionMap={currentOptionMap}
               emptyText={getEmptyText()}
               isLoading={isLoading}
-              items={items}
+              items={adjustedItems}
               onChange={setSelected}
               selectedItems={selected}
             />
@@ -209,7 +217,7 @@ const FilterForm = ({ isOpen, onClose, selectedCategory }: FilterFormProps) => {
               emptyText={getEmptyText()}
               hasNotFilteredOption={hasNotFilteredOption}
               isLoading={isLoading}
-              items={items}
+              items={adjustedItems}
               onChange={(option: string) => {
                 onChange(selectedCategory, [option]);
               }}

package/src/Components/Filter/Mobile/FilterItem.tsx

@@ -34,6 +34,10 @@ const FilterItem = ({ category }: FilterItemProps) => {
       return `${value.length} ${pluralCategoryString}`;
     }
 
+    if (type === 'switch' && value[0] === 'all') {
+      return `All ${pluralCategoryString}`;
+    }
+
     return getOptionLabel(value[0], optionsMap);
   };
 

package/src/Components/Filter/hooks/useFilterForm.ts

@@ -65,8 +65,12 @@ const useFilterForm = (props: Omit<FilterFormProps, 'onCancel'>) => {
   };
 
   const onClearClick = () => {
-    setSelected([]);
-    onChange(category, [], value);
+    let newValue: FilterValue = [];
+    if (data[category]?.type === 'switch') {
+      newValue = ['all'];
+    }
+    setSelected(newValue);
+    onChange(category, newValue, value);
   };
 
   const getEmptyText = () => {