Skip to content

Fix conditional hook problem in ActivityControlWidget #376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
haschek merged 1 commit into from
Mar 5, 2026
Merged

Fix conditional hook problem in ActivityControlWidget #376

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 46 additions & 36 deletions src/cmem/ActivityControl/ActivityControlWidget.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,42 +222,11 @@ export function ActivityControlWidget(props: ActivityControlWidgetProps) {
data-test-id={dataTestIdLegacy ? `${dataTestIdLegacy}-actions` : undefined}
>
{activityActions &&
activityActions.map((action, idx) => {
const actionButtonRef = React.useRef(null);
const ActionButton = () => (
<IconButton
data-test-id={action["data-test-id"]}
data-testid={action["data-testid"]}
name={action.icon}
text={action.tooltip}
onClick={action.action}
disabled={action.disabled}
intent={action.hasStateWarning ? "warning" : undefined}
tooltipProps={{
hoverOpenDelay: 200,
placement: "bottom"
}}
active={action.active}
/>
)
return action.notification ?
<>
<span key={idx} ref={actionButtonRef}>
<ActionButton />
</span>
{actionButtonRef.current && (
<DecoupledOverlay targetSelectorOrElement={actionButtonRef.current} paddingSize={"small"}>
<Notification
message={action.notification.message}
intent={action.notification.intent ?? "neutral"}
onDismiss={action.notification.onClose}
timeout={action.notification.timeout}
/>
</DecoupledOverlay>
)}
</> :
<ActionButton key={idx} />
})}
activityActions.map((action, idx) => <ActivityActionButton
key={idx}
action={action}
/>
)}
{additionalActions}
{activityContextMenu && activityContextMenu.menuItems.length > 0 && (
<ContextMenu
Expand Down Expand Up @@ -290,3 +259,44 @@ export function ActivityControlWidget(props: ActivityControlWidgetProps) {
<div className={classname}>{widget}</div>
);
}

interface ActivityActionButtonProps {
action: ActivityControlWidgetAction
}

const ActivityActionButton = ({action}: ActivityActionButtonProps) => {
const actionButtonRef = React.useRef(null);
const ActionButton = () => (
<IconButton
data-test-id={action["data-test-id"]}
data-testid={action["data-testid"]}
name={action.icon}
text={action.tooltip}
onClick={action.action}
disabled={action.disabled}
intent={action.hasStateWarning ? "warning" : undefined}
tooltipProps={{
hoverOpenDelay: 200,
placement: "bottom"
}}
active={action.active}
/>
)
return action.notification ?
<>
<span ref={actionButtonRef}>
<ActionButton/>
</span>
{actionButtonRef.current && (
<DecoupledOverlay targetSelectorOrElement={actionButtonRef.current} paddingSize={"small"}>
<Notification
message={action.notification.message}
intent={action.notification.intent ?? "neutral"}
onDismiss={action.notification.onClose}
timeout={action.notification.timeout}
/>
</DecoupledOverlay>
)}
</> :
<ActionButton/>
}