Skip to content

Commit

Permalink
Merge 5c1bdba into 3442046
Browse files Browse the repository at this point in the history
  • Loading branch information
yuriy-fix committed Jul 23, 2018
2 parents 3442046 + 5c1bdba commit 64ce6fd
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 0 deletions.
8 changes: 8 additions & 0 deletions src/vaadin-overlay.html
Expand Up @@ -454,11 +454,19 @@
}
}

_ensureTemplatized() {
this._setTemplateFromNodes(Array.from(this.children));
}

/**
* @event vaadin-overlay-open
* fired after the `vaadin-overlay` is opened.
*/
_openedChanged(opened) {
if (!this._instance) {
this._ensureTemplatized();
}

if (opened) {
this._animatedOpening();

Expand Down
38 changes: 38 additions & 0 deletions test/templating.html
Expand Up @@ -49,6 +49,31 @@
});
</script>

<dom-module id="opened-overlay-view">
<template>
<vaadin-overlay id="overlay" opened>
<template>
overlay content
</template>
</vaadin-overlay>
</template>
</dom-module>
<script>
addEventListener('WebComponentsReady', () => {
customElements.define('opened-overlay-view', class extends Polymer.Element {
static get is() {
return 'opened-overlay-view';
}
});
});
</script>

<test-fixture id="openedOverlayView">
<template>
<opened-overlay-view></opened-overlay-view>
</template>
</test-fixture>

<test-fixture id="myOverlayView">
<template>
<my-overlay-view></my-overlay-view>
Expand All @@ -74,6 +99,19 @@
let overlay;
let externalTemplate;

describe('template with initially opened overlay', () => {
let openedOverlayView, overlay;

beforeEach(() => {
openedOverlayView = fixture('openedOverlayView');
overlay = openedOverlayView.$.overlay;
});

it('should use content part shadowRoot for contents when initially opened in component scope', () => {
expect(overlay.content).to.be.instanceOf(ShadowRoot);
});
});

describe('in component scope', () => {
let myOverlayView;

Expand Down

0 comments on commit 64ce6fd

Please sign in to comment.