Skip to content

Commit

Permalink
Fixes #4447. Re-introduce the hostStack in order to maintain “clien…
Browse files Browse the repository at this point in the history
…t before host” ordering when `_flushProperties` is called before `connectedCallback` (e.g. as Templatize does).
  • Loading branch information
Steven Orvell committed Apr 6, 2017
1 parent 7836e6c commit 8467a69
Show file tree
Hide file tree
Showing 6 changed files with 415 additions and 13 deletions.
54 changes: 53 additions & 1 deletion lib/mixins/element-mixin.html
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,7 @@
*/
_initializeProperties() {
Polymer.telemetry.instanceCount++;
hostStack.registerHost(this);
this.constructor.finalize();
const importPath = this.constructor.importPath;
// note: finalize template when we have access to `localName` to
Expand Down Expand Up @@ -598,7 +599,9 @@
if (window.ShadyCSS) {
window.ShadyCSS.styleElement(this);
}
this._flushProperties();
if (!this.__dataInitialized) {
this._flushProperties();
}
}

/**
Expand All @@ -616,7 +619,9 @@
*/
ready() {
if (this._template) {
hostStack.beginHosting(this);
this.root = this._stampTemplate(this._template);
hostStack.endHosting(this);
}
super.ready();
}
Expand Down Expand Up @@ -745,6 +750,53 @@
return PolymerElement;
});

/**
* Helper api for enqueing client dom created by a host element.
*
* By default elements are flushed via `_flushProperties` when
* `connectedCallback` is called. Elements attach their client dom to
* themselves at `ready` time which results from this first flush.
* This provides an ordering guarantee that the client dom an element
* creates is flushed before the element itself (i.e. client `ready`
* fires before host `ready`).
*
* However, if `_flushProperties` is called *before* an element is connected,
* as for example `Templatize` does, this ordering guarantee cannot be
* satisfied because no elements are connected. (Note: Bound elements that
* receive data do become enqueued clients and are properly ordered but
* unbound elements are not.)
*
* To maintain the desired "client before host" ordering guarantee for this
* case we rely on the "host stack. Client nodes registers themselves with
* the creating host element when created. This ensures that all client dom
* is readied in the proper order, maintaining the desired guarantee.
*
* @private
*/
let hostStack = {

stack: [],

registerHost(inst) {
if (this.stack.length) {
let host = this.stack[this.stack.length-1];
host._enqueueClient(inst);
}
},

beginHosting(inst) {
this.stack.push(inst);
},

endHosting(inst) {
let stackLen = this.stack.length;
if (stackLen && this.stack[stackLen-1] == inst) {
this.stack.pop();
}
}

}

