Fixes #2113: ensures custom-style rules that use @apply combined with…

… defining properties apply correctly.
Polymer · Jul 29, 2015 · 69a4aa5 · 69a4aa5
1 parent 720f2c0
commit 69a4aa5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/lib/custom-style.html b/src/lib/custom-style.html
@@ -125,10 +125,6 @@
         function(rule) {
           var css = rule.cssText = rule.parsedCssText;
           if (rule.propertyInfo && rule.propertyInfo.cssText) {
-            // TODO(sorvell): factor better
-            // remove property assignments so next function isn't confused
-            css = css.replace(propertyUtils.rx.VAR_ASSIGN, '');
-            // replace with reified properties, scenario is same as mixin
             rule.cssText = propertyUtils.valueForProperties(css, props);
           }
           styleTransformer.documentRule(rule);

diff --git a/test/unit/custom-style.html b/test/unit/custom-style.html
@@ -41,6 +41,12 @@
       display: block;
     }
 
+    :root {
+      --bag2: {
+        border: 12px solid beige;
+      };
+    }
+
 
     :root {
 
@@ -59,6 +65,7 @@
       --special: var(--primary);
 
       --after: 11px solid orange;
+      @apply(--bag2);
     }
 
     x-foo {
@@ -242,6 +249,10 @@
         assertComputed(e, '11px', null, '::after');
       });
 
+      test('@apply in :root rule that also defines properties', function() {
+        assertComputed(document.body, '12px');
+      });
+
     });