Skip to content

feat(setting): add dark/light iframe CSS vars #4657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
elzody merged 1 commit into from
May 29, 2025
Merged

feat(setting): add dark/light iframe CSS vars #4657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/components/CoolFrame.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<input type="hidden" name="wopi_setting_base_url" :value="wopiSettingBaseUrl">
<input type="hidden" name="iframe_type" :value="iframeType">
<input type="hidden" name="css_variables" :value="cssVariables">
<input type="hidden" name="theme" :value="theme">
<input type="hidden" name="ui_theme" :value="uiTheme">
</form>
<iframe :id="iframeName"
Expand All @@ -26,7 +27,7 @@

<script>

import { generateCSSVarTokens, getUITheme } from '../helpers/coolParameters.js'
import { generateCSSVarTokens, getCollaboraTheme, getUITheme } from '../helpers/coolParameters.js'
import { languageToBCP47 } from '../helpers/index.js'
import PostMessageService from '../services/postMessage.tsx'

Expand Down Expand Up @@ -58,8 +59,9 @@ export default {
return {
iframeName: 'coolFrameIframe',
formAction: '',
cssVariables: generateCSSVarTokens(),
cssVariables: generateCSSVarTokens(true),
isIframeLoaded: false,
theme: getCollaboraTheme(),
uiTheme: getUITheme(),
postMessage: null,
}
Expand Down
37 changes: 27 additions & 10 deletions src/helpers/coolParameters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,13 @@ const createDataThemeDiv = (elementType, theme) => {
document.body.appendChild(element)
return element
}
const generateCSSVarTokens = () => {

const generateCSSVarTokens = (isSettingIframe = false) => {
/* NC versus COOL */
const cssVarMap = {
'--color-primary-element-text': '--co-primary-text',
'--color-primary-element': '--co-primary-element:--co-text-accent',
'--color-primary-element-light': '--co-primary-light:--co-primary-element-light',
'--color-primary-element-text': '--co-primary-text:--co-settings-btn-primary-text',
'--color-primary-element': '--co-primary-element:--co-text-accent:--co-settings-btn-primary',
'--color-primary-element-light': '--co-primary-light:--co-primary-element-light:--co-settings-btn-light',
'--color-error': '--co-color-error',
'--color-warning': '--co-color-warning',
'--color-success': '--co-color-success',
Expand All @@ -61,18 +62,31 @@ const generateCSSVarTokens = () => {
'--color-loading-light': '--co-loading-light',
'--color-loading-dark': '--co-loading-dark',
'--color-box-shadow': '--co-box-shadow',
'--color-border': '--co-border',
'--color-border-dark': '--co-border-dark',
'--color-border': '--co-border:--co-settings-border',
'--color-border-dark': '--co-border-dark:--co--settings-border-contrast',
'--border-radius-pill': '--co-border-radius-pill',
'--color-primary-element-light-text': '--co-settings-btn-light-text',
'--color-main-text': '--co-settings-text',
'--color-text-maxcontrast': '--co-settings-text-maxcontrast',
'--color-main-background': '--co-settings-background',
'--color-background-hover': '--co-settings-background-hover',
}
let str = ''
const lightElement = createDataThemeDiv('div', 'light')
const darkElement = createDataThemeDiv('div', 'dark')
let selectedElement = lightElement

// Note: To style the iframe properly, we send appropriate CSS variables based on the current theme.
// For example, if the current theme is dark, we send values corresponding to the dark theme.
if (isSettingIframe) {
selectedElement = getUITheme() === 'dark' ? darkElement : lightElement
}
try {
for (const cssVarKey in cssVarMap) {
let cStyle = window.getComputedStyle(lightElement).getPropertyValue(cssVarKey)
let cStyle = window.getComputedStyle(selectedElement).getPropertyValue(cssVarKey)
if (!cStyle) {
// try suffix -dark instead
cStyle = window.getComputedStyle(lightElement).getPropertyValue(cssVarKey + '-dark')
cStyle = window.getComputedStyle(selectedElement).getPropertyValue(cssVarKey + '-dark')
}
if (!cStyle) continue // skip if it is not set
const varNames = cssVarMap[cssVarKey].split(':')
Expand All @@ -84,8 +98,11 @@ const generateCSSVarTokens = () => {
// Skip extracting css vars if we cannot access parent
}

// New dark mode compatible way to hand over our Nextcloud variables in both light/dark to Collabora
const darkElement = createDataThemeDiv('div', 'dark')
if (isSettingIframe) {
lightElement.remove()
darkElement.remove()
return str.replace(/["']/g, '\\\'')
}

const handover = [
'--color-main-background',
Expand Down
Loading