diff --git a/crates/storybook2/src/stories/focus.rs b/crates/storybook2/src/stories/focus.rs index b10c75c190..0133a890be 100644 --- a/crates/storybook2/src/stories/focus.rs +++ b/crates/storybook2/src/stories/focus.rs @@ -1,8 +1,8 @@ use std::any::Any; use gpui3::{ - div, view, Action, Context, Focus, Interactive, KeyBinding, ParentElement, Styled, View, - WindowContext, + div, view, Action, Context, Focus, KeyBinding, ParentElement, StatelesslyInteractive, Styled, + View, WindowContext, }; use crate::themes::rose_pine; diff --git a/crates/ui2/src/components/collab_panel.rs b/crates/ui2/src/components/collab_panel.rs index 8afc4256c4..bd743bfdd1 100644 --- a/crates/ui2/src/components/collab_panel.rs +++ b/crates/ui2/src/components/collab_panel.rs @@ -1,12 +1,10 @@ -use std::marker::PhantomData; - -use gpui3::{img, svg, SharedString}; - use crate::prelude::*; use crate::{ static_collab_panel_channels, static_collab_panel_current_call, v_stack, Icon, List, ListHeader, ToggleState, }; +use gpui3::{img, svg, SharedString}; +use std::marker::PhantomData; #[derive(Element)] pub struct CollabPanel { diff --git a/crates/ui2/src/components/icon_button.rs b/crates/ui2/src/components/icon_button.rs index f71681e864..dd7e9457e1 100644 --- a/crates/ui2/src/components/icon_button.rs +++ b/crates/ui2/src/components/icon_button.rs @@ -1,7 +1,7 @@ use std::marker::PhantomData; use std::sync::Arc; -use gpui3::{MouseButton, StatelesslyInteractive}; +use gpui3::MouseButton; use crate::{h_stack, prelude::*}; use crate::{ClickHandler, Icon, IconColor, IconElement}; diff --git a/crates/ui2/src/elements/button.rs b/crates/ui2/src/elements/button.rs index f077f2286f..7e474fb5af 100644 --- a/crates/ui2/src/elements/button.rs +++ b/crates/ui2/src/elements/button.rs @@ -1,7 +1,7 @@ use std::marker::PhantomData; use std::sync::Arc; -use gpui3::{DefiniteLength, Hsla, MouseButton, StatelesslyInteractive, WindowContext}; +use gpui3::{DefiniteLength, Hsla, MouseButton, WindowContext}; use crate::settings::user_settings; use crate::{h_stack, Icon, IconColor, IconElement, Label, LabelColor}; diff --git a/crates/ui2/src/prelude.rs b/crates/ui2/src/prelude.rs index d61a5463c6..456d6cefe1 100644 --- a/crates/ui2/src/prelude.rs +++ b/crates/ui2/src/prelude.rs @@ -1,6 +1,6 @@ pub use gpui3::{ - div, Element, Hover, IntoAnyElement, ParentElement, ScrollState, SharedString, - StatefullyInteractive, Styled, ViewContext, WindowContext, + div, Element, IntoAnyElement, ParentElement, ScrollState, SharedString, StatefullyInteractive, + StatelesslyInteractive, Styled, ViewContext, WindowContext, }; use crate::settings::user_settings;