Skip to content

Commit f3116fd

Browse files
committed
Support :host > * as well
1 parent 1d83b74 commit f3116fd

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

src/lib/style-transformer.html

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@
295295
// handle 2.x rules like `:host, html {}`
296296
var parts = rule.selector.split(COMPLEX_SELECTOR_SEP);
297297
parts = parts.filter(function(part) {
298-
return part.trim() !== HOST;
298+
return !part.match(HOST_OR_HOST_GT_STAR);
299299
});
300300
rule.selector = parts.join(COMPLEX_SELECTOR_SEP);
301301
},
@@ -339,6 +339,7 @@
339339
var CONTENT_START = new RegExp('^(' + CONTENT + ')');
340340
var SELECTOR_NO_MATCH = 'should_not_match';
341341
var SLOTTED_PAREN = /(?:::slotted)(?:\(((?:\([^)(]*\)|[^)(]*)+?)\))/g;
342+
var HOST_OR_HOST_GT_STAR = /:host(?:\s*>\s*\*)?/;
342343

343344
// exports
344345
return api;

test/unit/custom-style.html

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,10 @@
143143
</style>
144144
<style is="custom-style">
145145
:host, html {
146-
--polymer-2-root: 10px solid rgb(123, 123, 123);
146+
--polymer-2-shared-host: 10px solid rgb(123, 123, 123);
147+
}
148+
:host > *, html {
149+
--polymer-2-shared-host-gt-star: 5px dotted orange;
147150
}
148151
</style>
149152
</head>
@@ -325,9 +328,13 @@
325328
<template>
326329
<style>
327330
:host {
328-
border: var(--polymer-2-root);
331+
border: var(--polymer-2-shared-host);
332+
}
333+
#foo {
334+
border: var(--polymer-2-shared-host-gt-star);
329335
}
330336
</style>
337+
<div id="foo"></div>
331338
</template>
332339
</dom-module>
333340

@@ -409,6 +416,7 @@
409416
test('polymer 2 shared styles applied', function() {
410417
var polymer2 = document.querySelector('polymer-2-root');
411418
assertComputed(polymer2, '10px');
419+
assertComputed(polymer2.$.foo, '5px');
412420
})
413421

414422
test('custom properties registered as defaults', function() {

0 commit comments

Comments
 (0)