/**
* Provides basic tracking of element definitions (registrations) and
* instance counts.
Expand Down
1 change: 1 addition & 0 deletions test/runner.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
'unit/case-map.html',
'unit/configure.html',
'unit/ready-attached-order.html',
'unit/ready-attached-order-class.html',
'unit/attributes.html',
'unit/async.html',
'unit/behaviors.html',
Expand Down
6 changes: 3 additions & 3 deletions test/smoke/ordering-test.html
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
}
connectedCallback() {
console.group(this.localName, 'connected');
super.connectedCallback();
console.warn(this.localName, 'connected (user)', this.shadowRoot);
super.connectedCallback();
console.groupEnd(this.localName, 'connected');
}
_flushProperties() {
Expand Down Expand Up @@ -79,8 +79,8 @@
}
connectedCallback() {
console.group(this.localName, 'connected');
super.connectedCallback();
console.warn(this.localName, 'connected (user)', this.shadowRoot);
super.connectedCallback();
console.groupEnd(this.localName, 'connected');
}
_flushProperties() {
Expand Down Expand Up @@ -113,8 +113,8 @@
}
connectedCallback() {
console.group(this.localName, 'connected');
super.connectedCallback();
console.warn(this.localName, 'connected (user)', this.shadowRoot);
super.connectedCallback();
console.groupEnd(this.localName, 'connected');
}
_flushProperties() {
Expand Down
277 changes: 277 additions & 0 deletions test/unit/ready-attached-order-class.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,277 @@
<!doctype html>
<!--
@license
Copyright (c) 2017 The Polymer Project Authors. All rights reserved.
This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
Code distributed by Google as part of the polymer project is also
subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
-->
<html>
<head>
<meta charset="utf-8">
<script src="../../../webcomponentsjs/webcomponents-lite.js"></script>
<script src="../../../web-component-tester/browser.js"></script>
<link rel="import" href="../../polymer.html">
</head>
<body>

<script>
window.clearTestLists = function() {
window.actualAttachedList = [];
window.actualReadyList = [];
window.actualReadyBeforeAtachedList = [];
}

window.clearTestLists();

window.readyMixin = function(base) {
return class readyMixin extends base {
static get properties() {
return {
prop: {
value: true,
observer: '_propChanged'
}
}
}

_propChanged() {
this.observerShadowRoot = Boolean(this.shadowRoot);
}
ready() {
super.ready();
this._readied = true;
this.readyList = window.actualReadyList.slice();
this.readyShadowRoot = Boolean(this.shadowRoot);
window.actualReadyList.push(this);
}

connectedCallback() {
this._eventList = [];
this.addEventListener('e', (e) => {
this._eventList.push(e.composedPath()[0]);
});
super.connectedCallback();
this.dispatchEvent(new Event('e', {composed: true, bubbles: true}))
this.attachedShadowRoot = Boolean(this.shadowRoot);
this.attachedTime$Keys = Object.keys(this.$);
this.attachedList = window.actualAttachedList.slice();
window.actualAttachedList.push(this);
if (!this._readied) {
window.actualReadyBeforeAtachedList.push(this);
}
}
}
};
</script>

<dom-module id="x-zot">
<template>
x-zot<slot></slot>
</template>
<script>
HTMLImports.whenReady(function() {
class El extends window.readyMixin(Polymer.Element) {
static get is() { return 'x-zot' }
}
customElements.define(El.is, El);
});
</script>
</dom-module>

<dom-module id="x-bar">
<template>
<x-zot id="zot"></x-zot>
</template>
<script>
HTMLImports.whenReady(function() {
class El extends window.readyMixin(Polymer.Element) {
static get is() { return 'x-bar' }
}
customElements.define(El.is, El);
});
</script>
</dom-module>

<dom-module id="x-foo">
<template>
<x-bar id="bar1"></x-bar>
<x-bar id="bar2"></x-bar>
</template>
<script>
HTMLImports.whenReady(function() {
class El extends window.readyMixin(Polymer.Element) {
static get is() { return 'x-foo' }
}
customElements.define(El.is, El);
});
</script>
</dom-module>

<dom-module id="x-ready">
<template>
<x-zot id="a">
<x-zot id="b"></x-zot>
<x-zot id="c">
<x-zot id="d"></x-zot>
</x-zot>
</x-zot>
<x-foo id="foo"></x-foo>
</template>
<script>
HTMLImports.whenReady(function() {
class El extends window.readyMixin(Polymer.Element) {
static get is() { return 'x-ready' }
static get properties() {
return {
foo: {
observer: '_fooChanged'
}
}
}
_fooChanged() {}
}
customElements.define(El.is, El);

});
</script>
</dom-module>

<dom-module id="x-templatized">
<template>
<template is="dom-if" if>
<x-ready foo="[[foo]]"></x-ready>
</template>
</template>
<script>
HTMLImports.whenReady(function() {
class El extends Polymer.Element {
static get is() { return 'x-templatized' }
static get properties() {
return {
foo: {
value: 'foo'
}
}
}
}
customElements.define(El.is, El);
});
</script>
</dom-module>

<script>

suite('ready and attached ordering', function() {

let el;

setup(function() {
window.clearTestLists();
el = document.createElement('x-ready');
document.body.appendChild(el);
});

teardown(function() {
document.body.removeChild(el);
});

test('element dom ready before element', function() {
assert.includeMembers(el.readyList, [el.$.a, el.$.b, el.$.c, el.$.d, el.$.foo]);
var foo = el.$.foo;
assert.includeMembers(foo.readyList, [foo.$.bar1, foo.$.bar1.$.zot, foo.$.bar2, foo.$.bar2.$.zot]);
var b1 = foo.$.bar1, b2 = foo.$.bar2;
assert.includeMembers(b1.readyList, [b1.$.zot]);
assert.includeMembers(b2.readyList, [b2.$.zot]);
});

test('can listen to events fired by element dom in connected', function() {
assert.includeMembers(el._eventList, [el.$.a, el.$.b, el.$.c, el.$.d, el.$.foo]);
var foo = el.$.foo;
assert.includeMembers(foo._eventList, [foo.$.bar1, foo.$.bar2]);
var b1 = foo.$.bar1, b2 = foo.$.bar2;
assert.includeMembers(b1._eventList, [b1.$.zot]);
assert.includeMembers(b2._eventList, [b2.$.zot]);
});

test('shadowRoot available in ready, connected, observer', function() {
[el, el.$.a, el.$.b, el.$.c, el.$.d, el.$.foo,
el.$.foo.$.bar1, el.$.foo.$.bar1.$.zot,
el.$.foo.$.bar2, el.$.foo.$.bar2.$.zot].forEach((e) => {
assert.isTrue(e.observerShadowRoot);
assert.isTrue(e.readyShadowRoot);
assert.isTrue(e.attachedShadowRoot);
});
});

test('element attached called after ready', function() {
assert.equal(window.actualReadyBeforeAtachedList.length, 0);
});

test('element has $ references at attached time', function() {
assert.sameMembers(el.attachedTime$Keys, ['a', 'b', 'c', 'd', 'foo']);
assert.sameMembers(el.$.foo.attachedTime$Keys, ['bar1', 'bar2']);
})

});

suite('templatized: ready and attached ordering', function() {

let container, el;

setup(function() {
window.clearTestLists();
container = document.createElement('x-templatized');
document.body.appendChild(container);
Polymer.flush();
el = container.shadowRoot.querySelector('x-ready');
});

teardown(function() {
document.body.removeChild(container);
});

test('element dom ready before element', function() {
assert.includeMembers(el.readyList, [el.$.a, el.$.b, el.$.c, el.$.d, el.$.foo]);
var foo = el.$.foo;
assert.includeMembers(foo.readyList, [foo.$.bar1, foo.$.bar1.$.zot, foo.$.bar2, foo.$.bar2.$.zot]);
var b1 = foo.$.bar1, b2 = foo.$.bar2;
assert.includeMembers(b1.readyList, [b1.$.zot]);
assert.includeMembers(b2.readyList, [b2.$.zot]);
});

test('can listen to events fired by element dom in connected', function() {
assert.includeMembers(el._eventList, [el.$.a, el.$.b, el.$.c, el.$.d, el.$.foo]);
var foo = el.$.foo;
assert.includeMembers(foo._eventList, [foo.$.bar1, foo.$.bar2]);
var b1 = foo.$.bar1, b2 = foo.$.bar2;
assert.includeMembers(b1._eventList, [b1.$.zot]);
assert.includeMembers(b2._eventList, [b2.$.zot]);
});

test('shadowRoot available in ready, connected, observer', function() {
[el, el.$.a, el.$.b, el.$.c, el.$.d, el.$.foo,
el.$.foo.$.bar1, el.$.foo.$.bar1.$.zot,
el.$.foo.$.bar2, el.$.foo.$.bar2.$.zot].forEach((e) => {
assert.isTrue(e.observerShadowRoot);
assert.isTrue(e.readyShadowRoot);
assert.isTrue(e.attachedShadowRoot);
});
});

test('element attached called after ready', function() {
assert.equal(window.actualReadyBeforeAtachedList.length, 0);
});

test('element has $ references at attached time', function() {
assert.sameMembers(el.attachedTime$Keys, ['a', 'b', 'c', 'd', 'foo']);
assert.sameMembers(el.$.foo.attachedTime$Keys, ['bar1', 'bar2']);
})

});

</script>
</body>
</html>
Loading

0 comments on commit 8467a69

Please sign in to comment.