EVOgeek
/
Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MOBILE-2473 ios: Fix cursor placed behind status bar

main
Dani Palou 2018-08-22 09:01:15 +02:00 committed by Pau Ferrer Ocaña
parent aff8c28ca4
commit f43f10d17e
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/components/rich-text-editor/rich-text-editor.ts
View File

@ -14,7 +14,7 @@
import { Component, Input, Output, EventEmitter, ViewChild, ElementRef, AfterContentInit, OnDestroy, Optional } import { Component, Input, Output, EventEmitter, ViewChild, ElementRef, AfterContentInit, OnDestroy, Optional }
from '@angular/core'; from '@angular/core';
import { TextInput, Content } from 'ionic-angular'; import { TextInput, Content, Platform } from 'ionic-angular';
import { CoreSitesProvider } from '@providers/sites'; import { CoreSitesProvider } from '@providers/sites';
import { CoreFilepoolProvider } from '@providers/filepool'; import { CoreFilepoolProvider } from '@providers/filepool';
import { CoreDomUtilsProvider } from '@providers/utils/dom'; import { CoreDomUtilsProvider } from '@providers/utils/dom';
@ -66,6 +66,7 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
protected valueChangeSubscription: Subscription; protected valueChangeSubscription: Subscription;
protected keyboardObs: any; protected keyboardObs: any;
protected initHeightInterval;
rteEnabled = false; rteEnabled = false;
editorSupported = true; editorSupported = true;
@ -73,7 +74,7 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
constructor(private domUtils: CoreDomUtilsProvider, private urlUtils: CoreUrlUtilsProvider, constructor(private domUtils: CoreDomUtilsProvider, private urlUtils: CoreUrlUtilsProvider,
private sitesProvider: CoreSitesProvider, private filepoolProvider: CoreFilepoolProvider, private sitesProvider: CoreSitesProvider, private filepoolProvider: CoreFilepoolProvider,
@Optional() private content: Content, elementRef: ElementRef, private events: CoreEventsProvider, @Optional() private content: Content, elementRef: ElementRef, private events: CoreEventsProvider,
private utils: CoreUtilsProvider) { private utils: CoreUtilsProvider, private platform: Platform) {
this.contentChanged = new EventEmitter<string>(); this.contentChanged = new EventEmitter<string>();
this.element = elementRef.nativeElement as HTMLDivElement; this.element = elementRef.nativeElement as HTMLDivElement;
} }
@ -114,10 +115,10 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
window.addEventListener('resize', this.resizeFunction); window.addEventListener('resize', this.resizeFunction);
let i = 0; let i = 0;
const interval = setInterval(() => { this.initHeightInterval = setInterval(() => {
this.maximizeEditorSize().then((height) => { this.maximizeEditorSize().then((height) => {
if (i >= 5 || height != 0) { if (i >= 5 || height != 0) {
clearInterval(interval); clearInterval(this.initHeightInterval);
} }
i++; i++;
}); });
@ -150,7 +151,22 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
setTimeout(() => { setTimeout(() => {
// Editor is ready, adjust Height if needed. // Editor is ready, adjust Height if needed.
const height = this.content.contentHeight - this.kbHeight - this.getSurroundingHeight(this.element); let height;
if (this.platform.is('ios') && this.kbHeight > 0) {
// Keyboard open in iOS.
// In this case, the header disappears or is scrollable, so we need to adjust the calculations.
height = window.innerHeight - this.getSurroundingHeight(this.element);
if (this.element.getBoundingClientRect().top < 40) {
// In iOS sometimes the editor is placed below the status bar. Move the scroll a bit so it doesn't happen.
window.scrollTo(window.scrollX, window.scrollY - 40);
}
} else {
// Header is fixed, use the content to calculate the editor height.
height = this.content.contentHeight - this.kbHeight - this.getSurroundingHeight(this.element);
}
if (height > this.minHeight) { if (height > this.minHeight) {
this.element.style.height = this.domUtils.formatPixelsSize(height); this.element.style.height = this.domUtils.formatPixelsSize(height);
} else { } else {
@ -473,5 +489,7 @@ export class CoreRichTextEditorComponent implements AfterContentInit, OnDestroy
ngOnDestroy(): void { ngOnDestroy(): void {
this.valueChangeSubscription && this.valueChangeSubscription.unsubscribe(); this.valueChangeSubscription && this.valueChangeSubscription.unsubscribe();
window.removeEventListener('resize', this.resizeFunction); window.removeEventListener('resize', this.resizeFunction);
clearInterval(this.initHeightInterval);
this.keyboardObs && this.keyboardObs.off();
} }
} }