@cashub/ui 0.18.2 → 0.18.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cashub/ui",
-  "version": "0.18.2",
+  "version": "0.18.3",
   "private": false,
   "author": "CASHUB Team",
   "description": "CASHUB UI components library",

package/select/Select.js

@@ -97,7 +97,6 @@ var Select = function Select(_ref) {
       fillReverse = _ref.fillReverse,
       onBlur = _ref.onBlur,
       onSearch = _ref.onSearch;
-  console.log('selected', selected);
 
   var _useTranslation = (0, _reactI18next.useTranslation)(),
       t = _useTranslation.t;
@@ -201,13 +200,15 @@ var Select = function Select(_ref) {
     return '';
   }, [selected]);
   var selectedAllOptions = (0, _react.useMemo)(function () {
-    var selectedAllOptions = _toConsumableArray(parsedSelected);
-
     if (multiple && enableSelectAll && parsedSelected.length + 1 === newOptions.length) {
-      selectedAllOptions.unshift(allOptionId);
+      var _selectedAllOptions = _toConsumableArray(parsedSelected);
+
+      _selectedAllOptions.unshift(allOptionId);
+
+      return _selectedAllOptions;
     }
 
-    return selectedAllOptions;
+    return parsedSelected;
   }, [multiple, enableSelectAll, newOptions.length, parsedSelected, allOptionId]); // set focused option
 
   var handleFocusItem = (0, _react.useCallback)(function (element) {
@@ -274,56 +275,66 @@ var Select = function Select(_ref) {
     if (disabled === true) return; // 選取選項
     // 點選 all 全選
 
-    if (value.toString() === allOptionId && selectedAllOptions.length < newOptions.length) {
-      for (var index = 1; index < newOptions.length; index += 1) {
-        onSelect(newOptions[index].id);
+    if (multiple) {
+      if (value.toString() === allOptionId && selectedAllOptions.length < newOptions.length) {
+        for (var index = 1; index < newOptions.length; index += 1) {
+          onSelect(newOptions[index].id);
+        }
       }
-    }
 
-    if (value.toString() !== allOptionId && !selectedAllOptions.includes(value.toString())) {
-      // 選取一個選項，變成全選
-      if (selectedAllOptions.length + 2 === newOptions.length) {
-        onSelect(value);
-      } else {
-        // 選取特定選項
-        onSelect(value);
-      }
-    } // 刪除選項
-    // 點選 all 刪除全選
+      if (value.toString() !== allOptionId && !selectedAllOptions.includes(value.toString())) {
+        // 選取一個選項，變成全選
+        if (selectedAllOptions.length + 2 === newOptions.length) {
+          onSelect(value);
+        } else {
+          // 選取特定選項
+          onSelect(value);
+        }
+      } // 刪除選項
+      // 點選 all 刪除全選
 
 
-    if (value.toString() === allOptionId && selectedAllOptions.length === newOptions.length) {
-      for (var _index = 0; _index < newOptions.length; _index += 1) {
-        onDeselect(newOptions[_index].id);
+      if (value.toString() === allOptionId && selectedAllOptions.length === newOptions.length) {
+        for (var _index = 0; _index < newOptions.length; _index += 1) {
+          onDeselect(newOptions[_index].id);
+        }
       }
-    }
 
-    if (value.toString() !== allOptionId && selectedAllOptions.includes(value.toString())) {
-      // 原本是 all 全選後來刪除其中一個選項
-      if (selectedAllOptions.length === newOptions.length) {
-        onDeselect(value);
-      } else {
-        // 刪除特定選項
-        onDeselect(value);
+      if (value.toString() !== allOptionId && selectedAllOptions.includes(value.toString())) {
+        // 原本是 all 全選後來刪除其中一個選項
+        if (selectedAllOptions.length === newOptions.length) {
+          onDeselect(value);
+        } else {
+          // 刪除特定選項
+          onDeselect(value);
+        }
       }
+
+      setDisplay(true);
+    } else {
+      onSelect(value);
+      setDisplay(false);
     }
 
     comboboxElement.focus();
     setSearch('');
-    setDisplay(true);
-  }, [disabled, onSelect, comboboxElement, selectedAllOptions, onDeselect, newOptions, allOptionId]);
+  }, [disabled, onSelect, comboboxElement, selectedAllOptions, onDeselect, newOptions, allOptionId, multiple]);
   var handleOnDeselect = (0, _react.useCallback)(function (event, value) {
     event.stopPropagation();
     if (disabled === true) return;
 
-    if (value.toString() === allOptionId) {
-      for (var index = 0; index < optionList.length; index += 1) {
-        onDeselect(optionList[index].id);
+    if (multiple) {
+      if (value.toString() === allOptionId) {
+        for (var index = 0; index < optionList.length; index += 1) {
+          onDeselect(optionList[index].id);
+        }
+      } else {
+        onDeselect(value);
       }
     } else {
       onDeselect(value);
     }
-  }, [disabled, onDeselect, optionList, allOptionId]); // list all selected option
+  }, [disabled, onDeselect, optionList, allOptionId, multiple]); // list all selected option
 
   var selectedItem = (0, _react.useMemo)(function () {
     if (selectedOptions.length > 0) {