diff --git a/Cargo.lock b/Cargo.lock index 2d3cfc5..072b426 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -233,7 +233,7 @@ dependencies = [ "async-task", "concurrent-queue", "fastrand 2.3.0", - "futures-lite 2.6.0", + "futures-lite 2.6.1", "pin-project-lite", "slab", ] @@ -246,7 +246,7 @@ checksum = "09f7e37c0ed80b2a977691c47dae8625cfb21e205827106c64f7c588766b2e50" dependencies = [ "async-lock", "blocking", - "futures-lite 2.6.0", + "futures-lite 2.6.1", ] [[package]] @@ -259,7 +259,7 @@ dependencies = [ "cfg-if", "concurrent-queue", "futures-io", - "futures-lite 2.6.0", + "futures-lite 2.6.1", "parking", "polling", "rustix 1.0.8", @@ -286,7 +286,7 @@ checksum = "b948000fad4873c1c9339d60f2623323a0cfd3816e5181033c6a5cb68b2accf7" dependencies = [ "async-io", "blocking", - "futures-lite 2.6.0", + "futures-lite 2.6.1", ] [[package]] @@ -303,7 +303,7 @@ dependencies = [ "blocking", "cfg-if", "event-listener", - "futures-lite 2.6.0", + "futures-lite 2.6.1", "rustix 1.0.8", ] @@ -392,7 +392,7 @@ checksum = "00b9f7252833d5ed4b00aa9604b563529dd5e11de9c23615de2dcdf91eb87b52" dependencies = [ "async-compression", "crc32fast", - "futures-lite 2.6.0", + "futures-lite 2.6.1", "pin-project", "thiserror 1.0.69", ] @@ -749,7 +749,7 @@ dependencies = [ "async-channel", "async-task", "futures-io", - "futures-lite 2.6.0", + "futures-lite 2.6.1", "piper", ] @@ -777,18 +777,18 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43" [[package]] name = "bytemuck" -version = "1.23.1" +version = "1.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c76a5792e44e4abe34d3abf15636779261d45a7450612059293d1d2cfc63422" +checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677" dependencies = [ "bytemuck_derive", ] [[package]] name = "bytemuck_derive" -version = "1.10.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "441473f2b4b0459a68628c744bc61d23e730fb00128b841d30fa4bb3972257e4" +checksum = "4f154e572231cb6ba2bd1176980827e3d5dc04cc183a75dea38109fbdd672d29" dependencies = [ "proc-macro2", "quote", @@ -1123,7 +1123,7 @@ dependencies = [ [[package]] name = "collections" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ea7c3a23fb2eb0f2c5d811eec3337897886482ee" +source = "git+https://github.com/zed-industries/zed#9edc01d9a528e06d9fb643b9bf61ae5bd4e52f4e" dependencies = [ "indexmap", "rustc-hash 2.1.1", @@ -1544,7 +1544,7 @@ dependencies = [ [[package]] name = "derive_refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ea7c3a23fb2eb0f2c5d811eec3337897886482ee" +source = "git+https://github.com/zed-industries/zed#9edc01d9a528e06d9fb643b9bf61ae5bd4e52f4e" dependencies = [ "proc-macro2", "quote", @@ -1718,7 +1718,7 @@ dependencies = [ "cc", "memchr", "rustc_version", - "toml 0.9.4", + "toml 0.9.5", "vswhom", "winreg", ] @@ -2210,9 +2210,9 @@ dependencies = [ [[package]] name = "futures-lite" -version = "2.6.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532" +checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad" dependencies = [ "fastrand 2.3.0", "futures-core", @@ -2436,7 +2436,7 @@ dependencies = [ [[package]] name = "gpui" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ea7c3a23fb2eb0f2c5d811eec3337897886482ee" +source = "git+https://github.com/zed-industries/zed#9edc01d9a528e06d9fb643b9bf61ae5bd4e52f4e" dependencies = [ "anyhow", "as-raw-xcb-connection", @@ -2529,7 +2529,7 @@ dependencies = [ [[package]] name = "gpui_macros" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ea7c3a23fb2eb0f2c5d811eec3337897886482ee" +source = "git+https://github.com/zed-industries/zed#9edc01d9a528e06d9fb643b9bf61ae5bd4e52f4e" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -2541,7 +2541,7 @@ dependencies = [ [[package]] name = "gpui_tokio" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ea7c3a23fb2eb0f2c5d811eec3337897886482ee" +source = "git+https://github.com/zed-industries/zed#9edc01d9a528e06d9fb643b9bf61ae5bd4e52f4e" dependencies = [ "gpui", "tokio", @@ -2551,15 +2551,15 @@ dependencies = [ [[package]] name = "grid" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71b01d27060ad58be4663b9e4ac9e2d4806918e8876af8912afbddd1a91d5eaa" +checksum = "12101ecc8225ea6d675bc70263074eab6169079621c2186fe0c66590b2df9681" [[package]] name = "h2" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17da50a276f1e01e0ba6c029e47b7100754904ee8a278f886546e98575380785" +checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386" dependencies = [ "atomic-waker", "bytes", @@ -2602,9 +2602,9 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "hashbrown" -version = "0.15.4" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ "foldhash", ] @@ -2772,7 +2772,7 @@ dependencies = [ [[package]] name = "http_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ea7c3a23fb2eb0f2c5d811eec3337897886482ee" +source = "git+https://github.com/zed-industries/zed#9edc01d9a528e06d9fb643b9bf61ae5bd4e52f4e" dependencies = [ "anyhow", "bytes", @@ -2782,6 +2782,7 @@ dependencies = [ "http-body", "log", "parking_lot", + "reqwest 0.12.15", "serde", "serde_json", "url", @@ -2791,7 +2792,7 @@ dependencies = [ [[package]] name = "http_client_tls" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ea7c3a23fb2eb0f2c5d811eec3337897886482ee" +source = "git+https://github.com/zed-industries/zed#9edc01d9a528e06d9fb643b9bf61ae5bd4e52f4e" dependencies = [ "rustls", "rustls-platform-verifier", @@ -3107,7 +3108,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661" dependencies = [ "equivalent", - "hashbrown 0.15.4", + "hashbrown 0.15.5", "serde", ] @@ -3593,7 +3594,7 @@ dependencies = [ [[package]] name = "media" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ea7c3a23fb2eb0f2c5d811eec3337897886482ee" +source = "git+https://github.com/zed-industries/zed#9edc01d9a528e06d9fb643b9bf61ae5bd4e52f4e" dependencies = [ "anyhow", "bindgen 0.71.1", @@ -3721,7 +3722,7 @@ dependencies = [ "cfg_aliases", "codespan-reporting 0.12.0", "half", - "hashbrown 0.15.4", + "hashbrown 0.15.5", "hexf-parse", "indexmap", "log", @@ -3831,7 +3832,7 @@ dependencies = [ [[package]] name = "nostr" version = "0.43.0" -source = "git+https://github.com/rust-nostr/nostr#9d91709c35f743361d68c16349d33979329ebd84" +source = "git+https://github.com/rust-nostr/nostr#0ac295f66052dc822f425a53daaa16101a8ef3bd" dependencies = [ "aes", "base64", @@ -3854,7 +3855,7 @@ dependencies = [ [[package]] name = "nostr-connect" version = "0.43.0" -source = "git+https://github.com/rust-nostr/nostr#9d91709c35f743361d68c16349d33979329ebd84" +source = "git+https://github.com/rust-nostr/nostr#0ac295f66052dc822f425a53daaa16101a8ef3bd" dependencies = [ "async-utility", "nostr", @@ -3866,7 +3867,7 @@ dependencies = [ [[package]] name = "nostr-database" version = "0.43.0" -source = "git+https://github.com/rust-nostr/nostr#9d91709c35f743361d68c16349d33979329ebd84" +source = "git+https://github.com/rust-nostr/nostr#0ac295f66052dc822f425a53daaa16101a8ef3bd" dependencies = [ "flatbuffers", "lru", @@ -3877,7 +3878,7 @@ dependencies = [ [[package]] name = "nostr-lmdb" version = "0.43.0" -source = "git+https://github.com/rust-nostr/nostr#9d91709c35f743361d68c16349d33979329ebd84" +source = "git+https://github.com/rust-nostr/nostr#0ac295f66052dc822f425a53daaa16101a8ef3bd" dependencies = [ "async-utility", "flume", @@ -3891,7 +3892,7 @@ dependencies = [ [[package]] name = "nostr-relay-pool" version = "0.43.0" -source = "git+https://github.com/rust-nostr/nostr#9d91709c35f743361d68c16349d33979329ebd84" +source = "git+https://github.com/rust-nostr/nostr#0ac295f66052dc822f425a53daaa16101a8ef3bd" dependencies = [ "async-utility", "async-wsocket", @@ -3907,7 +3908,7 @@ dependencies = [ [[package]] name = "nostr-sdk" version = "0.43.0" -source = "git+https://github.com/rust-nostr/nostr#9d91709c35f743361d68c16349d33979329ebd84" +source = "git+https://github.com/rust-nostr/nostr#0ac295f66052dc822f425a53daaa16101a8ef3bd" dependencies = [ "async-utility", "nostr", @@ -4219,7 +4220,7 @@ dependencies = [ "cipher", "digest", "endi", - "futures-lite 2.6.0", + "futures-lite 2.6.1", "futures-util", "getrandom 0.3.3", "hkdf", @@ -4983,7 +4984,7 @@ dependencies = [ [[package]] name = "refineable" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ea7c3a23fb2eb0f2c5d811eec3337897886482ee" +source = "git+https://github.com/zed-industries/zed#9edc01d9a528e06d9fb643b9bf61ae5bd4e52f4e" dependencies = [ "derive_refineable", "workspace-hack", @@ -5061,6 +5062,7 @@ dependencies = [ "js-sys", "log", "mime", + "mime_guess", "once_cell", "percent-encoding", "pin-project-lite", @@ -5140,7 +5142,7 @@ dependencies = [ [[package]] name = "reqwest_client" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ea7c3a23fb2eb0f2c5d811eec3337897886482ee" +source = "git+https://github.com/zed-industries/zed#9edc01d9a528e06d9fb643b9bf61ae5bd4e52f4e" dependencies = [ "anyhow", "bytes", @@ -5376,7 +5378,7 @@ dependencies = [ "openssl-probe", "rustls-pki-types", "schannel", - "security-framework 3.2.0", + "security-framework 3.3.0", ] [[package]] @@ -5413,7 +5415,7 @@ dependencies = [ "rustls-native-certs", "rustls-platform-verifier-android", "rustls-webpki", - "security-framework 3.2.0", + "security-framework 3.3.0", "security-framework-sys", "webpki-root-certs 0.26.11", "windows-sys 0.59.0", @@ -5646,9 +5648,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316" +checksum = "80fb1d92c5028aa318b4b8bd7302a5bfcf48be96a37fc6fc790f806b0004ee0c" dependencies = [ "bitflags 2.9.1", "core-foundation 0.10.1", @@ -5676,7 +5678,7 @@ checksum = "0f7d95a54511e0c7be3f51e8867aa8cf35148d7b9445d44de2f943e2b206e749" [[package]] name = "semantic_version" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ea7c3a23fb2eb0f2c5d811eec3337897886482ee" +source = "git+https://github.com/zed-industries/zed#9edc01d9a528e06d9fb643b9bf61ae5bd4e52f4e" dependencies = [ "anyhow", "serde", @@ -5951,7 +5953,7 @@ dependencies = [ "async-net", "async-process", "blocking", - "futures-lite 2.6.0", + "futures-lite 2.6.1", ] [[package]] @@ -6071,7 +6073,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "sum_tree" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ea7c3a23fb2eb0f2c5d811eec3337897886482ee" +source = "git+https://github.com/zed-industries/zed#9edc01d9a528e06d9fb643b9bf61ae5bd4e52f4e" dependencies = [ "arrayvec", "log", @@ -6294,9 +6296,9 @@ dependencies = [ [[package]] name = "taffy" -version = "0.8.3" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7aaef0ac998e6527d6d0d5582f7e43953bb17221ac75bb8eb2fcc2db3396db1c" +checksum = "a13e5d13f79d558b5d353a98072ca8ca0e99da429467804de959aa8c83c9a004" dependencies = [ "arrayvec", "grid", @@ -6655,9 +6657,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ae868b5a0f67631c14589f7e250c1ea2c574ee5ba21c6c8dd4b1485705a5a1" +checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8" dependencies = [ "indexmap", "serde", @@ -6702,9 +6704,9 @@ dependencies = [ [[package]] name = "toml_parser" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97200572db069e74c512a14117b296ba0a80a30123fbbb5aa1f4a348f639ca30" +checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10" dependencies = [ "winnow", ] @@ -7105,7 +7107,7 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "util" version = "0.1.0" -source = "git+https://github.com/zed-industries/zed#ea7c3a23fb2eb0f2c5d811eec3337897886482ee" +source = "git+https://github.com/zed-industries/zed#9edc01d9a528e06d9fb643b9bf61ae5bd4e52f4e" dependencies = [ "anyhow", "async-fs", @@ -8312,7 +8314,7 @@ dependencies = [ "enumflags2", "event-listener", "futures-core", - "futures-lite 2.6.0", + "futures-lite 2.6.1", "hex", "nix 0.30.1", "ordered-stream", @@ -8434,9 +8436,9 @@ dependencies = [ [[package]] name = "zerovec" -version = "0.11.2" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428" +checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b" dependencies = [ "yoke", "zerofrom", diff --git a/crates/coop/src/views/chat/mod.rs b/crates/coop/src/views/chat/mod.rs index 591de1f..3a8c1b3 100644 --- a/crates/coop/src/views/chat/mod.rs +++ b/crates/coop/src/views/chat/mod.rs @@ -140,15 +140,7 @@ impl Chat { // Initialize list state // [item_count] always equal to 1 at the beginning - let list_state = ListState::new(1, ListAlignment::Bottom, px(1024.), { - let this = cx.entity().downgrade(); - move |ix, window, cx| { - this.update(cx, |this, cx| { - this.render_message(ix, window, cx).into_any_element() - }) - .unwrap_or(Empty.into_any()) - } - }); + let list_state = ListState::new(1, ListAlignment::Bottom, px(1024.)); Self { id: room.read(cx).id.to_string().into(), @@ -872,10 +864,19 @@ impl Focusable for Chat { impl Render for Chat { fn render(&mut self, _window: &mut Window, cx: &mut Context) -> impl IntoElement { + let entity = cx.entity(); + v_flex() .image_cache(self.image_cache.clone()) .size_full() - .child(list(self.list_state.clone()).flex_1()) + .child( + list(self.list_state.clone(), move |ix, window, cx| { + entity.update(cx, |this, cx| { + this.render_message(ix, window, cx).into_any_element() + }) + }) + .flex_1(), + ) .child( div() .flex_shrink_0() diff --git a/crates/title_bar/src/lib.rs b/crates/title_bar/src/lib.rs index 77c8c80..1d6d198 100644 --- a/crates/title_bar/src/lib.rs +++ b/crates/title_bar/src/lib.rs @@ -118,14 +118,14 @@ impl Render for TitleBar { .w_full() .when(cx.theme().platform_kind.is_mac(), |this| { this.on_click(|event, window, _| { - if event.up.click_count == 2 { + if event.click_count() == 2 { window.titlebar_double_click(); } }) }) .when(cx.theme().platform_kind.is_linux(), |this| { this.on_click(|event, window, _| { - if event.up.click_count == 2 { + if event.click_count() == 2 { window.zoom_window(); } }) diff --git a/crates/ui/src/event.rs b/crates/ui/src/event.rs index b771f0a..5cd2035 100644 --- a/crates/ui/src/event.rs +++ b/crates/ui/src/event.rs @@ -10,7 +10,7 @@ pub trait InteractiveElementExt: InteractiveElement { Self: Sized, { self.interactivity().on_click(move |event, window, cx| { - if event.up.click_count == 2 { + if event.click_count() == 2 { listener(event, window, cx); } });