@useblu/ocean-react 1.113.0 → 1.113.2

package/index.js

@@ -46885,11 +46885,11 @@ var Snackbar = e.forwardRef(function (_a, ref) {
 Snackbar.displayName = 'Snackbar';
 
 var Shortcut = function (_a) {
-    var icon = _a.icon, label = _a.label, description = _a.description, _b = _a.size, size = _b === void 0 ? 'medium' : _b, _c = _a.blocked, blocked = _c === void 0 ? false : _c, _d = _a.disabled, disabled = _d === void 0 ? false : _d, _e = _a.fullWidth, fullWidth = _e === void 0 ? false : _e, _f = _a.orientation, orientation = _f === void 0 ? 'horizontal' : _f, count = _a.count, tag = _a.tag, rest = __rest$1(_a, ["icon", "label", "description", "size", "blocked", "disabled", "fullWidth", "orientation", "count", "tag"]);
+    var icon = _a.icon, label = _a.label, description = _a.description, _b = _a.size, size = _b === void 0 ? 'medium' : _b, _c = _a.blocked, blocked = _c === void 0 ? false : _c, _d = _a.disabled, disabled = _d === void 0 ? false : _d, _e = _a.fullWidth, fullWidth = _e === void 0 ? false : _e, _f = _a.orientation, orientation = _f === void 0 ? 'horizontal' : _f, count = _a.count, badge = _a.badge, tag = _a.tag, rest = __rest$1(_a, ["icon", "label", "description", "size", "blocked", "disabled", "fullWidth", "orientation", "count", "badge", "tag"]);
     return (e.createElement("div", __assign$1({ className: classNames('ods-shortcut', "ods-shortcut--".concat(size), blocked && 'ods-shortcut--blocked', disabled && 'ods-shortcut--disabled', fullWidth && 'ods-shortcut--full-width', count && 'ods-shortcut--with-badge', "ods-shortcut--".concat(orientation)) }, rest),
         blocked && (e.createElement("div", { className: "ods-shortcut__blocked" },
             e.createElement(At, null))),
-        !blocked && count ? (e.createElement(Badge, { className: "ods-shortcut__badge", variation: "small", color: disabled ? 'neutral' : 'alert', count: count })) : null,
+        !blocked && (count || badge) ? (e.createElement(Badge, { className: "ods-shortcut__badge", variation: "small", color: disabled ? 'neutral' : 'alert', count: count }, badge)) : null,
         !blocked && tag && orientation === 'vertical' && (e.createElement(Tag, { className: "ods-shortcut__tag", variant: "highlight", type: "important" }, tag)),
         e.createElement("div", { className: classNames('ods-shortcut__content', "ods-shortcut__content--".concat(orientation)) },
             e.createElement("div", { className: "ods-shortcut__icon" }, icon),
@@ -46925,16 +46925,21 @@ CardListItem.displayName = 'CardListItem';
 var Options = function (_a) {
     var options = _a.options, selectedOptions = _a.selectedOptions, clearLabel = _a.clearLabel, filterLabel = _a.filterLabel, multiChoice = _a.multiChoice, onSelect = _a.onSelect, filterOptions = _a.filterOptions, clearOptions = _a.clearOptions;
     var columns = multiChoice ? Math.ceil(options.length / 5) : 1;
+    var isMultiArray = Array.isArray(selectedOptions);
     return (e.createElement("div", { className: "ods-chips__options", "data-testid": "ods-chips-option" },
         e.createElement("div", { className: classNames('ods-chips__options--content', "ods-chips__options--content--columns-".concat(columns)) }, options.map(function (_a) {
             var label = _a.label, value = _a.value;
-            return (e.createElement("button", { key: label, type: "button", value: value, onClick: function () { return onSelect(label, value); }, className: classNames('ods-chips__options--option', {
-                    'ods-chips__options--option--selected': !multiChoice &&
-                        !Array.isArray(selectedOptions) &&
-                        selectedOptions.value === value,
-                }) },
-                multiChoice && Array.isArray(selectedOptions) && (e.createElement(Checkbox, { checked: !!selectedOptions.find(function (option) { return option.value === value; }), readOnly: true })),
-                label));
+            if (multiChoice && isMultiArray) {
+                var isSelected_1 = selectedOptions.some(function (option) { return option.value === value; });
+                return (e.createElement("div", { key: value, className: classNames('ods-chips__options--option', 'ods-chips__options--option-container', {
+                        'ods-chips__options--option--selected': isSelected_1,
+                    }) },
+                    e.createElement(Checkbox, { checked: isSelected_1, id: "chips-option-".concat(value), onClick: function () { return onSelect(label, value); }, readOnly: true, label: label })));
+            }
+            var isSelected = !multiChoice && !isMultiArray && selectedOptions.value === value;
+            return (e.createElement("button", { key: value, type: "button", value: value, onClick: function () { return onSelect(label, value); }, className: classNames('ods-chips__options--option', {
+                    'ods-chips__options--option--selected': isSelected,
+                }) }, label));
         })),
         multiChoice && (e.createElement("div", { className: "ods-chips__options--footer" },
             e.createElement("button", { type: "button", onClick: clearOptions, className: "ods-btn ods-btn--sm ods-btn--text" }, clearLabel),