michael/astro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: scope define:vars to :root for <style global> (#1663)

Browse source
This commit is contained in:
Nate Moore 2021-10-26 14:36:53 -07:00 committed by GitHub
parent 55c8453fd2
commit 8f699e5a42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
packages/astro/src/runtime/server/index.ts
View file

@ -338,12 +338,12 @@ function serializeListValue(value: any) {
} }
} }
export function defineStyleVars(astroId: string, vars: Record<any, any>) { export function defineStyleVars(selector: string, vars: Record<any, any>) {
let output = '\n'; let output = '\n';
for (const [key, value] of Object.entries(vars)) { for (const [key, value] of Object.entries(vars)) {
output += ` --${key}: ${value};\n`; output += ` --${key}: ${value};\n`;
} }
return `.astro-${astroId} {${output}}`; return `${selector} {${output}}`;
} }
export function defineScriptVars(vars: Record<any, any>) { export function defineScriptVars(vars: Record<any, any>) {
@ -380,10 +380,15 @@ export async function renderAstroComponent(component: InstanceType<typeof AstroC
} }
function renderElement(name: string, { props: _props, children = '' }: { props: Record<any, any>; children?: string }) { function renderElement(name: string, { props: _props, children = '' }: { props: Record<any, any>; children?: string }) {
const { hoist: _, 'data-astro-id': astroId, 'define:vars': defineVars, ...props } = _props; // Do not print `hoist`, `lang`, `global`
const { hoist: _0, lang: _1, global = false, 'data-astro-id': astroId, 'define:vars': defineVars, ...props } = _props;
if (defineVars) { if (defineVars) {
if (name === 'style') { if (name === 'style') {
children = defineStyleVars(astroId, defineVars) + '\n' + children; if (global) {
children = defineStyleVars(`:root`, defineVars) + '\n' + children;
} else {
children = defineStyleVars(`.astro-${astroId}`, defineVars) + '\n' + children;
}
} }
if (name === 'script') { if (name === 'script') {
children = defineScriptVars(defineVars) + '\n' + children; children = defineScriptVars(defineVars) + '\n' + children;