Merge pull request #3539 from lpranam/dark_theme_error

match dark theme of system if no nextcloud theme specified
nextcloud · Mar 27, 2024 · d4a6b85 · d4a6b85
2 parents ccdd7fc + 5826ae4
commit d4a6b85
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/helpers/coolParameters.js b/src/helpers/coolParameters.js
@@ -28,12 +28,12 @@ const getUIDefaults = () => {
 	const textRuler = 'false'
 	const sidebar = 'false'
 	const saveAsMode = 'group'
-	const uiMode = defaults.UIMode ?? 'notebookbar' // or notebookbar
+	const uiMode = defaults.UIMode ?? 'notebookbar'
 
 	const systemDarkMode = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches
-	// FIXME For now we need to access parent here as the public page loaded for collabora doesn't have the user theme
-	const nextcloudDarkMode = parent.document.body.dataset.themeDark === '' || parent.document.body.dataset.themeDarkHighcontrast === ''
-	const matchedDarkMode = parent.document.body.dataset.themeDefault === '' ? systemDarkMode : nextcloudDarkMode
+	const dataset = (document.body.dataset.themes ? document.body.dataset : parent?.document.body.dataset) ?? {}
+	const nextcloudDarkMode = dataset?.themeDark === '' || dataset?.themeDarkHighcontrast === ''
+	const matchedDarkMode = (!dataset?.themes || dataset?.themes === '' || dataset?.themeDefault === '') ? systemDarkMode : nextcloudDarkMode
 	const uiTheme = matchedDarkMode ? 'dark' : 'light'
 
 	let uiDefaults = 'TextRuler=' + textRuler + ';'