#344@trivial: Continues on CSSStyleDeclaration.

capricorn86 · Aug 31, 2022 · 4ca836b · 4ca836b
1 parent fb13f37
commit 4ca836b
Show file tree

Hide file tree

Showing 4 changed files with 386 additions and 34 deletions.
diff --git a/packages/happy-dom/src/css/declaration/utilities/CSSStyleDeclarationPropertyGetParser.ts b/packages/happy-dom/src/css/declaration/utilities/CSSStyleDeclarationPropertyGetParser.ts
@@ -51,7 +51,12 @@ export default class CSSStyleDeclarationPropertyGetParser {
 			!properties['border-top-width']?.value ||
 			properties['border-top-width']?.value !== properties['border-right-width']?.value ||
 			properties['border-top-width']?.value !== properties['border-bottom-width']?.value ||
-			properties['border-top-width']?.value !== properties['border-left-width']?.value
+			properties['border-top-width']?.value !== properties['border-left-width']?.value ||
+			!properties['border-image-source']?.value ||
+			!properties['border-image-slice']?.value ||
+			!properties['border-image-width']?.value ||
+			!properties['border-image-outset']?.value ||
+			!properties['border-image-repeat']?.value
 		) {
 			return null;
 		}

diff --git a/packages/happy-dom/src/css/declaration/utilities/CSSStyleDeclarationPropertyManager.ts b/packages/happy-dom/src/css/declaration/utilities/CSSStyleDeclarationPropertyManager.ts
@@ -198,18 +198,6 @@ export default class CSSStyleDeclarationPropertyManager {
 	 * @param important Important.
 	 */
 	public set(name: string, value: string, important: boolean): void {
-		const globalValue = CSSStyleDeclarationValueParser.getGlobal(value);
-
-		if (globalValue) {
-			this.remove(name);
-			this.properties[name] = {
-				value: globalValue,
-				important
-			};
-			this.definedPropertyNames[name] = true;
-			return;
-		}
-
 		let properties = null;
 
 		switch (name) {
@@ -237,6 +225,24 @@ export default class CSSStyleDeclarationPropertyManager {
 			case 'border-color':
 				properties = CSSStyleDeclarationPropertySetParser.getBorderColor(value, important);
 				break;
+			case 'border-image':
+				properties = CSSStyleDeclarationPropertySetParser.getBorderImage(value, important);
+				break;
+			case 'border-image-source':
+				properties = CSSStyleDeclarationPropertySetParser.getBorderImageSource(value, important);
+				break;
+			case 'border-image-slice':
+				properties = CSSStyleDeclarationPropertySetParser.getBorderImageSlice(value, important);
+				break;
+			case 'border-image-width':
+				properties = CSSStyleDeclarationPropertySetParser.getBorderImageWidth(value, important);
+				break;
+			case 'border-image-outset':
+				properties = CSSStyleDeclarationPropertySetParser.getBorderImageOutset(value, important);
+				break;
+			case 'border-image-repeat':
+				properties = CSSStyleDeclarationPropertySetParser.getBorderImageRepeat(value, important);
+				break;
 			case 'border-top-width':
 				properties = CSSStyleDeclarationPropertySetParser.getBorderTopWidth(value, important);
 				break;
@@ -421,9 +427,10 @@ export default class CSSStyleDeclarationPropertyManager {
 				properties = CSSStyleDeclarationPropertySetParser.getFloodColor(value, important);
 				break;
 			default:
+				const globalValue = CSSStyleDeclarationValueParser.getGlobal(value);
 				properties = value
 					? {
-							[name]: { value, important }
+							[name]: { value: globalValue ? globalValue : value, important }
 					  }
 					: null;
 				break;