From 4c9c7980ee4b2b160a02ddca7314c86b48a1a573 Mon Sep 17 00:00:00 2001
From: Jason Lee <huacnlee@gmail.com>
Date: Fri, 7 Mar 2025 20:22:58 +0800
Subject: [PATCH] chore: Upgrade GPUI 2025/03/07 (#697)

---
 Cargo.lock                    | 28 ++++++++++++++--------------
 crates/story/examples/form.rs | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 14 deletions(-)
 create mode 100644 crates/story/examples/form.rs

diff --git a/Cargo.lock b/Cargo.lock
index a2d64330..ead0df91 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -561,7 +561,7 @@ dependencies = [
  "bitflags 2.6.0",
  "cexpr",
  "clang-sys",
- "itertools 0.12.1",
+ "itertools 0.10.5",
  "lazy_static",
  "lazycell",
  "log",
@@ -584,7 +584,7 @@ dependencies = [
  "bitflags 2.6.0",
  "cexpr",
  "clang-sys",
- "itertools 0.13.0",
+ "itertools 0.10.5",
  "log",
  "prettyplease",
  "proc-macro2",
@@ -1105,7 +1105,7 @@ dependencies = [
 [[package]]
 name = "collections"
 version = "0.1.0"
-source = "git+https://github.com/huacnlee/zed.git?branch=webview#77264485e44e04fd25b90f78fae4a55b6a78b003"
+source = "git+https://github.com/huacnlee/zed.git?branch=webview#deac3307cea9c32c4571a3fe797555593c9efaef"
 dependencies = [
  "indexmap 2.7.1",
  "rustc-hash 2.1.0",
@@ -1554,7 +1554,7 @@ dependencies = [
 [[package]]
 name = "derive_refineable"
 version = "0.1.0"
-source = "git+https://github.com/huacnlee/zed.git?branch=webview#77264485e44e04fd25b90f78fae4a55b6a78b003"
+source = "git+https://github.com/huacnlee/zed.git?branch=webview#deac3307cea9c32c4571a3fe797555593c9efaef"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2558,7 +2558,7 @@ dependencies = [
 [[package]]
 name = "gpui"
 version = "0.1.0"
-source = "git+https://github.com/huacnlee/zed.git?branch=webview#77264485e44e04fd25b90f78fae4a55b6a78b003"
+source = "git+https://github.com/huacnlee/zed.git?branch=webview#deac3307cea9c32c4571a3fe797555593c9efaef"
 dependencies = [
  "anyhow",
  "as-raw-xcb-connection",
@@ -2676,7 +2676,7 @@ dependencies = [
 [[package]]
 name = "gpui_macros"
 version = "0.1.0"
-source = "git+https://github.com/huacnlee/zed.git?branch=webview#77264485e44e04fd25b90f78fae4a55b6a78b003"
+source = "git+https://github.com/huacnlee/zed.git?branch=webview#deac3307cea9c32c4571a3fe797555593c9efaef"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2944,7 +2944,7 @@ dependencies = [
 [[package]]
 name = "http_client"
 version = "0.1.0"
-source = "git+https://github.com/huacnlee/zed.git?branch=webview#77264485e44e04fd25b90f78fae4a55b6a78b003"
+source = "git+https://github.com/huacnlee/zed.git?branch=webview#deac3307cea9c32c4571a3fe797555593c9efaef"
 dependencies = [
  "anyhow",
  "bytes",
@@ -3683,7 +3683,7 @@ dependencies = [
 [[package]]
 name = "media"
 version = "0.1.0"
-source = "git+https://github.com/huacnlee/zed.git?branch=webview#77264485e44e04fd25b90f78fae4a55b6a78b003"
+source = "git+https://github.com/huacnlee/zed.git?branch=webview#deac3307cea9c32c4571a3fe797555593c9efaef"
 dependencies = [
  "anyhow",
  "bindgen 0.70.1",
@@ -4051,7 +4051,7 @@ version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
 dependencies = [
- "proc-macro-crate 3.2.0",
+ "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
  "syn 2.0.96",
@@ -5292,7 +5292,7 @@ dependencies = [
 [[package]]
 name = "refineable"
 version = "0.1.0"
-source = "git+https://github.com/huacnlee/zed.git?branch=webview#77264485e44e04fd25b90f78fae4a55b6a78b003"
+source = "git+https://github.com/huacnlee/zed.git?branch=webview#deac3307cea9c32c4571a3fe797555593c9efaef"
 dependencies = [
  "derive_refineable",
 ]
@@ -5385,7 +5385,7 @@ dependencies = [
 [[package]]
 name = "reqwest_client"
 version = "0.1.0"
-source = "git+https://github.com/huacnlee/zed.git?branch=webview#77264485e44e04fd25b90f78fae4a55b6a78b003"
+source = "git+https://github.com/huacnlee/zed.git?branch=webview#deac3307cea9c32c4571a3fe797555593c9efaef"
 dependencies = [
  "anyhow",
  "bytes",
@@ -5859,7 +5859,7 @@ checksum = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a"
 [[package]]
 name = "semantic_version"
 version = "0.1.0"
-source = "git+https://github.com/huacnlee/zed.git?branch=webview#77264485e44e04fd25b90f78fae4a55b6a78b003"
+source = "git+https://github.com/huacnlee/zed.git?branch=webview#deac3307cea9c32c4571a3fe797555593c9efaef"
 dependencies = [
  "anyhow",
  "serde",
@@ -6326,7 +6326,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 [[package]]
 name = "sum_tree"
 version = "0.1.0"
-source = "git+https://github.com/huacnlee/zed.git?branch=webview#77264485e44e04fd25b90f78fae4a55b6a78b003"
+source = "git+https://github.com/huacnlee/zed.git?branch=webview#deac3307cea9c32c4571a3fe797555593c9efaef"
 dependencies = [
  "arrayvec",
  "log",
@@ -7118,7 +7118,7 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 [[package]]
 name = "util"
 version = "0.1.0"
-source = "git+https://github.com/huacnlee/zed.git?branch=webview#77264485e44e04fd25b90f78fae4a55b6a78b003"
+source = "git+https://github.com/huacnlee/zed.git?branch=webview#deac3307cea9c32c4571a3fe797555593c9efaef"
 dependencies = [
  "anyhow",
  "async-fs 2.1.2",
diff --git a/crates/story/examples/form.rs b/crates/story/examples/form.rs
new file mode 100644
index 00000000..cb3eb272
--- /dev/null
+++ b/crates/story/examples/form.rs
@@ -0,0 +1,35 @@
+use gpui::*;
+use story::{Assets, FormStory};
+
+pub struct Example {
+    story: Entity<FormStory>,
+}
+
+impl Example {
+    pub fn new(window: &mut Window, cx: &mut Context<Self>) -> Self {
+        let story = FormStory::view(window, cx);
+
+        Self { story }
+    }
+
+    fn view(window: &mut Window, cx: &mut App) -> Entity<Self> {
+        cx.new(|cx| Self::new(window, cx))
+    }
+}
+
+impl Render for Example {
+    fn render(&mut self, _window: &mut Window, _cx: &mut Context<Self>) -> impl IntoElement {
+        div().p_4().size_full().child(self.story.clone())
+    }
+}
+
+fn main() {
+    let app = Application::new().with_assets(Assets);
+
+    app.run(move |cx| {
+        story::init(cx);
+        cx.activate(true);
+
+        story::create_new_window("Form Example", Example::view, cx);
+    });
+}