Update to GLSP-Client 2.1.0 & enable accessibility features (#154)

* Add requires to feature modules with their respective modules * Enable accessibility features * Update GLSP to 2.1.0
borkdominik · Feb 13, 2024 · b2fc87b · b2fc87b
1 parent 92c5ab7
commit b2fc87b
Show file tree

Hide file tree

Showing 21 changed files with 854 additions and 120 deletions.
diff --git a/client/package.json b/client/package.json
@@ -28,10 +28,10 @@
     "watch": "lerna run --parallel watch"
   },
   "resolutions": {
-    "**/@eclipse-glsp/client": "2.0.0",
-    "**/@eclipse-glsp/protocol": "2.0.0",
-    "**/@eclipse-glsp/vscode-integration": "2.0.0",
-    "**/@eclipse-glsp/vscode-integration-webview": "2.0.0",
+    "**/@eclipse-glsp/client": "2.1.0",
+    "**/@eclipse-glsp/protocol": "2.1.0",
+    "**/@eclipse-glsp/vscode-integration": "2.1.0",
+    "**/@eclipse-glsp/vscode-integration-webview": "2.1.0",
     "**/inversify": "6.0.1",
     "**/vscode-jsonrpc": "8.1.0"
   },

diff --git a/client/packages/uml-glsp/css/common.css b/client/packages/uml-glsp/css/common.css
@@ -19,7 +19,7 @@
     background-repeat: no-repeat;
 }
 
-.umlimg {
+.uml-icon {
     background-size: 16px 16px;
     height: 16px;
     width: 16px;

diff --git a/client/packages/uml-glsp/css/extensions/uml-toast.css b/client/packages/uml-glsp/css/extensions/uml-toast.css
@@ -0,0 +1,5 @@
+.uml-theme .toast-container {
+    background: var(--uml-notifications-background);
+    color: var(--uml-notifications-foreground);
+    border: 1px solid var(--uml-notifications-border);
+}
diff --git a/client/packages/uml-glsp/css/extensions/uml-tool-palette.css b/client/packages/uml-glsp/css/extensions/uml-tool-palette.css
@@ -1,3 +1,22 @@
+/* Reset until accessibility supports integrations */
+.uml-theme .accessibility-tool-palette .header-tools i {
+    margin: 0;
+}
+
+.uml-theme .accessibility-tool-palette .header-tools .key-shortcut {
+    top: 0;
+    right: 0;
+}
+
+.uml-theme .accessibility-tool-palette .tool-button .key-shortcut {
+    left: 0;
+}
+
+.uml-theme .accessibility-tool-palette .tool-button .key-shortcut,
+.uml-theme .accessibility-tool-palette .header-tools .key-shortcut {
+    position: relative;
+}
+
 /* Override */
 .uml-theme .tool-palette {
     max-height: 80%;
@@ -11,11 +30,33 @@
     overflow: visible;
 }
 
-.uml-theme .tool-palette .palette-body {
+.uml-theme .tool-palette .palette-header .header-tools .uml-theme .tool-palette .palette-body {
     overflow-y: auto;
     height: 100%;
 }
 
-.uml-theme .uml-tool-button {
+.uml-theme .tool-palette .palette-body {
+    overflow: auto;
+}
+
+.uml-theme .tool-button {
+    display: flex;
+}
+
+.uml-theme .accessibility-tool-palette .tool-button .key-shortcut,
+.uml-theme .accessibility-tool-palette .header-tools .key-shortcut {
+    background: var(--uml-editor-background);
+    color: var(--uml-editor-foreground);
+    border: 1px solid var(--uml-widget-border);
+}
+
+.uml-theme .accessibility-tool-palette .tool-button .key-shortcut {
+    margin-right: 4px;
+}
+
+.uml-theme .accessibility-tool-palette .header-tools > div {
     display: flex;
+    flex-direction: column;
+    align-items: center;
+    margin-right: 4px;
 }
diff --git a/client/packages/uml-glsp/css/style.css b/client/packages/uml-glsp/css/style.css
@@ -20,6 +20,7 @@
 @import 'extensions/uml-tool-palette.css';
 @import 'extensions/uml-editor-panel.css';
 @import 'extensions/uml-property-palette.css';
+@import 'extensions/uml-toast.css';
 @import 'extensions/shift-tool.css';
 
 @import 'diagram/package/style.css';