private currentRowHeight: number;
private lastRecordedBufferLength: number;
private lastRecordedViewportHeight: number;
+ private lastTouchY: number;
/**
* Creates a new Viewport.
* @param terminal The terminal this viewport belongs to.
* @param viewportElement The DOM element acting as the viewport.
* @param scrollArea The DOM element acting as the scroll area.
- * @param charMeasureElement A DOM element used to measure the character size of. the terminal.
+ * @param charMeasure A DOM element used to measure the character size of. the terminal.
*/
constructor(
private terminal: ITerminal,
this.terminal.on('resize', this.syncScrollArea.bind(this));
this.viewportElement.addEventListener('scroll', this.onScroll.bind(this));
- this.syncScrollArea();
+ // Perform this async to ensure the CharMeasure is ready.
+ setTimeout(() => this.syncScrollArea(), 0);
}
/**
* Refreshes row height, setting line-height, viewport height and scroll area height if
* necessary.
- * @param charSize A character size measurement bounding rect object, if it doesn't exist it will
- * be created.
*/
private refresh(): void {
if (this.charMeasure.height > 0) {
- var rowHeightChanged = this.charMeasure.height !== this.currentRowHeight;
+ const rowHeightChanged = this.charMeasure.height !== this.currentRowHeight;
if (rowHeightChanged) {
this.currentRowHeight = this.charMeasure.height;
this.viewportElement.style.lineHeight = this.charMeasure.height + 'px';
this.terminal.rowContainer.style.lineHeight = this.charMeasure.height + 'px';
}
- var viewportHeightChanged = this.lastRecordedViewportHeight !== this.terminal.rows;
+ const viewportHeightChanged = this.lastRecordedViewportHeight !== this.terminal.rows;
if (rowHeightChanged || viewportHeightChanged) {
this.lastRecordedViewportHeight = this.terminal.rows;
this.viewportElement.style.height = this.charMeasure.height * this.terminal.rows + 'px';
+ this.terminal.selectionContainer.style.height = this.viewportElement.style.height;
}
this.scrollArea.style.height = (this.charMeasure.height * this.lastRecordedBufferLength) + 'px';
}
* Updates dimensions and synchronizes the scroll area if necessary.
*/
public syncScrollArea(): void {
- if (this.lastRecordedBufferLength !== this.terminal.lines.length) {
+ if (this.lastRecordedBufferLength !== this.terminal.buffer.lines.length) {
// If buffer height changed
- this.lastRecordedBufferLength = this.terminal.lines.length;
+ this.lastRecordedBufferLength = this.terminal.buffer.lines.length;
this.refresh();
} else if (this.lastRecordedViewportHeight !== this.terminal.rows) {
// If viewport height changed
}
// Sync scrollTop
- var scrollTop = this.terminal.ydisp * this.currentRowHeight;
+ const scrollTop = this.terminal.buffer.ydisp * this.currentRowHeight;
if (this.viewportElement.scrollTop !== scrollTop) {
this.viewportElement.scrollTop = scrollTop;
}
* @param ev The scroll event.
*/
private onScroll(ev: Event) {
- var newRow = Math.round(this.viewportElement.scrollTop / this.currentRowHeight);
- var diff = newRow - this.terminal.ydisp;
+ const newRow = Math.round(this.viewportElement.scrollTop / this.currentRowHeight);
+ const diff = newRow - this.terminal.buffer.ydisp;
this.terminal.scrollDisp(diff, true);
}
return;
}
// Fallback to WheelEvent.DOM_DELTA_PIXEL
- var multiplier = 1;
+ let multiplier = 1;
if (ev.deltaMode === WheelEvent.DOM_DELTA_LINE) {
multiplier = this.currentRowHeight;
} else if (ev.deltaMode === WheelEvent.DOM_DELTA_PAGE) {
// Prevent the page from scrolling when the terminal scrolls
ev.preventDefault();
};
+
+ /**
+ * Handles the touchstart event, recording the touch occurred.
+ * @param ev The touch event.
+ */
+ public onTouchStart(ev: TouchEvent) {
+ this.lastTouchY = ev.touches[0].pageY;
+ };
+
+ /**
+ * Handles the touchmove event, scrolling the viewport if the position shifted.
+ * @param ev The touch event.
+ */
+ public onTouchMove(ev: TouchEvent) {
+ let deltaY = this.lastTouchY - ev.touches[0].pageY;
+ this.lastTouchY = ev.touches[0].pageY;
+ if (deltaY === 0) {
+ return;
+ }
+ this.viewportElement.scrollTop += deltaY;
+ ev.preventDefault();
+ };
}