From 15724ead0e7067406c898d8c0b9641db92d0573a Mon Sep 17 00:00:00 2001 From: dr2009 Date: Thu, 19 Jan 2023 14:35:59 +0800 Subject: [PATCH] #692@patch: Fixed CSSContainerRule, CSSMediaRule conditionText typo --- packages/happy-dom/src/css/CSSParser.ts | 4 ++-- .../declaration/utilities/CSSStyleDeclarationElementStyle.ts | 2 +- packages/happy-dom/src/css/rules/CSSContainerRule.ts | 4 ++-- packages/happy-dom/src/css/rules/CSSMediaRule.ts | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/happy-dom/src/css/CSSParser.ts b/packages/happy-dom/src/css/CSSParser.ts index 6401f0f51..4c6085cea 100644 --- a/packages/happy-dom/src/css/CSSParser.ts +++ b/packages/happy-dom/src/css/CSSParser.ts @@ -51,10 +51,10 @@ export default class CSSParser { cssRules.push(newRule); parentRule = newRule; } else if (selectorText.startsWith('@container')) { - const conditionalText = selectorText.replace(/@container */, ''); + const conditionText = selectorText.replace(/@container */, ''); const newRule = new CSSContainerRule(); - (newRule.conditionalText) = conditionalText; + (newRule.conditionText) = conditionText; newRule.parentStyleSheet = parentStyleSheet; cssRules.push(newRule); parentRule = newRule; diff --git a/packages/happy-dom/src/css/declaration/utilities/CSSStyleDeclarationElementStyle.ts b/packages/happy-dom/src/css/declaration/utilities/CSSStyleDeclarationElementStyle.ts index de3749d17..06a558566 100644 --- a/packages/happy-dom/src/css/declaration/utilities/CSSStyleDeclarationElementStyle.ts +++ b/packages/happy-dom/src/css/declaration/utilities/CSSStyleDeclarationElementStyle.ts @@ -298,7 +298,7 @@ export default class CSSStyleDeclarationElementStyle { } } else if ( rule.type === CSSRuleTypeEnum.mediaRule && - defaultView.matchMedia((rule).conditionalText).matches + defaultView.matchMedia((rule).conditionText).matches ) { this.parseCSSRules({ elements: options.elements, diff --git a/packages/happy-dom/src/css/rules/CSSContainerRule.ts b/packages/happy-dom/src/css/rules/CSSContainerRule.ts index dc57f69dc..1b9e2f12a 100644 --- a/packages/happy-dom/src/css/rules/CSSContainerRule.ts +++ b/packages/happy-dom/src/css/rules/CSSContainerRule.ts @@ -6,7 +6,7 @@ import CSSRule from '../CSSRule'; export default class CSSContainerRule extends CSSRule { public readonly type = CSSRule.CONTAINER_RULE; public readonly cssRules: CSSRule[] = []; - public readonly conditionalText = ''; + public readonly conditionText = ''; /** * Returns css text. @@ -18,6 +18,6 @@ export default class CSSContainerRule extends CSSRule { for (const cssRule of this.cssRules) { cssText += cssRule.cssText; } - return `@container ${this.conditionalText} { ${cssText} }`; + return `@container ${this.conditionText} { ${cssText} }`; } } diff --git a/packages/happy-dom/src/css/rules/CSSMediaRule.ts b/packages/happy-dom/src/css/rules/CSSMediaRule.ts index 4ffac0311..eb628deb5 100644 --- a/packages/happy-dom/src/css/rules/CSSMediaRule.ts +++ b/packages/happy-dom/src/css/rules/CSSMediaRule.ts @@ -19,7 +19,7 @@ export default class CSSMediaRule extends CSSRule { for (const cssRule of this.cssRules) { cssText += cssRule.cssText; } - return `@media ${this.conditionalText} { ${cssText} }`; + return `@media ${this.conditionText} { ${cssText} }`; } /** @@ -27,7 +27,7 @@ export default class CSSMediaRule extends CSSRule { * * @returns Conditional text. */ - public get conditionalText(): string { + public get conditionText(): string { return this.media.mediaText; } }