Skip to content

Send files directly between devices over the internet - no cloud storage, no size limits.

fix light theme not applying to dialogs

Denis Lupookovc8c778e3ff67
diff --git a/apps/desktop/src/renderer/components/Settings/sections/DevicesSection.tsx b/apps/desktop/src/renderer/components/Settings/sections/DevicesSection.tsx
index 80c9f49..c33e480 100644
--- a/apps/desktop/src/renderer/components/Settings/sections/DevicesSection.tsx
+++ b/apps/desktop/src/renderer/components/Settings/sections/DevicesSection.tsx
@@ -1,5 +1,4 @@
import { useState } from 'react'
-import { createPortal } from 'react-dom'
import { Button, LinkRow, ListItem, useTheme } from '@altersend/components'
import {
ClipboardIcon,
@@ -168,50 +167,38 @@ export function DevicesSection() {
</div>
)}
- {createPortal(
- <PairingQrModal open={qrOpen} topic={pairingTopic} onClose={() => setQrOpen(false)} />,
- document.body
- )}
- {createPortal(
- <PairingJoinModal
- open={joinOpen}
- isLoading={isJoining || isJoinWaiting}
- onClose={() => setJoinOpen(false)}
- onJoin={join}
- />,
- document.body
- )}
- {createPortal(
- <DeviceRenameModal
- open={renameTarget !== null}
- initialName={renameTarget?.name ?? ''}
- onClose={() => setRenameTarget(null)}
- onRename={async (name) => {
- if (!renameTarget) return false
- const renamed = await renamePeer(renameTarget.peerKey, name)
- toast.show(
- renamed
- ? { title: t('settings:pairing.deviceRenamed') }
- : { title: t('settings:pairing.renameFailed'), variant: 'error' }
- )
- return renamed
- }}
- />,
- document.body
- )}
- {createPortal(
- <ConfirmDialog
- open={removeTarget !== null}
- title={t('settings:pairing.removeConfirmTitle', { name: removeTarget?.name ?? '' })}
- message={t('settings:pairing.removeConfirmMessage')}
- confirmLabel={t('settings:pairing.removeDevice')}
- cancelLabel={t('common:actions.cancel')}
- destructive
- onConfirm={removeDevice}
- onCancel={() => setRemoveTarget(null)}
- />,
- document.body
- )}
+ <PairingQrModal open={qrOpen} topic={pairingTopic} onClose={() => setQrOpen(false)} />
+ <PairingJoinModal
+ open={joinOpen}
+ isLoading={isJoining || isJoinWaiting}
+ onClose={() => setJoinOpen(false)}
+ onJoin={join}
+ />
+ <DeviceRenameModal
+ open={renameTarget !== null}
+ initialName={renameTarget?.name ?? ''}
+ onClose={() => setRenameTarget(null)}
+ onRename={async (name) => {
+ if (!renameTarget) return false
+ const renamed = await renamePeer(renameTarget.peerKey, name)
+ toast.show(
+ renamed
+ ? { title: t('settings:pairing.deviceRenamed') }
+ : { title: t('settings:pairing.renameFailed'), variant: 'error' }
+ )
+ return renamed
+ }}
+ />
+ <ConfirmDialog
+ open={removeTarget !== null}
+ title={t('settings:pairing.removeConfirmTitle', { name: removeTarget?.name ?? '' })}
+ message={t('settings:pairing.removeConfirmMessage')}
+ confirmLabel={t('settings:pairing.removeDevice')}
+ cancelLabel={t('common:actions.cancel')}
+ destructive
+ onConfirm={removeDevice}
+ onCancel={() => setRemoveTarget(null)}
+ />
</SectionShell>
)
}
diff --git a/packages/components/src/theme/ThemeContext.tsx b/packages/components/src/theme/ThemeContext.tsx
index de96a72..2287754 100644
--- a/packages/components/src/theme/ThemeContext.tsx
+++ b/packages/components/src/theme/ThemeContext.tsx
@@ -43,6 +43,8 @@ function getFontThemeStyle(fontFamily: FontFamilyKey) {
return fontThemeStyles[fontFamily] ?? fontThemeStyles[DEFAULT_FONT_FAMILY_KEY]
}
+const THEME_ROOT_ID = 'as-theme-root'
+
const FONT_CUSTOM_PROPERTIES = [
'--as-font-family-sans',
'--as-font-family-display',
@@ -145,6 +147,18 @@ export function ThemeProvider({
useEffect(() => applyDocumentTheme(themeType), [themeType])
+ useEffect(() => {
+ if (typeof document === 'undefined') return
+
+ const themeRoot = document.getElementById(THEME_ROOT_ID)
+ if (!themeRoot) return
+
+ const themeClasses = Array.from(themeRoot.classList)
+ document.body.classList.add(...themeClasses)
+
+ return () => document.body.classList.remove(...themeClasses)
+ }, [themeStyle, fontThemeStyle])
+
const setThemePreference = (next: ThemePreference) => {
setThemePreferenceState(next)
onPreferenceChange?.(next)
@@ -163,6 +177,7 @@ export function ThemeProvider({
>
<html.div
data-theme={themeType}
+ id={THEME_ROOT_ID}
style={[themeStyle, fontThemeStyle, fontRootStyle] as unknown as HtmlDivStyle}
>
<html.div style={styles.root}>{children}</html.div>