From 207d843aee50348785d5790a9e94caa057403a3e Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Thu, 12 Oct 2023 10:44:18 -0400
Subject: [PATCH] Fix issues in `storybook2`

---
 crates/storybook2/src/collab_panel.rs    | 8 ++++----
 crates/storybook2/src/stories/z_index.rs | 2 +-
 crates/storybook2/src/storybook2.rs      | 2 +-
 crates/storybook2/src/workspace.rs       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/crates/storybook2/src/collab_panel.rs b/crates/storybook2/src/collab_panel.rs
index 2f733c1b76..a1efce7c0d 100644
--- a/crates/storybook2/src/collab_panel.rs
+++ b/crates/storybook2/src/collab_panel.rs
@@ -1,8 +1,8 @@
-use crate::theme::{theme, Theme};
 use gpui3::{
     div, svg, view, AppContext, Context, Element, ElementId, IntoAnyElement, ParentElement,
     ScrollState, SharedString, StyleHelpers, Styled, View, ViewContext, WindowContext,
 };
+use ui::{theme, Theme};
 
 pub struct CollabPanel {
     scroll_state: ScrollState,
@@ -68,21 +68,21 @@ impl CollabPanel {
                             .py_2()
                             .flex()
                             .flex_col()
-                            .child(self.list_section_header(1, "CHANNELS", true, theme)),
+                            .child(self.list_section_header(1, "CHANNELS", true, &theme)),
                     )
                     .child(
                         div()
                             .py_2()
                             .flex()
                             .flex_col()
-                            .child(self.list_section_header(2, "CONTACTS", true, theme))
+                            .child(self.list_section_header(2, "CONTACTS", true, &theme))
                             .children(
                                 std::iter::repeat_with(|| {
                                     vec![
                                         self.list_item(
                                             "http://github.com/as-cii.png?s=50",
                                             "as-cii",
-                                            theme,
+                                            &theme,
                                         ),
                                         // self.list_item(
                                         //     "http://github.com/nathansobo.png?s=50",
diff --git a/crates/storybook2/src/stories/z_index.rs b/crates/storybook2/src/stories/z_index.rs
index 89a146b4ec..4824386d8a 100644
--- a/crates/storybook2/src/stories/z_index.rs
+++ b/crates/storybook2/src/stories/z_index.rs
@@ -87,7 +87,7 @@ trait Styles: StyleHelpers {
     }
 }
 
-impl<S> Styles for Div<S> {}
+impl<S: 'static + Send + Sync> Styles for Div<S> {}
 
 #[derive(Element)]
 struct ZIndexExample<S: 'static + Send + Sync> {
diff --git a/crates/storybook2/src/storybook2.rs b/crates/storybook2/src/storybook2.rs
index 30fbb079a2..1f1a8af13d 100644
--- a/crates/storybook2/src/storybook2.rs
+++ b/crates/storybook2/src/storybook2.rs
@@ -102,7 +102,7 @@ impl StoryWrapper {
         Self { selector, theme }
     }
 
-    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl Element<State = Self> {
+    fn render(&mut self, cx: &mut ViewContext<Self>) -> impl Element<ViewState = Self> {
         themed(self.theme.clone(), cx, |cx| {
             div()
                 .flex()
diff --git a/crates/storybook2/src/workspace.rs b/crates/storybook2/src/workspace.rs
index e902df6565..2fb680cfc3 100644
--- a/crates/storybook2/src/workspace.rs
+++ b/crates/storybook2/src/workspace.rs
@@ -1,12 +1,12 @@
 use crate::{
     collab_panel::{collab_panel, CollabPanel},
-    theme::{theme, themed},
     themes::rose_pine,
 };
 use gpui3::{
     div, img, svg, view, Context, Element, ParentElement, RootView, StyleHelpers, Styled, View,
     ViewContext, WindowContext,
 };
+use ui::{theme, themed};
 
 pub struct Workspace {
     left_panel: View<CollabPanel, Self>,