javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-22 21:48:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(input): don't allow focus when disabled is set (#10214)

Browse Source 
Adds the disabled attribute to the parent input/textarea, also fixes
where disabled textareas were focusable regardless of where disabled
was set

fixes #10155
This commit is contained in:
Brandy Carney
2017-01-27 15:42:38 -05:00
committed by Justin Willis
parent d3f4bc0616
commit eba0866a34
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/input/input.scss
View File

@ -94,7 +94,7 @@ input.text-input:-webkit-autofill {
height: 100%; height: 100%;
} }
ion-input[disabled] .input-cover { .input[disabled] .input-cover {
pointer-events: none; pointer-events: none;
} }

10
src/components/input/input.ts
View File

@ -216,7 +216,7 @@ export class TextInput extends Ion implements IonicFormInput {
*/ */
@Input() @Input()
get disabled() { get disabled() {
return this.ngControl ? this.ngControl.disabled : this._disabled; return this._disabled;
} }
set disabled(val: boolean) { set disabled(val: boolean) {
this.setDisabled(this._disabled = isTrueProperty(val)); this.setDisabled(this._disabled = isTrueProperty(val));
@ -226,10 +226,18 @@ export class TextInput extends Ion implements IonicFormInput {
* @private * @private
*/ */
setDisabled(val: boolean) { setDisabled(val: boolean) {
this._renderer.setElementAttribute(this._elementRef.nativeElement, 'disabled', val ? '' : null);
this._item && this._item.setElementClass('item-input-disabled', val); this._item && this._item.setElementClass('item-input-disabled', val);
this._native && this._native.isDisabled(val); this._native && this._native.isDisabled(val);
} }
/**
* @private
*/
setDisabledState(isDisabled: boolean) {
this.disabled = isDisabled;
}
/** /**
* @input {boolean} If the input should be readonly or not * @input {boolean} If the input should be readonly or not
*/ */