diff --git a/package.json b/package.json index 5e0ba35208a..3a8978e3d3a 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "vscode-ripgrep": "^1.5.7", "vscode-sqlite3": "4.0.8", "vscode-textmate": "^4.2.2", - "xterm": "4.2.0-beta8", + "xterm": "4.2.0-beta10", "xterm-addon-search": "0.3.0-beta5", "xterm-addon-web-links": "0.2.0", "yauzl": "^2.9.2", diff --git a/remote/package.json b/remote/package.json index 6e3b3bc822d..c3bb2f25592 100644 --- a/remote/package.json +++ b/remote/package.json @@ -20,7 +20,7 @@ "vscode-proxy-agent": "0.4.0", "vscode-ripgrep": "^1.5.7", "vscode-textmate": "^4.2.2", - "xterm": "4.2.0-beta8", + "xterm": "4.2.0-beta10", "xterm-addon-search": "0.3.0-beta5", "xterm-addon-web-links": "0.2.0", "yauzl": "^2.9.2", diff --git a/remote/web/package.json b/remote/web/package.json index c588cd9db32..43bc35f457c 100644 --- a/remote/web/package.json +++ b/remote/web/package.json @@ -5,7 +5,7 @@ "onigasm-umd": "^2.2.2", "semver-umd": "^5.5.3", "vscode-textmate": "^4.2.2", - "xterm": "4.2.0-beta8", + "xterm": "4.2.0-beta10", "xterm-addon-search": "0.3.0-beta5", "xterm-addon-web-links": "0.2.0" } diff --git a/remote/web/yarn.lock b/remote/web/yarn.lock index 36e92301303..e39020e3633 100644 --- a/remote/web/yarn.lock +++ b/remote/web/yarn.lock @@ -41,7 +41,7 @@ xterm-addon-web-links@0.2.0: resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.2.0.tgz#b408a0be46211d8d4a0bb5e701d8f3c2bd07d473" integrity sha512-dq81c4Pzli2PgKVBgY2REte9sCVibR3df8AP3SEvCTM9uYFnUFxtxzMTplPnc7+rXabVhFdbU6x+rstIk8HNQg== -xterm@4.2.0-beta8: - version "4.2.0-beta8" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.2.0-beta8.tgz#f375cfef7d58240c56ba23c8ca1c36399ab7ccb1" - integrity sha512-oka51TIzcmxwpJaoV180bkynYiMW2H0rN7J9gehofEFFX7nHRxIh/tm9EzUEA8I9ELYB91a9TQc7V1PQSN+Mlw== +xterm@4.2.0-beta10: + version "4.2.0-beta10" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.2.0-beta10.tgz#28573392d2b3168e71dac15d8916248c2084532e" + integrity sha512-UUJ+qYBfV+dlEw9fUrGD9ZY6vy2BBpSICrvFU9/f3Z1Od1TXUO431AB00lr/2N6IdFfH35FHTMHXXxsxFD4k9A== diff --git a/remote/yarn.lock b/remote/yarn.lock index 27b5857a25c..2af12fb3fdb 100644 --- a/remote/yarn.lock +++ b/remote/yarn.lock @@ -421,10 +421,10 @@ xterm-addon-web-links@0.2.0: resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.2.0.tgz#b408a0be46211d8d4a0bb5e701d8f3c2bd07d473" integrity sha512-dq81c4Pzli2PgKVBgY2REte9sCVibR3df8AP3SEvCTM9uYFnUFxtxzMTplPnc7+rXabVhFdbU6x+rstIk8HNQg== -xterm@4.2.0-beta8: - version "4.2.0-beta8" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.2.0-beta8.tgz#f375cfef7d58240c56ba23c8ca1c36399ab7ccb1" - integrity sha512-oka51TIzcmxwpJaoV180bkynYiMW2H0rN7J9gehofEFFX7nHRxIh/tm9EzUEA8I9ELYB91a9TQc7V1PQSN+Mlw== +xterm@4.2.0-beta10: + version "4.2.0-beta10" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.2.0-beta10.tgz#28573392d2b3168e71dac15d8916248c2084532e" + integrity sha512-UUJ+qYBfV+dlEw9fUrGD9ZY6vy2BBpSICrvFU9/f3Z1Od1TXUO431AB00lr/2N6IdFfH35FHTMHXXxsxFD4k9A== yauzl@^2.9.2: version "2.10.0" diff --git a/src/typings/xterm.d.ts b/src/typings/xterm.d.ts index e7b8a156283..3cf935a0ed1 100644 --- a/src/typings/xterm.d.ts +++ b/src/typings/xterm.d.ts @@ -82,6 +82,16 @@ declare module 'xterm' { */ drawBoldTextInBrightColors?: boolean; + /** + * The modifier key hold to multiply scroll speed. + */ + fastScrollModifier?: 'alt' | 'ctrl' | 'shift' | undefined; + + /** + * The scroll speed multiplier used for fast scrolling. + */ + fastScrollSensitivity?: number; + /** * The font size used to render text. */ @@ -352,12 +362,12 @@ declare module 'xterm' { /** * The element containing the terminal. */ - readonly element: HTMLElement; + readonly element: HTMLElement | undefined; /** * The textarea that accepts input for the terminal. */ - readonly textarea: HTMLTextAreaElement; + readonly textarea: HTMLTextAreaElement | undefined; /** * The number of rows in the terminal's viewport. Use diff --git a/yarn.lock b/yarn.lock index 269c7073360..a5f8f9b585b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9276,10 +9276,10 @@ xterm-addon-web-links@0.2.0: resolved "https://registry.yarnpkg.com/xterm-addon-web-links/-/xterm-addon-web-links-0.2.0.tgz#b408a0be46211d8d4a0bb5e701d8f3c2bd07d473" integrity sha512-dq81c4Pzli2PgKVBgY2REte9sCVibR3df8AP3SEvCTM9uYFnUFxtxzMTplPnc7+rXabVhFdbU6x+rstIk8HNQg== -xterm@4.2.0-beta8: - version "4.2.0-beta8" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.2.0-beta8.tgz#f375cfef7d58240c56ba23c8ca1c36399ab7ccb1" - integrity sha512-oka51TIzcmxwpJaoV180bkynYiMW2H0rN7J9gehofEFFX7nHRxIh/tm9EzUEA8I9ELYB91a9TQc7V1PQSN+Mlw== +xterm@4.2.0-beta10: + version "4.2.0-beta10" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.2.0-beta10.tgz#28573392d2b3168e71dac15d8916248c2084532e" + integrity sha512-UUJ+qYBfV+dlEw9fUrGD9ZY6vy2BBpSICrvFU9/f3Z1Od1TXUO431AB00lr/2N6IdFfH35FHTMHXXxsxFD4k9A== y18n@^3.2.1: version "3.2.1"