@cashub/ui 0.45.0 → 0.45.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cashub/ui",
-  "version": "0.45.0",
+  "version": "0.45.1",
   "private": false,
   "author": "CasHUB Team",
   "description": "CasHUB UI components library",

package/select/Select.js

@@ -28,7 +28,7 @@ var _Footer = _interopRequireDefault(require("./subComponent/Footer"));
 var _figure = require("../figure");
 var _image = require("../image");
 var _jsxRuntime = require("react/jsx-runtime");
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6;
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.freeze(Object.defineProperties(e, { raw: { value: Object.freeze(t) } })); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -83,7 +83,11 @@ const Select = _ref => {
   } = (0, _hooks.useCustomPopper)(comboboxElement, listBoxElement);
   const newOptions = (0, _react.useMemo)(() => {
     if (!options) return;
-    const newOptions = [...options];
+    const newOptions = options.map(item => {
+      return _objectSpread({
+        isDisable: false
+      }, item);
+    });
     if (options.length > 0 && multiple && enableSelectAll) {
       newOptions.unshift({
         id: allOptionId,
@@ -92,6 +96,9 @@ const Select = _ref => {
     }
     return newOptions;
   }, [options, multiple, enableSelectAll, allOptionId]);
+  const enabledOptions = (0, _react.useMemo)(() => {
+    return newOptions.filter(item => !item.isDisable);
+  }, [newOptions]);
 
   // parse all value to string
   // for subsequently determine whether it is a selected item
@@ -108,13 +115,13 @@ const Select = _ref => {
     return '';
   }, [selected]);
   const selectedAllOptions = (0, _react.useMemo)(() => {
-    if (multiple && enableSelectAll && parsedSelected.length + 1 === newOptions.length) {
+    if (multiple && enableSelectAll && parsedSelected.length + 1 === enabledOptions.length) {
       const selectedAllOptions = [...parsedSelected];
       selectedAllOptions.unshift(allOptionId);
       return selectedAllOptions;
     }
     return parsedSelected;
-  }, [multiple, enableSelectAll, newOptions.length, parsedSelected, allOptionId]);
+  }, [multiple, enableSelectAll, enabledOptions.length, parsedSelected, allOptionId]);
   const showCheckbox = (0, _react.useMemo)(() => {
     if (multiple && displayMode === 'text') {
       return true;
@@ -175,18 +182,37 @@ const Select = _ref => {
   const handleOnSelect = (0, _react.useCallback)((event, value) => {
     event.stopPropagation();
     if (disabled === true) return;
+    const targetOption = newOptions.find(_ref2 => {
+      let {
+        id,
+        child
+      } = _ref2;
+      return id === value || child && child.find(_ref3 => {
+        let {
+          id
+        } = _ref3;
+        return id === value;
+      });
+    });
+    const actualOpt = targetOption !== null && targetOption !== void 0 && targetOption.child ? targetOption.child.find(_ref4 => {
+      let {
+        id
+      } = _ref4;
+      return id === value;
+    }) : targetOption;
+    if (actualOpt !== null && actualOpt !== void 0 && actualOpt.isDisable) return;
 
     // 選取選項
     // 點選 all 全選
     if (multiple) {
-      if (value.toString() === allOptionId && selectedAllOptions.length < newOptions.length) {
-        for (let index = 1; index < newOptions.length; index += 1) {
-          onSelect(newOptions[index].id);
+      if (value.toString() === allOptionId && selectedAllOptions.length < enabledOptions.length) {
+        for (let index = 1; index < enabledOptions.length; index += 1) {
+          onSelect(enabledOptions[index].id);
         }
       }
       if (value.toString() !== allOptionId && !selectedAllOptions.includes(value.toString())) {
         // 選取一個選項，變成全選
-        if (selectedAllOptions.length + 2 === newOptions.length) {
+        if (selectedAllOptions.length + 2 === enabledOptions.length) {
           onSelect(value);
         } else {
           // 選取特定選項
@@ -196,14 +222,14 @@ const Select = _ref => {
 
       // 刪除選項
       // 點選 all 刪除全選
-      if (value.toString() === allOptionId && selectedAllOptions.length === newOptions.length) {
-        for (let index = 0; index < newOptions.length; index += 1) {
-          onDeselect(newOptions[index].id);
+      if (value.toString() === allOptionId && selectedAllOptions.length === enabledOptions.length) {
+        for (let index = 0; index < enabledOptions.length; index += 1) {
+          onDeselect(enabledOptions[index].id);
         }
       }
       if (value.toString() !== allOptionId && selectedAllOptions.includes(value.toString())) {
         // 原本是 all 全選後來刪除其中一個選項
-        if (selectedAllOptions.length === newOptions.length) {
+        if (selectedAllOptions.length === enabledOptions.length) {
           onDeselect(value);
         } else {
           // 刪除特定選項
@@ -217,7 +243,7 @@ const Select = _ref => {
     }
     comboboxElement.focus();
     setSearch('');
-  }, [disabled, onSelect, comboboxElement, selectedAllOptions, onDeselect, newOptions, allOptionId, multiple]);
+  }, [disabled, onSelect, comboboxElement, selectedAllOptions, onDeselect, newOptions, allOptionId, multiple, enabledOptions]);
   const handleOnDeselect = (0, _react.useCallback)((event, value) => {
     event.stopPropagation();
     if (disabled === true) return;
@@ -287,32 +313,41 @@ const Select = _ref => {
             id: option.text,
             children: option.text
           }), option.child.map(option => {
-            return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Option.default, {
+            return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Option.default, {
               role: "option",
-              tabIndex: "0",
+              tabIndex: option.isDisable ? '-1' : '0',
               id: option.id,
-              onClick: event => handleOnSelect(event, option.id),
+              onClick: event => !option.isDisable && handleOnSelect(event, option.id),
               focus: focusedOption && focusedOption.id === option.id.toString(),
               selected: option.selected,
               "aria-selected": option.selected,
-              children: option.text
+              "aria-disabled": option.isDisable,
+              disabled: option.isDisable,
+              children: [option.text, option.suffix && /*#__PURE__*/(0, _jsxRuntime.jsxs)(OptionBadge, {
+                children: ["\xA0", option.suffix]
+              })]
             }, option.id);
           })]
         }, option.text);
       }
       return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Option.default, {
         role: "option",
-        tabIndex: "0",
+        tabIndex: option.isDisable ? '-1' : '0',
         id: option.id,
-        onClick: event => handleOnSelect(event, option.id),
+        onClick: event => !option.isDisable && handleOnSelect(event, option.id),
         focus: focusedOption && focusedOption.id === option.id.toString(),
         selected: option.selected,
         "aria-selected": option.selected,
+        "aria-disabled": option.isDisable,
+        disabled: option.isDisable,
         children: [showCheckbox && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Checkbox.default, {
-          selected: option.selected
+          selected: option.selected,
+          disabled: option.isDisable
         }), option.icon && /*#__PURE__*/(0, _jsxRuntime.jsx)(Icon, {
           src: option.icon
-        }), option.text]
+        }), option.text, option.suffix && /*#__PURE__*/(0, _jsxRuntime.jsxs)(OptionBadge, {
+          children: ["\xA0", option.suffix]
+        })]
       }, option.id);
     });
   }, [optionList, focusedOption, handleOnSelect, showCheckbox]);
@@ -337,6 +372,7 @@ const Select = _ref => {
         if (!display) {
           handleToggle();
         } else if (focusedOption) {
+          if (focusedOption.getAttribute('aria-disabled') === 'true') return;
           handleOnSelect(event, focusedOption.id);
         }
         break;
@@ -350,7 +386,10 @@ const Select = _ref => {
           if (!focusedOption) {
             return;
           }
-          const previousItem = findPreviousItem(focusedOption);
+          let previousItem = findPreviousItem(focusedOption);
+          while (previousItem && previousItem.getAttribute('aria-disabled') === 'true') {
+            previousItem = findPreviousItem(previousItem);
+          }
           if (previousItem) {
             handleFocusItem(previousItem);
           }
@@ -361,7 +400,10 @@ const Select = _ref => {
           if (!focusedOption) {
             return;
           }
-          const nextItem = findNextItem(focusedOption);
+          let nextItem = findNextItem(focusedOption);
+          while (nextItem && nextItem.getAttribute('aria-disabled') === 'true') {
+            nextItem = findNextItem(nextItem);
+          }
           if (nextItem) {
             handleFocusItem(nextItem);
           }
@@ -593,10 +635,10 @@ const Select = _ref => {
     })
   });
 };
-const Icon = _ref2 => {
+const Icon = _ref5 => {
   let {
     src
-  } = _ref2;
+  } = _ref5;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_figure.IconFigure, {
       size: "medium",
@@ -609,50 +651,50 @@ const Icon = _ref2 => {
     }), "\xA0"]
   });
 };
