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(select): Set transform origin for line ripple #3432

Merged
merged 5 commits into from
Aug 28, 2018
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
25 changes: 22 additions & 3 deletions packages/mdc-select/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ class MDCSelect extends MDCComponent {
this.handleFocus_;
/** @private {!Function} */
this.handleBlur_;
/** @private {!Function} */
this.handleClick_;
}

/**
Expand Down Expand Up @@ -169,10 +171,14 @@ class MDCSelect extends MDCComponent {
this.handleChange_ = () => this.foundation_.handleChange();
this.handleFocus_ = () => this.foundation_.handleFocus();
this.handleBlur_ = () => this.foundation_.handleBlur();
this.handleClick_ = (evt) => this.setTransformOrigin_(evt);

this.nativeControl_.addEventListener('change', this.handleChange_);
this.nativeControl_.addEventListener('focus', this.handleFocus_);
this.nativeControl_.addEventListener('blur', this.handleBlur_);
['mousedown', 'touchstart'].forEach((evtType) => {
this.nativeControl_.addEventListener(evtType, this.handleClick_);
});

// Initially sync floating label
this.foundation_.handleChange();
Expand All @@ -186,6 +192,9 @@ class MDCSelect extends MDCComponent {
this.nativeControl_.removeEventListener('change', this.handleChange_);
this.nativeControl_.removeEventListener('focus', this.handleFocus_);
this.nativeControl_.removeEventListener('blur', this.handleBlur_);
['mousedown', 'touchstart'].forEach((evtType) => {
this.nativeControl_.removeEventListener(evtType, this.handleClick_);
});

if (this.ripple) {
this.ripple.destroy();
Expand Down Expand Up @@ -264,12 +273,22 @@ class MDCSelect extends MDCComponent {
}
},
getLabelWidth: () => {
if (this.label_) {
return this.label_.getWidth();
}
return this.label_ ? this.label_.getWidth() : 0;
},
};
}

/**
* Sets the line ripple's transform origin, so that the line ripple activate
* animation will animate out from the user's click location.
* @param {!(MouseEvent|TouchEvent)} evt
*/
setTransformOrigin_(evt) {
const targetClientRect = evt.target.getBoundingClientRect();
const xCoordinate = evt.clientX;
const normalizedX = xCoordinate - targetClientRect.left;
this.lineRipple_.setRippleCenter(normalizedX);
}
}

export {MDCSelect, MDCSelectFoundation};
95 changes: 93 additions & 2 deletions test/unit/mdc-select/mdc-select.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,22 +33,29 @@ import {MDCSelect} from '../../../packages/mdc-select';
import {cssClasses} from '../../../packages/mdc-select/constants';
import {MDCNotchedOutline} from '../../../packages/mdc-notched-outline';

const LABEL_WIDTH = 100;

class FakeLabel {
constructor() {
this.float = td.func('label.float');
this.getWidth = td.func('label.getWidth');

td.when(this.getWidth()).thenReturn(LABEL_WIDTH);
}
}

class FakeBottomLine {
constructor() {
this.activate = td.func('bottomLine.activate');
this.deactivate = td.func('bottomLine.deactivate');
this.setRippleCenter = td.func('bottomLine.setRippleCenter');
}
}

class FakeOutline {
constructor() {
this.destroy = td.func('.destroy');
this.notch = td.func('.notch');
}
}

Expand Down Expand Up @@ -87,20 +94,47 @@ function getBoxFixture() {
`;
}

function getOutlineFixture() {
return bel`
<div class="mdc-select mdc-select--outlined">
<select class="mdc-select__native-control">
<option value="orange">
Orange
</option>
<option value="apple">
Apple
</option>
</select>
<label class="mdc-floating-label">Pick a Food Group</label>
<div class="mdc-notched-outline">
<svg>
<path class="mdc-notched-outline__path">
</svg>
</div>
<div class="mdc-notched-outline__idle"/>
</div>
`;
}

suite('MDCSelect');

test('attachTo returns a component instance', () => {
assert.isOk(MDCSelect.attachTo(getFixture()) instanceof MDCSelect);
});

function setupTest() {
function setupTest(hasOutline = false, hasLabel = true) {
const bottomLine = new FakeBottomLine();
const label = new FakeLabel();
const fixture = getFixture();
const fixture = hasOutline ? getOutlineFixture() : getFixture();
const nativeControl = fixture.querySelector('.mdc-select__native-control');
const labelEl = fixture.querySelector('.mdc-floating-label');
const bottomLineEl = fixture.querySelector('.mdc-line-ripple');
const outline = new FakeOutline();

if (!hasLabel) {
fixture.removeChild(labelEl);
}

const component = new MDCSelect(fixture, /* foundation */ undefined, () => label, () => bottomLine, () => outline);

return {fixture, nativeControl, label, labelEl, bottomLine, bottomLineEl, component, outline};
Expand Down Expand Up @@ -366,6 +400,37 @@ test('adapter#deactivateBottomLine removes active class from the bottom line', (
td.verify(bottomLine.deactivate());
});

test('adapter#notchOutline proxies labelWidth and isRtl to the outline', () => {
const hasOutline = true;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Tests use hasOutline, function uses isOutline

const {component, outline} = setupTest(hasOutline);
const isRtl = false;

component.getDefaultFoundation().adapter_.notchOutline(LABEL_WIDTH, isRtl);
td.verify(outline.notch(LABEL_WIDTH, isRtl), {times: 1});
});

test('adapter#notchOutline does not proxy values to the outline if it does not exist', () => {
const hasOutline = false;
const {component, outline} = setupTest(hasOutline);
const isRtl = false;

component.getDefaultFoundation().adapter_.notchOutline(LABEL_WIDTH, isRtl);
td.verify(outline.notch(LABEL_WIDTH, isRtl), {times: 0});
});

test('adapter#getLabelWidth returns the width of the label', () => {
const {component} = setupTest();
assert.equal(component.getDefaultFoundation().adapter_.getLabelWidth(), LABEL_WIDTH);
});

test('adapter#getLabelWidth returns 0 if the label does not exist', () => {
const hasOutline = true;
const hasLabel = false;
const {component} = setupTest(hasOutline, hasLabel);

assert.equal(component.getDefaultFoundation().adapter_.getLabelWidth(), 0);
});

test('change event triggers foundation.handleChange()', () => {
const {component, nativeControl} = setupTest();
component.foundation_.handleChange = td.func();
Expand Down Expand Up @@ -410,3 +475,29 @@ test('#destroy removes the blur handler', () => {
domEvents.emit(nativeControl, 'blur');
td.verify(component.foundation_.handleBlur(), {times: 0});
});

test('mousedown on the select sets the line ripple origin', () => {
const {bottomLine, fixture} = setupTest();
const event = document.createEvent('MouseEvent');
const clientX = 200;
const clientY = 200;
// IE11 mousedown event.
event.initMouseEvent('mousedown', true, true, window, 0, 0, 0, clientX, clientY, false, false, false, false, 0, null);
fixture.querySelector('select').dispatchEvent(event);

td.verify(bottomLine.setRippleCenter(200), {times: 1});
});

test('#destroy removes the mousedown listener', () => {
const {bottomLine, component, fixture} = setupTest();
const event = document.createEvent('MouseEvent');
const clientX = 200;
const clientY = 200;

component.destroy();
// IE11 mousedown event.
event.initMouseEvent('mousedown', true, true, window, 0, 0, 0, clientX, clientY, false, false, false, false, 0, null);
fixture.querySelector('select').dispatchEvent(event);

td.verify(bottomLine.setRippleCenter(200), {times: 0});
});