Table: enable copy key stroke even if table is disabledfeatures/cgu/poc_table_copy_key_stroke_229591_11_0

229591

5 files changed, 10 insertions, 4 deletions

diff --git a/eclipse-scout-core/src/form/fields/tablefield/TableField.less b/eclipse-scout-core/src/form/fields/tablefield/TableField.less
index 38e0fdf76d..bc9d3e01d4 100644
--- a/eclipse-scout-core/src/form/fields/tablefield/TableField.less
+++ b/eclipse-scout-core/src/form/fields/tablefield/TableField.less
@@ -23,7 +23,11 @@
       border-radius: @control-alternative-border-radius;
     }
 
-    &:focus,
+    &:focus {
+      outline: none;
+    }
+
+    &:not(.disabled):focus,
     &.focused {
       #scout.focus-border();
     }
diff --git a/eclipse-scout-core/src/keystroke/KeyStroke.js b/eclipse-scout-core/src/keystroke/KeyStroke.js
index 706d93f8a3..0ba8e6ee38 100644
--- a/eclipse-scout-core/src/keystroke/KeyStroke.js
+++ b/eclipse-scout-core/src/keystroke/KeyStroke.js
@@ -18,6 +18,7 @@ export default class KeyStroke {
 
     this.which = []; // keys which this keystroke is bound to. Typically, this is a single key, but may be multiple keys if handling the same action (e.g. ENTER and SPACE on a button).
     this.ctrl = false;
+    this.checkEnabled = true;
     this.alt = false;
     this.shift = false;
     this.preventDefault = true;
@@ -139,7 +140,7 @@ export default class KeyStroke {
         return false;
       }
       // Check enabled state
-      if (this.field.enabled !== undefined && !this.field.enabled) {
+      if (this.checkEnabled && this.field.enabled !== undefined && !this.field.enabled) {
         return false;
       }
     }
diff --git a/eclipse-scout-core/src/table/Table.js b/eclipse-scout-core/src/table/Table.js
index b900ebbfcf..287997edc3 100644
--- a/eclipse-scout-core/src/table/Table.js
+++ b/eclipse-scout-core/src/table/Table.js
@@ -4679,7 +4679,7 @@ export default class Table extends Widget {
       this.$data.setEnabled(enabled);
     }
 
-    this.$container.setTabbable(enabled);
+    this.$container.attr('tabIndex', enabled ? 0 : -1);
 
     if (this._isDataRendered()) {
       // Enable/disable all checkboxes
diff --git a/eclipse-scout-core/src/table/Table.less b/eclipse-scout-core/src/table/Table.less
index d434b09f2b..1023ea489f 100644
--- a/eclipse-scout-core/src/table/Table.less
+++ b/eclipse-scout-core/src/table/Table.less
@@ -15,7 +15,7 @@
 .table {
   position: relative;
 
-  &:focus,
+  &:not(.disabled):focus,
   &.focused {
     outline: none;
 
diff --git a/eclipse-scout-core/src/table/keystrokes/TableCopyKeyStroke.js b/eclipse-scout-core/src/table/keystrokes/TableCopyKeyStroke.js
index 609f0860c2..3e4442afce 100644
--- a/eclipse-scout-core/src/table/keystrokes/TableCopyKeyStroke.js
+++ b/eclipse-scout-core/src/table/keystrokes/TableCopyKeyStroke.js
@@ -18,6 +18,7 @@ export default class TableCopyKeyStroke extends KeyStroke {
     this.which = [keys.C];
     this.ctrl = true;
     this.renderingHints.render = false;
+    this.checkEnabled = false;
   }
 
   handle(event) {