fix: xterm alt buffer mode behaves oddly for clients that do not enab…

…le splitTerminals Fixes #5003
kubernetes-sigs · Jun 26, 2020 · ef48aab · ef48aab
1 parent 7e714dd
commit ef48aab
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/plugins/plugin-bash-like/src/pty/client.ts b/plugins/plugin-bash-like/src/pty/client.ts
@@ -53,7 +53,7 @@ const exitAltBufferPattern = /\x1b\[\??(47|1047|1049)l/
 
 import copy from './copy'
 
-import '../../web/css/static/xterm.css'
+import '../../web/scss/xterm.scss'
 
 interface Size {
   resizeGeneration: number

diff --git a/...plugin-bash-like/web/css/static/xterm.css → plugins/plugin-bash-like/web/scss/xterm.scss b/...plugin-bash-like/web/css/static/xterm.css → plugins/plugin-bash-like/web/scss/xterm.scss
@@ -39,8 +39,8 @@ disabled see https://github.com/IBM/kui/issues/3939
     height: auto !important;
   }
 
-  /* alt buffer mode */
-  .xterm-alt-buffer-mode {
+/* alt buffer mode */
+  &.xterm-alt-buffer-mode, .xterm-alt-buffer-mode { /* no-splitTerminal and splitTerminal variants */
     .xterm-container .xterm-rows.xterm-focus .xterm-cursor.xterm-cursor-block {
       background-color: var(--color-base08);
       color: var(--color-base00);

diff --git a/plugins/plugin-kubectl/web/scss/components/Terminal/Terminal.scss b/plugins/plugin-kubectl/web/scss/components/Terminal/Terminal.scss
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-@import '~@kui-shell/plugin-bash-like/web/css/static/xterm.css';
+@import '~@kui-shell/plugin-bash-like/web/scss/xterm';
 
 .kui--terminal[data-needs-hysteresis='true'][data-got-some-data='false'] .xterm {
   opacity: 0;