-const Combobox = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  flex-wrap: wrap;\n  align-items: center;\n  min-height: 36px;\n  cursor: pointer;\n  position: relative;\n  background: transparent;\n  color: var(--font-on-background);\n  font-size: var(--font-body1);\n  border: var(--border-width) solid var(--border-color);\n  border-radius: var(--border-radius-l);\n  padding: 0 calc(var(--spacing-s) * 2 + 8px) 0 var(--spacing-s);\n\n  &:focus {\n    ", ";\n  }\n\n  ", "\n\n  ", "\n\n  ", "\n  ", "\n  \n  ", ";\n\n  ", "\n\n  ", "\n\n  ", "\n"])), _ref3 => {
+const Combobox = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  flex-wrap: wrap;\n  align-items: center;\n  min-height: 36px;\n  cursor: pointer;\n  position: relative;\n  background: transparent;\n  color: var(--font-on-background);\n  font-size: var(--font-body1);\n  border: var(--border-width) solid var(--border-color);\n  border-radius: var(--border-radius-l);\n  padding: 0 calc(var(--spacing-s) * 2 + 8px) 0 var(--spacing-s);\n\n  &:focus {\n    ", ";\n  }\n\n  ", "\n\n  ", "\n\n  ", "\n  ", "\n  \n  ", ";\n\n  ", "\n\n  ", "\n\n  ", "\n"])), _ref6 => {
   let {
     disabled
-  } = _ref3;
+  } = _ref6;
   return !disabled && "\n        border-color: var(--color-primary);\n        outline: none;\n      ";
