fix(angular): apply validation classes properly

* fix(angular): add validation classes to ion-item

* fix(inputs): focus handling

fixes #17171
fixes #16052
fixes #15572
fixes #16452
fixes #17063
This commit is contained in:
Manu MA
2019-01-19 22:56:00 +01:00
committed by GitHub
parent 7832be3f1c
commit 2b4d7b7be9
14 changed files with 241 additions and 74 deletions

View File

@ -1,4 +1,4 @@
import { Component, ComponentInterface, Element, Event, EventEmitter, Prop, QueueApi, State, Watch } from '@stencil/core';
import { Component, ComponentInterface, Element, Event, EventEmitter, Listen, Prop, QueueApi, State, Watch } from '@stencil/core';
import { Color, Gesture, GestureDetail, KnobName, Mode, RangeChangeEventDetail, RangeValue, StyleEventDetail } from '../../interface';
import { clamp, debounceEvent } from '../../utils/helpers';
@ -145,6 +145,24 @@ export class Range implements ComponentInterface {
*/
@Event() ionBlur!: EventEmitter<void>;
@Listen('focusout')
onBlur() {
if (this.hasFocus) {
this.hasFocus = false;
this.ionBlur.emit();
this.emitStyle();
}
}
@Listen('focusin')
onFocus() {
if (!this.hasFocus) {
this.hasFocus = true;
this.ionFocus.emit();
this.emitStyle();
}
}
componentWillLoad() {
this.updateRatio();
this.debounceChanged();
@ -165,7 +183,7 @@ export class Range implements ComponentInterface {
this.gesture.setDisabled(this.disabled);
}
private handleKeyboard = (knob: string, isIncrease: boolean) => {
private handleKeyboard = (knob: KnobName, isIncrease: boolean) => {
let step = this.step;
step = step > 0 ? step : 1;
step = step / (this.max - this.min);
@ -200,29 +218,12 @@ export class Range implements ComponentInterface {
private emitStyle() {
this.ionStyle.emit({
'interactive': true,
'interactive-disabled': this.disabled
});
}
private fireBlur() {
if (this.hasFocus) {
this.hasFocus = false;
this.ionBlur.emit();
this.emitStyle();
}
}
private fireFocus() {
if (!this.hasFocus) {
this.hasFocus = true;
this.ionFocus.emit();
this.emitStyle();
}
}
private onStart(detail: GestureDetail) {
this.fireFocus();
const rect = this.rect = this.rangeSlider!.getBoundingClientRect() as any;
const currentX = detail.currentX;
@ -234,6 +235,8 @@ export class Range implements ComponentInterface {
? 'A'
: 'B';
this.setFocus(this.pressedKnob);
// update the active knob's position
this.update(currentX);
}
@ -245,7 +248,6 @@ export class Range implements ComponentInterface {
private onEnd(detail: GestureDetail) {
this.update(detail.currentX);
this.pressedKnob = undefined;
this.fireBlur();
}
private update(currentX: number) {
@ -255,8 +257,11 @@ export class Range implements ComponentInterface {
let ratio = clamp(0, (currentX - rect.left) / rect.width, 1);
if (this.snaps) {
// snaps the ratio to the current value
const value = ratioToValue(ratio, this.min, this.max, this.step);
ratio = valueToRatio(value, this.min, this.max);
ratio = valueToRatio(
ratioToValue(ratio, this.min, this.max, this.step),
this.min,
this.max
);
}
// update which knob is pressed
@ -317,6 +322,15 @@ export class Range implements ComponentInterface {
this.noUpdate = false;
}
private setFocus(knob: KnobName) {
if (this.el.shadowRoot) {
const knobEl = this.el.shadowRoot.querySelector(knob === 'A' ? '.range-knob-a' : '.range-knob-b') as HTMLElement | undefined;
if (knobEl) {
knobEl.focus();
}
}
}
hostData() {
return {
class: {
@ -401,7 +415,7 @@ export class Range implements ComponentInterface {
}
interface RangeKnob {
knob: string;
knob: KnobName;
value: number;
ratio: number;
min: number;
@ -410,7 +424,7 @@ interface RangeKnob {
pressed: boolean;
pin: boolean;
handleKeyboard: (name: string, isIncrease: boolean) => void;
handleKeyboard: (name: KnobName, isIncrease: boolean) => void;
}
function renderKnob({ knob, value, ratio, min, max, disabled, pressed, pin, handleKeyboard }: RangeKnob) {
@ -431,6 +445,8 @@ function renderKnob({ knob, value, ratio, min, max, disabled, pressed, pin, hand
}}
class={{
'range-knob-handle': true,
'range-knob-a': knob === 'A',
'range-knob-b': knob === 'B',
'range-knob-pressed': pressed,
'range-knob-min': value === min,
'range-knob-max': value === max