@useblu/ocean-react 1.110.0 → 1.112.1

package/index.js

@@ -468,31 +468,35 @@ var Badge = e.forwardRef(function (_a, ref) {
 Badge.displayName = 'Badge';
 
 var Header = function (_a) {
-    var title = _a.title, subtitle = _a.subtitle, count = _a.count;
+    var title = _a.title, subtitle = _a.subtitle, count = _a.count, tag = _a.tag;
     return (e.createElement("div", { className: "ods-card-group__header" },
         e.createElement("div", { className: "ods-card-group__header--content" },
-            e.createElement("p", { className: "ods-typography ods-typography__heading4" }, title),
+            e.createElement("div", { className: "container-line" },
+                e.createElement("p", { className: "ods-typography ods-typography__heading4" }, title),
+                tag && e.createElement(Tag, __assign$1({ size: "medium", setIconOff: true }, tag))),
             subtitle && (e.createElement("p", { className: "ods-typography ods-typography__description" }, subtitle))),
         count !== undefined && (e.createElement(Badge, { variation: "medium", color: count === 0 ? 'neutral' : 'alert', count: count }))));
 };
 
 var ActionButton = function (_a) {
-    var actionLabel = _a.actionLabel, actionClick = _a.actionClick;
+    var actionLabel = _a.actionLabel, actionCount = _a.actionCount, actionClick = _a.actionClick;
     return (e.createElement(e.Fragment, null,
         e.createElement("hr", { className: "ods-divider" }),
         e.createElement("button", { onClick: actionClick, type: "button", className: "ods-card-group__action", "aria-label": actionLabel },
             e.createElement("span", { className: "ods-card-group__action--label" }, actionLabel),
-            e.createElement(re, { size: 20 }))));
+            e.createElement("div", { className: "ods-card-group__action--right" },
+                actionCount !== undefined && (e.createElement(Badge, { variation: "medium", color: actionCount === 0 ? 'neutral' : 'alert', count: actionCount })),
+                e.createElement(re, { size: 20 })))));
 };
 
 var CardGroup = e.forwardRef(function (_a, ref) {
-    var title = _a.title, subtitle = _a.subtitle, actionLabel = _a.actionLabel, actionClick = _a.actionClick, count = _a.count, children = _a.children, _b = _a.variant, variant = _b === void 0 ? 'minimal' : _b, rest = __rest$1(_a, ["title", "subtitle", "actionLabel", "actionClick", "count", "children", "variant"]);
+    var title = _a.title, subtitle = _a.subtitle, actionLabel = _a.actionLabel, actionCount = _a.actionCount, actionClick = _a.actionClick, count = _a.count, tag = _a.tag, children = _a.children, _b = _a.variant, variant = _b === void 0 ? 'minimal' : _b, rest = __rest$1(_a, ["title", "subtitle", "actionLabel", "actionCount", "actionClick", "count", "tag", "children", "variant"]);
     return (e.createElement("div", __assign$1({ ref: ref }, rest, { "data-testid": "card-group", className: classNames('ods-card-group', "ods-card-group--".concat(variant)) }),
-        (title || subtitle) && (e.createElement(Header, { title: title, subtitle: subtitle, count: count })),
+        (title || subtitle) && (e.createElement(Header, { title: title, subtitle: subtitle, count: count, tag: tag })),
         children && variant !== 'header' && (e.createElement(e.Fragment, null,
             (title || subtitle) && e.createElement("hr", { className: "ods-divider" }),
             e.createElement("div", null, children))),
-        actionLabel && variant !== 'header' && (e.createElement(ActionButton, { actionLabel: actionLabel, actionClick: actionClick }))));
+        actionLabel && variant !== 'header' && (e.createElement(ActionButton, { actionLabel: actionLabel, actionCount: actionCount, actionClick: actionClick }))));
 });
 CardGroup.displayName = 'CardGroup';
 
@@ -46885,11 +46889,12 @@ var Shortcut = function (_a) {
     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))),
-        count ? (e.createElement(Badge, { className: "ods-shortcut__badge", variation: "small", color: "alert", count: count })) : null,
+        !blocked && count ? (e.createElement(Badge, { className: "ods-shortcut__badge", variation: "small", color: disabled ? 'neutral' : 'alert', count: count })) : 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),
             e.createElement("h5", { className: classNames('ods-shortcut__label', 'ods-typography__heading5') }, label),
-            tag && (e.createElement(Tag, { variant: "highlight", type: "important" }, tag))),
+            tag && orientation === 'horizontal' && (e.createElement(Tag, { variant: "highlight", type: "important" }, tag))),
         size === 'medium' && description && (e.createElement("span", { className: classNames('ods-shortcut__description', 'ods-typography__description') }, description))));
 };