From d18fa03f31e39a05b233f893cdaf062a4c4c2f71 Mon Sep 17 00:00:00 2001 From: d-r-w Date: Mon, 27 Feb 2023 19:16:43 -0600 Subject: [PATCH 1/2] Makes entire note clickable --- packages/app/src/Element/Note.css | 7 +++++-- packages/app/src/Element/Note.tsx | 9 +++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/packages/app/src/Element/Note.css b/packages/app/src/Element/Note.css index fc6dff8..a1217de 100644 --- a/packages/app/src/Element/Note.css +++ b/packages/app/src/Element/Note.css @@ -2,6 +2,10 @@ min-height: 110px; } +.note:hover { + cursor: pointer; +} + .note > .header .reply { font-size: 13px; color: var(--font-secondary-color); @@ -132,8 +136,7 @@ } .note > .header img:hover, -.note > .header .name > .reply:hover, -.note .body:hover { +.note > .header .name > .reply:hover { cursor: pointer; } diff --git a/packages/app/src/Element/Note.tsx b/packages/app/src/Element/Note.tsx index b858572..8587d10 100644 --- a/packages/app/src/Element/Note.tsx +++ b/packages/app/src/Element/Note.tsx @@ -175,7 +175,11 @@ export default function Note(props: NoteProps) { } }, [inView, entry, extendable]); - function goToEvent(e: React.MouseEvent, id: u256) { + function goToEvent(e: React.MouseEvent, id: u256, isTargetAllowed: boolean = e.target === e.currentTarget) { + if (!isTargetAllowed) { + return; + } + e.stopPropagation(); navigate(eventLink(id)); } @@ -287,7 +291,7 @@ export default function Note(props: NoteProps) { )} )} -
goToEvent(e, ev.Id)}> +
goToEvent(e, ev.Id, true)}> {transformBody()} {translation()} {options.showReactionsLink && ( @@ -320,6 +324,7 @@ export default function Note(props: NoteProps) { const note = (
goToEvent(e, ev.Id)} ref={ref}> {content()}
From d228772e92ed15c6050a35bc1314bd2d0b47b1cc Mon Sep 17 00:00:00 2001 From: d-r-w Date: Tue, 7 Mar 2023 08:59:38 -0600 Subject: [PATCH 2/2] Fixes Prettier issue --- packages/app/src/Element/Note.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/app/src/Element/Note.tsx b/packages/app/src/Element/Note.tsx index 8587d10..4b11ef5 100644 --- a/packages/app/src/Element/Note.tsx +++ b/packages/app/src/Element/Note.tsx @@ -179,7 +179,7 @@ export default function Note(props: NoteProps) { if (!isTargetAllowed) { return; } - + e.stopPropagation(); navigate(eventLink(id)); }