@true-engineering/true-react-common-ui-kit 3.15.0 → 3.15.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@true-engineering/true-react-common-ui-kit",
-  "version": "3.15.0",
+  "version": "3.15.1",
   "description": "True Engineering React UI Kit with theming support",
   "author": "True Engineering (https://trueengineering.ru)",
   "keywords": [

package/src/components/MultiSelectList/MultiSelectList.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useState, useMemo, useRef, useCallback, ReactNode } from 'react';
 import clsx from 'clsx';
 import { debounce } from 'ts-debounce';
-import { isNotEmpty } from '@true-engineering/true-react-platform-helpers';
+import { isArrayNotEmpty, isNotEmpty } from '@true-engineering/true-react-platform-helpers';
 import { addDataAttributes } from '../../helpers';
 import { useIsMounted, useTweakStyles } from '../../hooks';
 import { ICommonProps } from '../../types';
@@ -317,20 +317,17 @@ export function MultiSelectList<Value extends IMultiSelectListValues<Option>, Op
 
   const mainOptionsList = isGroupingEnabled ? unchosenOptions : allOptions;
 
-  const hasSelectedOptionsGroup =
-    isGroupingEnabled && chosenValues !== undefined && chosenValues.length > 0;
+  const hasSelectedOptionsGroup = isGroupingEnabled && isArrayNotEmpty(chosenValues);
 
-  const shouldShowNothingFoundMessage = !isLoading && allOptions.length === 0;
+  const shouldShowNothingFoundMessage = !isLoading && !isArrayNotEmpty(allOptions);
 
   const shouldShowAllOptionsLabel =
-    isGroupingEnabled &&
-    unchosenOptions.length > 0 &&
-    chosenValues !== undefined &&
-    chosenValues.length > 0;
+    hasSelectedOptionsGroup && (isArrayNotEmpty(unchosenOptions) || !isArrayNotEmpty(allOptions));
 
   const shouldShowPreloader = isLoading || isLoadingOptionsOnScroll;
 
-  const shouldShowOptionsList = !isLoading && allOptions.length !== 0;
+  const shouldShowOptionsList =
+    !isLoading && (isArrayNotEmpty(allOptions) || isArrayNotEmpty(chosenValues));
 
   return (
     <div className={classes.root} {...addDataAttributes(data)}>