Arsharth/hydrogen-web
1
0
Fork 0
forked from mystiq/hydrogen-web
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move code into ThemeLoader

Browse source
This commit is contained in:
RMidhunSuresh 2022-05-31 20:21:18 +05:30
parent 9e79b632a8
commit 12a8e94243
2 changed files with 51 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
scripts/build-plugins/rollup-plugin-build-themes.js
View file

@ -254,50 +254,9 @@ module.exports = function buildThemes(options) {
const derivedVariables = compiledVariables["derived-variables"];
const icon = compiledVariables["icon"];
const builtAssets = {};
let defaultDarkVariant = {}, defaultLightVariant = {};
const themeName = manifest.name;
for (const chunk of chunkArray) {
const [, name, variant] = chunk.fileName.match(/theme-(.+)-(.+)\.css/);
const {name: variantName, default: isDefault, dark} = manifest.values.variants[variant];
const themeId = `${name}-${variant}`;
const themeDisplayName = `${themeName} ${variantName}`;
if (isDefault) {
/**
* This is a default variant!
* We'll add these to the builtAssets (separately) keyed with just the
* theme-name (i.e "Element" instead of "Element Dark").
* We need to be able to distinguish them from other variants!
*
* This allows us to render radio-buttons with "dark" and
* "light" options.
*/
const defaultVariant = dark ? defaultDarkVariant : defaultLightVariant;
defaultVariant.variantName = variantName;
defaultVariant.id = themeId
defaultVariant.cssLocation = assetMap.get(chunk.fileName).fileName;
continue;
}
// Non-default variants are keyed in builtAssets with "theme_name variant_name"
// eg: "Element Dark"
builtAssets[themeDisplayName] = {
cssLocation: assetMap.get(chunk.fileName).fileName,
id: themeId
};
}
if (defaultDarkVariant.id && defaultLightVariant.id) {
/**
* As mentioned above, if there's both a default dark and a default light variant,
* add them to builtAsset separately.
*/
builtAssets[themeName] = { dark: defaultDarkVariant, light: defaultLightVariant };
}
else {
/**
* If only one default variant is found (i.e only dark default or light default but not both),
* treat it like any other variant.
*/
const variant = defaultDarkVariant.id ? defaultDarkVariant : defaultLightVariant;
builtAssets[`${themeName} ${variant.variantName}`] = { id: variant.id, cssLocation: variant.cssLocation };
builtAssets[`${name}-${variant}`] = assetMap.get(chunk.fileName).fileName;
}
manifest.source = {
"built-assets": builtAssets,

51
src/platform/web/ThemeLoader.ts
View file

@ -55,13 +55,14 @@ export class ThemeLoader {
cache: true,
})
.response();
this._populateThemeMap(body);
/*
After build has finished, the source section of each theme manifest
contains `built-assets` which is a mapping from the theme-name to theme
information which includes the location of the CSS file.
(see type ThemeInformation above)
*/
Object.assign(this._themeMapping, body["source"]["built-assets"]);
// Object.assign(this._themeMapping, body["source"]["built-assets"]);
//Add the default-theme as an additional option to the mapping
const defaultThemeId = this.getDefaultTheme();
if (defaultThemeId) {
@ -73,6 +74,54 @@ export class ThemeLoader {
}
}
private _populateThemeMap(manifest) {
const builtAssets: Record<string, string> = manifest.source?.["built-assets"];
const themeName = manifest.name;
let defaultDarkVariant: any = {}, defaultLightVariant: any = {};
for (const [themeId, cssLocation] of Object.entries(builtAssets)) {
const variant = themeId.match(/.+-(.+)/)?.[1];
const { name: variantName, default: isDefault, dark } = manifest.values.variants[variant!];
const themeDisplayName = `${themeName} ${variantName}`;
if (isDefault) {
/**
* This is a default variant!
* We'll add these to the themeMapping (separately) keyed with just the
* theme-name (i.e "Element" instead of "Element Dark").
* We need to be able to distinguish them from other variants!
*
* This allows us to render radio-buttons with "dark" and
* "light" options.
*/
const defaultVariant = dark ? defaultDarkVariant : defaultLightVariant;
defaultVariant.variantName = variantName;
defaultVariant.id = themeId
defaultVariant.cssLocation = cssLocation;
continue;
}
// Non-default variants are keyed in themeMapping with "theme_name variant_name"
// eg: "Element Dark"
this._themeMapping[themeDisplayName] = {
cssLocation,
id: themeId
};
}
if (defaultDarkVariant.id && defaultLightVariant.id) {
/**
* As mentioned above, if there's both a default dark and a default light variant,
* add them to themeMapping separately.
*/
this._themeMapping[themeName] = { dark: defaultDarkVariant, light: defaultLightVariant };
}
else {
/**
* If only one default variant is found (i.e only dark default or light default but not both),
* treat it like any other variant.
*/
const variant = defaultDarkVariant.id ? defaultDarkVariant : defaultLightVariant;
this._themeMapping[`${themeName} ${variant.variantName}`] = { id: variant.id, cssLocation: variant.cssLocation };
}
}
setTheme(themeId: string, log?: ILogItem) {
this._platform.logger.wrapOrRun(log, {l: "change theme", id: themeId}, () => {
const themeLocation = this._findThemeLocationFromId(themeId);