Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,17 @@
class="status-toggle-item focus-inside px-4"
role="radio"
[attr.aria-checked]="$index === selIndexValue"
[attr.tabindex]="isDisabled() || item.disabled ? '' : '0'"
[attr.tabindex]="
isDisabled() || item.disabled ? null : $index === focusedIndex() ? '0' : '-1'
"
[attr.aria-disabled]="isDisabled() || item.disabled"
[class.active]="$index === selIndexValue"
[class.disabled]="item.disabled || isDisabled()"
[style.width.%]="100 / $count"
(keydown.space)="$event.preventDefault(); selectItem($index)"
(keydown.enter)="selectItem($index)"
(keydown.arrowRight)="navigateFocus($event, $index, 1)"
(keydown.arrowLeft)="navigateFocus($event, $index, -1)"
>
<span class="icon icon-stack">
<si-icon
Expand Down
35 changes: 33 additions & 2 deletions projects/element-ng/status-toggle/si-status-toggle.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ import {
output,
signal,
SimpleChanges,
viewChild
viewChild,
viewChildren
} from '@angular/core';
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
import { isRTL, listenGlobal } from '@siemens/element-ng/common';
Expand All @@ -38,7 +39,10 @@ import { StatusToggleItem } from './status-toggle.model';
multi: true
}
],
changeDetection: ChangeDetectionStrategy.OnPush
changeDetection: ChangeDetectionStrategy.OnPush,
host: {
role: 'toolbar'
}
})
export class SiStatusToggleComponent implements ControlValueAccessor, OnInit, OnDestroy, OnChanges {
/** List of status items. */
Expand All @@ -56,6 +60,7 @@ export class SiStatusToggleComponent implements ControlValueAccessor, OnInit, On

private readonly containerElement = viewChild.required<ElementRef>('container');
private readonly draggableElement = viewChild.required<ElementRef>('draggable');
private readonly itemElements = viewChildren<ElementRef<HTMLElement>>('items');

private boundingX = 0;
private x0 = 0;
Expand All @@ -66,6 +71,7 @@ export class SiStatusToggleComponent implements ControlValueAccessor, OnInit, On
private readonly internalDisabled = signal(false);

protected readonly selectedIndex = signal<number | undefined>(undefined);
protected readonly focusedIndex = signal(0);
protected readonly draggablePosition = signal('');
protected readonly animated = signal(false);
protected readonly isDisabled = computed(() => this.disabled() || this.internalDisabled());
Expand All @@ -81,6 +87,12 @@ export class SiStatusToggleComponent implements ControlValueAccessor, OnInit, On
if (selectedIndex >= 0) {
this.selectItem(selectedIndex, false, false);
}
// If nothing ended up selected (no match, or matched item is disabled),
// ensure focusedIndex points to the first reachable (non-disabled) item
if (this.selectedIndex() === undefined) {
const firstEnabled = this.items().findIndex(item => !item.disabled);
this.focusedIndex.set(Math.max(0, firstEnabled));
}
}

ngOnDestroy(): void {
Expand Down Expand Up @@ -212,8 +224,13 @@ export class SiStatusToggleComponent implements ControlValueAccessor, OnInit, On
this.value.set(value.value);
this.animated.set(animated);
this.selectedIndex.set(index);
this.focusedIndex.set(index);
this.draggablePosition.set(`${(100 / values.length) * index}%`);

if (emit) {
this.itemElements()[index]?.nativeElement.focus();
}

if (emit && index !== prevIndex) {
if (this.onChange) {
this.onChange(this.value()!);
Expand All @@ -225,4 +242,18 @@ export class SiStatusToggleComponent implements ControlValueAccessor, OnInit, On
}
}
}

protected navigateFocus(event: Event, fromIndex: number, direction: 1 | -1): void {
event.preventDefault();
const items = this.items();
const step = isRTL() ? -direction : direction;
let targetIndex = (fromIndex + step + items.length) % items.length;
while (targetIndex !== fromIndex && items[targetIndex].disabled) {
targetIndex = (targetIndex + step + items.length) % items.length;
}
if (!items[targetIndex].disabled) {
this.focusedIndex.set(targetIndex);
this.itemElements()[targetIndex].nativeElement.focus();
}
}
}
Loading