-}, _ref4 => {
+}, _ref7 => {
   let {
     flexGrow
-  } = _ref4;
+  } = _ref7;
   return !flexGrow && 'min-width: 160px;';
-}, _ref5 => {
+}, _ref8 => {
   let {
     $display
-  } = _ref5;
+  } = _ref8;
   return $display && "\n      border-color: var(--color-primary);\n      outline: none;\n    ";
-}, _ref6 => {
+}, _ref9 => {
   let {
     disabled
-  } = _ref6;
+  } = _ref9;
   return disabled && 'cursor: not-allowed;opacity: 0.5;';
-}, _ref7 => {
+}, _ref10 => {
   let {
     placeholder
-  } = _ref7;
+  } = _ref10;
   return placeholder && 'color: var(--font-on-mute);';
-}, _ref8 => {
+}, _ref11 => {
   let {
     fullWidth
-  } = _ref8;
+  } = _ref11;
   return fullWidth ? 'width: 100%' : 'max-width: 320px';
-}, _ref9 => {
+}, _ref12 => {
   let {
     large
-  } = _ref9;
+  } = _ref12;
   return large && "\n      height: 40px;\n      padding: 12px calc(var(--spacing-s) * 2 + 8px) 12px var(--spacing-s);\n    ";
-}, _ref10 => {
+}, _ref13 => {
   let {
     $fill
-  } = _ref10;
+  } = _ref13;
   return $fill && "\n      background: var(--color-background2);\n      border-color: transparent;\n    ";
-}, _ref11 => {
+}, _ref14 => {
   let {
     fillReverse
-  } = _ref11;
+  } = _ref14;
   return fillReverse && "\n      background: var(--color-background1);\n      border-color: transparent;\n    ";
 });
 Combobox.displayName = 'Combobox';
@@ -662,4 +704,5 @@ const ExpandArrow = (0, _styledComponents.default)(_ti.TiArrowSortedDown)(_templ
 ExpandArrow.displayName = 'ExpandArrow';
 const Message = _styledComponents.default.p(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  margin: 0;\n  padding: 12px var(--spacing-s);\n"])));
 Message.displayName = 'Message';
+const OptionBadge = _styledComponents.default.span(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  color: var(--color-danger);\n  font-style: italic;\n"])));
 var _default = exports.default = Select;

package/select/subComponent/Option.js

@@ -5,16 +5,21 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _styledComponents = _interopRequireWildcard(require("styled-components"));
-var _templateObject, _templateObject2;
+var _templateObject, _templateObject2, _templateObject3;
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.freeze(Object.defineProperties(e, { raw: { value: Object.freeze(t) } })); }
-const Option = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  max-width: 100%;\n  word-break: break-all;\n  padding: 12px var(--spacing-s);\n  background: var(--color-background1);\n  transition: background 0.3s;\n\n  &:hover {\n    background: var(--color-hover);\n  }\n\n  ", "\n"])), _ref => {
+const Option = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  display: flex;\n  align-items: center;\n  max-width: 100%;\n  word-break: break-all;\n  padding: 12px var(--spacing-s);\n  background: var(--color-background1);\n  transition: background 0.3s;\n\n  &:hover {\n    background: var(--color-hover);\n  }\n\n  ", "\n\n  ", "\n"])), _ref => {
   let {
     selected,
     focus
   } = _ref;
   return (selected || focus) && (0, _styledComponents.css)(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n      background: var(--color-hover);\n    "])));
+}, _ref2 => {
+  let {
+    disabled
+  } = _ref2;
+  return disabled && (0, _styledComponents.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n    cursor: not-allowed;\n    opacity: 0.5;\n    pointer-events: none;\n  "])));
 });
 Option.displayName = 'Option';
 var _default = exports.default = Option;