(null);
+ const hasIcon = item.iconName || item.iconUrl || item.iconSvg;
+ const hasPressedIcon = item.pressedIconName || item.pressedIconUrl || item.pressedIconSvg;
+
+ if (!hasIcon) {
+ warnOnce('ButtonGroup', `Missing icon for item with id: ${item.id}`);
+ }
+ if (!hasPressedIcon) {
+ warnOnce('ButtonGroup', `Missing pressed icon for item with id: ${item.id}`);
+ }
+
+ const feedbackContent = item.pressed ? item.popoverFeedback : item.pressedPopoverFeedback;
+ return (
+
+ fireCancelableEvent(onItemClick, { id: item.id, pressed: event.detail.pressed })}
+ ref={ref}
+ data-testid={item.id}
+ data-itemid={item.id}
+ className={clsx(testUtilStyles.item, testUtilStyles['button-group-item'])}
+ __title=""
+ >
+ {item.text}
+
+ {showTooltip && !item.disabled && !item.loading && (!showFeedback || feedbackContent) && (
+ {feedbackContent}) || item.text
+ }
+ className={clsx(testUtilStyles.tooltip, testUtilStyles['button-group-tooltip'])}
+ />
+ )}
+
+ );
+ }
+);
+
+export default IconToggleButtonItem;
diff --git a/src/button-group/interfaces.ts b/src/button-group/interfaces.ts
index ea10e3ec58..4c65c6413a 100644
--- a/src/button-group/interfaces.ts
+++ b/src/button-group/interfaces.ts
@@ -48,6 +48,21 @@ export interface ButtonGroupProps extends BaseComponentProps {
* * `iconSvg` (optional, ReactNode) - Custom SVG icon. Equivalent to the `svg` slot of the [icon component](/components/icon/).
* * `popoverFeedback` (optional, string) - Text that appears when the user clicks the button. Use to provide feedback to the user.
*
+ * * ### icon-toggle-button
+ *
+ * * `id` (string) - The unique identifier of the button, used as detail in `onItemClick` handler and to focus the button using `ref.focus(id)`.
+ * * `text` (string) - The name shown as a tooltip or menu text for this button.
+ * * `pressed` (boolean) - The toggle button pressed state.
+ * * `disabled` (optional, boolean) - The disabled state indication for the button.
+ * * `loading` (optional, boolean) - The loading state indication for the button.
+ * * `loadingText` (optional, string) - The loading text announced to screen readers.
+ * * `iconName` (optional, string) - Specifies the name of the icon, used with the [icon component](/components/icon/).
+ * * `iconUrl` (optional, string) - Specifies the URL of a custom icon.
+ * * `iconSvg` (optional, ReactNode) - Custom SVG icon. Equivalent to the `svg` slot of the [icon component](/components/icon/).
+ * * `pressedIconName` (optional, string) - Specifies the name of the icon in pressed state, used with the [icon component](/components/icon/).
+ * * `pressedIconUrl` (optional, string) - Specifies the URL of a custom icon in pressed state.
+ * * `pressedIconSvg` (optional, ReactNode) - Custom SVG icon in pressed state. Equivalent to the `svg` slot of the [icon component](/components/icon/).
+ *
* ### menu-dropdown
*
* * `id` (string) - The unique identifier of the button, used as detail in `onItemClick`.
@@ -67,6 +82,8 @@ export interface ButtonGroupProps extends BaseComponentProps {
* Called when the user clicks on an item, and the item is not disabled. The event detail object contains the id of the clicked item.
*/
onItemClick?: NonCancelableEventHandler;
+
+ tooltipToggle?: boolean;
}
export interface InternalButtonGroupProps extends ButtonGroupProps, InternalBaseComponentProps {}
@@ -75,7 +92,7 @@ export namespace ButtonGroupProps {
export type Variant = 'icon';
export type ItemOrGroup = Item | Group;
- export type Item = IconButton | MenuDropdown;
+ export type Item = IconButton | IconToggleButton | MenuDropdown;
export interface IconButton {
type: 'icon-button';
@@ -91,6 +108,25 @@ export namespace ButtonGroupProps {
popoverFeedback?: React.ReactNode;
}
+ export interface IconToggleButton {
+ type: 'icon-toggle-button';
+ id: string;
+ text: string;
+ pressed: boolean;
+ pressedText: string;
+ disabled?: boolean;
+ loading?: boolean;
+ loadingText?: string;
+ iconName?: IconProps.Name;
+ iconUrl?: string;
+ iconSvg?: React.ReactNode;
+ pressedIconName?: IconProps.Name;
+ pressedIconUrl?: string;
+ pressedIconSvg?: React.ReactNode;
+ popoverFeedback?: React.ReactNode;
+ pressedPopoverFeedback?: React.ReactNode;
+ }
+
export interface MenuDropdown {
type: 'menu-dropdown';
id: string;
@@ -109,6 +145,7 @@ export namespace ButtonGroupProps {
export interface ItemClickDetails {
id: string;
+ pressed?: boolean;
}
export interface Ref {
diff --git a/src/button-group/internal.tsx b/src/button-group/internal.tsx
index c645f236d8..2e1efc9222 100644
--- a/src/button-group/internal.tsx
+++ b/src/button-group/internal.tsx
@@ -30,6 +30,7 @@ const InternalButtonGroup = forwardRef(
onItemClick,
ariaLabel,
dropdownExpandToViewport,
+ tooltipToggle = false,
__internalRootRef = null,
...props
}: InternalButtonGroupProps,
@@ -158,6 +159,7 @@ const InternalButtonGroup = forwardRef(
setTooltip={setTooltip}
onItemClick={onItemClick}
ref={element => (itemsRef.current[item.id] = element)}
+ tooltipToggle={tooltipToggle}
/>
);
diff --git a/src/button-group/item-element.tsx b/src/button-group/item-element.tsx
index 63312ae649..1fff38cb1f 100644
--- a/src/button-group/item-element.tsx
+++ b/src/button-group/item-element.tsx
@@ -3,9 +3,10 @@
import React, { forwardRef, useEffect, useImperativeHandle, useRef } from 'react';
import { ButtonProps } from '../button/interfaces.js';
-import { ClickDetail, fireCancelableEvent, NonCancelableEventHandler } from '../internal/events';
+import { fireCancelableEvent, NonCancelableEventHandler } from '../internal/events';
import { nodeBelongs } from '../internal/utils/node-belongs';
import IconButtonItem from './icon-button-item';
+import IconToggleButtonItem from './icon-toggle-button-item.js';
import { ButtonGroupProps } from './interfaces';
import MenuDropdownItem from './menu-dropdown-item';
@@ -17,11 +18,12 @@ interface ItemElementProps {
tooltip: null | { item: string; feedback: boolean };
setTooltip: (tooltip: null | { item: string; feedback: boolean }) => void;
onItemClick?: NonCancelableEventHandler | undefined;
+ tooltipToggle: boolean;
}
const ItemElement = forwardRef(
(
- { item, dropdownExpandToViewport, tooltip, setTooltip, onItemClick }: ItemElementProps,
+ { item, dropdownExpandToViewport, tooltip, setTooltip, onItemClick, tooltipToggle }: ItemElementProps,
ref: React.Ref
) => {
const containerRef = useRef(null);
@@ -79,14 +81,16 @@ const ItemElement = forwardRef(
setTooltip(show ? { item: item.id, feedback: false } : null);
};
- const onClickHandler = (event: CustomEvent) => {
+ const onClickHandler = (event: CustomEvent) => {
const hasPopoverFeedback = 'popoverFeedback' in item && item.popoverFeedback;
if (hasPopoverFeedback) {
setTooltip({ item: item.id, feedback: true });
+ } else if (tooltipToggle) {
+ setTooltip(tooltip ? null : { item: item.id, feedback: false });
}
- fireCancelableEvent(onItemClick, { id: 'id' in event.detail ? event.detail.id : item.id }, event);
+ fireCancelableEvent(onItemClick, event.detail, event);
};
return (
@@ -115,6 +119,15 @@ const ItemElement = forwardRef(
showFeedback={!!tooltip?.feedback}
/>
)}
+ {item.type === 'icon-toggle-button' && (
+
+ )}
{item.type === 'menu-dropdown' && (
) => {
if (isDevelopment) {