From 6864f2b5a7e1b9ec5a8754b3703d6a31c94a193b Mon Sep 17 00:00:00 2001 From: sawka Date: Sun, 17 Sep 2023 14:14:51 -0700 Subject: [PATCH] bump xterm.js version to v5.3.0 (perf improvements) --- package.json | 4 ++-- static/xterm.css | 22 ++++++++++++++++++++-- yarn.lock | 6 +++--- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index f4d4d436..e4639e2a 100644 --- a/package.json +++ b/package.json @@ -61,14 +61,14 @@ "lodash-webpack-plugin": "^0.11.6", "mini-css-extract-plugin": "^2.6.0", "prettier": "^2.8.8", + "react-split-it": "^2.0.0", "style-loader": "^3.3.1", "typescript": "^4.7.3", "webpack": "^5.73.0", "webpack-bundle-analyzer": "^4.5.0", "webpack-cli": "^4.9.2", "webpack-dev-server": "^4.9.1", - "webpack-merge": "^5.8.0", - "react-split-it": "^2.0.0" + "webpack-merge": "^5.8.0" }, "scripts": { "start": "electron-forge start", diff --git a/static/xterm.css b/static/xterm.css index 9471e1eb..74acc267 100644 --- a/static/xterm.css +++ b/static/xterm.css @@ -146,8 +146,10 @@ left: 0; top: 0; bottom: 0; + right: 0; z-index: 10; color: transparent; + pointer-events: none; } .xterm .live-region { @@ -159,7 +161,9 @@ } .xterm-dim { - opacity: 0.5; + /* Dim should not apply to background, so the opacity of the foreground color is applied + * explicitly in the generated class and reset to 1 here */ + opacity: 1 !important; } .xterm-underline-1 { text-decoration: underline; } @@ -168,6 +172,16 @@ .xterm-underline-4 { text-decoration: dotted underline; } .xterm-underline-5 { text-decoration: dashed underline; } +.xterm-overline { + text-decoration: overline; +} + +.xterm-overline.xterm-underline-1 { text-decoration: overline underline; } +.xterm-overline.xterm-underline-2 { text-decoration: overline double underline; } +.xterm-overline.xterm-underline-3 { text-decoration: overline wavy underline; } +.xterm-overline.xterm-underline-4 { text-decoration: overline dotted underline; } +.xterm-overline.xterm-underline-5 { text-decoration: overline dashed underline; } + .xterm-strikethrough { text-decoration: line-through; } @@ -177,8 +191,12 @@ position: absolute; } +.xterm-screen .xterm-decoration-container .xterm-decoration.xterm-decoration-top-layer { + z-index: 7; +} + .xterm-decoration-overview-ruler { - z-index: 7; + z-index: 8; position: absolute; top: 0; right: 0; diff --git a/yarn.lock b/yarn.lock index 1953574f..75f9a709 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7946,9 +7946,9 @@ xmlbuilder@^15.1.1: integrity sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg== xterm@^5.0.0: - version "5.2.1" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.2.1.tgz#b3fea7bdb55b9be1d4b31f4cd1091f26ac42afb8" - integrity sha512-cs5Y1fFevgcdoh2hJROMVIWwoBHD80P1fIP79gopLHJIE4kTzzblanoivxTiQ4+92YM9IxS36H1q0MxIJXQBcA== + version "5.3.0" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-5.3.0.tgz#867daf9cc826f3d45b5377320aabd996cb0fce46" + integrity sha512-8QqjlekLUFTrU6x7xck1MsPzPA571K5zNqWm0M0oroYEWVOptZ0+ubQSkQ3uxIEhcIHRujJy6emDWX4A7qyFzg== y18n@^4.0.0: version "4.0.3"