-
Notifications
You must be signed in to change notification settings - Fork 10.4k
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.
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
fix(editor): Allow overriding theme from query params #7591
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
8df3b18
fix: Allow overriding theme from query params
mutdmour 4fe7398
test: add tests
mutdmour 8392abd
Merge branch 'master' of github.com:n8n-io/n8n into ado-1315
mutdmour 1b2b0a4
test: refactor
mutdmour 25fba3f
test: refactor
mutdmour c9e4f7f
test: refactor
mutdmour File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
import workflow from '../fixtures/Manual_wait_set.json'; | ||
import { importWorkflow, vistDemoPage } from '../pages/demo'; | ||
import { WorkflowPage } from '../pages/workflow'; | ||
|
||
const workflowPage = new WorkflowPage(); | ||
|
||
describe('Demo', () => { | ||
it('can import template', () => { | ||
vistDemoPage(); | ||
importWorkflow(workflow); | ||
workflowPage.getters.canvasNodes().should('have.length', 3); | ||
}); | ||
|
||
it('can override theme to dark', () => { | ||
vistDemoPage('dark'); | ||
cy.get('body').should('have.attr', 'data-theme', 'dark'); | ||
}); | ||
|
||
it('can override theme to light', () => { | ||
vistDemoPage('light'); | ||
cy.get('body').should('have.attr', 'data-theme', 'light'); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
/** | ||
* Actions | ||
*/ | ||
|
||
export function vistDemoPage(theme?: 'dark' | 'light') { | ||
const query = theme ? `?theme=${theme}` : ''; | ||
cy.visit('/workflows/demo' + query); | ||
cy.waitForLoad(); | ||
cy.window().then((win) => { | ||
// @ts-ignore | ||
win.preventNodeViewBeforeUnload = true; | ||
}); | ||
} | ||
|
||
export function importWorkflow(workflow: object) { | ||
const OPEN_WORKFLOW = {command: 'openWorkflow', workflow}; | ||
cy.window().then($window => { | ||
const message = JSON.stringify(OPEN_WORKFLOW); | ||
$window.postMessage(message, '*') | ||
}); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
import type { AppliedThemeOption, ThemeOption } from '@/Interface'; | ||
import { LOCAL_STORAGE_THEME } from '@/constants'; | ||
|
||
export function addThemeToBody(theme: AppliedThemeOption) { | ||
window.document.body.setAttribute('data-theme', theme); | ||
} | ||
|
||
export function isValidTheme(theme: string | null): theme is AppliedThemeOption { | ||
return !!theme && ['light', 'dark'].includes(theme); | ||
} | ||
|
||
// query param allows overriding theme for demo view in preview iframe without flickering | ||
export function getThemeOverride() { | ||
return getQueryParam('theme') || localStorage.getItem(LOCAL_STORAGE_THEME); | ||
} | ||
|
||
function getQueryParam(paramName: string): string | null { | ||
return new URLSearchParams(window.location.search).get(paramName); | ||
} | ||
|
||
export function updateTheme(theme: ThemeOption) { | ||
if (theme === 'system') { | ||
window.document.body.removeAttribute('data-theme'); | ||
localStorage.removeItem(LOCAL_STORAGE_THEME); | ||
} else { | ||
addThemeToBody(theme); | ||
localStorage.setItem(LOCAL_STORAGE_THEME, theme); | ||
} | ||
} | ||
|
||
export function getPreferredTheme(): AppliedThemeOption { | ||
const isDarkMode = | ||
!!window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)')?.matches; | ||
|
||
return isDarkMode ? 'dark' : 'light'; | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nit: Can we move this to
typeGuards.ts
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's okay here.. we need to start splitting our types / guards more..