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

[BUGFIX] fixed issue when passing false to activeClass would break things #15265

Merged
merged 1 commit into from
Sep 14, 2017
Merged
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
20 changes: 13 additions & 7 deletions packages/ember-glimmer/lib/components/link-to.js
Original file line number Diff line number Diff line change
Expand Up @@ -545,7 +545,7 @@ const LinkComponent = EmberComponent.extend({
}
}),

_computeActive(routerState) {
_isActive(routerState) {
if (get(this, 'loading')) { return false; }

let routing = get(this, '_routing');
Expand All @@ -563,7 +563,7 @@ const LinkComponent = EmberComponent.extend({

for (let i = 0; i < currentWhen.length; i++) {
if (routing.isActiveForRoute(models, resolvedQueryParams, currentWhen[i], routerState, isCurrentWhenSpecified)) {
return get(this, 'activeClass');
return true;
}
}

Expand All @@ -584,31 +584,37 @@ const LinkComponent = EmberComponent.extend({
@property active
@private
*/
active: computed('attrs.params', '_routing.currentState', function computeLinkToComponentActive() {
active: computed('attrs.params', '_active', function computeLinkToComponentActiveClass() {
let currentState = get(this, '_routing.currentState');
if (!currentState) { return false; }

return this._computeActive(currentState);
return this.get('_active') ? get(this, 'activeClass') : false;
}),

_active: computed('_routing.currentState', function computeLinkToComponentActive() {
let currentState = get(this, '_routing.currentState');
if (!currentState) { return false; }
return this._isActive(currentState);
}),

willBeActive: computed('_routing.targetState', function computeLinkToComponentWillBeActive() {
let routing = get(this, '_routing');
let targetState = get(routing, 'targetState');
if (get(routing, 'currentState') === targetState) { return; }

return !!this._computeActive(targetState);
return this._isActive(targetState);
}),

transitioningIn: computed('active', 'willBeActive', function computeLinkToComponentTransitioningIn() {
if (get(this, 'willBeActive') === true && !get(this, 'active')) {
if (get(this, 'willBeActive') === true && !get(this, '_active')) {
return 'ember-transitioning-in';
} else {
return false;
}
}),

transitioningOut: computed('active', 'willBeActive', function computeLinkToComponentTransitioningOut() {
if (get(this, 'willBeActive') === false && get(this, 'active')) {
if (get(this, 'willBeActive') === false && get(this, '_active')) {
return 'ember-transitioning-out';
} else {
return false;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,13 @@ moduleFor('The {{link-to}} helper: .transitioning-in .transitioning-out CSS clas

this.aboutDefer = RSVP.defer();
this.otherDefer = RSVP.defer();
this.newsDefer = RSVP.defer();
let _this = this;

this.router.map(function() {
this.route('about');
this.route('other');
this.route('news');
});

this.add('route:about', Route.extend({
Expand All @@ -39,11 +41,18 @@ moduleFor('The {{link-to}} helper: .transitioning-in .transitioning-out CSS clas
}
}));

this.add('route:news', Route.extend({
model() {
return _this.newsDefer.promise;
}
}));

this.addTemplate('application',`
{{outlet}}
{{link-to 'Index' 'index' id='index-link'}}
{{link-to 'About' 'about' id='about-link'}}
{{link-to 'Other' 'other' id='other-link'}}
{{link-to 'News' 'news' activeClass=false id='news-link'}}
`);

this.visit('/');
Expand All @@ -53,6 +62,7 @@ moduleFor('The {{link-to}} helper: .transitioning-in .transitioning-out CSS clas
super.teardown();
this.aboutDefer = null;
this.otherDefer = null;
this.newsDefer = null;
}

['@test while a transition is underway'](assert) {
Expand Down Expand Up @@ -88,6 +98,41 @@ moduleFor('The {{link-to}} helper: .transitioning-in .transitioning-out CSS clas
assertHasNoClass(assert, $about, 'ember-transitioning-out');
assertHasNoClass(assert, $other, 'ember-transitioning-out');
}

['@test while a transition is underway with activeClass is false'](assert) {
let $index = this.$('#index-link');
let $news = this.$('#news-link');
let $other = this.$('#other-link');

$news.click();

assertHasClass(assert, $index, 'active');
assertHasNoClass(assert, $news, 'active');
assertHasNoClass(assert, $other, 'active');

assertHasNoClass(assert, $index, 'ember-transitioning-in');
assertHasClass(assert, $news, 'ember-transitioning-in');
assertHasNoClass(assert, $other, 'ember-transitioning-in');

assertHasClass(assert, $index, 'ember-transitioning-out');
assertHasNoClass(assert, $news, 'ember-transitioning-out');
assertHasNoClass(assert, $other, 'ember-transitioning-out');

this.runTask(() => this.newsDefer.resolve());

assertHasNoClass(assert, $index, 'active');
assertHasNoClass(assert, $news, 'active');
assertHasNoClass(assert, $other, 'active');

assertHasNoClass(assert, $index, 'ember-transitioning-in');
assertHasNoClass(assert, $news, 'ember-transitioning-in');
assertHasNoClass(assert, $other, 'ember-transitioning-in');

assertHasNoClass(assert, $index, 'ember-transitioning-out');
assertHasNoClass(assert, $news, 'ember-transitioning-out');
assertHasNoClass(assert, $other, 'ember-transitioning-out');
}

});

moduleFor(`The {{link-to}} helper: .transitioning-in .transitioning-out CSS classes - nested link-to's`, class extends ApplicationTestCase {
Expand Down