Ensure element scope selectors are updated correctly when updateStyle…

…s is called when element is not in dom.
Polymer · Jun 23, 2016 · 6d90480 · 6d90480
1 parent ae4a07e
commit 6d90480
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/standard/x-styling.html b/src/standard/x-styling.html
@@ -77,7 +77,9 @@
       _beforeAttached: function() {
         // note: do this once automatically,
         // then requires calling `updateStyles`
-        if (!this._scopeSelector && this._needsStyleProperties()) {
+        if ((!this._scopeSelector || this.__stylePropertiesInvalid) && 
+          this._needsStyleProperties()) {
+          this.__stylePropertiesInvalid = false;
           this._updateStyleProperties();
         }
       },
@@ -274,7 +276,7 @@
           // if called when an element is not attached, invalidate 
           // styling by unsetting scopeSelector.
           } else {
-            this._scopeSelector = null;
+            this.__stylePropertiesInvalid = true;
           }
           if (this._styleCache) {
             this._styleCache.clear();

diff --git a/test/unit/styling-cross-scope-var.html b/test/unit/styling-cross-scope-var.html
@@ -979,11 +979,17 @@
     assertComputed(x.$.child, '6px');
     x.active = false;
     assertComputed(x.$.child, '0px');
+    var scopeSelector = x.$.child._scopeSelector;
     document.body.removeChild(x);
     CustomElements.takeRecords();
     x.active = true;
     document.body.appendChild(x);
     CustomElements.takeRecords();
+    if (styled.shadyRoot && !Polymer.Settings.useNativeCSSProperties) {
+      assert.notEqual(scopeSelector, x.$.child._scopeSelector);
+      assert.isTrue(x.$.child.classList.contains(x.$.child._scopeSelector));
+      assert.isFalse(x.$.child.classList.contains(scopeSelector));
+    }
     assertComputed(x.$.child, '6px');
   });