From a9d4326490baeba89e69d5de0c600729437a3f20 Mon Sep 17 00:00:00 2001 From: Roland Osborne Date: Fri, 27 Jan 2023 15:40:04 -0800 Subject: [PATCH] more conversation details refactor --- .../session/cardSelect/selectItem/SelectItem.jsx | 5 +++-- net/web/src/session/details/Details.jsx | 16 ++++++++-------- net/web/src/session/details/useDetails.hook.js | 6 +++--- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/net/web/src/session/cardSelect/selectItem/SelectItem.jsx b/net/web/src/session/cardSelect/selectItem/SelectItem.jsx index 17b9e13a..2de1adb2 100644 --- a/net/web/src/session/cardSelect/selectItem/SelectItem.jsx +++ b/net/web/src/session/cardSelect/selectItem/SelectItem.jsx @@ -15,7 +15,7 @@ export function SelectItem({ item, select, selected, markup, setItem, clearItem return profile?.handle; } - const onSelect = () => { + const onSelect = (ev) => { if (select) { select(item.id); } @@ -25,6 +25,7 @@ export function SelectItem({ item, select, selected, markup, setItem, clearItem if (clearItem && state.selected) { clearItem(item.id); } + ev.stopPropagation() } return ( @@ -37,7 +38,7 @@ export function SelectItem({ item, select, selected, markup, setItem, clearItem { (select || setItem || clearItem) && (
- + onSelect(ev)} size="small" />
)} { state.markup && ( diff --git a/net/web/src/session/details/Details.jsx b/net/web/src/session/details/Details.jsx index 53822228..3dbb3577 100644 --- a/net/web/src/session/details/Details.jsx +++ b/net/web/src/session/details/Details.jsx @@ -152,7 +152,7 @@ export function Details({ closeDetails, closeConversation, openContact }) {
- { state.host && ( + { !state.host && (
{ state.sealed && !state.contentKey && ( @@ -173,7 +173,7 @@ export function Details({ closeDetails, closeConversation, openContact }) { )}
)} - { !state.host && ( + { state.host && (
{ state.sealed && !state.contentKey && ( @@ -189,22 +189,22 @@ export function Details({ closeDetails, closeConversation, openContact }) { )}
)} - { state.host && ( + { !state.host && (
host
)} - { !state.host && ( + { state.host && (
guest
)}
{ state.started }
- { state.host && ( + { !state.host && (
Delete Topic
)} - { state.host && !state.sealed && ( + { !state.host && !state.sealed && (
Edit Membership
)} - { !state.host && ( + { state.host && (
Leave Topic
)}
Members
@@ -215,7 +215,7 @@ export function Details({ closeDetails, closeConversation, openContact }) { } return false; }} unknown={state.unknown} - /> + markup={state.host} />