ulysia/Vencord
1
0
Fork 0
Code Pull requests Activity

InteractionKeybinds: Scroll to message if offscreen

Browse source 
Closes https://github.com/Vendicated/Vencord/issues/200
This commit is contained in:
Vendicated 2022-11-12 00:29:36 +01:00
parent 30ca4f1cf9
commit 8380328465
No known key found for this signature in database
GPG key ID: EC781ADFB93EFFA3
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/plugins/interactionKeybinds.ts
View file

@ -22,9 +22,9 @@ import { Devs } from "../utils/constants";
import { lazyWebpack } from "../utils/misc"; import { lazyWebpack } from "../utils/misc";
import definePlugin from "../utils/types"; import definePlugin from "../utils/types";
import { filters } from "../webpack"; import { filters } from "../webpack";
import { ChannelStore, FluxDispatcher as Dispatcher, SelectedChannelStore, UserStore } from "../webpack/common"; import { ChannelStore, FluxDispatcher as Dispatcher, MessageStore, SelectedChannelStore, UserStore } from "../webpack/common";
const MessageStore = lazyWebpack(filters.byProps("getRawMessages")); const Kangaroo = lazyWebpack(filters.byProps("jumpToMessage"));
const isMac = navigator.platform.includes("Mac"); // bruh const isMac = navigator.platform.includes("Mac"); // bruh
let replyIdx = -1; let replyIdx = -1;
@ -91,6 +91,24 @@ function onKeydown(e: KeyboardEvent) {
nextReply(isUp); nextReply(isUp);
} }
function jumpIfOffScreen(channelId: string, messageId: string) {
const element = document.getElementById("message-content-" + messageId);
if (!element) return;
const vh = Math.max(document.documentElement.clientHeight, window.innerHeight);
const rect = element.getBoundingClientRect();
const isOffscreen = rect.bottom < 200 || rect.top - vh >= -200;
if (isOffscreen) {
Kangaroo.jumpToMessage({
channelId,
messageId,
flash: false,
jumpType: "INSTANT"
});
}
}
function getNextMessage(isUp: boolean, isReply: boolean) { function getNextMessage(isUp: boolean, isReply: boolean) {
let messages: Message[] = MessageStore.getMessages(SelectedChannelStore.getChannelId())._array; let messages: Message[] = MessageStore.getMessages(SelectedChannelStore.getChannelId())._array;
if (!isReply) { // we are editing so only include own if (!isReply) { // we are editing so only include own
@ -131,6 +149,7 @@ function nextReply(isUp: boolean) {
showMentionToggle: channel.guild_id !== null && message.author.id !== meId, showMentionToggle: channel.guild_id !== null && message.author.id !== meId,
_isQuickReply: true _isQuickReply: true
}); });
jumpIfOffScreen(channel.id, message.id);
} }
// handle next/prev edit // handle next/prev edit
@ -142,7 +161,7 @@ function nextEdit(isUp: boolean) {
type: "MESSAGE_END_EDIT", type: "MESSAGE_END_EDIT",
channelId: SelectedChannelStore.getChannelId() channelId: SelectedChannelStore.getChannelId()
}); });
else else {
Dispatcher.dispatch({ Dispatcher.dispatch({
type: "MESSAGE_START_EDIT", type: "MESSAGE_START_EDIT",
channelId: message.channel_id, channelId: message.channel_id,
@ -150,4 +169,6 @@ function nextEdit(isUp: boolean) {
content: message.content, content: message.content,
_isQuickEdit: true _isQuickEdit: true
}); });
jumpIfOffScreen(message.channel_id, message.id);
}
} }

2
src/webpack/common.tsx
View file

@ -32,7 +32,7 @@ export const Flux = lazyWebpack(filters.byProps("connectStores"));
export let React: typeof import("react"); export let React: typeof import("react");
export const ReactDOM: typeof import("react-dom") = lazyWebpack(filters.byProps("createPortal", "render")); export const ReactDOM: typeof import("react-dom") = lazyWebpack(filters.byProps("createPortal", "render"));
export const MessageStore = lazyWebpack(filters.byProps("getRawMessages")) as Stores.MessageStore; export const MessageStore = lazyWebpack(filters.byProps("getRawMessages")) as Omit<Stores.MessageStore, "getMessages"> & { getMessages(chanId: string): any; };
export let GuildStore: Stores.GuildStore; export let GuildStore: Stores.GuildStore;
export let UserStore: Stores.UserStore; export let UserStore: Stores.UserStore;
export let SelectedChannelStore: Stores.SelectedChannelStore; export let SelectedChannelStore: Stores.SelectedChannelStore;