Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

fix(app): survive spoofed screen.orientation at boot (#3851)

Hampus0098958f94ba
diff --git a/fluxer_app/src/features/accessibility/state/Accessibility.ts b/fluxer_app/src/features/accessibility/state/Accessibility.ts
index f6c29d0d2..511d7447e 100644
--- a/fluxer_app/src/features/accessibility/state/Accessibility.ts
+++ b/fluxer_app/src/features/accessibility/state/Accessibility.ts
@@ -1023,9 +1023,13 @@ class Accessibility {
private initializeMotionDetection() {
if (typeof window !== 'undefined' && typeof window.matchMedia === 'function') {
- this.mediaQuery = window.matchMedia('(prefers-reduced-motion: reduce)');
- this.systemReducedMotion = this.mediaQuery.matches;
- this.mediaQuery.addEventListener('change', this.handleSystemMotionChange);
+ const mediaQuery = window.matchMedia('(prefers-reduced-motion: reduce)');
+ this.systemReducedMotion = mediaQuery.matches;
+ if (typeof mediaQuery.addEventListener !== 'function') {
+ return;
+ }
+ this.mediaQuery = mediaQuery;
+ mediaQuery.addEventListener('change', this.handleSystemMotionChange);
}
}
diff --git a/fluxer_app/src/features/theme/layout/RemFromPx.ts b/fluxer_app/src/features/theme/layout/RemFromPx.ts
index 61054abc4..f23ddad77 100644
--- a/fluxer_app/src/features/theme/layout/RemFromPx.ts
+++ b/fluxer_app/src/features/theme/layout/RemFromPx.ts
@@ -87,7 +87,7 @@ function trackRemScaleForWindow(ownerDocument: Document, ownerWindow: Window): (
return;
}
const nextQuery = ownerWindow.matchMedia(`(resolution: ${ownerWindow.devicePixelRatio}dppx)`);
- if (!nextQuery.matches) {
+ if (!nextQuery.matches || typeof nextQuery.addEventListener !== 'function') {
stopWatchingResolution();
return;
}
diff --git a/fluxer_app/src/features/theme/state/Theme.ts b/fluxer_app/src/features/theme/state/Theme.ts
index 32022a981..2b451b73b 100644
--- a/fluxer_app/src/features/theme/state/Theme.ts
+++ b/fluxer_app/src/features/theme/state/Theme.ts
@@ -90,9 +90,13 @@ class Theme {
if (!window.matchMedia) {
return;
}
- this.mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
- this.systemPrefersDark = this.mediaQuery.matches;
- this.mediaQuery.addEventListener('change', this.handleSystemThemeChange);
+ const mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');
+ this.systemPrefersDark = mediaQuery.matches;
+ if (typeof mediaQuery.addEventListener !== 'function') {
+ return;
+ }
+ this.mediaQuery = mediaQuery;
+ mediaQuery.addEventListener('change', this.handleSystemThemeChange);
}
private handleSystemThemeChange = (event: MediaQueryListEvent): void => {
diff --git a/patches/[email protected] b/patches/[email protected]
new file mode 100644
index 000000000..1a36b9e4d
--- /dev/null
+++ b/patches/[email protected]
@@ -0,0 +1,60 @@
+diff --git a/dist/private/utils/domHelpers.cjs b/dist/private/utils/domHelpers.cjs
+index a3c1264bc62bd5fc3938dc6c175e7a1e7a81646b..2505e9cb6742f3e270cc36ddeaed4f823dc06777 100644
+--- a/dist/private/utils/domHelpers.cjs
++++ b/dist/private/utils/domHelpers.cjs
+@@ -49,12 +49,12 @@ function $49582955cc364b1c$export$af51f0f06c0f328a(value) {
+ }
+ function $49582955cc364b1c$export$f531f92e2a15358f(target, event, listener, options) {
+ if (listener == null || target == null) return ()=>{};
+- let eventTargets = Array.isArray(target) ? target : [
++ let eventTargets = (Array.isArray(target) ? target : [
+ target
+- ];
++ ]).filter((eventTarget)=>typeof eventTarget?.addEventListener === 'function');
+ for (let eventTarget of eventTargets)eventTarget.addEventListener(event, listener, options);
+ return ()=>{
+- for (let eventTarget of eventTargets)eventTarget.removeEventListener(event, listener, options);
++ for (let eventTarget of eventTargets)if (typeof eventTarget.removeEventListener === 'function') eventTarget.removeEventListener(event, listener, options);
+ };
+ }
+ function $49582955cc364b1c$export$37a5fde709c1db82(target, property, value, priority) {
+diff --git a/dist/private/utils/domHelpers.js b/dist/private/utils/domHelpers.js
+index 24ce2d4b97cdbdd991811847d81c235ee732770d..a49c86a520d3701d629e2fbda254231941c4ff02 100644
+--- a/dist/private/utils/domHelpers.js
++++ b/dist/private/utils/domHelpers.js
+@@ -39,12 +39,12 @@ function $cc3c3666b64debad$export$af51f0f06c0f328a(value) {
+ }
+ function $cc3c3666b64debad$export$f531f92e2a15358f(target, event, listener, options) {
+ if (listener == null || target == null) return ()=>{};
+- let eventTargets = Array.isArray(target) ? target : [
++ let eventTargets = (Array.isArray(target) ? target : [
+ target
+- ];
++ ]).filter((eventTarget)=>typeof eventTarget?.addEventListener === 'function');
+ for (let eventTarget of eventTargets)eventTarget.addEventListener(event, listener, options);
+ return ()=>{
+- for (let eventTarget of eventTargets)eventTarget.removeEventListener(event, listener, options);
++ for (let eventTarget of eventTargets)if (typeof eventTarget.removeEventListener === 'function') eventTarget.removeEventListener(event, listener, options);
+ };
+ }
+ function $cc3c3666b64debad$export$37a5fde709c1db82(target, property, value, priority) {
+diff --git a/dist/private/utils/domHelpers.mjs b/dist/private/utils/domHelpers.mjs
+index dc2ee7fcee4ab3b07a15704321e7d2b95c716554..15c39cb64f67462b153da81026140772a943fe40 100644
+--- a/dist/private/utils/domHelpers.mjs
++++ b/dist/private/utils/domHelpers.mjs
+@@ -37,12 +37,12 @@ function $d447af545b77c9f1$export$af51f0f06c0f328a(value) {
+ }
+ function $d447af545b77c9f1$export$f531f92e2a15358f(target, event, listener, options) {
+ if (listener == null || target == null) return ()=>{};
+- let eventTargets = Array.isArray(target) ? target : [
++ let eventTargets = (Array.isArray(target) ? target : [
+ target
+- ];
++ ]).filter((eventTarget)=>typeof eventTarget?.addEventListener === 'function');
+ for (let eventTarget of eventTargets)eventTarget.addEventListener(event, listener, options);
+ return ()=>{
+- for (let eventTarget of eventTargets)eventTarget.removeEventListener(event, listener, options);
++ for (let eventTarget of eventTargets)if (typeof eventTarget.removeEventListener === 'function') eventTarget.removeEventListener(event, listener, options);
+ };
+ }
+ function $d447af545b77c9f1$export$37a5fde709c1db82(target, property, value, priority) {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 59886f9df..296e03aa1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -476,6 +476,7 @@ patchedDependencies:
[email protected]: 343c47e52467ec6018beff92d73b6ca2cf231399d98116925687451e8bd527d8
[email protected]: ea6e8ed3084100883f9206acf5b9031ef6aeaf25236ff59a9cb3dbea3b77ed10
[email protected]: 594ff55f398ab3a575ba1b4d090c4838a26e4251a2f1d65ba0f02d5b098d02ae
+ [email protected]: 37413adf8946bee83eb7f1f053ac96764e0bdcbe851af11bf6e4e9221437bcd0
[email protected]: 34ef83d86b7cdf910a393193e3321a239470e7c5e5c7755fd14c30e30db4ea8e
importers:
@@ -15663,7 +15664,7 @@ snapshots:
dependencies:
'@swc/helpers': 0.5.23
react: 19.3.1
+ react-aria: 3.53.1(patch_hash=37413adf8946bee83eb7f1f053ac96764e0bdcbe851af11bf6e4e9221437bcd0)([email protected]([email protected]))([email protected])
react-dom: 19.3.1([email protected])
'@react-dnd/[email protected]': {}
@@ -20859,12 +20860,12 @@ snapshots:
'@swc/helpers': 0.5.23
client-only: 0.0.1
react: 19.3.1
+ react-aria: 3.53.1(patch_hash=37413adf8946bee83eb7f1f053ac96764e0bdcbe851af11bf6e4e9221437bcd0)([email protected]([email protected]))([email protected])
react-dom: 19.3.1([email protected])
react-stately: 3.51.0([email protected])
use-sync-external-store: 1.7.0([email protected])
+ [email protected](patch_hash=37413adf8946bee83eb7f1f053ac96764e0bdcbe851af11bf6e4e9221437bcd0)([email protected]([email protected]))([email protected]):
dependencies:
'@internationalized/date': 3.12.4
'@internationalized/number': 3.6.9
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index ac9c0e146..741d25a5c 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -204,6 +204,7 @@ patchedDependencies:
peerDependencyRules: