ZacharyZhang-NY/Ely-GPUI-Components
1
1 Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

i18n, a11y, IME · palette copy reads i18n with builtin en/zh; dialog and palette Enter run on the field's key-down action, so an IME-kept Enter never submits; Button, IconButton, TextInput, Tabs, EditorTabs, StatusBarItem and palette rows name their role and label

Browse Source
This commit is contained in:
ZacharyZhang-NY committed 2026-10-02 12:58:43 -04:00
1 parent 8fd7b8ab87
commit 4580e3b075
15 files changed
+257 -75
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/navigation/editor_tabs.rs
+5 -2
View File
@@ -2,8 +2,8 @@ use std::rc::Rc;
use gpui::{
AnyElement, App, ElementId, EntityId, InteractiveElement, IntoElement, MouseButton,
ParentElement, Pixels, RenderOnce, ScrollHandle, SharedString, StatefulInteractiveElement,
Styled, Window, canvas, div, prelude::*,
ParentElement, Pixels, RenderOnce, Role, ScrollHandle, SharedString,
StatefulInteractiveElement, Styled, Window, canvas, div, prelude::*,
};
use super::TabOverflowMenu;
@@ -246,6 +246,9 @@ impl RenderOnce for EditorTabs {
let (title, icon, edge) = (tab.title.clone(), tab.icon, colors.focus);
div()
.id(tab.id.clone())
.role(Role::Tab)
.aria_selected(on)
.aria_label(tab.title.clone())
.group(group)
.relative()
.flex()
src/navigation/palette/kinds.rs
+26 -14
View File
@@ -5,6 +5,7 @@ use gpui::{App, ElementId, IntoElement, RenderOnce, SharedString, Window};
use super::{Fit, Group, Palette, Row, fuzzy, marked, query_field};
use crate::{
forms::{Choice, OnValue, Run},
i18n,
primitives::IconName,
typography::{Highlight, KbdCombo},
};
@@ -60,6 +61,7 @@ impl Command {
fn row(&self, hits: Vec<Range<usize>>, cx: &App) -> Row {
Row {
value: self.value.clone(),
name: self.label.clone(),
icon: self.icon,
label: marked(self.label.clone(), hits, cx),
detail: None,
@@ -123,7 +125,8 @@ impl CommandPalette {
impl RenderOnce for CommandPalette {
fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
let input = query_field(&self.id, "Type a command", window, cx);
let placeholder = i18n::text(cx, "palette.command.placeholder", &[]);
let input = query_field(&self.id, placeholder, window, cx);
let query = input.read(cx).text().trim().to_string();
let groups = if query.is_empty() {
let find = |value: &SharedString| {
@@ -134,7 +137,7 @@ impl RenderOnce for CommandPalette {
.unwrap_or_else(|| panic!("recent command {value} is not in the palette"))
};
let recent = Group {
title: Some("Recent".into()),
title: Some(i18n::text(cx, "palette.recent", &[])),
rows: self
.recent
.iter()
@@ -182,7 +185,7 @@ impl RenderOnce for CommandPalette {
input,
groups,
start: 0,
empty: "No matching commands".into(),
empty: i18n::text(cx, "palette.command.empty", &[]),
on_pick: self.on_run,
on_close: self.on_close,
}
@@ -246,6 +249,7 @@ fn file_row(path: &SharedString, hits: &[Range<usize>], cx: &App) -> Row {
let folder = &path[..name_at.saturating_sub(1)];
Row {
value: path.clone(),
name: path[name_at..].to_string().into(),
icon: Some(IconName::File),
label: marked(
path[name_at..].to_string().into(),
@@ -260,7 +264,8 @@ fn file_row(path: &SharedString, hits: &[Range<usize>], cx: &App) -> Row {
impl RenderOnce for QuickOpen {
fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
let input = query_field(&self.id, "Go to file", window, cx);
let placeholder = i18n::text(cx, "palette.open.placeholder", &[]);
let input = query_field(&self.id, placeholder, window, cx);
let query = input.read(cx).text().trim().to_string();
let (group, empty) = if query.is_empty() {
let rows = self
@@ -270,10 +275,10 @@ impl RenderOnce for QuickOpen {
.collect();
(
Group {
title: Some("Recent".into()),
title: Some(i18n::text(cx, "palette.recent", &[])),
rows,
},
"Type part of a file name",
i18n::text(cx, "palette.open.idle", &[]),
)
} else {
let rows = ranked(self.paths.iter(), &query, |path| &path[..])
@@ -281,14 +286,17 @@ impl RenderOnce for QuickOpen {
.take(SHOWN)
.map(|(path, fit)| file_row(path, &fit.hits, cx))
.collect();
(Group { title: None, rows }, "No matching files")
(
Group { title: None, rows },
i18n::text(cx, "palette.open.empty", &[]),
)
};
Palette {
id: self.id,
input,
groups: vec![group],
start: 0,
empty: empty.into(),
empty,
on_pick: self.on_open,
on_close: self.on_close,
}
@@ -336,10 +344,12 @@ impl QuickSwitcher {
impl RenderOnce for QuickSwitcher {
fn render(self, window: &mut Window, cx: &mut App) -> impl IntoElement {
let input = query_field(&self.id, "Switch to", window, cx);
let placeholder = i18n::text(cx, "palette.switch.placeholder", &[]);
let input = query_field(&self.id, placeholder, window, cx);
let query = input.read(cx).text().trim().to_string();
let row = |item: &Choice, hits: Vec<Range<usize>>| Row {
value: item.value.clone(),
name: item.label.clone(),
icon: item.icon,
label: marked(item.label.clone(), hits, cx),
detail: None,
@@ -367,7 +377,7 @@ impl RenderOnce for QuickSwitcher {
input,
groups: vec![Group { title: None, rows }],
start,
empty: "Nothing open by that name".into(),
empty: i18n::text(cx, "palette.switch.empty", &[]),
on_pick: self.on_switch,
on_close: self.on_close,
}
@@ -424,7 +434,8 @@ impl SearchPalette {
}
pub(crate) fn palette(self, window: &mut Window, cx: &mut App) -> Palette {
let input = query_field(&self.id, "Search everything", window, cx);
let placeholder = i18n::text(cx, "palette.search.placeholder", &[]);
let input = query_field(&self.id, placeholder, window, cx);
let query = input.read(cx).text().trim().to_string();
let groups = (self.search)(&query)
.into_iter()
@@ -441,7 +452,8 @@ impl SearchPalette {
);
})
.map(|result| Row {
value: result.value,
value: result.value.clone(),
name: result.label.clone(),
icon: result.icon,
label: Highlight::matching(result.label, &query).into_any_element(),
detail: result
@@ -458,9 +470,9 @@ impl SearchPalette {
groups,
start: 0,
empty: if query.is_empty() {
"Type to search".into()
i18n::text(cx, "palette.search.idle", &[])
} else {
format!("Nothing found for “{query}”").into()
i18n::text(cx, "palette.search.empty", &[("query", &query)])
},
on_pick: self.on_open,
on_close: self.on_close,
src/navigation/palette/mod.rs
+12 -8
View File
@@ -7,8 +7,8 @@ use std::{ops::Range, rc::Rc};
use gpui::{
Animation, AnimationExt, AnyElement, App, ElementId, Entity, FontWeight, HighlightStyle,
InteractiveElement, IntoElement, MouseButton, ParentElement, Point, ScrollHandle, SharedString,
StatefulInteractiveElement, Styled, StyledText, Window, div, prelude::*,
InteractiveElement, IntoElement, MouseButton, ParentElement, Point, Role, ScrollHandle,
SharedString, StatefulInteractiveElement, Styled, StyledText, Window, div, prelude::*,
};
use crate::{
@@ -102,6 +102,8 @@ pub(crate) fn marked(text: SharedString, hits: Vec<Range<usize>>, cx: &App) -> A
/// One result: the value a pick hands back, then what the row shows.
pub(crate) struct Row {
pub value: SharedString,
/// The row's plain name, for assistive technology.
pub name: SharedString,
pub icon: Option<IconName>,
pub label: AnyElement,
pub detail: Option<AnyElement>,
@@ -125,7 +127,7 @@ struct Cursor {
/// The query field kept for palette `id`.
pub(crate) fn query_field(
id: &ElementId,
placeholder: &'static str,
placeholder: SharedString,
window: &mut Window,
cx: &mut App,
) -> Entity<TextInput> {
@@ -250,6 +252,9 @@ impl Palette {
children.push(
div()
.id(("row", ix))
.role(Role::ListBoxOption)
.aria_selected(ix == at)
.aria_label(row.name.clone())
.flex()
.flex_none()
.items_center()
@@ -328,11 +333,9 @@ impl Palette {
cx.stop_propagation();
down(1, cx);
})
.capture_action(|_: &Enter, _, cx| cx.stop_propagation())
.on_key_up(move |event, window, cx| {
let stroke = &event.keystroke;
if stroke.key == "enter" && !stroke.modifiers.modified() && count > 0 {
cx.stop_propagation();
.capture_action(move |_: &Enter, window, cx| {
cx.stop_propagation();
if count > 0 {
enter(chosen.read(cx).at.min(count - 1), window, cx);
}
})
@@ -363,6 +366,7 @@ impl Palette {
.child(
div()
.id((self.id.clone(), "list"))
.role(Role::ListBox)
.flex()
.flex_col()
.flex_1()
src/navigation/tabs.rs
+6 -2
View File
@@ -2,8 +2,8 @@ use std::rc::Rc;
use gpui::{
Animation, AnimationExt, AnyElement, App, ElementId, FontWeight, InteractiveElement,
IntoElement, MouseButton, ParentElement, RenderOnce, SharedString, StatefulInteractiveElement,
Styled, Window, div, prelude::*,
IntoElement, MouseButton, ParentElement, RenderOnce, Role, SharedString,
StatefulInteractiveElement, Styled, Window, div, prelude::*,
};
use crate::{
@@ -150,6 +150,9 @@ impl RenderOnce for Tabs {
let pick = pick.clone();
div()
.id(("tab", ix))
.role(Role::Tab)
.aria_selected(on)
.aria_label(tab.label.clone())
.relative()
.flex()
.items_center()
@@ -195,6 +198,7 @@ impl RenderOnce for Tabs {
let (keys, key_pick) = (tabs.clone(), pick.clone());
let strip = div()
.id((self.id.clone(), "strip"))
.role(Role::TabList)
.track_focus(&focus)
.relative()
.flex()