a11y: a skip link, color-blind safe charts
i18n::SkipLink holds a Tab stop in flow at zero size, first where it sits, and while focused raises a pill over the page; Enter, Space or a press hands focus to its target. gpui orders stops by tab_index before paint and registers none for an invisible element, so the stop stays in flow and only the pill is raised. Theme::set_color_blind_safe swaps Ely's chart hues for a set fitted to stay apart under Machado's protanopia, deuteranopia and tritanopia; a test holds every pair 0.10 apart in Oklab and each hue 3:1 on its page, and red against green shows the measure bites. KeyboardNavigationHelper points to interaction::RovingFocus. The announcer, labels and screen-reader text stay blocked: gpui 0.2.2 has no accessibility tree, and nothing here is trusted to observe VoiceOver. The i18n tests move under src/i18n/tests.
This commit is contained in:
1 parent
aa39fba87f
commit
1ac5c04fb0
10 files changed
+463
-7
No files matched your search
@@ -0,0 +1,101 @@
|
||||
use ely_gpui_component::{
|
||||
buttons::{Button, ButtonVariant},
|
||||
forms::Switch,
|
||||
i18n::SkipLink,
|
||||
theme::{ActiveTheme, HUE_NAMES, Radius, Theme},
|
||||
};
|
||||
use gpui::{
|
||||
App, ElementId, InteractiveElement, IntoElement, ParentElement, SharedString, Styled, Window,
|
||||
div, px,
|
||||
};
|
||||
|
||||
use crate::probe::probe;
|
||||
use crate::ui::{blocked, section, specimen, specimens};
|
||||
|
||||
const NAV: [&str; 5] = ["Home", "Docs", "Pricing", "Blog", "About"];
|
||||
|
||||
pub fn skip_link(window: &mut Window, cx: &mut App) -> impl IntoElement + use<> {
|
||||
let main = window
|
||||
.use_keyed_state("skip-main", cx, |_, cx| cx.focus_handle())
|
||||
.read(cx)
|
||||
.clone();
|
||||
let theme = cx.theme();
|
||||
let nav = NAV.map(|name| {
|
||||
let id = ElementId::Name(SharedString::from(format!("skip-nav-{name}")));
|
||||
Button::new(id, name).variant(ButtonVariant::Ghost)
|
||||
});
|
||||
section(
|
||||
"SkipLink · KeyboardNavigationHelper",
|
||||
"A link that shows only while focused and moves focus past the nav to the main part: Tab into the card, then Enter. Arrows among a group's items live in interaction::RovingFocus.",
|
||||
cx,
|
||||
)
|
||||
.child(
|
||||
probe(
|
||||
"skip-demo",
|
||||
div()
|
||||
.max_w(px(480.0))
|
||||
.flex()
|
||||
.flex_col()
|
||||
.rounded(theme.radius(Radius::Lg))
|
||||
.border_1()
|
||||
.border_color(theme.colors.border)
|
||||
.child(SkipLink::new("skip", "Skip to content", &main))
|
||||
.child(
|
||||
div()
|
||||
.flex()
|
||||
.flex_wrap()
|
||||
.gap_1()
|
||||
.p_2()
|
||||
.border_b_1()
|
||||
.border_color(theme.colors.border)
|
||||
.children(nav),
|
||||
)
|
||||
.child(
|
||||
div()
|
||||
.track_focus(&main)
|
||||
.flex()
|
||||
.flex_col()
|
||||
.items_start()
|
||||
.gap_3()
|
||||
.p_4()
|
||||
.text_color(theme.colors.fg_muted)
|
||||
.child("The main part starts here.")
|
||||
.child(Button::new("skip-read", "Read the guide")),
|
||||
),
|
||||
),
|
||||
)
|
||||
.child(blocked(
|
||||
"LiveRegion / Announcer, AccessibleIcon, AriaLabel, ScreenReaderOnly: gpui 0.2.2 exposes no accessibility tree, so no label or live region reaches a screen reader.",
|
||||
cx,
|
||||
))
|
||||
}
|
||||
|
||||
pub fn color_blind(cx: &App) -> impl IntoElement + use<> {
|
||||
let theme = cx.theme();
|
||||
let on = theme.color_blind_safe();
|
||||
let swatches = HUE_NAMES
|
||||
.iter()
|
||||
.zip(theme.colors.chart)
|
||||
.map(|(name, color)| {
|
||||
specimen(
|
||||
*name,
|
||||
div()
|
||||
.size(px(40.0))
|
||||
.rounded(theme.radius(Radius::Md))
|
||||
.bg(color),
|
||||
cx,
|
||||
)
|
||||
});
|
||||
section(
|
||||
"ColorBlindSafe Palette",
|
||||
"Ely's chart hues share one lightness, so protanopia, deuteranopia and tritanopia run some together. The safe hues differ in lightness too: every pair stays apart for each, and each is 3:1 on its page.",
|
||||
cx,
|
||||
)
|
||||
.child(probe(
|
||||
"color-blind",
|
||||
Switch::new("color-blind", on)
|
||||
.label("Color-blind safe charts")
|
||||
.on_change(|on, _, cx| Theme::set_color_blind_safe(on, cx)),
|
||||
))
|
||||
.child(specimens().gap_3().children(swatches))
|
||||
}
|
||||
@@ -8,6 +8,8 @@ use ely_gpui_component::{
|
||||
use gpui::{AnyElement, App, IntoElement, ParentElement, Styled, Window, div, px};
|
||||
use jiff::{Timestamp, tz::TimeZone};
|
||||
|
||||
mod a11y;
|
||||
|
||||
use super::Page;
|
||||
use crate::probe::probe;
|
||||
use crate::script::Step;
|
||||
@@ -29,6 +31,19 @@ pub const PAGE: Page = Page {
|
||||
Step::Key("home"),
|
||||
Step::Key("enter"),
|
||||
Step::Wait(300),
|
||||
Step::Key("tab"),
|
||||
Step::HoverAt("skip-demo", 300.0, 70.0),
|
||||
Step::Wait(300),
|
||||
Step::Shot("skip-link"),
|
||||
Step::Key("enter"),
|
||||
Step::Key("tab"),
|
||||
Step::Wait(300),
|
||||
Step::Shot("skipped"),
|
||||
Step::Click("color-blind"),
|
||||
Step::Wait(300),
|
||||
Step::Shot("color-blind"),
|
||||
Step::Click("color-blind"),
|
||||
Step::Wait(300),
|
||||
],
|
||||
};
|
||||
|
||||
@@ -105,11 +120,13 @@ pub fn install(cx: &mut App) {
|
||||
);
|
||||
}
|
||||
|
||||
fn render(_: &mut Window, cx: &mut App) -> AnyElement {
|
||||
fn render(window: &mut Window, cx: &mut App) -> AnyElement {
|
||||
div()
|
||||
.child(messages(cx))
|
||||
.child(formats(cx))
|
||||
.child(mirrored(cx))
|
||||
.child(a11y::skip_link(window, cx))
|
||||
.child(a11y::color_blind(cx))
|
||||
.into_any_element()
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user