summaryrefslogtreecommitdiffstats
path: root/src/components
diff options
context:
space:
mode:
Diffstat (limited to 'src/components')
-rw-r--r--src/components/avatar.rs63
-rw-r--r--src/components/chat_header.rs10
-rw-r--r--src/components/chats_list.rs93
-rw-r--r--src/components/chats_list/chats_list_item.rs52
-rw-r--r--src/components/icon.rs15
-rw-r--r--src/components/message.rs116
-rw-r--r--src/components/message_composer.rs91
-rw-r--r--src/components/message_history_buffer.rs126
-rw-r--r--src/components/mod.rs20
-rw-r--r--src/components/modal.rs23
-rw-r--r--src/components/new_chat.rs38
-rw-r--r--src/components/overlay.rs16
-rw-r--r--src/components/personal_status.rs226
-rw-r--r--src/components/roster_list.rs105
-rw-r--r--src/components/roster_list/contact_request_manager.rs248
-rw-r--r--src/components/roster_list/roster_list_item.rs110
-rw-r--r--src/components/sidebar.rs231
17 files changed, 1073 insertions, 510 deletions
diff --git a/src/components/avatar.rs b/src/components/avatar.rs
index 9265ef7..11d2097 100644
--- a/src/components/avatar.rs
+++ b/src/components/avatar.rs
@@ -1,36 +1,53 @@
+// SPDX-FileCopyrightText: 2025 cel <cel@bunny.garden>
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
use filamento::{presence::PresenceType, user::User};
use leptos::prelude::*;
use reactive_stores::Store;
-use crate::{components::icon::{show_to_icon, IconComponent}, icon::Icon, user::get_avatar, user_presences::UserPresences};
+use crate::{
+ components::icon::{IconComponent, show_to_icon},
+ icon::Icon,
+ user::{MacawUser, get_avatar},
+ user_presences::UserPresences,
+};
#[component]
-pub fn AvatarWithPresence(user: Store<User>) -> impl IntoView {
- let avatar = LocalResource::new(move || get_avatar(user));
+pub fn AvatarWithPresence(user: MacawUser) -> impl IntoView {
let user_presences: Store<UserPresences> = use_context().expect("no user presences in context");
- let presence = move || user_presences.write().get_user_presences(&user.read().jid).read().presence();
- let show_icon = move || presence().map(|(_, presence)| {
- match presence.presence {
- PresenceType::Online(online) => if let Some(show) = online.show {
- Some(show_to_icon(show))
- } else {
- Some(Icon::Available16Color)
- },
- PresenceType::Offline(offline) => None,
- }
- }).unwrap_or_default();
+ let presence = move || {
+ user_presences
+ .write()
+ .get_user_presences(&user.get().read().jid)
+ .read()
+ .presence()
+ };
+ let show_icon = move || {
+ presence()
+ .map(|(_, presence)| match presence.presence {
+ PresenceType::Online(online) => {
+ if let Some(show) = online.show {
+ Some(show_to_icon(show))
+ } else {
+ Some(Icon::Available16Color)
+ }
+ }
+ PresenceType::Offline(offline) => None,
+ })
+ .unwrap_or_default()
+ };
view! {
<div class="avatar-with-presence">
- <img class="avatar" src=move || avatar.get() />
- {move || if let Some(icon) = show_icon() {
- view!{
- <IconComponent icon=icon class:presence-show-icon=true />
- }.into_any()
- } else {
- view! {}.into_any()
- }}
+ <img class="avatar" src=move || user.avatar().get() />
+ {move || {
+ if let Some(icon) = show_icon() {
+ view! { <IconComponent icon=icon class:presence-show-icon=true /> }.into_any()
+ } else {
+ view! {}.into_any()
+ }
+ }}
</div>
}
}
-
diff --git a/src/components/chat_header.rs b/src/components/chat_header.rs
index ab33d2b..3fb5df8 100644
--- a/src/components/chat_header.rs
+++ b/src/components/chat_header.rs
@@ -1,3 +1,7 @@
+// SPDX-FileCopyrightText: 2025 cel <cel@bunny.garden>
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
use filamento::user::UserStoreFields;
use leptos::prelude::*;
use reactive_stores::ArcStore;
@@ -11,12 +15,12 @@ pub fn ChatViewHeader(chat: MacawChat) -> impl IntoView {
view! {
<div class="chat-view-header panel">
- <AvatarWithPresence user=chat.user.get().into() />
- <div class="user-info">
+ {move || {
+ view! { <AvatarWithPresence user=chat.user /> }
+ }} <div class="user-info">
<h2 class="name">{name}</h2>
<h3>{jid}</h3>
</div>
</div>
}
}
-
diff --git a/src/components/chats_list.rs b/src/components/chats_list.rs
index a5ecc9b..73ffdff 100644
--- a/src/components/chats_list.rs
+++ b/src/components/chats_list.rs
@@ -1,10 +1,23 @@
+// SPDX-FileCopyrightText: 2025 cel <cel@bunny.garden>
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
use chats_list_item::ChatsListItem;
use indexmap::IndexMap;
use jid::BareJID;
-use leptos::prelude::*;
+use js_sys::{wasm_bindgen::UnwrapThrowExt, Object, Reflect, JSON};
+use leptos::{html::Div, prelude::*};
+use overlay_scrollbars::OverlayScrollbars;
use tracing::debug;
-use crate::{chat::{ArcMacawChat, MacawChat}, client::Client, components::{icon::IconComponent, new_chat::NewChatWidget, overlay::Overlay}, icon::Icon, message::{ArcMacawMessage, MacawMessage}, message_subscriptions::MessageSubscriptions};
+use crate::{
+ chat::{ArcMacawChat, MacawChat},
+ client::Client,
+ components::{icon::IconComponent, new_chat::NewChatWidget, overlay::Overlay},
+ icon::Icon,
+ message::{ArcMacawMessage, MacawMessage},
+ message_subscriptions::MessageSubscriptions,
+};
mod chats_list_item;
@@ -20,18 +33,16 @@ pub fn ChatsList() -> impl IntoView {
.map_err(|e| e.to_string());
match chats {
Ok(c) => {
- let chats = c
- .into_iter()
- .map(|((chat, chat_user), (message, message_user))| {
+ let mut chats = IndexMap::new();
+ for ((chat, chat_user), (message, message_user)) in c {
+ chats.insert(
+ chat.correspondent.clone(),
(
- chat.correspondent.clone(),
- (
- ArcMacawChat::got_chat_and_user(chat, chat_user),
- ArcMacawMessage::got_message_and_user(message, message_user),
- ),
- )
- })
- .collect::<IndexMap<BareJID, _>>();
+ ArcMacawChat::got_chat_and_user(chat, chat_user).await,
+ ArcMacawMessage::got_message_and_user(message, message_user).await,
+ ),
+ );
+ }
set_chats.set(chats);
}
Err(_) => {
@@ -55,7 +66,10 @@ pub fn ChatsList() -> impl IntoView {
if let Some((chat, _latest_message)) = chats.shift_remove(&to) {
// TODO: check if new message is actually latest message
debug!("chat existed");
- debug!("new message: {}", new_message.message.get().read().body.body);
+ debug!(
+ "new message: {}",
+ new_message.message.get().read().body.body
+ );
chats.insert_before(0, to, (chat.clone(), new_message));
debug!("done setting");
} else {
@@ -64,7 +78,7 @@ pub fn ChatsList() -> impl IntoView {
let chat = client.get_chat(to.clone()).await.unwrap();
let user = client.get_user(to.clone()).await.unwrap();
debug!("before got chat");
- let chat = ArcMacawChat::got_chat_and_user(chat, user);
+ let chat = ArcMacawChat::got_chat_and_user(chat, user).await;
debug!("after got chat");
chats.insert_before(0, to, (chat, new_message));
debug!("done setting");
@@ -78,32 +92,65 @@ pub fn ChatsList() -> impl IntoView {
}
});
+ let chats_list: NodeRef<Div> = NodeRef::new();
+ let chats_list_viewport: NodeRef<Div> = NodeRef::new();
+
+ let _scrollbars = Effect::new(move |_| {
+ if let Some(buffer) = chats_list.get() {
+ if let Some(viewport) = chats_list_viewport.get() {
+ let scrollbars_obj = Object::new();
+ // Reflect::set(&scrollbars_obj, &"theme".into(), &"os-macaw".into()).unwrap_throw();
+ // Reflect::set(&scrollbars_obj, &"autoHide".into(), &"leave".into()).unwrap_throw();
+ let options_obj = Object::new();
+ // Reflect::set(&options_obj, &"scrollbars".into(), &scrollbars_obj).unwrap_throw();
+
+ let elements_obj = Object::new();
+ Reflect::set(&elements_obj, &"viewport".into(), &viewport.into()).unwrap_throw();
+ let element_obj = Object::new();
+ Reflect::set(&elements_obj, &"elements".into(), &elements_obj).unwrap_throw();
+ Reflect::set(&element_obj, &"target".into(), &buffer.into()).unwrap_throw();
+ // let element = Object::define_property(&Object::define_property(&Object::new(), &"target".into(), &buffer.into()), &"elements".into(), &Object::define_property(&Object::new(), &"viewport".into(), &viewport.into()));
+ debug!("scrollable element: {}", JSON::stringify(&element_obj.clone().into()).unwrap_throw());
+ OverlayScrollbars(element_obj, options_obj);
+ }
+ }
+ });
+
view! {
<div class="chats-list panel">
// TODO: update icon, tooltip on hover.
<div class="header">
<h2>Chats</h2>
- <div class="new-chat header-icon" class:open=open_new_chat >
- <IconComponent icon=Icon::NewBubble24 on:click=move |_| set_open_new_chat.update(|state| *state = !*state)/>
+ <div class="new-chat header-icon" class:open=open_new_chat>
+ <IconComponent
+ icon=Icon::NewBubble24
+ on:click=move |_| set_open_new_chat.update(|state| *state = !*state)
+ />
{move || {
if *open_new_chat.read() {
view! {
<Overlay set_open=set_open_new_chat>
<NewChatWidget set_open_new_chat />
</Overlay>
- }.into_any()
+ }
+ .into_any()
} else {
view! {}.into_any()
}
}}
</div>
</div>
- <div class="chats-list-chats">
- <For each=move || chats.get() key=|chat| chat.1.1.message.get().read().id let(chat)>
- <ChatsListItem chat=chat.1.0.into() message=chat.1.1.into() />
- </For>
+ <div class="overlay-scroll" node_ref=chats_list>
+ <div class="chats-list-chats" node_ref=chats_list_viewport>
+ <For
+ each=move || chats.get()
+ key=|chat| chat.1.1.message.get().read().id
+ let(chat)
+ >
+ <ChatsListItem chat=chat.1.0.into() message=chat.1.1.into() />
+ </For>
+ </div>
</div>
</div>
}
}
-
diff --git a/src/components/chats_list/chats_list_item.rs b/src/components/chats_list/chats_list_item.rs
index d1da727..3e18dbe 100644
--- a/src/components/chats_list/chats_list_item.rs
+++ b/src/components/chats_list/chats_list_item.rs
@@ -1,12 +1,25 @@
+// SPDX-FileCopyrightText: 2025 cel <cel@bunny.garden>
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
use std::ops::Deref;
use chrono::Local;
-use filamento::{chat::{Chat, ChatStoreFields, Message, MessageStoreFields}, user::User};
+use filamento::{
+ chat::{Chat, ChatStoreFields, Message, MessageStoreFields},
+ user::User,
+};
use leptos::prelude::*;
use reactive_stores::{ArcStore, Store};
use tracing::debug;
-use crate::{chat::MacawChat, components::{avatar::AvatarWithPresence, sidebar::Open}, message::MacawMessage, open_chats::{OpenChatsPanel, OpenChatsPanelStoreFields}, user::get_name};
+use crate::{
+ chat::MacawChat,
+ components::{avatar::AvatarWithPresence, sidebar::Open},
+ message::MacawMessage,
+ open_chats::{OpenChatsPanel, OpenChatsPanelStoreFields},
+ user::get_name,
+};
#[component]
pub fn ChatsListItem(chat: MacawChat, message: MacawMessage) -> impl IntoView {
@@ -44,19 +57,36 @@ pub fn ChatsListItem(chat: MacawChat, message: MacawMessage) -> impl IntoView {
let date = move || message.get().timestamp().read().naive_local();
let now = move || Local::now().naive_local();
- let timeinfo = move || if date().date() == now().date() {
- // TODO: localisation/config
- date().time().format("%H:%M").to_string()
- } else {
- date().date().format("%d/%m").to_string()
+ let timeinfo = move || {
+ if date().date() == now().date() {
+ // TODO: localisation/config
+ date().time().format("%H:%M").to_string()
+ } else {
+ date().date().format("%d/%m").to_string()
+ }
};
view! {
- <div class="chats-list-item" class:open=move || open() class:focused=move || focused() on:click=open_chat>
- <AvatarWithPresence user=chat.user.get().into() />
+ <div
+ class="chats-list-item"
+ class:open=move || open()
+ class:focused=move || focused()
+ on:click=open_chat
+ >
+ {move || {
+ view! { <AvatarWithPresence user=chat.user /> }
+ }}
<div class="item-info">
- <div class="main-info"><p class="name">{name}</p><p class="timestamp">{timeinfo}</p></div>
- <div class="sub-info"><p class="message-preview">{latest_message_body}</p><p><!-- "TODO: delivery or unread state" --></p></div>
+ <div class="main-info">
+ <p class="name">{name}</p>
+ <p class="timestamp">{timeinfo}</p>
+ </div>
+ <div class="sub-info">
+ <p class="message-preview">{latest_message_body}</p>
+ <p>
+ <!-- "TODO: delivery or unread state" -->
+ </p>
+ </div>
</div>
</div>
}
diff --git a/src/components/icon.rs b/src/components/icon.rs
index 7eaa52f..73b0f5d 100644
--- a/src/components/icon.rs
+++ b/src/components/icon.rs
@@ -1,5 +1,9 @@
-use leptos::prelude::*;
+// SPDX-FileCopyrightText: 2025 cel <cel@bunny.garden>
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
use filamento::{chat::Delivery, presence::Show};
+use leptos::prelude::*;
use crate::icon::Icon;
@@ -7,7 +11,12 @@ use crate::icon::Icon;
#[component]
pub fn IconComponent(icon: Icon) -> impl IntoView {
view! {
- <img class:light=icon.light() class:icon=true style=move || format!("height: {}px; width: {}px", icon.size(), icon.size()) src=move || icon.src() />
+ <img
+ class:light=icon.light()
+ class:icon=true
+ style=move || format!("height: {}px; width: {}px", icon.size(), icon.size())
+ src=move || icon.src()
+ />
}
}
@@ -53,5 +62,3 @@ pub fn Delivery(delivery: Delivery) -> impl IntoView {
}
}
}
-
-
diff --git a/src/components/message.rs b/src/components/message.rs
index 5deccdd..83a4bad 100644
--- a/src/components/message.rs
+++ b/src/components/message.rs
@@ -1,52 +1,98 @@
+// SPDX-FileCopyrightText: 2025 cel <cel@bunny.garden>
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
use filamento::chat::MessageStoreFields;
use leptos::prelude::*;
use reactive_stores::{ArcStore, Store};
-use crate::{message::MacawMessage, user::{get_avatar, get_name, NO_AVATAR}};
+use crate::{
+ message::MacawMessage,
+ user::{get_avatar, get_name, NO_AVATAR},
+};
use super::icon::Delivery;
#[component]
-pub fn Message(message: MacawMessage, major: bool, r#final: bool) -> impl IntoView {
- let message_message: Store<filamento::chat::Message> =
- <ArcStore<filamento::chat::Message> as Clone>::clone(&message.get()).into();
- let message_user = <ArcStore<filamento::user::User> as Clone>::clone(&message.user.get()).into();
- let avatar = LocalResource::new(move || get_avatar(message_user));
- let name = move || get_name(message_user, false);
+pub fn Message(message: MacawMessage, major: bool, r#final: bool, new_day: bool) -> impl IntoView {
+ let name = move || get_name(message.user.get().into(), false);
// TODO: chrono-humanize?
// TODO: if final, show delivery not only on hover.
// {move || message_message.delivery().read().map(|delivery| delivery.to_string()).unwrap_or_default()}
- if major {
- view! {
- <div class:final=r#final class="chat-message major">
- <div class="left">
- <Transition fallback=|| view! { <img class="avatar" src=NO_AVATAR /> } >
- <img class="avatar" src=move || avatar.get() />
- </Transition>
+ view! {
+ {move || {
+ if major {
+ view! {
+ <div class:final=r#final class="chat-message major">
+ <div class="left">
+ <Transition fallback=|| view! { <img class="avatar" src=NO_AVATAR /> }>
+ <img class="avatar" src=move || message.user.avatar().get() />
+ </Transition>
+ </div>
+ <div class="middle">
+ <div class="message-info">
+ <div class="message-user-name">{name}</div>
+ <div class="message-timestamp">
+ {move || {
+ message.get().timestamp().read().format("%H:%M").to_string()
+ }}
+ </div>
+ </div>
+ <div class="message-text">
+ {move || message.get().body().read().body.clone()}
+ </div>
+ </div>
+ <div class="right message-delivery">
+ {move || {
+ message
+ .get()
+ .delivery()
+ .get()
+ .map(|delivery| {
+ view! { <Delivery class:light=true delivery /> }
+ })
+ }}
+ </div>
</div>
- <div class="middle">
- <div class="message-info">
- <div class="message-user-name">{name}</div>
- <div class="message-timestamp">{move || message_message.timestamp().read().format("%H:%M").to_string()}</div>
+ }
+ .into_any()
+ } else {
+ view! {
+ <div class:final=r#final class="chat-message minor">
+ <div class="left message-timestamp">
+ {move || message.get().timestamp().read().format("%H:%M").to_string()}
+ </div>
+ <div class="middle message-text">
+ {move || message.get().body().read().body.clone()}
+ </div>
+ <div class="right message-delivery">
+ {move || {
+ message
+ .get()
+ .delivery()
+ .get()
+ .map(|delivery| view! { <Delivery delivery /> })
+ }}
+ </div>
</div>
- <div class="message-text">
- {move || message_message.body().read().body.clone()}
+ }
+ .into_any()
+ }
+ }}
+ {move || {
+ if new_day {
+ view! {
+ <div class="new-day">
+ {move || {
+ message.get().timestamp().read().format("%Y-%m-%d").to_string()
+ }}
</div>
- </div>
- <div class="right message-delivery">{move || message_message.delivery().get().map(|delivery| view! { <Delivery class:light=true delivery /> } ) }</div>
- </div>
- }.into_any()
- } else {
- view! {
- <div class:final=r#final class="chat-message minor">
- <div class="left message-timestamp">
- {move || message_message.timestamp().read().format("%H:%M").to_string()}
- </div>
- <div class="middle message-text">{move || message_message.body().read().body.clone()}</div>
- <div class="right message-delivery">{move || message_message.delivery().get().map(|delivery| view! { <Delivery delivery /> } ) }</div>
- </div>
- }.into_any()
+ }
+ .into_any()
+ } else {
+ view! {}.into_any()
+ }
+ }}
}
}
-
diff --git a/src/components/message_composer.rs b/src/components/message_composer.rs
index 3876a5a..fd4e59b 100644
--- a/src/components/message_composer.rs
+++ b/src/components/message_composer.rs
@@ -1,6 +1,13 @@
+// SPDX-FileCopyrightText: 2025 cel <cel@bunny.garden>
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
use filamento::chat::Body;
use jid::BareJID;
+use js_sys::{wasm_bindgen::UnwrapThrowExt, Object, Reflect, JSON};
use leptos::{html::Div, prelude::*, task::spawn_local};
+use overlay_scrollbars::OverlayScrollbars;
+use tracing::debug;
use crate::client::Client;
@@ -60,38 +67,68 @@ pub fn ChatViewMessageComposer(chat: BareJID) -> impl IntoView {
// };
//
+ let composer: NodeRef<Div> = NodeRef::new();
+
+ let _scrollbars = Effect::new(move |_| {
+ if let Some(buffer) = composer.get() {
+ if let Some(viewport) = message_input.get() {
+ let scrollbars_obj = Object::new();
+ Reflect::set(&scrollbars_obj, &"theme".into(), &"os-macaw".into()).unwrap_throw();
+ Reflect::set(&scrollbars_obj, &"autoHide".into(), &"leave".into()).unwrap_throw();
+ let options_obj = Object::new();
+ Reflect::set(&options_obj, &"scrollbars".into(), &scrollbars_obj).unwrap_throw();
+
+ let elements_obj = Object::new();
+ Reflect::set(&elements_obj, &"viewport".into(), &viewport.into()).unwrap_throw();
+ let element_obj = Object::new();
+ Reflect::set(&elements_obj, &"elements".into(), &elements_obj).unwrap_throw();
+ Reflect::set(&element_obj, &"target".into(), &buffer.into()).unwrap_throw();
+ // let element = Object::define_property(&Object::define_property(&Object::new(), &"target".into(), &buffer.into()), &"elements".into(), &Object::define_property(&Object::new(), &"viewport".into(), &viewport.into()));
+ debug!(
+ "scrollable element: {}",
+ JSON::stringify(&element_obj.clone().into()).unwrap_throw()
+ );
+ debug!(
+ "scrollable options: {}",
+ JSON::stringify(&options_obj.clone().into()).unwrap_throw()
+ );
+ OverlayScrollbars(element_obj, options_obj);
+ }
+ }
+ });
+
// TODO: placeholder
view! {
- <form
- class="new-message-composer panel"
- >
- <div
- class="text-box"
- on:input:target=move |ev| new_message.set(ev.target().text_content().unwrap_or_default())
- node_ref=message_input
- contenteditable
- on:keydown=move |ev| {
- match ev.key_code() {
- 16 => set_shift_pressed.set(true),
- 13 => if !shift_pressed.get() {
- ev.prevent_default();
- send_message();
+ <form class="new-message-composer panel">
+ <div class="overlay-scroll" node_ref=composer>
+ <div
+ class="text-box"
+ on:input:target=move |ev| {
+ new_message.set(ev.target().text_content().unwrap_or_default())
+ }
+ node_ref=message_input
+ contenteditable
+ on:keydown=move |ev| {
+ match ev.key_code() {
+ 16 => set_shift_pressed.set(true),
+ 13 => {
+ if !shift_pressed.get() {
+ ev.prevent_default();
+ send_message();
+ }
+ }
+ _ => {}
}
- _ => {}
- // debug!("shift pressed down");
}
- }
- on:keyup=move |ev| {
- match ev.key_code() {
- 16 => set_shift_pressed.set(false),
- _ => {}
- // debug!("shift released");
+ on:keyup=move |ev| {
+ match ev.key_code() {
+ 16 => set_shift_pressed.set(false),
+ _ => {}
+ }
}
- }
- ></div>
- // <input hidden type="submit" />
+ ></div>
+ </div>
+ // <input hidden type="submit" />
</form>
}
}
-
-
diff --git a/src/components/message_history_buffer.rs b/src/components/message_history_buffer.rs
index ecdba5b..c733700 100644
--- a/src/components/message_history_buffer.rs
+++ b/src/components/message_history_buffer.rs
@@ -1,5 +1,12 @@
+// SPDX-FileCopyrightText: 2025 cel <cel@bunny.garden>
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
use chrono::{NaiveDateTime, TimeDelta};
-use filamento::{chat::{Chat, ChatStoreFields, MessageStoreFields}, user::User};
+use filamento::{
+ chat::{Chat, ChatStoreFields, MessageStoreFields},
+ user::User,
+};
use indexmap::IndexMap;
use jid::BareJID;
use leptos::prelude::*;
@@ -7,15 +14,17 @@ use reactive_stores::{ArcStore, Store};
use tracing::{debug, error};
use uuid::Uuid;
-use crate::{chat::MacawChat, client::Client, components::message::Message, message::{ArcMacawMessage, MacawMessage}, message_subscriptions::MessageSubscriptions};
+use crate::{
+ chat::MacawChat,
+ client::Client,
+ components::message::Message,
+ message::{ArcMacawMessage, MacawMessage},
+ message_subscriptions::MessageSubscriptions,
+};
#[component]
pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView {
let (messages, set_messages) = arc_signal(IndexMap::new());
- let chat_chat: Store<Chat> =
- <ArcStore<filamento::chat::Chat> as Clone>::clone(&chat.get()).into();
- let chat_user: Store<User> =
- <ArcStore<filamento::user::User> as Clone>::clone(&chat.user.get()).into();
let load_set_messages = set_messages.clone();
let load_messages = LocalResource::new(move || {
@@ -23,20 +32,18 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView {
async move {
let client = use_context::<Client>().expect("client not in context");
let messages = client
- .get_messages_with_users(chat_chat.correspondent().get())
+ .get_messages_with_users(chat.get().correspondent().get())
.await
.map_err(|e| e.to_string());
match messages {
Ok(m) => {
- let messages = m
- .into_iter()
- .map(|(message, message_user)| {
- (
- message.id,
- ArcMacawMessage::got_message_and_user(message, message_user),
- )
- })
- .collect::<IndexMap<Uuid, _>>();
+ let mut messages = IndexMap::new();
+ for (message, message_user) in m {
+ messages.insert(
+ message.id,
+ ArcMacawMessage::got_message_and_user(message, message_user).await,
+ );
+ }
load_set_messages.set(messages);
}
Err(err) => {
@@ -57,40 +64,22 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView {
load_messages.await;
let (sub_id, mut new_messages) = new_messages_signal
.write()
- .subscribe_chat(chat_chat.correspondent().get());
+ .subscribe_chat(chat.get().correspondent().get());
set_sub_id.set(Some(sub_id));
while let Some(new_message) = new_messages.recv().await {
debug!("got new message in let message buffer");
let mut messages = load_new_messages_set.write();
if let Some((_, last)) = messages.last() {
- if *<ArcStore<filamento::chat::Message> as Clone>::clone(&last.message.get())
- .timestamp()
- .read()
- < *<ArcStore<filamento::chat::Message> as Clone>::clone(&new_message.message.get())
- .timestamp()
- .read()
- {
- messages.insert(
- <ArcStore<filamento::chat::Message> as Clone>::clone(
- &new_message.message.get(),
- )
- .id()
- .get(),
- new_message,
- );
+ if *last.get().timestamp().read() < *new_message.get().timestamp().read() {
+ messages.insert(new_message.get().id().get(), new_message);
debug!("set the new message in message buffer");
} else {
let index = match messages.binary_search_by(|_, value| {
- <ArcStore<filamento::chat::Message> as Clone>::clone(&value.message.get())
+ value
+ .get()
.timestamp()
.read()
- .cmp(
- &<ArcStore<filamento::chat::Message> as Clone>::clone(
- &new_message.message.get(),
- )
- .timestamp()
- .read(),
- )
+ .cmp(&new_message.get().timestamp().read())
}) {
Ok(i) => i,
Err(i) => i,
@@ -98,22 +87,13 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView {
messages.insert_before(
// TODO: check if this logic is correct
index,
- <ArcStore<filamento::chat::Message> as Clone>::clone(
- &new_message.message.get(),
- )
- .id()
- .get(),
+ new_message.get().id().get(),
new_message,
);
debug!("set the new message in message buffer");
}
} else {
- messages.insert(
- <ArcStore<filamento::chat::Message> as Clone>::clone(&new_message.message.get())
- .id()
- .get(),
- new_message,
- );
+ messages.insert(new_message.get().id().get(), new_message);
debug!("set the new message in message buffer");
}
}
@@ -123,7 +103,7 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView {
if let Some(sub_id) = sub_id.get_untracked() {
new_messages_signal
.write()
- .unsubscribe_chat(sub_id, chat_chat.correspondent().get_untracked());
+ .unsubscribe_chat(sub_id, chat.get().correspondent().get_untracked());
}
});
@@ -134,32 +114,26 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView {
.get()
.into_iter()
.map(|(id, message)| {
- let message_timestamp =
- <ArcStore<filamento::chat::Message> as Clone>::clone(&message.message.get())
- .timestamp()
- .read()
- .naive_local();
- // TODO: mark new day
- // if message_timestamp.date() > last_timestamp.date() {
- // messages_view = messages_view.push(date(message_timestamp.date()));
- // }
- let major = if last_user.as_ref() != Some(&message.message.get().read().from)
+ let message_timestamp = message.message.get().timestamp().read().naive_local();
+ let mut major = if last_user.as_ref() != Some(&message.message.get().read().from)
|| message_timestamp - last_timestamp > TimeDelta::minutes(3)
{
true
} else {
false
};
- last_user = Some(
- <ArcStore<filamento::chat::Message> as Clone>::clone(&message.message.get())
- .from()
- .get(),
- );
+ let new_day = if message_timestamp.date() > last_timestamp.date() {
+ major = true;
+ true
+ } else {
+ false
+ };
+ last_user = Some(message.get().from().get());
last_timestamp = message_timestamp;
- (id, (message, major, false))
+ (id, (message, major, false, new_day))
})
.collect::<Vec<_>>();
- if let Some((_id, (_, _, last))) = messages.last_mut() {
+ if let Some((_id, (_, _, last, _))) = messages.last_mut() {
*last = true
}
messages.into_iter().rev()
@@ -167,10 +141,18 @@ pub fn MessageHistoryBuffer(chat: MacawChat) -> impl IntoView {
view! {
<div class="messages-buffer">
- <For each=each key=|message| (message.0, message.1.1, message.1.2) let(message)>
- <Message message=message.1.0.into() major=message.1.1 r#final=message.1.2 />
+ <For
+ each=each
+ key=|message| (message.0, message.1.1, message.1.2, message.1.3)
+ let(message)
+ >
+ <Message
+ message=message.1.0.into()
+ major=message.1.1
+ r#final=message.1.2
+ new_day=message.1.3
+ />
</For>
</div>
}
}
-
diff --git a/src/components/mod.rs b/src/components/mod.rs
index 879f99e..d2fb6b5 100644
--- a/src/components/mod.rs
+++ b/src/components/mod.rs
@@ -1,13 +1,17 @@
-pub mod sidebar;
-mod chats_list;
-mod new_chat;
-mod roster_list;
+// SPDX-FileCopyrightText: 2025 cel <cel@bunny.garden>
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
mod avatar;
+pub mod chat_header;
+mod chats_list;
+pub mod icon;
mod message;
-pub mod message_history_buffer;
pub mod message_composer;
-pub mod chat_header;
-mod overlay;
+pub mod message_history_buffer;
pub mod modal;
-pub mod icon;
+mod new_chat;
+mod overlay;
mod personal_status;
+mod roster_list;
+pub mod sidebar;
diff --git a/src/components/modal.rs b/src/components/modal.rs
index 62e1fac..e23fa5d 100644
--- a/src/components/modal.rs
+++ b/src/components/modal.rs
@@ -1,16 +1,25 @@
-use leptos::prelude::*;
+// SPDX-FileCopyrightText: 2025 cel <cel@bunny.garden>
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
use leptos::ev::MouseEvent;
+use leptos::prelude::*;
#[component]
-pub fn Modal(on_background_click: impl Fn(MouseEvent) + 'static, children: Children) -> impl IntoView {
+pub fn Modal(
+ on_background_click: impl Fn(MouseEvent) + 'static,
+ children: Children,
+) -> impl IntoView {
view! {
- <div class="modal" on:click=move |e| {
- if e.current_target() == e.target() {
- on_background_click(e)
+ <div
+ class="modal"
+ on:click=move |e| {
+ if e.current_target() == e.target() {
+ on_background_click(e)
+ }
}
- }>
+ >
{children()}
</div>
}
}
-
diff --git a/src/components/new_chat.rs b/src/components/new_chat.rs
index b706ca9..925ec57 100644
--- a/src/components/new_chat.rs
+++ b/src/components/new_chat.rs
@@ -1,12 +1,26 @@
+// SPDX-FileCopyrightText: 2025 cel <cel@bunny.garden>
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
use std::str::FromStr;
-use filamento::{chat::Chat, error::{CommandError, DatabaseError}, user::User};
+use filamento::{
+ chat::Chat,
+ error::{CommandError, DatabaseError},
+ user::User,
+};
use jid::{BareJID, JID};
use leptos::{html::Input, prelude::*};
use reactive_stores::{ArcStore, Store};
use thiserror::Error;
-use crate::{chat::{ArcMacawChat, MacawChat}, client::Client, open_chats::OpenChatsPanel, state_store::StateStore, user::{ArcMacawUser, MacawUser}};
+use crate::{
+ chat::{ArcMacawChat, MacawChat},
+ client::Client,
+ open_chats::OpenChatsPanel,
+ state_store::StateStore,
+ user::{ArcMacawUser, MacawUser, fetch_avatar},
+};
#[derive(Clone, Debug, Error)]
pub enum NewChatError {
@@ -34,14 +48,14 @@ pub fn NewChatWidget(set_open_new_chat: WriteSignal<bool>) -> impl IntoView {
})
};
let (new_chat_pending, set_new_chat_pending) = signal(false);
-
+
let open_chats: Store<OpenChatsPanel> =
use_context().expect("no open chats panel store in context");
let client = use_context::<Client>().expect("client not in context");
let chat_state_store: StateStore<BareJID, ArcStore<Chat>> =
use_context().expect("no chat state store");
- let user_state_store: StateStore<BareJID, ArcStore<User>> =
+ let user_state_store: StateStore<BareJID, (ArcStore<User>, ArcRwSignal<String>)> =
use_context().expect("no user state store");
let open_chat = Action::new_local(move |_| {
@@ -72,12 +86,23 @@ pub fn NewChatWidget(set_open_new_chat: WriteSignal<bool>) -> impl IntoView {
set_error.set(Some(e.into()));
set_new_chat_pending.set(false);
return;
- },
+ }
};
let chat = {
// let user = MacawUser::got_user(user);
- let user = user_state_store.store(user.jid.clone(), ArcStore::new(user));
+ // let user = user_state_store.store(user.jid.clone(), ArcStore::new(user));
+ let old_user = user_state_store.get_listener(user.jid.clone());
+ let user = if let Some(old_user) = old_user {
+ old_user.update(|(old_user, _avatar)| {
+ old_user.set(user);
+ });
+ old_user
+ } else {
+ let avatar = fetch_avatar(user.avatar.as_deref()).await;
+ let avatar = ArcRwSignal::new(avatar);
+ user_state_store.store(user.jid.clone(), (ArcStore::new(user), avatar))
+ };
let user = ArcMacawUser { user };
let chat = chat_state_store.store(chat.correspondent.clone(), ArcStore::new(chat));
ArcMacawChat { chat, user }
@@ -120,4 +145,3 @@ pub fn NewChatWidget(set_open_new_chat: WriteSignal<bool>) -> impl IntoView {
</div>
}
}
-
diff --git a/src/components/overlay.rs b/src/components/overlay.rs
index d4ff1bf..d10f33a 100644
--- a/src/components/overlay.rs
+++ b/src/components/overlay.rs
@@ -1,3 +1,7 @@
+// SPDX-FileCopyrightText: 2025 cel <cel@bunny.garden>
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
use leptos::prelude::*;
use tracing::debug;
@@ -5,12 +9,14 @@ use tracing::debug;
pub fn Overlay(set_open: WriteSignal<bool>, children: Children) -> impl IntoView {
view! {
<div class="overlay">
- <div class="overlay-background" on:click=move |_| {
- debug!("set open to false");
- set_open.update(|state| *state = false)
- }></div>
+ <div
+ class="overlay-background"
+ on:click=move |_| {
+ debug!("set open to false");
+ set_open.update(|state| *state = false)
+ }
+ ></div>
<div class="overlay-content">{children()}</div>
</div>
}
}
-
diff --git a/src/components/personal_status.rs b/src/components/personal_status.rs
index 8439756..b74b366 100644
--- a/src/components/personal_status.rs
+++ b/src/components/personal_status.rs
@@ -1,65 +1,93 @@
-use filamento::{presence::{Offline, Online, PresenceType, Show}, user::{User, UserStoreFields}};
+// SPDX-FileCopyrightText: 2025 cel <cel@bunny.garden>
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+use filamento::{
+ presence::{Offline, Online, PresenceType, Show},
+ user::{User, UserStoreFields},
+};
use leptos::{html, prelude::*};
use reactive_stores::{ArcStore, Store};
use tracing::{debug, error};
-use crate::{client::Client, components::{avatar::AvatarWithPresence, overlay::Overlay}, user::{get_name, MacawUser}, user_presences::UserPresences, views::{macaw::settings::SettingsPage, AppState}};
+use crate::{
+ client::Client,
+ components::{avatar::AvatarWithPresence, overlay::Overlay},
+ user::{MacawUser, get_name},
+ user_presences::UserPresences,
+ views::{AppState, macaw::settings::SettingsPage},
+};
#[component]
pub fn PersonalStatus() -> impl IntoView {
let user: LocalResource<MacawUser> = use_context().expect("no local user in context");
let (open, set_open) = signal(false);
- move || if let Some(user) = user.get() {
- view! {
- <div class="dock-item" class:focused=move || *open.read() on:click=move |_| {
- debug!("set open to true");
- set_open.update(|state| *state = !*state)
- }>
- <AvatarWithPresence user=user.get().into() />
- <div class="dock-pill"></div>
- </div>
- {move || {
- let open = open.get();
- debug!("open = {:?}", open);
- if open {
- view! {
- <Overlay set_open>
- <PersonalStatusMenu user=user.get().into() set_open/>
- </Overlay>
- }.into_any()
- } else {
- view! {}.into_any()
- }}}
- }.into_any()
- } else {
- view! {}.into_any()
+ move || {
+ if let Some(user) = user.get() {
+ view! {
+ <div
+ class="dock-item"
+ class:focused=move || *open.read()
+ on:click=move |_| {
+ debug!("set open to true");
+ set_open.update(|state| *state = !*state)
+ }
+ >
+ <AvatarWithPresence user />
+ <div class="dock-pill"></div>
+ </div>
+ {move || {
+ let open = open.get();
+ debug!("open = {:?}", open);
+ if open {
+ view! {
+ <Overlay set_open>
+ <PersonalStatusMenu user set_open />
+ </Overlay>
+ }
+ .into_any()
+ } else {
+ view! {}.into_any()
+ }
+ }}
+ }
+ .into_any()
+ } else {
+ view! {}.into_any()
+ }
}
}
#[component]
-pub fn PersonalStatusMenu(user: Store<User>, set_open: WriteSignal<bool>) -> impl IntoView {
+pub fn PersonalStatusMenu(user: MacawUser, set_open: WriteSignal<bool>) -> impl IntoView {
let set_app: WriteSignal<AppState> = use_context().unwrap();
let show_settings: RwSignal<Option<SettingsPage>> = use_context().unwrap();
let user_presences: Store<UserPresences> = use_context().expect("no user presence store");
-
+
let client = use_context::<Client>().expect("client not in context");
let client1 = client.clone();
let (show_value, set_show_value) = signal({
- let show = match user_presences.write().get_user_presences(&user.jid().read()).write().resource_presence(client.resource.read().clone().unwrap_or_default()).presence {
- PresenceType::Online(online) => match online.show {
- Some(s) => match s {
- Show::Away => 3,
- Show::Chat => 0,
- Show::DoNotDisturb => 2,
- Show::ExtendedAway => 4,
+ let show = match user_presences
+ .write()
+ .get_user_presences(&user.get().jid().read())
+ .write()
+ .resource_presence(client.resource.read().clone().unwrap_or_default())
+ .presence
+ {
+ PresenceType::Online(online) => match online.show {
+ Some(s) => match s {
+ Show::Away => 3,
+ Show::Chat => 0,
+ Show::DoNotDisturb => 2,
+ Show::ExtendedAway => 4,
+ },
+ None => 1,
},
- None => 1,
- },
- PresenceType::Offline(_offline) => 5,
- };
- debug!("initial show = {show}");
- show
+ PresenceType::Offline(_offline) => 5,
+ };
+ debug!("initial show = {show}");
+ show
});
let show_select: NodeRef<html::Select> = NodeRef::new();
@@ -71,7 +99,7 @@ pub fn PersonalStatusMenu(user: Store<User>, set_open: WriteSignal<bool>) -> imp
}
});
let set_status = Action::new_local(move |show_value: &i32| {
- let show_value = show_value.to_owned();
+ let show_value = show_value.to_owned();
let client = client1.clone();
async move {
if let Err(e) = match show_value {
@@ -79,46 +107,71 @@ pub fn PersonalStatusMenu(user: Store<User>, set_open: WriteSignal<bool>) -> imp
if let Ok(r) = client.connect().await {
client.resource.set(Some(r))
};
- client.set_status(Online { show: Some(Show::Chat), ..Default::default() }).await
- },
+ client
+ .set_status(Online {
+ show: Some(Show::Chat),
+ ..Default::default()
+ })
+ .await
+ }
1 => {
if let Ok(r) = client.connect().await {
client.resource.set(Some(r))
};
- client.set_status(Online { show: None, ..Default::default() }).await
- },
+ client
+ .set_status(Online {
+ show: None,
+ ..Default::default()
+ })
+ .await
+ }
2 => {
if let Ok(r) = client.connect().await {
client.resource.set(Some(r))
};
- client.set_status(Online { show: Some(Show::DoNotDisturb), ..Default::default() }).await
- },
+ client
+ .set_status(Online {
+ show: Some(Show::DoNotDisturb),
+ ..Default::default()
+ })
+ .await
+ }
3 => {
if let Ok(r) = client.connect().await {
client.resource.set(Some(r))
};
- client.set_status(Online { show: Some(Show::Away), ..Default::default() }).await
- },
+ client
+ .set_status(Online {
+ show: Some(Show::Away),
+ ..Default::default()
+ })
+ .await
+ }
4 => {
if let Ok(r) = client.connect().await {
client.resource.set(Some(r))
};
- client.set_status(Online { show: Some(Show::ExtendedAway), ..Default::default() }).await
- },
+ client
+ .set_status(Online {
+ show: Some(Show::ExtendedAway),
+ ..Default::default()
+ })
+ .await
+ }
5 => {
if let Ok(_) = client.disconnect(Offline::default()).await {
client.resource.set(None)
}
set_show_value.set(5);
- return
+ return;
}
_ => {
error!("invalid availability select");
- return
+ return;
}
} {
error!("show set error: {e}");
- return
+ return;
}
set_show_value.set(show_value);
}
@@ -129,8 +182,8 @@ pub fn PersonalStatusMenu(user: Store<User>, set_open: WriteSignal<bool>) -> imp
<div class="user">
<AvatarWithPresence user=user />
<div class="user-info">
- <div class="nick">{move || get_name(user, false)}</div>
- <div class="jid">{move || user.jid().with(|jid| jid.to_string())}</div>
+ <div class="nick">{move || get_name(user.get().into(), false)}</div>
+ <div class="jid">{move || user.get().jid().with(|jid| jid.to_string())}</div>
</div>
</div>
<div class="status-edit">
@@ -142,36 +195,55 @@ pub fn PersonalStatusMenu(user: Store<User>, set_open: WriteSignal<bool>) -> imp
}
prop:show_value=move || show_value.get().to_string()
>
- <option value="0" selected=move || show_value.get_untracked() == 0>Available to Chat</option>
- <option value="1" selected=move || show_value.get_untracked() == 1>Online</option>
- <option value="2" selected=move || show_value.get_untracked() == 2>Do not disturb</option>
- <option value="3" selected=move || show_value.get_untracked() == 3>Away</option>
- <option value="4" selected=move || show_value.get_untracked() == 4>Extended Away</option>
- <option value="5" selected=move || show_value.get_untracked() == 5>Offline</option>
+ <option value="0" selected=move || show_value.get_untracked() == 0>
+ Available to Chat
+ </option>
+ <option value="1" selected=move || show_value.get_untracked() == 1>
+ Online
+ </option>
+ <option value="2" selected=move || show_value.get_untracked() == 2>
+ Do not disturb
+ </option>
+ <option value="3" selected=move || show_value.get_untracked() == 3>
+ Away
+ </option>
+ <option value="4" selected=move || show_value.get_untracked() == 4>
+ Extended Away
+ </option>
+ <option value="5" selected=move || show_value.get_untracked() == 5>
+ Offline
+ </option>
</select>
</div>
<hr />
- <div class="menu-item" on:click=move |_| {
- show_settings.set(Some(SettingsPage::Profile));
- set_open.set(false);
- }>
+ <div
+ class="menu-item"
+ on:click=move |_| {
+ show_settings.set(Some(SettingsPage::Profile));
+ set_open.set(false);
+ }
+ >
Profile
</div>
- <div class="menu-item" on:click=move |_| {
- show_settings.set(Some(SettingsPage::Account));
- set_open.set(false);
- }>
+ <div
+ class="menu-item"
+ on:click=move |_| {
+ show_settings.set(Some(SettingsPage::Account));
+ set_open.set(false);
+ }
+ >
Settings
</div>
<hr />
- <div class="menu-item" on:click=move |_| {
- // TODO: check if client is actually dropped/shutdown eventually
- disconnect.dispatch(());
- set_app.set(AppState::LoggedOut)
- }>
+ <div
+ class="menu-item"
+ on:click=move |_| {
+ disconnect.dispatch(());
+ set_app.set(AppState::LoggedOut)
+ }
+ >
Log out
</div>
</div>
}
}
-
diff --git a/src/components/roster_list.rs b/src/components/roster_list.rs
index a398ffe..b018d45 100644
--- a/src/components/roster_list.rs
+++ b/src/components/roster_list.rs
@@ -1,22 +1,88 @@
+// SPDX-FileCopyrightText: 2025 cel <cel@bunny.garden>
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
use std::collections::HashSet;
use contact_request_manager::AddContact;
use jid::BareJID;
-use leptos::prelude::*;
+use js_sys::{wasm_bindgen::UnwrapThrowExt, Object, Reflect, JSON};
+use leptos::{html::Div, prelude::*};
+use overlay_scrollbars::OverlayScrollbars;
use reactive_stores::Store;
use roster_list_item::RosterListItem;
+use tracing::debug;
-use crate::{components::icon::IconComponent, icon::Icon, roster::{Roster, RosterStoreFields}};
+use crate::{
+ components::icon::IconComponent,
+ icon::Icon,
+ open_chats::{OpenChatsPanel, OpenChatsPanelStoreFields},
+ roster::{Roster, RosterStoreFields},
+};
mod contact_request_manager;
mod roster_list_item;
#[component]
pub fn RosterList() -> impl IntoView {
- let requests: ReadSignal<HashSet<BareJID>> = use_context().expect("no pending subscriptions in context");
+ let requests: ReadSignal<HashSet<BareJID>> =
+ use_context().expect("no pending subscriptions in context");
+
+ let open_chats: Store<OpenChatsPanel> =
+ use_context().expect("no open chats panel store in context");
let roster: Store<Roster> = use_context().expect("no roster in context");
let (open_add_contact, set_open_add_contact) = signal(false);
+ let open_chat = Memo::new(move |_| open_chats.chat_view().get());
+ provide_context(open_chat);
+
+ let roster_list: NodeRef<Div> = NodeRef::new();
+ let roster_list_viewport: NodeRef<Div> = NodeRef::new();
+
+ let _scrollbars = Effect::new(move |_| {
+ if let Some(buffer) = roster_list.get() {
+ if let Some(viewport) = roster_list_viewport.get() {
+ let elements_obj = Object::new();
+ Reflect::set(&elements_obj, &"viewport".into(), &viewport.into()).unwrap_throw();
+ let element_obj = Object::new();
+ Reflect::set(&elements_obj, &"elements".into(), &elements_obj).unwrap_throw();
+ Reflect::set(&element_obj, &"target".into(), &buffer.into()).unwrap_throw();
+ // let element = Object::define_property(&Object::define_property(&Object::new(), &"target".into(), &buffer.into()), &"elements".into(), &Object::define_property(&Object::new(), &"viewport".into(), &viewport.into()));
+ debug!(
+ "scrollable element: {}",
+ JSON::stringify(&element_obj.clone().into()).unwrap_throw()
+ );
+ OverlayScrollbars(element_obj, Object::new());
+ }
+ }
+ });
+
+ let add_contact: NodeRef<Div> = NodeRef::new();
+ let add_contact_viewport: NodeRef<Div> = NodeRef::new();
+
+ let _scrollbars = Effect::new(move |_| {
+ if let Some(buffer) = add_contact.get() {
+ if let Some(viewport) = add_contact_viewport.get() {
+ let scrollbars_obj = Object::new();
+ Reflect::set(&scrollbars_obj, &"theme".into(), &"os-macaw".into()).unwrap_throw();
+ Reflect::set(&scrollbars_obj, &"move".into(), &"leave".into()).unwrap_throw();
+ let options_obj = Object::new();
+ Reflect::set(&options_obj, &"scrollbars".into(), &scrollbars_obj).unwrap_throw();
+
+ let elements_obj = Object::new();
+ Reflect::set(&elements_obj, &"viewport".into(), &viewport.into()).unwrap_throw();
+ let element_obj = Object::new();
+ Reflect::set(&elements_obj, &"elements".into(), &elements_obj).unwrap_throw();
+ Reflect::set(&element_obj, &"target".into(), &buffer.into()).unwrap_throw();
+ // let element = Object::define_property(&Object::define_property(&Object::new(), &"target".into(), &buffer.into()), &"elements".into(), &Object::define_property(&Object::new(), &"viewport".into(), &viewport.into()));
+ debug!(
+ "scrollable element: {}",
+ JSON::stringify(&element_obj.clone().into()).unwrap_throw()
+ );
+ OverlayScrollbars(element_obj, options_obj);
+ }
+ }
+ });
// TODO: filter new messages signal
view! {
@@ -24,12 +90,13 @@ pub fn RosterList() -> impl IntoView {
<div class="header">
<h2>Roster</h2>
<div class="add-contact header-icon" class:open=open_add_contact>
- <IconComponent icon=Icon::AddContact24 on:click=move |_| set_open_add_contact.update(|state| *state = !*state)/>
+ <IconComponent
+ icon=Icon::AddContact24
+ on:click=move |_| set_open_add_contact.update(|state| *state = !*state)
+ />
{move || {
if !requests.read().is_empty() {
- view! {
- <div class="badge"></div>
- }.into_any()
+ view! { <div class="badge"></div> }.into_any()
} else {
view! {}.into_any()
}
@@ -39,20 +106,28 @@ pub fn RosterList() -> impl IntoView {
{move || {
if *open_add_contact.read() {
view! {
- <div class="roster-add-contact">
- <AddContact />
+ <div class="overlay-scroll add-contact-panel" node_ref=add_contact>
+ <div class="roster-add-contact" node_ref=add_contact_viewport>
+ <AddContact />
+ </div>
</div>
- }.into_any()
+ }
+ .into_any()
} else {
view! {}.into_any()
}
}}
- <div class="roster-list-roster">
- <For each=move || roster.contacts().get() key=|contact| contact.0.clone() let(contact)>
- <RosterListItem contact=contact.1 />
- </For>
+ <div class="overlay-scroll" node_ref=roster_list>
+ <div class="roster-list-roster" node_ref=roster_list_viewport>
+ <For
+ each=move || roster.contacts().get()
+ key=|contact| contact.0.clone()
+ let(contact)
+ >
+ <RosterListItem contact=contact.1 />
+ </For>
+ </div>
</div>
</div>
}
}
-
diff --git a/src/components/roster_list/contact_request_manager.rs b/src/components/roster_list/contact_request_manager.rs
index 174e677..4c28142 100644
--- a/src/components/roster_list/contact_request_manager.rs
+++ b/src/components/roster_list/contact_request_manager.rs
@@ -1,12 +1,22 @@
+// SPDX-FileCopyrightText: 2025 cel <cel@bunny.garden>
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
use std::{collections::HashSet, str::FromStr};
-use filamento::{error::{CommandError, SubscribeError}, roster::ContactStoreFields};
+use filamento::{
+ error::{CommandError, SubscribeError},
+ roster::ContactStoreFields,
+};
use jid::{BareJID, JID};
use leptos::{html::Input, prelude::*};
use reactive_stores::Store;
use thiserror::Error;
-use crate::{client::Client, roster::{Roster, RosterStoreFields}};
+use crate::{
+ client::Client,
+ roster::{Roster, RosterStoreFields},
+};
#[derive(Clone, Debug, Error)]
pub enum AddContactError {
@@ -21,9 +31,11 @@ pub enum AddContactError {
#[component]
// TODO: rename
pub fn AddContact() -> impl IntoView {
- let requests: ReadSignal<HashSet<BareJID>> = use_context().expect("no pending subscriptions in context");
- let set_requests: WriteSignal<HashSet<BareJID>> = use_context().expect("no pending subscriptions write signal in context");
- let roster: Store<Roster> = use_context().expect("no roster in context");
+ let requests: ReadSignal<HashSet<BareJID>> =
+ use_context().expect("no pending subscriptions in context");
+ let set_requests: WriteSignal<HashSet<BareJID>> =
+ use_context().expect("no pending subscriptions write signal in context");
+ let roster: Store<Roster> = use_context().expect("no roster in context");
let jid = RwSignal::new("".to_string());
// TODO: compartmentalise into error component, form component...
@@ -43,8 +55,9 @@ pub fn AddContact() -> impl IntoView {
let client2 = client.clone();
let client3 = client.clone();
let client4 = client.clone();
+ let client5 = client.clone();
- let add_contact= Action::new_local(move |_| {
+ let add_contact = Action::new_local(move |_| {
let client = client.clone();
async move {
set_add_contact_pending.set(true);
@@ -71,8 +84,8 @@ pub fn AddContact() -> impl IntoView {
Err(e) => {
set_error.set(Some(e.into()));
set_add_contact_pending.set(false);
- return;
- },
+ return;
+ }
};
set_add_contact_pending.set(false);
@@ -90,26 +103,44 @@ pub fn AddContact() -> impl IntoView {
}
});
- let outgoing = move || roster.contacts().get().into_iter().filter(|(jid, contact)| {
- match *contact.contact.subscription().read() {
- filamento::roster::Subscription::None => false,
- filamento::roster::Subscription::PendingOut => true,
- filamento::roster::Subscription::PendingIn => false,
- filamento::roster::Subscription::PendingInPendingOut => true,
- filamento::roster::Subscription::OnlyOut => false,
- filamento::roster::Subscription::OnlyIn => false,
- filamento::roster::Subscription::OutPendingIn => false,
- filamento::roster::Subscription::InPendingOut => true,
- filamento::roster::Subscription::Buddy => false,
- }
- }).collect::<Vec<_>>();
+ let outgoing = move || {
+ roster
+ .contacts()
+ .get()
+ .into_iter()
+ .filter(
+ |(jid, contact)| match *contact.contact.subscription().read() {
+ filamento::roster::Subscription::None => false,
+ filamento::roster::Subscription::PendingOut => true,
+ filamento::roster::Subscription::PendingIn => false,
+ filamento::roster::Subscription::PendingInPendingOut => true,
+ filamento::roster::Subscription::OnlyOut => false,
+ filamento::roster::Subscription::OnlyIn => false,
+ filamento::roster::Subscription::OutPendingIn => false,
+ filamento::roster::Subscription::InPendingOut => true,
+ filamento::roster::Subscription::Buddy => false,
+ },
+ )
+ .collect::<Vec<_>>()
+ };
let accept_friend_request = Action::new_local(move |jid: &BareJID| {
let client = client2.clone();
let jid = jid.clone();
async move {
// TODO: error
- client.accept_buddy_request(jid).await;
+ client.accept_buddy_request(jid.clone()).await;
+ set_requests.write().remove(&jid);
+ }
+ });
+
+ let accept_subscription_request = Action::new_local(move |jid: &BareJID| {
+ let client = client5.clone();
+ let jid = jid.clone();
+ async move {
+ // TODO: error
+ client.accept_subscription_request(jid.clone()).await;
+ set_requests.write().remove(&jid);
}
});
@@ -129,70 +160,125 @@ pub fn AddContact() -> impl IntoView {
async move {
// TODO: error
client.unsubscribe_from_contact(jid).await;
-
}
});
view! {
<div class="add-contact-menu">
- <div>
- {error_message}
- <form on:submit=move |ev| {
- ev.prevent_default();
- add_contact.dispatch(());
- }>
- <input
- disabled=add_contact_pending
- placeholder="JID"
- type="text"
- node_ref=jid_input
- bind:value=jid
- name="jid"
- id="jid"
- autofocus="true"
- />
- <input disabled=add_contact_pending class="button" type="submit" value="Send Friend Request" />
- </form>
- </div>
- {move || if !requests.read().is_empty() {
- view! {
- <div>
- <h3>Incoming Subscription Requests</h3>
- <For each=move || requests.get() key=|request| request.clone() let(request)>
- {
- let request2 = request.clone();
- let request3 = request.clone();
- let jid_string = move || request.to_string();
- view! {
- <div class="jid-with-button"><div class="jid">{jid_string}</div>
- <div><div class="button" on:click=move |_| { accept_friend_request.dispatch(request2.clone()); } >Accept</div><div class="button" on:click=move |_| { reject_friend_request.dispatch(request3.clone()); } >Reject</div></div></div>
- }
- }
- </For>
- </div>
- }.into_any()
- } else {
- view! {}.into_any()
- }}
- {move || if !outgoing().is_empty() {
- view! {
- <div>
- <h3>Pending Outgoing Subscription Requests</h3>
- <For each=move || outgoing() key=|(jid, _contact)| jid.clone() let((jid, contact))>
- {
- let jid2 = jid.clone();
- let jid_string = move || jid.to_string();
- view! {
- <div class="jid-with-button"><div class="jid">{jid_string}</div><div class="button" on:click=move |_| { cancel_subscription_request.dispatch(jid2.clone()); } >Cancel</div></div>
- }
- }
- </For>
- </div>
- }.into_any()
- } else {
- view! {}.into_any()
- }}
+ <div>
+ {error_message}
+ <form on:submit=move |ev| {
+ ev.prevent_default();
+ add_contact.dispatch(());
+ }>
+ <input
+ disabled=add_contact_pending
+ placeholder="JID"
+ type="text"
+ node_ref=jid_input
+ bind:value=jid
+ name="jid"
+ id="jid"
+ autofocus="true"
+ />
+ <input
+ disabled=add_contact_pending
+ class="button"
+ type="submit"
+ value="Send Friend Request"
+ />
+ </form>
+ </div>
+ {move || {
+ if !requests.read().is_empty() {
+ view! {
+ <div>
+ <h3>Incoming Subscription Requests</h3>
+ <For
+ each=move || requests.get()
+ key=|request| request.clone()
+ let(request)
+ >
+ {
+ let request2 = request.clone();
+ let request3 = request.clone();
+ let request4 = request.clone();
+ let jid_string = move || request.to_string();
+ view! {
+ <div class="jid-with-buttons">
+ <div class="jid">{jid_string}</div>
+ <div class="buttons">
+ <div
+ class="button"
+ on:click=move |_| {
+ reject_friend_request.dispatch(request3.clone());
+ }
+ >
+ Reject
+ </div>
+ <div
+ class="button"
+ on:click=move |_| {
+ accept_subscription_request.dispatch(request4.clone());
+ }
+ >
+ Sub-only
+ </div>
+ <div
+ class="button"
+ on:click=move |_| {
+ accept_friend_request.dispatch(request2.clone());
+ }
+ >
+ Accept Buddy
+ </div>
+ </div>
+ </div>
+ }
+ }
+ </For>
+ </div>
+ }
+ .into_any()
+ } else {
+ view! {}.into_any()
+ }
+ }}
+ {move || {
+ if !outgoing().is_empty() {
+ view! {
+ <div>
+ <h3>Pending Outgoing Subscription Requests</h3>
+ <For
+ each=move || outgoing()
+ key=|(jid, _contact)| jid.clone()
+ let((jid, contact))
+ >
+ {
+ let jid2 = jid.clone();
+ let jid_string = move || jid.to_string();
+ view! {
+ <div class="jid-with-button">
+ <div class="jid">{jid_string}</div>
+ <div
+ class="button"
+ on:click=move |_| {
+ cancel_subscription_request.dispatch(jid2.clone());
+ }
+ >
+ Cancel
+ </div>
+ </div>
+ }
+ }
+ </For>
+ </div>
+ }
+ .into_any()
+ } else {
+ view! {}.into_any()
+ }
+ }}
</div>
}
}
-
diff --git a/src/components/roster_list/roster_list_item.rs b/src/components/roster_list/roster_list_item.rs
index 9ebc26a..a6fd714 100644
--- a/src/components/roster_list/roster_list_item.rs
+++ b/src/components/roster_list/roster_list_item.rs
@@ -1,46 +1,93 @@
+// SPDX-FileCopyrightText: 2025 cel <cel@bunny.garden>
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
use std::ops::Deref;
-use filamento::{chat::Chat, roster::{Contact, ContactStoreFields}, user::{User, UserStoreFields}};
+use filamento::{
+ chat::Chat,
+ roster::{Contact, ContactStoreFields},
+ user::{User, UserStoreFields},
+};
+use jid::BareJID;
use leptos::prelude::*;
use reactive_stores::{ArcStore, Store};
use tracing::debug;
-use crate::{chat::{ArcMacawChat, MacawChat}, components::{avatar::AvatarWithPresence, sidebar::Open}, contact::MacawContact, open_chats::{OpenChatsPanel, OpenChatsPanelStoreFields}, user::get_name};
+use crate::{
+ chat::{ArcMacawChat, MacawChat},
+ client::Client,
+ components::{avatar::AvatarWithPresence, sidebar::Open},
+ contact::MacawContact,
+ open_chats::{OpenChatsPanel, OpenChatsPanelStoreFields},
+ state_store::StateStore,
+ user::{ArcMacawUser, fetch_avatar, get_name},
+};
#[component]
pub fn RosterListItem(contact: MacawContact) -> impl IntoView {
- let contact_contact: Store<Contact> = contact.contact;
- let contact_user: Store<User> =
- <ArcStore<filamento::user::User> as Clone>::clone(&contact.user.get()).into();
- let name = move || get_name(contact_user, false);
+ let name = move || get_name(contact.user.get().into(), false);
let open_chats: Store<OpenChatsPanel> =
use_context().expect("no open chats panel store in context");
- // TODO: why can this not be in the closure?????
- // TODO: not good, as overwrites preexisting chat state with possibly incorrect one...
- let chat = Chat {
- correspondent: contact_user.jid().get(),
- have_chatted: false,
- };
- let chat = ArcMacawChat::got_chat_and_user(chat, contact_user.get());
+ let client = use_context::<Client>().expect("client not in context");
- let open_chat = move |_| {
- debug!("opening chat");
- open_chats.update(|open_chats| open_chats.open(Clone::clone(&chat)));
- };
+ let chat_state_store: StateStore<BareJID, ArcStore<Chat>> =
+ use_context().expect("no chat state store");
+ let user_state_store: StateStore<BareJID, (ArcStore<User>, ArcRwSignal<String>)> =
+ use_context().expect("no user state store");
+
+ let open_chat = Action::new_local(move |_| {
+ let client = client.clone();
+ async move {
+ let to = contact.user.get().jid().get();
+ let (chat, user) = match client.get_chat_and_user(to).await {
+ Ok(c) => c,
+ Err(e) => {
+ // TODO: error
+ // set_error.set(Some(e.into()));
+ // set_new_chat_pending.set(false);
+ return;
+ }
+ };
+
+ let chat = {
+ // let user = MacawUser::got_user(user);
+ // let user = user_state_store.store(user.jid.clone(), ArcStore::new(user));
+ let old_user = user_state_store.get_listener(user.jid.clone());
+ let user = if let Some(old_user) = old_user {
+ old_user.update(|(old_user, _avatar)| {
+ old_user.set(user);
+ });
+ old_user
+ } else {
+ let avatar = fetch_avatar(user.avatar.as_deref()).await;
+ let avatar = ArcRwSignal::new(avatar);
+ user_state_store.store(user.jid.clone(), (ArcStore::new(user), avatar))
+ };
+ let user = ArcMacawUser { user };
+ let chat = chat_state_store.store(chat.correspondent.clone(), ArcStore::new(chat));
+ ArcMacawChat { chat, user }
+ };
+ open_chats.update(|open_chats| open_chats.open(chat.clone()));
+ }
+ });
+
+ let current_open_chat: Memo<Option<BareJID>> =
+ use_context().expect("no open chat memo in context");
let open = move || {
- if let Some(open_chat) = &*open_chats.chat_view().read() {
+ if let Some(open_chat) = &*current_open_chat.read() {
debug!("got open chat: {:?}", open_chat);
- if *open_chat == *contact_user.jid().read() {
+ if *open_chat == *contact.user.get().jid().read() {
return Open::Focused;
}
}
if let Some(_backgrounded_chat) = open_chats
.chats()
.read()
- .get(contact_user.jid().read().deref())
+ .get(contact.user.get().jid().read().deref())
{
return Open::Open;
}
@@ -50,13 +97,26 @@ pub fn RosterListItem(contact: MacawContact) -> impl IntoView {
let open = move || open().is_open();
view! {
- <div class="roster-list-item" class:open=move || open() class:focused=move || focused() on:click=open_chat>
- <AvatarWithPresence user=contact_user />
+ <div
+ class="roster-list-item"
+ class:open=move || open()
+ class:focused=move || focused()
+ on:click=move |_| {
+ open_chat.dispatch(());
+ }
+ >
+ {move || {
+ view! { <AvatarWithPresence user=contact.user /> }
+ }}
<div class="item-info">
- <div class="main-info"><p class="name">{name}<span class="jid"> - {move || contact_contact.user_jid().read().to_string()}</span></p></div>
- <div class="sub-info">{move || contact_contact.subscription().read().to_string()}</div>
+ <div class="main-info">
+ <p class="name">
+ {name}
+ <span class="jid">- {move || contact.user_jid().read().to_string()}</span>
+ </p>
+ </div>
+ <div class="sub-info">{move || contact.subscription().read().to_string()}</div>
</div>
</div>
}
}
-
diff --git a/src/components/sidebar.rs b/src/components/sidebar.rs
index ca753ef..9f555b5 100644
--- a/src/components/sidebar.rs
+++ b/src/components/sidebar.rs
@@ -1,20 +1,29 @@
-use std::collections::HashSet;
+// SPDX-FileCopyrightText: 2025 cel <cel@bunny.garden>
+//
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+use std::collections::{HashMap, HashSet};
use jid::BareJID;
use leptos::prelude::*;
+use reactive_stores::Store;
use crate::components::{
- personal_status::PersonalStatus,
- chats_list::ChatsList,
- roster_list::RosterList,
+ chats_list::ChatsList, personal_status::PersonalStatus, roster_list::RosterList,
};
-#[derive(PartialEq, Eq, Clone, Copy)]
+#[derive(PartialEq, Eq, Clone, Copy, Hash)]
pub enum SidebarOpen {
Roster,
Chats,
}
+#[derive(Store)]
+pub struct Drawer {
+ open: SidebarOpen,
+ hovering: bool,
+}
+
pub enum Open {
/// Currently on screen
Focused,
@@ -55,122 +64,170 @@ pub fn toggle_open(state: &mut Option<SidebarOpen>, open: SidebarOpen) -> bool {
}
}
None => {
- *state = Some(open);
- true
- },
+ *state = Some(open);
+ true
+ }
}
}
#[component]
pub fn Sidebar() -> impl IntoView {
- let requests: ReadSignal<HashSet<BareJID>> = use_context().expect("no pending subscriptions in context");
+ let requests: ReadSignal<HashSet<BareJID>> =
+ use_context().expect("no pending subscriptions in context");
// for what has been clicked open (in the background)
let (open, set_open) = signal(None::<SidebarOpen>);
// for what is just in the hovered state (not clicked to be pinned open yet necessarily)
+ let open = Memo::new(move |_| open.get());
let (hovered, set_hovered) = signal(None::<SidebarOpen>);
+ let hovered = Memo::new(move |_| hovered.get());
let (just_closed, set_just_closed) = signal(false);
+ let just_closed = Memo::new(move |_| just_closed.get());
+
+ let pages = Memo::new(move |_| {
+ let mut pages = HashSet::new();
+ if let Some(hovered) = *hovered.read() {
+ pages.insert(hovered);
+ }
+ if let Some(opened) = *open.read() {
+ pages.insert(opened);
+ }
+ pages
+ });
view! {
- <div class="sidebar" on:mouseleave=move |_| {
- set_hovered.set(None);
- set_just_closed.set(false);
- }>
+ <div
+ class="sidebar"
+ on:mouseleave=move |_| {
+ set_hovered.set(None);
+ set_just_closed.set(false);
+ }
+ >
<div class="dock panel">
<div class="shortcuts">
- <div class="roster-tab dock-item" class:focused=move || *open.read() == Some(SidebarOpen::Roster) class:hovering=move || *hovered.read() == Some(SidebarOpen::Roster)
- on:mouseenter=move |_| {
- set_just_closed.set(false);
- set_hovered.set(Some(SidebarOpen::Roster))
- }
- on:click=move |_| {
- set_open.update(|state| {
- if !toggle_open(state, SidebarOpen::Roster) {
- set_just_closed.set(true);
- }
- })
- }>
+ <div
+ class="roster-tab dock-item"
+ class:focused=move || *open.read() == Some(SidebarOpen::Roster)
+ class:hovering=move || *hovered.read() == Some(SidebarOpen::Roster)
+ on:mouseenter=move |_| {
+ set_just_closed.set(false);
+ set_hovered.set(Some(SidebarOpen::Roster))
+ }
+ on:click=move |_| {
+ set_open
+ .update(|state| {
+ if !toggle_open(state, SidebarOpen::Roster) {
+ set_just_closed.set(true);
+ } else {
+ set_just_closed.set(false);
+ }
+ })
+ }
+ >
<div class="dock-pill"></div>
<div class="dock-icon">
<div class="icon-with-badge">
- <img src="/assets/caw.png" />
- {move || {
- let len = requests.read().len();
- if len > 0 {
- view! {
- <div class="badge">{len}</div>
- }.into_any()
- } else {
- view! {}.into_any()
- }
- }}
+ <img src="/assets/caw.png" />
+ {move || {
+ let len = requests.read().len();
+ if len > 0 {
+ view! { <div class="badge">{len}</div> }.into_any()
+ } else {
+ view! {}.into_any()
+ }
+ }}
</div>
</div>
</div>
- <div class="chats-tab dock-item" class:focused=move || *open.read() == Some(SidebarOpen::Chats) class:hovering=move || *hovered.read() == Some(SidebarOpen::Chats)
- on:mouseenter=move |_| {
- set_just_closed.set(false);
- set_hovered.set(Some(SidebarOpen::Chats))
- }
- on:click=move |_| {
- set_open.update(|state| {
- if !toggle_open(state, SidebarOpen::Chats) {
- set_just_closed.set(true);
- }
- })
- }>
+ <div
+ class="chats-tab dock-item"
+ class:focused=move || *open.read() == Some(SidebarOpen::Chats)
+ class:hovering=move || *hovered.read() == Some(SidebarOpen::Chats)
+ on:mouseenter=move |_| {
+ set_just_closed.set(false);
+ set_hovered.set(Some(SidebarOpen::Chats))
+ }
+ on:click=move |_| {
+ set_open
+ .update(|state| {
+ if !toggle_open(state, SidebarOpen::Chats) {
+ set_just_closed.set(true);
+ } else {
+ set_just_closed.set(false);
+ }
+ })
+ }
+ >
<div class="dock-pill"></div>
<img src="/assets/bubble.png" />
</div>
</div>
- <div class="pins">
- </div>
+ <div class="pins"></div>
<div class="personal">
<PersonalStatus />
</div>
</div>
- {move || if let Some(hovered) = *hovered.read() {
- if Some(hovered) != *open.read() {
- if !just_closed.get() {
- match hovered {
- SidebarOpen::Roster => view! {
- <div class="sidebar-drawer sidebar-hovering-drawer">
- <RosterList />
- </div>
- }.into_any(),
- SidebarOpen::Chats => view! {
- <div class="sidebar-drawer sidebar-hovering-drawer">
- <ChatsList />
- </div>
- }.into_any(),
- }
- } else {
-
- view! {}.into_any()
+ {move || {
+ if !just_closed.get() {
+ view! {
+ <For each=move || pages.get() key=|page| *page let(page)>
+ {move || match page {
+ SidebarOpen::Roster => {
+ view! {
+ {move || {
+ if *open.read() == None
+ && *hovered.read() == Some(SidebarOpen::Roster)
+ {
+ view! { <div class="sidebar-drawer behind-hovering"></div> }
+ .into_any()
+ } else {
+ view! {}.into_any()
+ }
+ }}
+ <div
+ class:sidebar-drawer=true
+ class:sidebar-hovering-drawer=move || {
+ !(*open.read() == Some(SidebarOpen::Roster))
+ && (*hovered.read() == Some(SidebarOpen::Roster))
+ }
+ >
+ <RosterList />
+ </div>
+ }
+ .into_any()
+ }
+ SidebarOpen::Chats => {
+ view! {
+ {move || {
+ if *open.read() == None
+ && *hovered.read() == Some(SidebarOpen::Chats)
+ {
+ view! { <div class="sidebar-drawer behind-hovering"></div> }
+ .into_any()
+ } else {
+ view! {}.into_any()
+ }
+ }}
+ <div
+ class:sidebar-drawer=true
+ class:sidebar-hovering-drawer=move || {
+ !(*open.read() == Some(SidebarOpen::Chats))
+ && (*hovered.read() == Some(SidebarOpen::Chats))
+ }
+ >
+ <ChatsList />
+ </div>
+ }
+ .into_any()
+ }
+ }}
+ </For>
}
+ .into_any()
} else {
view! {}.into_any()
}
- } else {
- view! {}.into_any()
- }}
- {move || if let Some(opened) = *open.read() {
- match opened {
- SidebarOpen::Roster => view! {
- <div class="sidebar-drawer">
- <RosterList />
- </div>
- }.into_any(),
- SidebarOpen::Chats => view! {
- <div class="sidebar-drawer">
- <ChatsList />
- </div>
- }.into_any(),
- }
- } else {
- view! {}.into_any()
}}
</div>
}
}
-
generated by cgit (git 2.34.1) at 2025-12-13 11:18:47 +0000