Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

call buttons active state (#9126)

Eric Hayesfa33b96e9366
diff --git a/.agents/rules/web/design-system.md b/.agents/rules/web/design-system.md
index 321e43be16..fb23cc4f44 100644
--- a/.agents/rules/web/design-system.md
+++ b/.agents/rules/web/design-system.md
@@ -61,7 +61,9 @@ construction. Browse them at `/app/component/ui` (Foundations → Controls).
for accessible names, tooltips, sizing, explicit segments, and activation behavior.
- **FE-64** Components own their state treatments: desktop Tabs share a flat rounded track with an inset selected pill;
Button uses the semantic pressed fill for its variant. Mark action toggles with
- `aria-pressed`, and expansion triggers with `aria-expanded`. Do not restyle
+ `aria-pressed`, and expansion triggers with `aria-expanded`. A toggle whose
+ label and icon flip with its state (call mic and camera: Mute/Unmute) omits
+ `aria-pressed` and keeps one fill. Do not restyle
buttons as tabs. The agent composer's Auto/Chat/Code switch remains
`Tabs variant="track"`, a flat pill sliding along the composer's tray. Keep all
tab treatments flat: use borders and selected fills, not raised edges, gradients, or shadows.
diff --git a/apps/web/src/features/channel/Call/CallControls/CallControlBar.tsx b/apps/web/src/features/channel/Call/CallControls/CallControlBar.tsx
index 74e92341ae..d062e4e114 100644
--- a/apps/web/src/features/channel/Call/CallControls/CallControlBar.tsx
+++ b/apps/web/src/features/channel/Call/CallControls/CallControlBar.tsx
@@ -10,13 +10,13 @@ import { createSignal, type JSX, Show } from 'solid-js';
/**
* A media toggle split from its settings menu: the left half turns the device
- * on or off, the caret opens its menu on click.
+ * on or off, the caret opens its menu on click. The toggle keeps one fill and
+ * shows its state through the icon.
*/
function MediaSplitButton(props: {
label: string;
toggleLabel: string;
menuLabel: string;
- on: boolean;
disabled?: boolean;
onToggle: () => void;
icon: JSX.Element;
@@ -29,7 +29,6 @@ function MediaSplitButton(props: {
<ButtonGroup.Button
aria-label={props.toggleLabel}
tooltip={{ content: props.toggleLabel, placement: 'top' }}
- aria-pressed={props.on}
disabled={props.disabled}
onClick={props.onToggle}
>
@@ -85,7 +84,6 @@ export function CallControlBar(props: {
props.audioMuted ? 'Unmute microphone' : 'Mute microphone'
}
menuLabel="Audio settings"
- on={!props.audioMuted}
disabled={props.disabled}
onToggle={props.onToggleAudio}
icon={
@@ -103,7 +101,6 @@ export function CallControlBar(props: {
label="Camera"
toggleLabel={props.videoMuted ? 'Turn on camera' : 'Turn off camera'}
menuLabel="Video settings"
- on={!props.videoMuted}
disabled={props.disabled}
onToggle={props.onToggleVideo}
icon={
diff --git a/apps/web/src/features/channel/Call/tests/call-controls.test.tsx b/apps/web/src/features/channel/Call/tests/call-controls.test.tsx
index 1e7e82b9fe..65ba34f5e9 100644
--- a/apps/web/src/features/channel/Call/tests/call-controls.test.tsx
+++ b/apps/web/src/features/channel/Call/tests/call-controls.test.tsx
@@ -80,8 +80,8 @@ describe('call controls', () => {
expect(
screen
.getByRole('button', { name: 'Unmute microphone' })
- .getAttribute('aria-pressed')
- ).toBe('false');
+ .hasAttribute('aria-pressed')
+ ).toBe(false);
});
it('opens audio settings from the caret and switches the microphone', async () => {
diff --git a/apps/web/src/features/meetings/views/meeting-media-setup.tsx b/apps/web/src/features/meetings/views/meeting-media-setup.tsx
index d7e6820c49..935f1ee5a1 100644
--- a/apps/web/src/features/meetings/views/meeting-media-setup.tsx
+++ b/apps/web/src/features/meetings/views/meeting-media-setup.tsx
@@ -142,7 +142,6 @@ export function MeetingMediaSetup(props: {
size="icon-lg"
class="size-12"
disabled={props.disabled}
- aria-pressed={media.microphoneEnabled()}
onClick={() =>
media.setMicrophoneEnabled(!media.microphoneEnabled())
}
@@ -170,7 +169,6 @@ export function MeetingMediaSetup(props: {
size="icon-lg"
class="size-12"
disabled={props.disabled}
- aria-pressed={media.cameraEnabled()}
onClick={() => media.setCameraEnabled(!media.cameraEnabled())}
>
<Show