From 28d8a07a9f614cfd59787bb248cf99bd45042806 Mon Sep 17 00:00:00 2001
From: Westbrook Johnson <westbrook.johnson@gmail.com>
Date: Mon, 8 Jun 2020 10:39:25 -0400
Subject: [PATCH] fix(theme): prevent property sets attribute set property
 stack overflow

---
 packages/theme/src/theme.ts | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/packages/theme/src/theme.ts b/packages/theme/src/theme.ts
index 2dbab8f34e..a2a05f5d48 100644
--- a/packages/theme/src/theme.ts
+++ b/packages/theme/src/theme.ts
@@ -72,6 +72,9 @@ export class Theme extends HTMLElement implements ThemeKindProvider {
         old: string | null,
         value: string | null
     ): void {
+        if (old === value) {
+            return;
+        }
         if (attrName === 'color') {
             this.color = value as Color;
         } else if (attrName === 'scale') {
@@ -109,14 +112,15 @@ export class Theme extends HTMLElement implements ThemeKindProvider {
             !!newValue && ColorValues.includes(newValue)
                 ? newValue
                 : this.color;
+        if (color !== this._color) {
+            this._color = color;
+            this.requestUpdate();
+        }
         if (color) {
             this.setAttribute('color', color);
         } else {
             this.removeAttribute('color');
         }
-        if (color === this._color) return;
-        this._color = color;
-        this.requestUpdate();
     }
 
     private _scale: Scale | '' = '';
@@ -134,14 +138,15 @@ export class Theme extends HTMLElement implements ThemeKindProvider {
             !!newValue && ScaleValues.includes(newValue)
                 ? newValue
                 : this.scale;
+        if (scale !== this._scale) {
+            this._scale = scale;
+            this.requestUpdate();
+        }
         if (scale) {
             this.setAttribute('scale', scale);
         } else {
             this.removeAttribute('scale');
         }
-        if (scale === this._scale) return;
-        this._scale = scale;
-        this.requestUpdate();
     }
 
     private get styles(): CSSResult[] {