chore: audit components
This commit is contained in:
+63
-44
@@ -12,7 +12,7 @@ use gpui::{
|
||||
canvas, deferred, div, ease_out_quint, point, px, relative,
|
||||
};
|
||||
use gpui_native_icons::{Icon, IconRole, icon as icon_glyph};
|
||||
use gpui_native_theme::{ActiveTheme as _, POPUP_MAX_HEIGHT};
|
||||
use gpui_native_theme::{ActiveTheme as _, BORDER_WIDTH, POPUP_MAX_HEIGHT};
|
||||
use gpui_native_utils::focus_handle;
|
||||
|
||||
use crate::common::v_flex;
|
||||
@@ -23,6 +23,8 @@ pub type ItemHandler = Rc<dyn Fn(&mut Window, &mut App)>;
|
||||
|
||||
/// Reports the next open state of a menu: `true` to open, `false` to close.
|
||||
pub(crate) type ChangeHandler = Rc<dyn Fn(bool, &mut Window, &mut App)>;
|
||||
/// Flips a panel's flyout open state; `true` arms the first row for keyboard.
|
||||
type FlyoutSetter = Rc<dyn Fn(Option<usize>, bool, &mut App)>;
|
||||
/// Bounds captured during the last paint, shared with the dismissal listener.
|
||||
pub(crate) type TriggerBoundsCell = Rc<RefCell<Option<Bounds<Pixels>>>>;
|
||||
type TriggerFn = Box<dyn Fn(&mut Window, &mut App) -> AnyElement>;
|
||||
@@ -30,7 +32,9 @@ type ItemsFn = Box<dyn Fn(&mut Window, &mut App) -> Vec<MenuItem>>;
|
||||
|
||||
/// One row of a [`Menu`]: an action, a checkable action, a submenu, or a separator.
|
||||
#[derive(Clone)]
|
||||
#[must_use]
|
||||
pub struct MenuItem {
|
||||
id: Option<ElementId>,
|
||||
kind: MenuItemKind,
|
||||
label: SharedString,
|
||||
icon: Option<Icon>,
|
||||
@@ -55,6 +59,7 @@ impl MenuItem {
|
||||
L: Into<SharedString>,
|
||||
{
|
||||
Self {
|
||||
id: None,
|
||||
kind: MenuItemKind::Action,
|
||||
label: label.into(),
|
||||
icon: None,
|
||||
@@ -69,6 +74,7 @@ impl MenuItem {
|
||||
/// A divider between groups of actions.
|
||||
pub fn separator() -> Self {
|
||||
Self {
|
||||
id: None,
|
||||
kind: MenuItemKind::Separator,
|
||||
label: SharedString::default(),
|
||||
icon: None,
|
||||
@@ -80,6 +86,15 @@ impl MenuItem {
|
||||
}
|
||||
}
|
||||
|
||||
/// Overrides the row's element id, for stable identity across reorderings.
|
||||
pub fn id<I>(mut self, id: I) -> Self
|
||||
where
|
||||
I: Into<ElementId>,
|
||||
{
|
||||
self.id = Some(id.into());
|
||||
self
|
||||
}
|
||||
|
||||
/// Runs this action when the item is activated. The menu closes first.
|
||||
pub fn handler<F>(mut self, handler: F) -> Self
|
||||
where
|
||||
@@ -176,6 +191,7 @@ pub(crate) struct MenuChrome {
|
||||
|
||||
/// A floating menu of actions anchored below its trigger.
|
||||
#[derive(IntoElement)]
|
||||
#[must_use]
|
||||
pub struct Menu {
|
||||
id: ElementId,
|
||||
open: bool,
|
||||
@@ -256,7 +272,10 @@ impl Menu {
|
||||
}
|
||||
|
||||
/// Positions the panel at this window point when it opens.
|
||||
pub fn open_at(mut self, position: impl Into<Option<Point<Pixels>>>) -> Self {
|
||||
pub fn open_at<P>(mut self, position: P) -> Self
|
||||
where
|
||||
P: Into<Option<Point<Pixels>>>,
|
||||
{
|
||||
self.open_at = position.into();
|
||||
self
|
||||
}
|
||||
@@ -461,6 +480,8 @@ struct FlyoutContext<'a> {
|
||||
state: &'a MenuPanelState,
|
||||
open: &'a Entity<Option<usize>>,
|
||||
preselect: &'a Entity<bool>,
|
||||
/// Opens or closes this level's flyout, re-arming it on every switch.
|
||||
set_flyout: FlyoutSetter,
|
||||
/// The open flyout's painted bounds; a parent ignores clicks inside them.
|
||||
bounds: &'a TriggerBoundsCell,
|
||||
/// Bounds of every open flyout below this panel, this level's included.
|
||||
@@ -492,6 +513,8 @@ pub(crate) fn anchored_menu_panel(
|
||||
) -> Option<AnyElement> {
|
||||
let was_open = window.use_keyed_state((id.clone(), "menu-was-open"), cx, |_, _| false);
|
||||
|
||||
// Render-phase residue: trigger-toggle and owner-driven closes bypass every
|
||||
// dismissal handler, so this closed frame is the only universal close hook.
|
||||
if !spec.open {
|
||||
was_open.update(cx, |was_open, _| *was_open = false);
|
||||
// A closed menu drops any open flyout; fresh state on the next open.
|
||||
@@ -551,6 +574,8 @@ fn menu_panel(
|
||||
selection,
|
||||
} = state;
|
||||
|
||||
// Render-phase residue: panels open from owner state alone, so this mount
|
||||
// frame is the only place fresh-selection init can read its params.
|
||||
let selected = if *was_open.read(cx) {
|
||||
*selection.read(cx)
|
||||
} else {
|
||||
@@ -574,8 +599,6 @@ fn menu_panel(
|
||||
let flyout_open = window.use_keyed_state((params.id.clone(), "submenu-open"), cx, |_, _| None);
|
||||
let flyout_preselect =
|
||||
window.use_keyed_state((params.id.clone(), "submenu-preselect"), cx, |_, _| false);
|
||||
let flyout_last =
|
||||
window.use_keyed_state((params.id.clone(), "submenu-last-open"), cx, |_, _| None);
|
||||
let flyout_bounds: TriggerBoundsCell = Rc::new(RefCell::new(None));
|
||||
let flyout_stack: Rc<RefCell<Vec<TriggerBoundsCell>>> = Rc::new(RefCell::new(Vec::new()));
|
||||
flyout_stack.borrow_mut().push(flyout_bounds.clone());
|
||||
@@ -584,25 +607,29 @@ fn menu_panel(
|
||||
outer_stack.borrow_mut().push(flyout_bounds.clone());
|
||||
}
|
||||
|
||||
// A switched or reopened flyout starts from a clean selection.
|
||||
let open_flyout = *flyout_open.read(cx);
|
||||
if *flyout_last.read(cx) != open_flyout {
|
||||
flyout_state
|
||||
.was_open
|
||||
.update(cx, |was_open, _| *was_open = false);
|
||||
flyout_state
|
||||
.selection
|
||||
.update(cx, |selection, _| *selection = None);
|
||||
flyout_last.update(cx, |last, _| *last = open_flyout);
|
||||
}
|
||||
|
||||
let dismiss_flyout: ChangeHandler = {
|
||||
// Every open flip re-arms a clean flyout, so render never reconciles one.
|
||||
let set_flyout: FlyoutSetter = {
|
||||
let flyout_open = flyout_open.clone();
|
||||
let flyout_preselect = flyout_preselect.clone();
|
||||
let flyout_was_open = flyout_state.was_open.clone();
|
||||
let flyout_selection = flyout_state.selection.clone();
|
||||
Rc::new(move |index, opens_preselected, cx| {
|
||||
if index.is_some() && *flyout_open.read(cx) == index {
|
||||
return;
|
||||
}
|
||||
|
||||
flyout_open.update(cx, |open, _| *open = index);
|
||||
flyout_preselect.update(cx, |preselect, _| *preselect = opens_preselected);
|
||||
flyout_was_open.update(cx, |was_open, _| *was_open = false);
|
||||
flyout_selection.update(cx, |selection, _| *selection = None);
|
||||
})
|
||||
};
|
||||
|
||||
let dismiss_flyout: ChangeHandler = {
|
||||
let set_flyout = set_flyout.clone();
|
||||
let focus = focus.clone();
|
||||
Rc::new(move |_, window, cx| {
|
||||
flyout_open.update(cx, |open, _| *open = None);
|
||||
flyout_preselect.update(cx, |preselect, _| *preselect = false);
|
||||
set_flyout(None, false, cx);
|
||||
window.focus(&focus, cx);
|
||||
})
|
||||
};
|
||||
@@ -611,6 +638,7 @@ fn menu_panel(
|
||||
state: &flyout_state,
|
||||
open: &flyout_open,
|
||||
preselect: &flyout_preselect,
|
||||
set_flyout: set_flyout.clone(),
|
||||
bounds: &flyout_bounds,
|
||||
stack: &flyout_stack,
|
||||
dismiss: dismiss_flyout,
|
||||
@@ -693,8 +721,7 @@ fn menu_panel(
|
||||
.on_key_down({
|
||||
let items = params.items.clone();
|
||||
let selection = selection.clone();
|
||||
let flyout_open = flyout_open.clone();
|
||||
let flyout_preselect = flyout_preselect.clone();
|
||||
let set_flyout = set_flyout.clone();
|
||||
let on_dismiss = params.on_dismiss.clone();
|
||||
let on_activate = params.on_activate.clone();
|
||||
let left_dismisses = params.is_flyout;
|
||||
@@ -704,8 +731,7 @@ fn menu_panel(
|
||||
MenuKeyEnv {
|
||||
items: &items,
|
||||
selection: &selection,
|
||||
flyout_open: &flyout_open,
|
||||
flyout_preselect: &flyout_preselect,
|
||||
set_flyout: &set_flyout,
|
||||
on_dismiss: &on_dismiss,
|
||||
on_activate: &on_activate,
|
||||
left_dismisses,
|
||||
@@ -764,7 +790,7 @@ fn render_item(
|
||||
) -> AnyElement {
|
||||
match &item.kind {
|
||||
MenuItemKind::Separator => div()
|
||||
.h(px(1.))
|
||||
.h(BORDER_WIDTH)
|
||||
.debug_selector(move || format!("{}-separator-{index}", env.debug_prefix))
|
||||
.mx(env.chrome.spacing_unit * 2.0)
|
||||
.my(env.chrome.spacing_unit)
|
||||
@@ -835,17 +861,13 @@ fn render_item(
|
||||
|
||||
row_shell(cx, item, index, selected, env)
|
||||
.on_click({
|
||||
let flyout_open = flyout.open.clone();
|
||||
let flyout_preselect = flyout.preselect.clone();
|
||||
let set_flyout = flyout.set_flyout.clone();
|
||||
move |_, _window, cx| {
|
||||
if disabled {
|
||||
return;
|
||||
}
|
||||
// Hover already opens the flyout; a click never closes it.
|
||||
if *flyout_open.read(cx) != Some(index) {
|
||||
flyout_open.update(cx, |open, _| *open = Some(index));
|
||||
flyout_preselect.update(cx, |preselect, _| *preselect = false);
|
||||
}
|
||||
set_flyout(Some(index), false, cx);
|
||||
}
|
||||
})
|
||||
.child(
|
||||
@@ -914,9 +936,14 @@ fn row_shell(
|
||||
let selectable = item.selectable();
|
||||
let opens_submenu = item.submenu_items().is_some();
|
||||
let flyout_open = *env.flyout.open.read(cx) == Some(index);
|
||||
let row_id = item
|
||||
.id
|
||||
.clone()
|
||||
.unwrap_or_else(|| ("menu-item", index).into());
|
||||
|
||||
div()
|
||||
.id(("menu-item", index))
|
||||
.id(row_id)
|
||||
.role(Role::MenuItem)
|
||||
.debug_selector(move || format!("{}-item-{index}", env.debug_prefix))
|
||||
.flex()
|
||||
.items_center()
|
||||
@@ -945,7 +972,7 @@ fn row_shell(
|
||||
.on_mouse_move({
|
||||
let selection = env.selection.clone();
|
||||
let flyout_open = env.flyout.open.clone();
|
||||
let flyout_preselect = env.flyout.preselect.clone();
|
||||
let set_flyout = env.flyout.set_flyout.clone();
|
||||
let dismiss = env.flyout.dismiss.clone();
|
||||
move |_, window, cx| {
|
||||
if !selectable {
|
||||
@@ -957,10 +984,7 @@ fn row_shell(
|
||||
}
|
||||
|
||||
if opens_submenu {
|
||||
if *flyout_open.read(cx) != Some(index) {
|
||||
flyout_open.update(cx, |open, _| *open = Some(index));
|
||||
flyout_preselect.update(cx, |preselect, _| *preselect = false);
|
||||
}
|
||||
set_flyout(Some(index), false, cx);
|
||||
} else if flyout_open.read(cx).is_some() {
|
||||
dismiss(false, window, cx);
|
||||
}
|
||||
@@ -996,8 +1020,7 @@ fn row_color(
|
||||
struct MenuKeyEnv<'a> {
|
||||
items: &'a [MenuItem],
|
||||
selection: &'a Entity<Option<usize>>,
|
||||
flyout_open: &'a Entity<Option<usize>>,
|
||||
flyout_preselect: &'a Entity<bool>,
|
||||
set_flyout: &'a FlyoutSetter,
|
||||
on_dismiss: &'a Option<ChangeHandler>,
|
||||
on_activate: &'a Option<ChangeHandler>,
|
||||
left_dismisses: bool,
|
||||
@@ -1044,9 +1067,7 @@ fn handle_menu_key(event: &KeyDownEvent, env: MenuKeyEnv, window: &mut Window, c
|
||||
if !opens {
|
||||
return;
|
||||
}
|
||||
env.flyout_open.update(cx, |open, _| *open = current);
|
||||
env.flyout_preselect
|
||||
.update(cx, |preselect, _| *preselect = true);
|
||||
(env.set_flyout)(current, true, cx);
|
||||
}
|
||||
"enter" | "space" => {
|
||||
if let Some(current) = current
|
||||
@@ -1054,9 +1075,7 @@ fn handle_menu_key(event: &KeyDownEvent, env: MenuKeyEnv, window: &mut Window, c
|
||||
&& item.selectable()
|
||||
{
|
||||
if item.submenu_items().is_some() {
|
||||
env.flyout_open.update(cx, |open, _| *open = Some(current));
|
||||
env.flyout_preselect
|
||||
.update(cx, |preselect, _| *preselect = true);
|
||||
(env.set_flyout)(Some(current), true, cx);
|
||||
} else {
|
||||
if let Some(on_activate) = env.on_activate {
|
||||
on_activate(false, window, cx);
|
||||
|
||||
Reference in New Issue
Block a user