Merge c0b1c02628 into b875ebf92d

src/plugins/betterQuickReact/index.css

@@ -0,0 +1,30 @@
+/* Fixes to make the quick reactions look better */
+
+.vc-better-quick-react {
+    /* Discord officially has a 2px right margin and a 0px left margin, which is a hack for their selection border being cut off on the right */
+    padding: 4px 1px 6px;
+    justify-content: center;
+    grid-template-columns: repeat(var(--vc-better-quick-react-columns), 44px);
+    grid-template-rows: unset;
+    grid-auto-rows: 44px;
+    z-index: 10;
+}
+
+.vc-better-quick-react.vc-better-quick-react-compact {
+    grid-template-columns: repeat(var(--vc-better-quick-react-columns), 33px);
+    grid-auto-rows: 33px;
+}
+
+.vc-better-quick-react.vc-better-quick-react-compact > div {
+    scale: 0.75;
+}
+
+.vc-better-quick-react.vc-better-quick-react-compact img {
+    width: 25px;
+    height: 25px;
+}
+
+/* 8 or more columns exceeds the default max width */
+[class*="menu_"]:has(>div>.vc-better-quick-react) {
+    max-width: fit-content;
+}

src/plugins/betterQuickReact/index.tsx

@@ -0,0 +1,109 @@
+/*
+ * Vencord, a Discord client mod
+ * Copyright (c) 2024 Vendicated and contributors
+ * SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+import "./index.css";
+
+import { definePluginSettings } from "@api/Settings";
+import { makeRange } from "@components/PluginSettings/components";
+import { Devs } from "@utils/constants";
+import definePlugin, { OptionType } from "@utils/types";
+
+export const settings = definePluginSettings({
+    frequentEmojis: {
+        description: "Use frequently used emojis instead of favourite emojis",
+        type: OptionType.BOOLEAN,
+        default: true
+    },
+    rows: {
+        description: "Rows of quick reactions to display",
+        type: OptionType.SLIDER,
+        default: 2,
+        markers: makeRange(1, 16, 1),
+        stickToMarkers: true
+    },
+    columns: {
+        description: "Columns of quick reactions to display",
+        type: OptionType.SLIDER,
+        default: 4,
+        markers: makeRange(1, 12, 1),
+        stickToMarkers: true
+    },
+    compactMode: {
+        description: "Scales the buttons to 75% of their original scale, whilst increasing the inner emoji to 125% scale. Emojis will be 93.75% of the original size. Recommended to have a minimum of 5 columns",
+        type: OptionType.BOOLEAN,
+        default: false
+    },
+    scroll: {
+        description: "Enable scrolling the list of emojis",
+        type: OptionType.BOOLEAN,
+        default: true
+    }
+});
+
+export default definePlugin({
+    name: "BetterQuickReact",
+    description: "Improves the quick react buttons in the message context menu.",
+    authors: [Devs.Ven, Devs.Sqaaakoi],
+    settings,
+
+    patches: [
+        // Remove favourite emojis from being inserted at the start of the reaction list
+        {
+            find: "this.favoriteEmojisWithoutFetchingLatest.concat",
+            replacement: {
+                match: /(this\.favoriteEmojisWithoutFetchingLatest)\.concat/,
+                replace: "($self.settings.store.frequentEmojis?[]:$1).concat"
+            }
+        },
+        {
+            find: ".ADD_REACTION_NAMED.format",
+            group: true,
+            replacement: [
+                // Override limit of emojis to display with offset hook.
+                {
+                    match: /(\i)\.length>4&&\((\i)\.length=4\);/,
+                    replace: "let [betterQuickReactScrollValue,setBetterQuickReactScrollValue]=Vencord.Webpack.Common.React.useState(0);betterQuickReactScrollValue;"
+                },
+                // Add a custom class to identify the quick reactions have been modified and a CSS variable for the number of columns to display
+                {
+                    match: /className:(\i)\.wrapper,/,
+                    replace: "className:\"vc-better-quick-react \"+($self.settings.store.compactMode?\"vc-better-quick-react-compact \":\"\")+$1.wrapper,style:{\"--vc-better-quick-react-columns\":$self.settings.store.columns},"
+                },
+                // Scroll handler + Apply the emoji count limit from earlier with custom logic
+                {
+                    match: /children:(\i)\.map\(/,
+                    replace: "onWheel:$self.onWheelWrapper(betterQuickReactScrollValue,setBetterQuickReactScrollValue,$1.length),children:$self.applyScroll($1,betterQuickReactScrollValue).map("
+                }
+            ]
+        },
+        // MenuGroup doesn't accept styles or anything special by default :/
+        {
+            find: ".groupLabel,",
+            replacement: {
+                match: /role:"group",/,
+                replace: "$&style:arguments[0].style,onWheel:arguments[0].onWheel,"
+            }
+        }
+    ],
+    getMaxQuickReactions() {
+        return settings.store.rows * settings.store.columns;
+    },
+    applyScroll(emojis: any[], index: number) {
+        return emojis.slice(index, index + this.getMaxQuickReactions());
+    },
+    onWheelWrapper(currentScrollValue: number, setScrollHook: (value: number) => void, emojisLength: number) {
+        if (settings.store.scroll) return (e: WheelEvent) => {
+            if (e.deltaY === 0 || e.shiftKey) return;
+            e.stopPropagation(); // does this do anything?
+            const modifier = e.deltaY < 0 ? -1 : 1;
+            const newValue = currentScrollValue + (modifier * settings.store.columns);
+            setScrollHook(Math.max(0, Math.min(newValue, emojisLength - this.getMaxQuickReactions())));
+        };
+    },
+    AddReactionsButton() {
+
+    }
+});