@bitrise/bitkit 13.248.0 → 13.250.0

package/package.json

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

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

@@ -51,6 +51,9 @@ const MatchingResults = (props: MatchingResultsProps) => {
   } else {
     const filterRegexp = new RegExp(`^${selected[0].split(/\*+/).map(regExpEscape).join('.*')}$`);
     matchingResults = items.filter((item) => {
+      if (item.includes('*')) {
+        return false;
+      }
       return filterRegexp.test(item);
     });
     if (!matchingResults.length) {
@@ -61,7 +64,7 @@ const MatchingResults = (props: MatchingResultsProps) => {
       );
     } else {
       content = (
-        <Box maxHeight="11rem" overflow="scroll">
+        <Box maxHeight="11rem" overflow="auto">
           <List textStyle="body/md/regular" variant="unordered">
             {matchingResults.map((r) => (
               <ListItem key={r}>{r}</ListItem>
@@ -128,7 +131,8 @@ const FilterForm = (props: FilterFormProps) => {
   const isAsync = !!onAsyncSearch;
   const withSearch = (options && options.length > 5) || isAsync;
 
-  const isDisabled = isEqual(selected, value) || !selected[0].includes('*');
+  const isSubmitDisabled =
+    isEqual(selected, value) || (mode === 'pattern' && !!selected[0] && !selected[0].includes('*'));
   const filteredOptions = useMemo(() => {
     if (options?.length) {
       return options.filter((opt) => {
@@ -314,8 +318,11 @@ const FilterForm = (props: FilterFormProps) => {
           <Button onClick={onCancelClick} size="sm" type="reset" variant="secondary">
             Cancel
           </Button>
-          <Tooltip label={isDisabled ? 'Add `*` in the pattern or select manually.' : undefined}>
-            <Button isDisabled={isDisabled} size="sm" type="submit">
+          <Tooltip
+            label="Add `*` in the pattern or select manually."
+            isDisabled={mode === 'manually' || !!(selected[0] && selected[0].includes('*'))}
+          >
+            <Button isDisabled={isSubmitDisabled} size="sm" type="submit">
               {(selected.length === 0 || selected[0] === '') && isEditMode ? 'Remove' : 'Apply'}
             </Button>
           </Tooltip>