Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix didTransitionOut not being called reliably #105

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions addon/src/modifiers/css-transition.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if (macroCondition(dependencySatisfies('ember-modifier', '>=3.2.0 || 4.x'))) {
parentElement = null;
nextElementSibling = null;
installed = false;
finishedTransitionIn = false;
startedTransitionIn = false;
isEnabled = true;
parentSelector;

Expand Down Expand Up @@ -108,7 +108,7 @@ if (macroCondition(dependencySatisfies('ember-modifier', '>=3.2.0 || 4.x'))) {
super(owner, args);

registerDestructor(this, () => {
if (this.isEnabled === false || !this.finishedTransitionIn) {
if (this.isEnabled === false || !this.startedTransitionIn) {
return;
}

Expand Down Expand Up @@ -222,6 +222,8 @@ if (macroCondition(dependencySatisfies('ember-modifier', '>=3.2.0 || 4.x'))) {
}

*transitionIn() {
this.startedTransitionIn = true;

if (this.enterClass) {
yield* this.transition({
className: this.enterClass,
Expand All @@ -233,8 +235,6 @@ if (macroCondition(dependencySatisfies('ember-modifier', '>=3.2.0 || 4.x'))) {
this.didTransitionIn();
}
}

this.finishedTransitionIn = true;
}

*transitionOut() {
Expand Down
152 changes: 152 additions & 0 deletions test-app/tests/integration/components/css-transition-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,11 @@ module('Integration | Component | transition group', function (hooks) {
this.didTransitionOut.notCalled,
'didTransitionOut was not called'
);

await new Promise((resolve) => {
setTimeout(resolve, 1000);
});

assert.dom('#my-element_clone').doesNotExist('clone was not created');
});

Expand Down Expand Up @@ -228,6 +233,11 @@ module('Integration | Component | transition group', function (hooks) {
this.didTransitionOut.notCalled,
'didTransitionOut was not called'
);

await new Promise((resolve) => {
setTimeout(resolve, 1000);
});

assert.dom('#my-element_clone').doesNotExist('clone was not created');
});
});
Expand Down Expand Up @@ -500,4 +510,146 @@ module('Integration | Component | transition group', function (hooks) {
.dom('#my-element')
.exists({ count: 1 }, 'child element is still rendered');
});

module('Always call didTransitionOut', function () {
let testCases = [
{
name: 'element',
template: hbs`
<style>
.window-enter,
.window-leave-to {
opacity: 0;
transform: scale(0.9);
}

.window-enter-active,
.window-leave-active {
transition: opacity 0.5s ease, transform 0.5s ease;
}

.window-enter-to,
.window-leave {
opacity: 1;
transform: scale(1);
}
</style>

{{#if this.show}}
<div id="my-element" {{css-transition
enterClass="window-enter"
enterActiveClass="window-enter-active"
enterToClass="window-enter-to"
leaveClass="window-leave"
leaveActiveClass="window-leave-active"
leaveToClass="window-leave-to"
didTransitionOut=this.didTransitionOut
}}>
<p class="content">Çup?</p>
</div>
{{/if}}
`,
},
{
name: 'classic component',
template: hbs`
<style>
.window-enter,
.window-leave-to {
opacity: 0;
transform: scale(0.9);
}

.window-enter-active,
.window-leave-active {
transition: opacity 0.5s ease, transform 0.5s ease;
}

.window-enter-to,
.window-leave {
opacity: 1;
transform: scale(1);
}
</style>

{{#if this.show}}
<MyComponent id="my-element" {{css-transition
enterClass="window-enter"
enterActiveClass="window-enter-active"
enterToClass="window-enter-to"
leaveClass="window-leave"
leaveActiveClass="window-leave-active"
leaveToClass="window-leave-to"
didTransitionOut=this.didTransitionOut
}}>
<p class="content">Çup?</p>
</MyComponent>
{{/if}}
`,
},
{
name: 'glimmer component',
template: hbs`
<style>
.window-enter,
.window-leave-to {
opacity: 0;
transform: scale(0.9);
}

.window-enter-active,
.window-leave-active {
transition: opacity 0.5s ease, transform 0.5s ease;
}

.window-enter-to,
.window-leave {
opacity: 1;
transform: scale(1);
}
</style>

{{#if this.show}}
<GlimmerComponent id="my-element" {{css-transition
enterClass="window-enter"
enterActiveClass="window-enter-active"
enterToClass="window-enter-to"
leaveClass="window-leave"
leaveActiveClass="window-leave-active"
leaveToClass="window-leave-to"
didTransitionOut=this.didTransitionOut
}}>
<p class="content">Çup?</p>
</GlimmerComponent>
{{/if}}
`,
},
];

testCases.forEach((i) => {
test(`didTransitionOut is called for (${i.name})`, async function (assert) {
this.didTransitionOut = () => {
assert.step('transition-out');
};

this.set('show', false);

await render(i.template);

this.set('show', true);

await new Promise((resolve) => {
setTimeout(resolve, 1);
});

this.set('show', false);

await new Promise((resolve) => {
setTimeout(resolve, 2000);
});

assert.verifySteps(['transition-out']);
});
});
});
});