Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix focus story

Browse source
This commit is contained in:
Antonio Scandurra 2023-11-13 14:35:49 +01:00
parent 9c18253863
commit 26d26fadb3
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
crates/storybook2/src/stories/focus.rs
View file

@ -1,12 +1,16 @@
use gpui::{ use gpui::{
actions, div, Div, Focusable, FocusableKeyDispatch, KeyBinding, ParentElement, Render, actions, div, Div, FocusHandle, Focusable, FocusableKeyDispatch, KeyBinding, ParentElement,
StatefulInteractivity, StatelessInteractive, Styled, View, VisualContext, WindowContext, Render, StatefulInteractivity, StatelessInteractive, Styled, View, VisualContext,
WindowContext,
}; };
use theme2::ActiveTheme; use theme2::ActiveTheme;
actions!(ActionA, ActionB, ActionC); actions!(ActionA, ActionB, ActionC);
pub struct FocusStory {} pub struct FocusStory {
child_1_focus: FocusHandle,
child_2_focus: FocusHandle,
}
impl FocusStory { impl FocusStory {
pub fn view(cx: &mut WindowContext) -> View<Self> { pub fn view(cx: &mut WindowContext) -> View<Self> {
@ -16,7 +20,10 @@ impl FocusStory {
KeyBinding::new("cmd-c", ActionC, None), KeyBinding::new("cmd-c", ActionC, None),
]); ]);
cx.build_view(move |cx| Self {}) cx.build_view(move |cx| Self {
child_1_focus: cx.focus_handle(),
child_2_focus: cx.focus_handle(),
})
} }
} }
@ -31,8 +38,6 @@ impl Render for FocusStory {
let color_4 = theme.status().conflict; let color_4 = theme.status().conflict;
let color_5 = theme.status().ignored; let color_5 = theme.status().ignored;
let color_6 = theme.status().renamed; let color_6 = theme.status().renamed;
let child_1 = cx.focus_handle();
let child_2 = cx.focus_handle();
div() div()
.id("parent") .id("parent")
@ -56,7 +61,7 @@ impl Render for FocusStory {
.focus_in(|style| style.bg(color_3)) .focus_in(|style| style.bg(color_3))
.child( .child(
div() div()
.track_focus(&child_1) .track_focus(&self.child_1_focus)
.context("child-1") .context("child-1")
.on_action(|_, action: &ActionB, cx| { .on_action(|_, action: &ActionB, cx| {
println!("Action B dispatched on child 1 during"); println!("Action B dispatched on child 1 during");
@ -76,7 +81,7 @@ impl Render for FocusStory {
) )
.child( .child(
div() div()
.track_focus(&child_2) .track_focus(&self.child_2_focus)
.context("child-2") .context("child-2")
.on_action(|_, action: &ActionC, cx| { .on_action(|_, action: &ActionC, cx| {
println!("Action C dispatched on child 2"); println!("Action C dispatched on child 2");