Skip to content
Snippets Groups Projects
Commit 7a5ace2d authored by insert's avatar insert
Browse files

Highlight messages we jump to.

parent 362e7452
No related merge requests found
......@@ -28,12 +28,14 @@ interface Props {
attachContext?: boolean;
queued?: QueuedMessage;
message: MessageObject;
highlight?: boolean;
contrast?: boolean;
content?: Children;
head?: boolean;
}
function Message({
highlight,
attachContext,
message,
contrast,
......@@ -72,6 +74,7 @@ function Message({
/>
))}
<MessageBase
highlight={highlight}
head={head && !(message.replies && message.replies.length > 0)}
contrast={contrast}
sending={typeof queued !== "undefined"}
......
import styled, { css } from "styled-components";
import styled, { css, keyframes } from "styled-components";
import { decodeTime } from "ulid";
import { Text } from "preact-i18n";
......@@ -17,8 +17,15 @@ export interface BaseMessageProps {
blocked?: boolean;
sending?: boolean;
contrast?: boolean;
highlight?: boolean;
}
const highlight = keyframes`
0% { background: var(--mention); }
66% { background: var(--mention); }
100% { background: transparent; }
`;
export default styled.div<BaseMessageProps>`
display: flex;
overflow: none;
......@@ -70,6 +77,14 @@ export default styled.div<BaseMessageProps>`
color: var(--error);
`}
${(props) =>
props.highlight &&
css`
animation-name: ${highlight};
animation-timing-function: ease;
animation-duration: 3s;
`}
.detail {
gap: 8px;
display: flex;
......
......@@ -35,9 +35,10 @@ type SystemMessageParsed =
interface Props {
attachContext?: boolean;
message: MessageObject;
highlight?: boolean;
}
export function SystemMessage({ attachContext, message }: Props) {
export function SystemMessage({ attachContext, message, highlight }: Props) {
const ctx = useForceUpdate();
let data: SystemMessageParsed;
......@@ -143,6 +144,7 @@ export function SystemMessage({ attachContext, message }: Props) {
return (
<MessageBase
highlight={highlight}
onContextMenu={
attachContext
? attachContextMenu("Menu", {
......
......@@ -60,7 +60,9 @@ export function MessageArea({ id }: Props) {
const status = useContext(StatusContext);
const { focusTaken } = useContext(IntermediateContext);
// ? Required data for message links.
const { message } = useParams<{ message: string }>();
const [highlight, setHighlight] = useState<string | undefined>(undefined);
// ? This is the scroll container.
const ref = useRef<HTMLDivElement>(null);
......@@ -99,7 +101,7 @@ export function MessageArea({ id }: Props) {
});
} else if (scrollState.current.type === "ScrollToView") {
document.getElementById(scrollState.current.id)
?.scrollIntoView();
?.scrollIntoView({ block: 'center' });
setScrollState({ type: "Free" });
} else if (scrollState.current.type === "OffsetTop") {
......@@ -170,6 +172,7 @@ export function MessageArea({ id }: Props) {
// ? If message present or changes, load it as well.
useEffect(() => {
if (message) {
setHighlight(message);
SingletonMessageRenderer.init(id, message);
let channel = client.channels.get(id);
......@@ -284,7 +287,7 @@ export function MessageArea({ id }: Props) {
</RequiresOnline>
)}
{state.type === "RENDER" && (
<MessageRenderer id={id} state={state} />
<MessageRenderer id={id} state={state} highlight={highlight} />
)}
{state.type === "EMPTY" && <ConversationStart id={id} />}
</div>
......
......@@ -28,6 +28,7 @@ import MessageEditor from "./MessageEditor";
interface Props {
id: string;
state: RenderState;
highlight?: string;
queue: QueuedMessage[];
}
......@@ -42,7 +43,7 @@ const BlockedMessage = styled.div`
}
`;
function MessageRenderer({ id, state, queue }: Props) {
function MessageRenderer({ id, state, queue, highlight }: Props) {
if (state.type !== "RENDER") return null;
const client = useContext(AppContext);
......@@ -132,6 +133,7 @@ function MessageRenderer({ id, state, queue }: Props) {
key={message._id}
message={message}
attachContext
highlight={highlight === message._id}
/>,
);
} else {
......@@ -158,6 +160,7 @@ function MessageRenderer({ id, state, queue }: Props) {
) : undefined
}
attachContext
highlight={highlight === message._id}
/>,
);
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment