Skip to content

Fix swatch class location and other minor fixes #990

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
ajivanyandev merged 2 commits into from
Sep 11, 2025
Merged

Fix swatch class location and other minor fixes #990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c106c16
add sass embedded to avoid ci problems in template
ajivanyandev Sep 10, 2025
af68d59
Update swatch class location
ajivanyandev Sep 10, 2025
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
9 changes: 4 additions & 5 deletions packages/devextreme-cli/src/templates/nextjs/application/src/theme.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ function toggleTheme(prevTheme<%=#isTypeScript%>: string<%=/isTypeScript%>) {
const newTheme = getNextTheme(prevTheme);

if (typeof window !== 'undefined') {
document.body.classList.replace(
document.querySelector('.app')?.classList.replace(
themeClassNamePrefix + prevTheme,
themeClassNamePrefix + newTheme
);
Expand All @@ -27,8 +27,7 @@ function toggleTheme(prevTheme<%=#isTypeScript%>: string<%=/isTypeScript%>) {
const additionalClassNamePostfix = isCurrentThemeDark ? '-' + prevTheme : '';
const additionalClassName = `${additionalClassNamePrefix}${additionalClassNamePostfix}`

document.body
.querySelector(`.${additionalClassName}`)?.classList
document.querySelector('.app')?.querySelector(`.${additionalClassName}`)?.classList
.replace(additionalClassName, additionalClassNamePrefix + (isCurrentThemeDark ? '' : '-dark'));

currentTheme = newTheme;
Expand All @@ -45,8 +44,8 @@ export function useThemeContext() {
}, []);

useLayoutEffect(() => {
if (typeof window !== 'undefined' && !document.body.className.includes(themeClassNamePrefix)) {
document.body.classList.add(themeClassNamePrefix + theme);
if (typeof window !== 'undefined' && !document.querySelector('.app')?.className.includes(themeClassNamePrefix)) {
document.querySelector('.app')?.classList.add(themeClassNamePrefix + theme);
}
}, [theme]);

Expand Down
9 changes: 4 additions & 5 deletions packages/devextreme-cli/src/templates/react/application/src/theme.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function toggleTheme(prevTheme<%=#isTypeScript%>: string<%=/isTypeScript%>) {
const isCurrentThemeDark = prevTheme === 'dark';
const newTheme = getNextTheme(prevTheme);

document.body.classList.replace(
document.getElementById('root')?.classList.replace(
themeClassNamePrefix + prevTheme,
themeClassNamePrefix + newTheme
);
Expand All @@ -25,8 +25,7 @@ function toggleTheme(prevTheme<%=#isTypeScript%>: string<%=/isTypeScript%>) {
const additionalClassNamePostfix = isCurrentThemeDark ? '-' + prevTheme : '';
const additionalClassName = `${additionalClassNamePrefix}${additionalClassNamePostfix}`

document.body
.querySelector(`.${additionalClassName}`)?.classList
document.getElementById('root')?.querySelector(`.${additionalClassName}`)?.classList
.replace(additionalClassName, additionalClassNamePrefix + (isCurrentThemeDark ? '' : '-dark'));

currentTheme = newTheme;
Expand All @@ -41,8 +40,8 @@ export function useThemeContext() {
return currentTheme === 'dark';
}, []);

if (!document.body.className.includes(themeClassNamePrefix)) {
document.body.classList.add(themeClassNamePrefix + theme);
if (!document.getElementById('root')?.className.includes(themeClassNamePrefix)) {
document.getElementById('root')?.classList.add(themeClassNamePrefix + theme);
}

return useMemo(()=> ({ theme, switchTheme, isDark }), [theme, switchTheme, isDark]);
Expand Down
8 changes: 4 additions & 4 deletions packages/devextreme-cli/src/templates/vue-v3/application/src/theme-service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ class ThemeService {
isDark = ref(false);

constructor() {
if (!document.body.className.includes(this.themeClassNamePrefix)) {
if (!document.getElementById('app').className.includes(this.themeClassNamePrefix)) {
this.currentTheme.value = this.themes[0];

document.body.classList.add(this.themeClassNamePrefix + this.currentTheme.value);
document.getElementById('app').classList.add(this.themeClassNamePrefix + this.currentTheme.value);
}
}

Expand All @@ -20,7 +20,7 @@ class ThemeService {

this.currentTheme.value = this.themes[prevTheme === this.themes[0] ? 1 : 0];

document.body.classList.replace(
document.getElementById('app').classList.replace(
this.themeClassNamePrefix + prevTheme,
this.themeClassNamePrefix + this.currentTheme.value
);
Expand All @@ -29,7 +29,7 @@ class ThemeService {
const additionalClassNamePostfix = isCurrentThemeDark ? '-' + prevTheme : '';
const additionalClassName = `${additionalClassNamePrefix}${additionalClassNamePostfix}`

document.body
document.getElementById('app')
.querySelector(`.${additionalClassName}`)?.classList
.replace(additionalClassName, additionalClassNamePrefix + (isCurrentThemeDark ? '' : '-dark'));

Expand Down
9 changes: 4 additions & 5 deletions packages/devextreme-schematics/src/add-layout/files/src/app/shared/services/theme.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ export class ThemeService {
currentTheme: Theme = getNextTheme();

constructor(@Inject(DOCUMENT) private document: Document) {
if (!this.document.body.className.includes(themeClassNamePrefix)) {
this.document.body.classList.add(themeClassNamePrefix + this.currentTheme);
if (!this.document.querySelector('.app')?.className.includes(themeClassNamePrefix)) {
this.document.querySelector('.app')?.classList.add(themeClassNamePrefix + this.currentTheme);
}
}

Expand All @@ -30,7 +30,7 @@ export class ThemeService {
const newTheme = getNextTheme(this.currentTheme);
const isCurrentThemeDark = currentTheme === 'dark';

this.document.body.classList.replace(
this.document.querySelector('.app')?.classList.replace(
themeClassNamePrefix + currentTheme,
themeClassNamePrefix + newTheme
);
Expand All @@ -39,8 +39,7 @@ export class ThemeService {
const additionalClassNamePostfix = isCurrentThemeDark ? '-' + currentTheme : '';
const additionalClassName = `${additionalClassNamePrefix}${additionalClassNamePostfix}`

this.document.body
.querySelector(`.${additionalClassName}`)?.classList
this.document.querySelector('.app')?.querySelector(`.${additionalClassName}`)?.classList
.replace(additionalClassName, additionalClassNamePrefix + (isCurrentThemeDark ? '' : '-dark'));

this.currentTheme = newTheme;
Expand Down
10 changes: 10 additions & 0 deletions packages/devextreme-schematics/src/install/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export default function(options: any): Rule {

return chain([
(host: Tree) => addDevExtremeDependency(host, { dxversion: options.dxversion }),
(host: Tree) => addSassEmbeddedDependency(host),
(host: Tree) => addDevExtremeCSS(host, { project: options.project }),
(host: Tree) => reqisterJSZip(host),
(_, context: SchematicContext) => {
Expand Down Expand Up @@ -55,6 +56,15 @@ function addDevExtremeDependency(host: Tree, options: any) {
return host;
}

function addSassEmbeddedDependency(host: Tree) {
addPackageJsonDependency(host, {
type: NodeDependencyType.Dev,
name: 'sass-embedded',
version: latestVersions['sass-embedded']
});
return host;
}

async function addDevExtremeCSS(host: Tree, options: any) {
const projectName = await getProjectName(host, options.project);
modifyJSONFile(host, './angular.json', config => {
Expand Down
3 changes: 2 additions & 1 deletion packages/devextreme-schematics/src/utility/latest-versions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
export const latestVersions = {
'devextreme': '25.1.4',
'devextreme-angular': '25.1.4',
'devextreme-cli': 'latest'
'devextreme-cli': 'latest',
'sass-embedded': '1.66.0'
};
Loading