diff --git a/scripts/runInstaller.mjs b/scripts/runInstaller.mjs index 0c124b170..b7afcc31b 100644 --- a/scripts/runInstaller.mjs +++ b/scripts/runInstaller.mjs @@ -19,7 +19,7 @@ import "./checkNodeVersion.js"; import { execFileSync, execSync } from "child_process"; -import { createWriteStream, existsSync, mkdirSync, readFileSync, writeFileSync } from "fs"; +import { createWriteStream, existsSync, mkdirSync, readFileSync, writeFileSync, cpSync, rmSync } from "fs"; import { dirname, join } from "path"; import { Readable } from "stream"; import { finished } from "stream/promises"; diff --git a/src/plugins/gifPaste/index.ts b/src/plugins/gifPaste/index.ts index 70b53f4e2..81cec5897 100644 --- a/src/plugins/gifPaste/index.ts +++ b/src/plugins/gifPaste/index.ts @@ -30,7 +30,7 @@ export default definePlugin({ patches: [{ find: "handleSelectGIF=", replacement: { - match: /handleSelectGIF=(\i)=>\{/, + match: /handleSelectGIF=\((\i),\i\)=>\{/, replace: "$&if (!this?.props?.className) return $self.handleSelect($1);" } }], diff --git a/src/plugins/superReactionTweaks/index.ts b/src/plugins/superReactionTweaks/index.ts index 51f24f94c..d259177ea 100644 --- a/src/plugins/superReactionTweaks/index.ts +++ b/src/plugins/superReactionTweaks/index.ts @@ -53,8 +53,8 @@ export default definePlugin({ { find: ".EMOJI_PICKER_CONSTANTS_EMOJI_CONTAINER_PADDING_HORIZONTAL)", replacement: { - match: /(openPopoutType:void 0(?=.+?isBurstReaction:(\i).+?;(\i===\i\.\i\.REACTION)&&\i\.push\().+?\[\2,\i\]=\i\.useState\()!1\)/, - replace: (_, rest, _isBurstReactionVariable, isReactionIntention) => `${rest}$self.shouldSuperReactByDefault&&${isReactionIntention})` + match: /(openPopoutType:void 0(?=.+?isBurstReaction:(\i).+?\.intention===(\i\.\i\.REACTION)).+?\[\2,\i\]=\i\.useState\()!1\)(?<=pickerIntention:(\i).+?)/, + replace: (_, rest, _isBurstReactionVariable, REACTION_INTENTION, pickerIntention) => `${rest}$self.shouldSuperReactByDefault&&${pickerIntention}===${REACTION_INTENTION})` } } ], diff --git a/src/webpack/common/components.ts b/src/webpack/common/components.ts index 38a64f202..8cadf71be 100644 --- a/src/webpack/common/components.ts +++ b/src/webpack/common/components.ts @@ -112,7 +112,7 @@ export const ScrollerAuto = LazyComponent(() => createScroller?.(scrollerClasses export const ListScrollerThin = LazyComponent(() => createListScroller(listScrollerClasses.thin, listScrollerClasses.fade, "", ResizeObserver)); export const ListScrollerAuto = LazyComponent(() => createListScroller(listScrollerClasses.auto, listScrollerClasses.fade, "", ResizeObserver)); -export const FocusLock = waitForComponent("FocusLock", filters.componentByCode(".containerRef,{keyboardModeEnabled:")); +export const FocusLock = waitForComponent("FocusLock", filters.componentByCode(".containerRef,{disableReturn:")); export let useToken: t.useToken; waitFor(m => {