@xterm/xterm 6.1.0-beta.20 → 6.1.0-beta.201
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +60 -38
- package/css/xterm.css +29 -22
- package/lib/xterm.js +1 -1
- package/lib/xterm.js.map +1 -1
- package/lib/xterm.mjs +8 -34
- package/lib/xterm.mjs.map +4 -4
- package/package.json +25 -14
- package/src/browser/AccessibilityManager.ts +6 -3
- package/src/browser/Clipboard.ts +6 -3
- package/src/browser/CoreBrowserTerminal.ts +147 -318
- package/src/browser/Dom.ts +178 -0
- package/src/browser/Linkifier.ts +11 -11
- package/src/browser/OscLinkProvider.ts +3 -1
- package/src/browser/RenderDebouncer.ts +2 -2
- package/src/browser/TimeBasedDebouncer.ts +2 -2
- package/src/browser/Types.ts +12 -11
- package/src/browser/Viewport.ts +55 -20
- package/src/browser/decorations/BufferDecorationRenderer.ts +1 -1
- package/src/browser/decorations/OverviewRulerRenderer.ts +33 -17
- package/src/browser/input/CompositionHelper.ts +44 -8
- package/src/browser/public/Terminal.ts +25 -28
- package/src/browser/renderer/dom/DomRenderer.ts +205 -41
- package/src/browser/renderer/dom/DomRendererRowFactory.ts +19 -13
- package/src/browser/renderer/dom/WidthCache.ts +54 -52
- package/src/browser/renderer/shared/Constants.ts +7 -0
- package/src/browser/renderer/shared/TextBlinkStateManager.ts +97 -0
- package/src/browser/renderer/shared/Types.ts +8 -2
- package/src/browser/scrollable/abstractScrollbar.ts +300 -0
- package/src/browser/scrollable/fastDomNode.ts +126 -0
- package/src/browser/scrollable/globalPointerMoveMonitor.ts +90 -0
- package/src/browser/scrollable/horizontalScrollbar.ts +85 -0
- package/src/browser/scrollable/mouseEvent.ts +292 -0
- package/src/browser/scrollable/scrollable.ts +486 -0
- package/src/browser/scrollable/scrollableElement.ts +579 -0
- package/src/browser/scrollable/scrollableElementOptions.ts +161 -0
- package/src/browser/scrollable/scrollbarArrow.ts +110 -0
- package/src/browser/scrollable/scrollbarState.ts +246 -0
- package/src/browser/scrollable/scrollbarVisibilityController.ts +113 -0
- package/src/browser/scrollable/touch.ts +485 -0
- package/src/browser/scrollable/verticalScrollbar.ts +143 -0
- package/src/browser/scrollable/widget.ts +23 -0
- package/src/browser/services/CharSizeService.ts +2 -2
- package/src/browser/services/CoreBrowserService.ts +7 -5
- package/src/browser/services/KeyboardService.ts +67 -0
- package/src/browser/services/LinkProviderService.ts +1 -1
- package/src/browser/services/MouseCoordsService.ts +47 -0
- package/src/browser/services/MouseService.ts +518 -25
- package/src/browser/services/RenderService.ts +22 -15
- package/src/browser/services/SelectionService.ts +16 -8
- package/src/browser/services/Services.ts +40 -17
- package/src/browser/services/ThemeService.ts +2 -2
- package/src/common/Async.ts +105 -0
- package/src/common/CircularList.ts +2 -2
- package/src/common/Color.ts +8 -0
- package/src/common/CoreTerminal.ts +28 -18
- package/src/common/Event.ts +118 -0
- package/src/common/InputHandler.ts +256 -36
- package/src/common/Lifecycle.ts +113 -0
- package/src/common/Platform.ts +13 -3
- package/src/common/SortedList.ts +7 -3
- package/src/common/TaskQueue.ts +14 -5
- package/src/common/Types.ts +35 -15
- package/src/common/Version.ts +9 -0
- package/src/common/buffer/Buffer.ts +20 -14
- package/src/common/buffer/BufferLine.ts +4 -5
- package/src/common/buffer/BufferSet.ts +7 -6
- package/src/common/buffer/CellData.ts +57 -0
- package/src/common/buffer/Marker.ts +2 -2
- package/src/common/buffer/Types.ts +6 -2
- package/src/common/data/EscapeSequences.ts +71 -70
- package/src/common/input/Keyboard.ts +14 -7
- package/src/common/input/KittyKeyboard.ts +519 -0
- package/src/common/input/Win32InputMode.ts +297 -0
- package/src/common/input/WriteBuffer.ts +34 -2
- package/src/common/input/XParseColor.ts +2 -2
- package/src/common/parser/ApcParser.ts +245 -0
- package/src/common/parser/Constants.ts +22 -4
- package/src/common/parser/DcsParser.ts +5 -5
- package/src/common/parser/EscapeSequenceParser.ts +158 -55
- package/src/common/parser/OscParser.ts +5 -5
- package/src/common/parser/Params.ts +13 -0
- package/src/common/parser/Types.ts +35 -1
- package/src/common/public/BufferLineApiView.ts +2 -2
- package/src/common/public/BufferNamespaceApi.ts +2 -2
- package/src/common/public/ParserApi.ts +3 -0
- package/src/common/services/BufferService.ts +8 -5
- package/src/common/services/CharsetService.ts +4 -0
- package/src/common/services/CoreService.ts +18 -4
- package/src/common/services/DecorationService.ts +24 -8
- package/src/common/services/LogService.ts +1 -31
- package/src/common/services/{CoreMouseService.ts → MouseStateService.ts} +21 -132
- package/src/common/services/OptionsService.ts +13 -4
- package/src/common/services/Services.ts +47 -40
- package/src/common/services/UnicodeService.ts +1 -1
- package/typings/xterm.d.ts +316 -32
- package/src/common/TypedArrayUtils.ts +0 -17
- package/src/vs/base/browser/browser.ts +0 -141
- package/src/vs/base/browser/canIUse.ts +0 -49
- package/src/vs/base/browser/dom.ts +0 -2369
- package/src/vs/base/browser/fastDomNode.ts +0 -316
- package/src/vs/base/browser/globalPointerMoveMonitor.ts +0 -112
- package/src/vs/base/browser/iframe.ts +0 -135
- package/src/vs/base/browser/keyboardEvent.ts +0 -213
- package/src/vs/base/browser/mouseEvent.ts +0 -229
- package/src/vs/base/browser/touch.ts +0 -372
- package/src/vs/base/browser/ui/scrollbar/abstractScrollbar.ts +0 -303
- package/src/vs/base/browser/ui/scrollbar/horizontalScrollbar.ts +0 -114
- package/src/vs/base/browser/ui/scrollbar/scrollableElement.ts +0 -720
- package/src/vs/base/browser/ui/scrollbar/scrollableElementOptions.ts +0 -165
- package/src/vs/base/browser/ui/scrollbar/scrollbarArrow.ts +0 -114
- package/src/vs/base/browser/ui/scrollbar/scrollbarState.ts +0 -243
- package/src/vs/base/browser/ui/scrollbar/scrollbarVisibilityController.ts +0 -118
- package/src/vs/base/browser/ui/scrollbar/verticalScrollbar.ts +0 -116
- package/src/vs/base/browser/ui/widget.ts +0 -57
- package/src/vs/base/browser/window.ts +0 -14
- package/src/vs/base/common/arrays.ts +0 -887
- package/src/vs/base/common/arraysFind.ts +0 -202
- package/src/vs/base/common/assert.ts +0 -71
- package/src/vs/base/common/async.ts +0 -1992
- package/src/vs/base/common/cancellation.ts +0 -148
- package/src/vs/base/common/charCode.ts +0 -450
- package/src/vs/base/common/collections.ts +0 -140
- package/src/vs/base/common/decorators.ts +0 -130
- package/src/vs/base/common/equals.ts +0 -146
- package/src/vs/base/common/errors.ts +0 -303
- package/src/vs/base/common/event.ts +0 -1778
- package/src/vs/base/common/functional.ts +0 -32
- package/src/vs/base/common/hash.ts +0 -316
- package/src/vs/base/common/iterator.ts +0 -159
- package/src/vs/base/common/keyCodes.ts +0 -526
- package/src/vs/base/common/keybindings.ts +0 -284
- package/src/vs/base/common/lazy.ts +0 -47
- package/src/vs/base/common/lifecycle.ts +0 -801
- package/src/vs/base/common/linkedList.ts +0 -142
- package/src/vs/base/common/map.ts +0 -202
- package/src/vs/base/common/numbers.ts +0 -98
- package/src/vs/base/common/observable.ts +0 -76
- package/src/vs/base/common/observableInternal/api.ts +0 -31
- package/src/vs/base/common/observableInternal/autorun.ts +0 -281
- package/src/vs/base/common/observableInternal/base.ts +0 -489
- package/src/vs/base/common/observableInternal/debugName.ts +0 -145
- package/src/vs/base/common/observableInternal/derived.ts +0 -428
- package/src/vs/base/common/observableInternal/lazyObservableValue.ts +0 -146
- package/src/vs/base/common/observableInternal/logging.ts +0 -328
- package/src/vs/base/common/observableInternal/promise.ts +0 -209
- package/src/vs/base/common/observableInternal/utils.ts +0 -610
- package/src/vs/base/common/platform.ts +0 -281
- package/src/vs/base/common/scrollable.ts +0 -522
- package/src/vs/base/common/sequence.ts +0 -34
- package/src/vs/base/common/stopwatch.ts +0 -43
- package/src/vs/base/common/strings.ts +0 -557
- package/src/vs/base/common/symbols.ts +0 -9
- package/src/vs/base/common/uint.ts +0 -59
- package/src/vs/patches/nls.ts +0 -90
- package/src/vs/typings/base-common.d.ts +0 -20
- package/src/vs/typings/require.d.ts +0 -42
- package/src/vs/typings/vscode-globals-nls.d.ts +0 -36
- package/src/vs/typings/vscode-globals-product.d.ts +0 -33
|
@@ -0,0 +1,486 @@
|
|
|
1
|
+
/*---------------------------------------------------------------------------------------------
|
|
2
|
+
* Copyright (c) Microsoft Corporation. All rights reserved.
|
|
3
|
+
* Licensed under the MIT License. See License.txt in the project root for license information.
|
|
4
|
+
*--------------------------------------------------------------------------------------------*/
|
|
5
|
+
|
|
6
|
+
import { Emitter, IEvent } from 'common/Event';
|
|
7
|
+
import { Disposable, IDisposable } from 'common/Lifecycle';
|
|
8
|
+
|
|
9
|
+
export const enum ScrollbarVisibility {
|
|
10
|
+
AUTO = 1,
|
|
11
|
+
HIDDEN = 2,
|
|
12
|
+
VISIBLE = 3
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
export interface IScrollEvent {
|
|
16
|
+
inSmoothScrolling: boolean;
|
|
17
|
+
|
|
18
|
+
oldWidth: number;
|
|
19
|
+
oldScrollWidth: number;
|
|
20
|
+
oldScrollLeft: number;
|
|
21
|
+
|
|
22
|
+
width: number;
|
|
23
|
+
scrollWidth: number;
|
|
24
|
+
scrollLeft: number;
|
|
25
|
+
|
|
26
|
+
oldHeight: number;
|
|
27
|
+
oldScrollHeight: number;
|
|
28
|
+
oldScrollTop: number;
|
|
29
|
+
|
|
30
|
+
height: number;
|
|
31
|
+
scrollHeight: number;
|
|
32
|
+
scrollTop: number;
|
|
33
|
+
|
|
34
|
+
widthChanged: boolean;
|
|
35
|
+
scrollWidthChanged: boolean;
|
|
36
|
+
scrollLeftChanged: boolean;
|
|
37
|
+
|
|
38
|
+
heightChanged: boolean;
|
|
39
|
+
scrollHeightChanged: boolean;
|
|
40
|
+
scrollTopChanged: boolean;
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
export class ScrollState implements IScrollDimensions, IScrollPosition {
|
|
44
|
+
private _scrollStateBrand: void = undefined;
|
|
45
|
+
|
|
46
|
+
public readonly rawScrollLeft: number;
|
|
47
|
+
public readonly rawScrollTop: number;
|
|
48
|
+
|
|
49
|
+
public readonly width: number;
|
|
50
|
+
public readonly scrollWidth: number;
|
|
51
|
+
public readonly scrollLeft: number;
|
|
52
|
+
public readonly height: number;
|
|
53
|
+
public readonly scrollHeight: number;
|
|
54
|
+
public readonly scrollTop: number;
|
|
55
|
+
|
|
56
|
+
constructor(
|
|
57
|
+
private readonly _forceIntegerValues: boolean,
|
|
58
|
+
width: number,
|
|
59
|
+
scrollWidth: number,
|
|
60
|
+
scrollLeft: number,
|
|
61
|
+
height: number,
|
|
62
|
+
scrollHeight: number,
|
|
63
|
+
scrollTop: number
|
|
64
|
+
) {
|
|
65
|
+
if (this._forceIntegerValues) {
|
|
66
|
+
width = width | 0;
|
|
67
|
+
scrollWidth = scrollWidth | 0;
|
|
68
|
+
scrollLeft = scrollLeft | 0;
|
|
69
|
+
height = height | 0;
|
|
70
|
+
scrollHeight = scrollHeight | 0;
|
|
71
|
+
scrollTop = scrollTop | 0;
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
this.rawScrollLeft = scrollLeft;
|
|
75
|
+
this.rawScrollTop = scrollTop;
|
|
76
|
+
|
|
77
|
+
if (width < 0) {
|
|
78
|
+
width = 0;
|
|
79
|
+
}
|
|
80
|
+
if (scrollLeft + width > scrollWidth) {
|
|
81
|
+
scrollLeft = scrollWidth - width;
|
|
82
|
+
}
|
|
83
|
+
if (scrollLeft < 0) {
|
|
84
|
+
scrollLeft = 0;
|
|
85
|
+
}
|
|
86
|
+
|
|
87
|
+
if (height < 0) {
|
|
88
|
+
height = 0;
|
|
89
|
+
}
|
|
90
|
+
if (scrollTop + height > scrollHeight) {
|
|
91
|
+
scrollTop = scrollHeight - height;
|
|
92
|
+
}
|
|
93
|
+
if (scrollTop < 0) {
|
|
94
|
+
scrollTop = 0;
|
|
95
|
+
}
|
|
96
|
+
|
|
97
|
+
this.width = width;
|
|
98
|
+
this.scrollWidth = scrollWidth;
|
|
99
|
+
this.scrollLeft = scrollLeft;
|
|
100
|
+
this.height = height;
|
|
101
|
+
this.scrollHeight = scrollHeight;
|
|
102
|
+
this.scrollTop = scrollTop;
|
|
103
|
+
}
|
|
104
|
+
|
|
105
|
+
public equals(other: ScrollState): boolean {
|
|
106
|
+
return (
|
|
107
|
+
this.rawScrollLeft === other.rawScrollLeft
|
|
108
|
+
&& this.rawScrollTop === other.rawScrollTop
|
|
109
|
+
&& this.width === other.width
|
|
110
|
+
&& this.scrollWidth === other.scrollWidth
|
|
111
|
+
&& this.scrollLeft === other.scrollLeft
|
|
112
|
+
&& this.height === other.height
|
|
113
|
+
&& this.scrollHeight === other.scrollHeight
|
|
114
|
+
&& this.scrollTop === other.scrollTop
|
|
115
|
+
);
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
public withScrollDimensions(update: INewScrollDimensions, useRawScrollPositions: boolean): ScrollState {
|
|
119
|
+
return new ScrollState(
|
|
120
|
+
this._forceIntegerValues,
|
|
121
|
+
(typeof update.width !== 'undefined' ? update.width : this.width),
|
|
122
|
+
(typeof update.scrollWidth !== 'undefined' ? update.scrollWidth : this.scrollWidth),
|
|
123
|
+
useRawScrollPositions ? this.rawScrollLeft : this.scrollLeft,
|
|
124
|
+
(typeof update.height !== 'undefined' ? update.height : this.height),
|
|
125
|
+
(typeof update.scrollHeight !== 'undefined' ? update.scrollHeight : this.scrollHeight),
|
|
126
|
+
useRawScrollPositions ? this.rawScrollTop : this.scrollTop
|
|
127
|
+
);
|
|
128
|
+
}
|
|
129
|
+
|
|
130
|
+
public withScrollPosition(update: INewScrollPosition): ScrollState {
|
|
131
|
+
return new ScrollState(
|
|
132
|
+
this._forceIntegerValues,
|
|
133
|
+
this.width,
|
|
134
|
+
this.scrollWidth,
|
|
135
|
+
(typeof update.scrollLeft !== 'undefined' ? update.scrollLeft : this.rawScrollLeft),
|
|
136
|
+
this.height,
|
|
137
|
+
this.scrollHeight,
|
|
138
|
+
(typeof update.scrollTop !== 'undefined' ? update.scrollTop : this.rawScrollTop)
|
|
139
|
+
);
|
|
140
|
+
}
|
|
141
|
+
|
|
142
|
+
public createScrollEvent(previous: ScrollState, inSmoothScrolling: boolean): IScrollEvent {
|
|
143
|
+
const widthChanged = (this.width !== previous.width);
|
|
144
|
+
const scrollWidthChanged = (this.scrollWidth !== previous.scrollWidth);
|
|
145
|
+
const scrollLeftChanged = (this.scrollLeft !== previous.scrollLeft);
|
|
146
|
+
|
|
147
|
+
const heightChanged = (this.height !== previous.height);
|
|
148
|
+
const scrollHeightChanged = (this.scrollHeight !== previous.scrollHeight);
|
|
149
|
+
const scrollTopChanged = (this.scrollTop !== previous.scrollTop);
|
|
150
|
+
|
|
151
|
+
return {
|
|
152
|
+
inSmoothScrolling: inSmoothScrolling,
|
|
153
|
+
oldWidth: previous.width,
|
|
154
|
+
oldScrollWidth: previous.scrollWidth,
|
|
155
|
+
oldScrollLeft: previous.scrollLeft,
|
|
156
|
+
|
|
157
|
+
width: this.width,
|
|
158
|
+
scrollWidth: this.scrollWidth,
|
|
159
|
+
scrollLeft: this.scrollLeft,
|
|
160
|
+
|
|
161
|
+
oldHeight: previous.height,
|
|
162
|
+
oldScrollHeight: previous.scrollHeight,
|
|
163
|
+
oldScrollTop: previous.scrollTop,
|
|
164
|
+
|
|
165
|
+
height: this.height,
|
|
166
|
+
scrollHeight: this.scrollHeight,
|
|
167
|
+
scrollTop: this.scrollTop,
|
|
168
|
+
|
|
169
|
+
widthChanged: widthChanged,
|
|
170
|
+
scrollWidthChanged: scrollWidthChanged,
|
|
171
|
+
scrollLeftChanged: scrollLeftChanged,
|
|
172
|
+
|
|
173
|
+
heightChanged: heightChanged,
|
|
174
|
+
scrollHeightChanged: scrollHeightChanged,
|
|
175
|
+
scrollTopChanged: scrollTopChanged,
|
|
176
|
+
};
|
|
177
|
+
}
|
|
178
|
+
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
export interface IScrollDimensions {
|
|
182
|
+
readonly width: number;
|
|
183
|
+
readonly scrollWidth: number;
|
|
184
|
+
readonly height: number;
|
|
185
|
+
readonly scrollHeight: number;
|
|
186
|
+
}
|
|
187
|
+
export interface INewScrollDimensions {
|
|
188
|
+
width?: number;
|
|
189
|
+
scrollWidth?: number;
|
|
190
|
+
height?: number;
|
|
191
|
+
scrollHeight?: number;
|
|
192
|
+
}
|
|
193
|
+
|
|
194
|
+
export interface IScrollPosition {
|
|
195
|
+
readonly scrollLeft: number;
|
|
196
|
+
readonly scrollTop: number;
|
|
197
|
+
}
|
|
198
|
+
export interface ISmoothScrollPosition {
|
|
199
|
+
readonly scrollLeft: number;
|
|
200
|
+
readonly scrollTop: number;
|
|
201
|
+
|
|
202
|
+
readonly width: number;
|
|
203
|
+
readonly height: number;
|
|
204
|
+
}
|
|
205
|
+
export interface INewScrollPosition {
|
|
206
|
+
scrollLeft?: number;
|
|
207
|
+
scrollTop?: number;
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
export interface IScrollableOptions {
|
|
211
|
+
forceIntegerValues: boolean;
|
|
212
|
+
smoothScrollDuration: number;
|
|
213
|
+
scheduleAtNextAnimationFrame: (callback: () => void) => IDisposable;
|
|
214
|
+
}
|
|
215
|
+
|
|
216
|
+
export class Scrollable extends Disposable {
|
|
217
|
+
|
|
218
|
+
private _scrollableBrand: void = undefined;
|
|
219
|
+
|
|
220
|
+
private _smoothScrollDuration: number;
|
|
221
|
+
private readonly _scheduleAtNextAnimationFrame: (callback: () => void) => IDisposable;
|
|
222
|
+
private _state: ScrollState;
|
|
223
|
+
private _smoothScrolling: SmoothScrollingOperation | null;
|
|
224
|
+
|
|
225
|
+
private _onScroll = this._register(new Emitter<IScrollEvent>());
|
|
226
|
+
public readonly onScroll: IEvent<IScrollEvent> = this._onScroll.event;
|
|
227
|
+
|
|
228
|
+
constructor(options: IScrollableOptions) {
|
|
229
|
+
super();
|
|
230
|
+
|
|
231
|
+
this._smoothScrollDuration = options.smoothScrollDuration;
|
|
232
|
+
this._scheduleAtNextAnimationFrame = options.scheduleAtNextAnimationFrame;
|
|
233
|
+
this._state = new ScrollState(options.forceIntegerValues, 0, 0, 0, 0, 0, 0);
|
|
234
|
+
this._smoothScrolling = null;
|
|
235
|
+
}
|
|
236
|
+
|
|
237
|
+
public override dispose(): void {
|
|
238
|
+
if (this._smoothScrolling) {
|
|
239
|
+
this._smoothScrolling.dispose();
|
|
240
|
+
this._smoothScrolling = null;
|
|
241
|
+
}
|
|
242
|
+
super.dispose();
|
|
243
|
+
}
|
|
244
|
+
|
|
245
|
+
public setSmoothScrollDuration(smoothScrollDuration: number): void {
|
|
246
|
+
this._smoothScrollDuration = smoothScrollDuration;
|
|
247
|
+
}
|
|
248
|
+
|
|
249
|
+
public validateScrollPosition(scrollPosition: INewScrollPosition): IScrollPosition {
|
|
250
|
+
return this._state.withScrollPosition(scrollPosition);
|
|
251
|
+
}
|
|
252
|
+
|
|
253
|
+
public getScrollDimensions(): IScrollDimensions {
|
|
254
|
+
return this._state;
|
|
255
|
+
}
|
|
256
|
+
|
|
257
|
+
public setScrollDimensions(dimensions: INewScrollDimensions, useRawScrollPositions: boolean): void {
|
|
258
|
+
const newState = this._state.withScrollDimensions(dimensions, useRawScrollPositions);
|
|
259
|
+
this._setState(newState, Boolean(this._smoothScrolling));
|
|
260
|
+
|
|
261
|
+
this._smoothScrolling?.acceptScrollDimensions(this._state);
|
|
262
|
+
}
|
|
263
|
+
|
|
264
|
+
public getFutureScrollPosition(): IScrollPosition {
|
|
265
|
+
if (this._smoothScrolling) {
|
|
266
|
+
return this._smoothScrolling.to;
|
|
267
|
+
}
|
|
268
|
+
return this._state;
|
|
269
|
+
}
|
|
270
|
+
|
|
271
|
+
public getCurrentScrollPosition(): IScrollPosition {
|
|
272
|
+
return this._state;
|
|
273
|
+
}
|
|
274
|
+
|
|
275
|
+
public setScrollPositionNow(update: INewScrollPosition): void {
|
|
276
|
+
const newState = this._state.withScrollPosition(update);
|
|
277
|
+
|
|
278
|
+
if (this._smoothScrolling) {
|
|
279
|
+
this._smoothScrolling.dispose();
|
|
280
|
+
this._smoothScrolling = null;
|
|
281
|
+
}
|
|
282
|
+
|
|
283
|
+
this._setState(newState, false);
|
|
284
|
+
}
|
|
285
|
+
|
|
286
|
+
public setScrollPositionSmooth(update: INewScrollPosition, reuseAnimation?: boolean): void {
|
|
287
|
+
if (this._smoothScrollDuration === 0) {
|
|
288
|
+
this.setScrollPositionNow(update); return;
|
|
289
|
+
}
|
|
290
|
+
|
|
291
|
+
if (this._smoothScrolling) {
|
|
292
|
+
update = {
|
|
293
|
+
scrollLeft: (typeof update.scrollLeft === 'undefined' ? this._smoothScrolling.to.scrollLeft : update.scrollLeft),
|
|
294
|
+
scrollTop: (typeof update.scrollTop === 'undefined' ? this._smoothScrolling.to.scrollTop : update.scrollTop)
|
|
295
|
+
};
|
|
296
|
+
|
|
297
|
+
const validTarget = this._state.withScrollPosition(update);
|
|
298
|
+
|
|
299
|
+
if (this._smoothScrolling.to.scrollLeft === validTarget.scrollLeft && this._smoothScrolling.to.scrollTop === validTarget.scrollTop) {
|
|
300
|
+
return;
|
|
301
|
+
}
|
|
302
|
+
let newSmoothScrolling: SmoothScrollingOperation;
|
|
303
|
+
if (reuseAnimation) {
|
|
304
|
+
newSmoothScrolling = new SmoothScrollingOperation(this._smoothScrolling.from, validTarget, this._smoothScrolling.startTime, this._smoothScrolling.duration);
|
|
305
|
+
} else {
|
|
306
|
+
newSmoothScrolling = SmoothScrollingOperation.start(this._state, validTarget, this._smoothScrollDuration);
|
|
307
|
+
}
|
|
308
|
+
this._smoothScrolling.dispose();
|
|
309
|
+
this._smoothScrolling = newSmoothScrolling;
|
|
310
|
+
} else {
|
|
311
|
+
const validTarget = this._state.withScrollPosition(update);
|
|
312
|
+
|
|
313
|
+
this._smoothScrolling = SmoothScrollingOperation.start(this._state, validTarget, this._smoothScrollDuration);
|
|
314
|
+
}
|
|
315
|
+
|
|
316
|
+
this._smoothScrolling.animationFrameDisposable = this._scheduleAtNextAnimationFrame(() => {
|
|
317
|
+
if (!this._smoothScrolling) {
|
|
318
|
+
return;
|
|
319
|
+
}
|
|
320
|
+
this._smoothScrolling.animationFrameDisposable = null;
|
|
321
|
+
this._performSmoothScrolling();
|
|
322
|
+
});
|
|
323
|
+
}
|
|
324
|
+
|
|
325
|
+
public hasPendingScrollAnimation(): boolean {
|
|
326
|
+
return Boolean(this._smoothScrolling);
|
|
327
|
+
}
|
|
328
|
+
|
|
329
|
+
private _performSmoothScrolling(): void {
|
|
330
|
+
if (!this._smoothScrolling) {
|
|
331
|
+
return;
|
|
332
|
+
}
|
|
333
|
+
const update = this._smoothScrolling.tick();
|
|
334
|
+
const newState = this._state.withScrollPosition(update);
|
|
335
|
+
|
|
336
|
+
this._setState(newState, true);
|
|
337
|
+
|
|
338
|
+
if (!this._smoothScrolling) {
|
|
339
|
+
return;
|
|
340
|
+
}
|
|
341
|
+
|
|
342
|
+
if (update.isDone) {
|
|
343
|
+
this._smoothScrolling.dispose();
|
|
344
|
+
this._smoothScrolling = null;
|
|
345
|
+
return;
|
|
346
|
+
}
|
|
347
|
+
|
|
348
|
+
this._smoothScrolling.animationFrameDisposable = this._scheduleAtNextAnimationFrame(() => {
|
|
349
|
+
if (!this._smoothScrolling) {
|
|
350
|
+
return;
|
|
351
|
+
}
|
|
352
|
+
this._smoothScrolling.animationFrameDisposable = null;
|
|
353
|
+
this._performSmoothScrolling();
|
|
354
|
+
});
|
|
355
|
+
}
|
|
356
|
+
|
|
357
|
+
private _setState(newState: ScrollState, inSmoothScrolling: boolean): void {
|
|
358
|
+
const oldState = this._state;
|
|
359
|
+
if (oldState.equals(newState)) {
|
|
360
|
+
return;
|
|
361
|
+
}
|
|
362
|
+
this._state = newState;
|
|
363
|
+
this._onScroll.fire(this._state.createScrollEvent(oldState, inSmoothScrolling));
|
|
364
|
+
}
|
|
365
|
+
}
|
|
366
|
+
|
|
367
|
+
class SmoothScrollingUpdate {
|
|
368
|
+
|
|
369
|
+
public readonly scrollLeft: number;
|
|
370
|
+
public readonly scrollTop: number;
|
|
371
|
+
public readonly isDone: boolean;
|
|
372
|
+
|
|
373
|
+
constructor(scrollLeft: number, scrollTop: number, isDone: boolean) {
|
|
374
|
+
this.scrollLeft = scrollLeft;
|
|
375
|
+
this.scrollTop = scrollTop;
|
|
376
|
+
this.isDone = isDone;
|
|
377
|
+
}
|
|
378
|
+
|
|
379
|
+
}
|
|
380
|
+
|
|
381
|
+
interface IAnimation {
|
|
382
|
+
(completion: number): number;
|
|
383
|
+
}
|
|
384
|
+
|
|
385
|
+
function createEaseOutCubic(from: number, to: number): IAnimation {
|
|
386
|
+
const delta = to - from;
|
|
387
|
+
return function (completion: number): number {
|
|
388
|
+
return from + delta * easeOutCubic(completion);
|
|
389
|
+
};
|
|
390
|
+
}
|
|
391
|
+
|
|
392
|
+
function createComposed(a: IAnimation, b: IAnimation, cut: number): IAnimation {
|
|
393
|
+
return function (completion: number): number {
|
|
394
|
+
if (completion < cut) {
|
|
395
|
+
return a(completion / cut);
|
|
396
|
+
}
|
|
397
|
+
return b((completion - cut) / (1 - cut));
|
|
398
|
+
};
|
|
399
|
+
}
|
|
400
|
+
|
|
401
|
+
class SmoothScrollingOperation {
|
|
402
|
+
|
|
403
|
+
public readonly from: ISmoothScrollPosition;
|
|
404
|
+
public to: ISmoothScrollPosition;
|
|
405
|
+
public readonly duration: number;
|
|
406
|
+
public readonly startTime: number;
|
|
407
|
+
public animationFrameDisposable: IDisposable | null;
|
|
408
|
+
|
|
409
|
+
private _scrollLeft!: IAnimation;
|
|
410
|
+
private _scrollTop!: IAnimation;
|
|
411
|
+
|
|
412
|
+
constructor(from: ISmoothScrollPosition, to: ISmoothScrollPosition, startTime: number, duration: number) {
|
|
413
|
+
this.from = from;
|
|
414
|
+
this.to = to;
|
|
415
|
+
this.duration = duration;
|
|
416
|
+
this.startTime = startTime;
|
|
417
|
+
|
|
418
|
+
this.animationFrameDisposable = null;
|
|
419
|
+
|
|
420
|
+
this._initAnimations();
|
|
421
|
+
}
|
|
422
|
+
|
|
423
|
+
private _initAnimations(): void {
|
|
424
|
+
this._scrollLeft = this._initAnimation(this.from.scrollLeft, this.to.scrollLeft, this.to.width);
|
|
425
|
+
this._scrollTop = this._initAnimation(this.from.scrollTop, this.to.scrollTop, this.to.height);
|
|
426
|
+
}
|
|
427
|
+
|
|
428
|
+
private _initAnimation(from: number, to: number, viewportSize: number): IAnimation {
|
|
429
|
+
const delta = Math.abs(from - to);
|
|
430
|
+
if (delta > 2.5 * viewportSize) {
|
|
431
|
+
let stop1: number; let stop2: number;
|
|
432
|
+
if (from < to) {
|
|
433
|
+
stop1 = from + 0.75 * viewportSize;
|
|
434
|
+
stop2 = to - 0.75 * viewportSize;
|
|
435
|
+
} else {
|
|
436
|
+
stop1 = from - 0.75 * viewportSize;
|
|
437
|
+
stop2 = to + 0.75 * viewportSize;
|
|
438
|
+
}
|
|
439
|
+
return createComposed(createEaseOutCubic(from, stop1), createEaseOutCubic(stop2, to), 0.33);
|
|
440
|
+
}
|
|
441
|
+
return createEaseOutCubic(from, to);
|
|
442
|
+
}
|
|
443
|
+
|
|
444
|
+
public dispose(): void {
|
|
445
|
+
if (this.animationFrameDisposable !== null) {
|
|
446
|
+
this.animationFrameDisposable.dispose();
|
|
447
|
+
this.animationFrameDisposable = null;
|
|
448
|
+
}
|
|
449
|
+
}
|
|
450
|
+
|
|
451
|
+
public acceptScrollDimensions(state: ScrollState): void {
|
|
452
|
+
this.to = state.withScrollPosition(this.to);
|
|
453
|
+
this._initAnimations();
|
|
454
|
+
}
|
|
455
|
+
|
|
456
|
+
public tick(): SmoothScrollingUpdate {
|
|
457
|
+
return this._tick(Date.now());
|
|
458
|
+
}
|
|
459
|
+
|
|
460
|
+
protected _tick(now: number): SmoothScrollingUpdate {
|
|
461
|
+
const completion = (now - this.startTime) / this.duration;
|
|
462
|
+
|
|
463
|
+
if (completion < 1) {
|
|
464
|
+
const newScrollLeft = this._scrollLeft(completion);
|
|
465
|
+
const newScrollTop = this._scrollTop(completion);
|
|
466
|
+
return new SmoothScrollingUpdate(newScrollLeft, newScrollTop, false);
|
|
467
|
+
}
|
|
468
|
+
|
|
469
|
+
return new SmoothScrollingUpdate(this.to.scrollLeft, this.to.scrollTop, true);
|
|
470
|
+
}
|
|
471
|
+
|
|
472
|
+
public static start(from: ISmoothScrollPosition, to: ISmoothScrollPosition, duration: number): SmoothScrollingOperation {
|
|
473
|
+
duration = duration + 10;
|
|
474
|
+
const startTime = Date.now() - 10;
|
|
475
|
+
|
|
476
|
+
return new SmoothScrollingOperation(from, to, startTime, duration);
|
|
477
|
+
}
|
|
478
|
+
}
|
|
479
|
+
|
|
480
|
+
function easeInCubic(t: number): number {
|
|
481
|
+
return Math.pow(t, 3);
|
|
482
|
+
}
|
|
483
|
+
|
|
484
|
+
function easeOutCubic(t: number): number {
|
|
485
|
+
return 1 - easeInCubic(1 - t);
|
|
486
|
+
}
|