Merge pull request #1269 from core-ds/fix/select-select-all-empty

fix(select): 'Select all' is hidden while options are empty
core-ds · Jul 5, 2024 · 2c7ca00 · 2c7ca00
2 parents dfaf48a + a0161a0
commit 2c7ca00
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 6 deletions.
diff --git a/.changeset/curvy-eagles-hope.md b/.changeset/curvy-eagles-hope.md
@@ -0,0 +1,5 @@
+---
+'@alfalab/core-components-select': patch
+---
+
+Пункт 'Выбрать все' скрыт, когда список вариантов пуст
diff --git a/packages/select/src/components/base-select/Component.tsx b/packages/select/src/components/base-select/Component.tsx
@@ -719,7 +719,7 @@ export const BaseSelect = forwardRef(
                         bottomAddons={
                             <React.Fragment>
                                 {renderSearch()}
-                                {bottomSheetProps?.bottomAddons}
+                                {flatOptions.length > 0 && bottomSheetProps?.bottomAddons}
                             </React.Fragment>
                         }
                         containerProps={{
@@ -773,7 +773,7 @@ export const BaseSelect = forwardRef(
                             bottomAddons={
                                 <React.Fragment>
                                     {renderSearch()}
-                                    {modalHeaderProps?.bottomAddons}
+                                    {flatOptions.length > 0 && modalHeaderProps?.bottomAddons}
                                 </React.Fragment>
                             }
                         >

diff --git a/packages/select/src/presets/useSelectWithApply/hook.tsx b/packages/select/src/presets/useSelectWithApply/hook.tsx
@@ -92,7 +92,7 @@ export function useSelectWithApply({
     const groupAccessor = searchProps.groupAccessor ?? defaultGroupAccessor;
     const filterGroup = searchProps.filterGroup ?? false;
 
-    const { flatOptions, selectedOptions } = useMemo(
+    const { flatOptions, filteredOptions, selectedOptions } = useMemo(
         () =>
             processOptions(
                 options,
@@ -177,8 +177,11 @@ export function useSelectWithApply({
     }, [selectedOptions]);
 
     const memoizedOptions = useMemo(
-        () => (showSelectAll ? [selectAllOption, ...options] : options),
-        [options, showSelectAll],
+        () =>
+            filteredOptions.length && showSelectAll
+                ? [selectAllOption, ...filteredOptions]
+                : filteredOptions,
+        [filteredOptions, showSelectAll],
     );
 
     return {

diff --git a/packages/select/src/presets/useSelectWithApply/options-list-with-apply/Component.tsx b/packages/select/src/presets/useSelectWithApply/options-list-with-apply/Component.tsx
@@ -97,7 +97,9 @@ export const OptionsListWithApply = forwardRef<HTMLDivElement, OptionsListWithAp
             return (
                 <React.Fragment>
                     {header}
-                    {showHeaderWithSelectAll && <Header {...headerProps} />}
+                    {showHeaderWithSelectAll && flatOptions.length > 0 && (
+                        <Header {...headerProps} />
+                    )}
                 </React.Fragment>
             );
         };