-
Notifications
You must be signed in to change notification settings - Fork 4.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
UI: Fixes healthy node listing resize on large portrait screens (#4564)
1. Split the resizing functionality of into a separate mixin to be shared across components 2. Add basic integration tests to prove that everything is getting called through out the lifetime of the app. I decided against unit testing as there isn't really any isolated logic to be tested, more checking that things are being called in the correct order etc i.e. the integration is correct. Adds assertion to with-resizing so its obvious to override `resize`
- Loading branch information
Showing
6 changed files
with
103 additions
and
32 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,32 @@ | ||
import { computed, get } from '@ember/object'; | ||
import Component from 'ember-collection/components/ember-collection'; | ||
import style from 'ember-computed-style'; | ||
import WithResizing from 'consul-ui/mixins/with-resizing'; | ||
import qsaFactory from 'consul-ui/utils/qsa-factory'; | ||
const $$ = qsaFactory(); | ||
|
||
export default Component.extend({ | ||
export default Component.extend(WithResizing, { | ||
tagName: 'div', | ||
attributeBindings: ['style'], | ||
height: 500, | ||
style: style('getStyle'), | ||
classNames: ['list-collection'], | ||
getStyle: computed('height', function() { | ||
return { | ||
height: get(this, 'height'), | ||
}; | ||
}), | ||
resize: function(e) { | ||
const $self = this.element; | ||
const $appContent = [...$$('main > div')][0]; | ||
if ($appContent) { | ||
const rect = $self.getBoundingClientRect(); | ||
const $footer = [...$$('footer[role="contentinfo"]')][0]; | ||
const space = rect.top + $footer.clientHeight; | ||
const height = e.detail.height - space; | ||
this.set('height', Math.max(0, height)); | ||
this.updateItems(); | ||
this.updateScrollPosition(); | ||
} | ||
}, | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
import Mixin from '@ember/object/mixin'; | ||
import { get } from '@ember/object'; | ||
import { assert } from '@ember/debug'; | ||
export default Mixin.create({ | ||
resize: function(e) { | ||
assert('with-resizing.resize needs to be overridden', false); | ||
}, | ||
win: window, | ||
init: function() { | ||
this._super(...arguments); | ||
this.handler = e => { | ||
const win = e.target; | ||
this.resize({ | ||
detail: { width: win.innerWidth, height: win.innerHeight }, | ||
}); | ||
}; | ||
}, | ||
didInsertElement: function() { | ||
this._super(...arguments); | ||
get(this, 'win').addEventListener('resize', this.handler); | ||
this.didAppear(); | ||
}, | ||
didAppear: function() { | ||
this.handler({ target: get(this, 'win') }); | ||
}, | ||
willDestroyElement: function() { | ||
get(this, 'win').removeEventListener('resize', this.handler); | ||
this._super(...arguments); | ||
}, | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
import { module } from 'qunit'; | ||
import test from 'ember-sinon-qunit/test-support/test'; | ||
import { setupTest } from 'ember-qunit'; | ||
import EmberObject from '@ember/object'; | ||
import Mixin from 'consul-ui/mixins/with-resizing'; | ||
module('Integration | Mixin | with-resizing', function(hooks) { | ||
setupTest(hooks); | ||
test('window.addEventListener, resize and window.removeEventListener are called once each through the entire lifecycle', function(assert) { | ||
const win = { | ||
innerWidth: 0, | ||
innerHeight: 0, | ||
addEventListener: this.stub(), | ||
removeEventListener: this.stub(), | ||
}; | ||
const subject = EmberObject.extend(Mixin, { | ||
win: win, | ||
}).create(); | ||
const resize = this.stub(subject, 'resize'); | ||
subject.didInsertElement(); | ||
subject.willDestroyElement(); | ||
assert.ok(win.addEventListener.calledOnce); | ||
assert.ok(resize.calledOnce); | ||
assert.ok(resize.calledWith({ detail: { width: 0, height: 0 } })); | ||
assert.ok(win.removeEventListener.calledOnce); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
import EmberObject from '@ember/object'; | ||
import WithResizingMixin from 'consul-ui/mixins/with-resizing'; | ||
import { module, test } from 'qunit'; | ||
|
||
module('Unit | Mixin | with resizing'); | ||
|
||
// Replace this with your real tests. | ||
test('it works', function(assert) { | ||
let WithResizingObject = EmberObject.extend(WithResizingMixin); | ||
let subject = WithResizingObject.create(); | ||
assert.ok(subject); | ||
}); |