fix keyboard navigation after copy/paste (#90)

plotly · Sep 14, 2018 · bebde86 · bebde86
1 parent 693ff5a
commit bebde86
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 15 deletions.
diff --git a/packages/dash-table/CHANGELOG.md b/packages/dash-table/CHANGELOG.md
@@ -116,4 +116,8 @@
 ## RC15 - Global copy/paste (through browser menu), incorrect pasted data fix
 
     Issue: https://github.com/plotly/dash-table/issues/75
-    Issue: https://github.com/plotly/dash-table/issues/88
+    Issue: https://github.com/plotly/dash-table/issues/88
+
+## RC16 - Fix incorrect keyboard navigation
+
+    Issue: https://github.com/plotly/dash-table/issues/49
diff --git a/packages/dash-table/dash_table/bundle.js b/packages/dash-table/dash_table/bundle.js
diff --git a/packages/dash-table/dash_table/demo.js b/packages/dash-table/dash_table/demo.js
diff --git a/packages/dash-table/dash_table/package.json b/packages/dash-table/dash_table/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dash-table",
-  "version": "3.0.0rc15",
+  "version": "3.0.0rc16",
   "description": "Dash table",
   "main": "build/index.js",
   "scripts": {

diff --git a/packages/dash-table/package.json b/packages/dash-table/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dash-table",
-  "version": "3.0.0rc15",
+  "version": "3.0.0rc16",
   "description": "Dash table",
   "main": "build/index.js",
   "scripts": {

diff --git a/packages/dash-table/src/dash-table/components/ControlledTable/index.tsx b/packages/dash-table/src/dash-table/components/ControlledTable/index.tsx
@@ -5,9 +5,7 @@ import { colIsEditable } from 'dash-table/components/derivedState';
 import {
     KEY_CODES,
     isCtrlMetaKey,
-    /*#if TEST_COPY_PASTE*/
     isCtrlDown,
-    /*#endif*/
     isMetaKey,
     isNavKey
 } from 'dash-table/utils/unicode';
@@ -137,20 +135,23 @@ export default class ControlledTable extends Component<ControlledTableProps> {
             return;
         }
 
-        /*#if TEST_COPY_PASTE*/
         const ctrlDown = isCtrlDown(e);
 
         if (ctrlDown && e.keyCode === KEY_CODES.V) {
+            /*#if TEST_COPY_PASTE*/
             this.onPaste({} as any);
             e.preventDefault();
+            /*#endif*/
             return;
         }
 
         if (e.keyCode === KEY_CODES.C && ctrlDown && !is_focused) {
+            /*#if TEST_COPY_PASTE*/
             this.onCopy(e as any);
+            e.preventDefault();
+            /*#endif*/
             return;
         }
-        /*#endif*/
 
         if (e.keyCode === KEY_CODES.ESCAPE) {
             setProps({ is_focused: false });
@@ -452,8 +453,6 @@ export default class ControlledTable extends Component<ControlledTableProps> {
         } = this.props;
         const dataframe = virtualizer.dataframe;
 
-        e.preventDefault();
-
         const columnIndexOffset =
             (row_deletable ? 1 : 0) +
             (row_selectable ? 1 : 0);

diff --git a/packages/dash-table/tests/e2e/cypress/integration/navigation_test.ts b/packages/dash-table/tests/e2e/cypress/integration/navigation_test.ts
@@ -65,6 +65,14 @@ describe('navigate', () => {
             });
         });
 
+        // Issue: https://github.com/plotly/dash-table/issues/49
+        it.only('can move after ctrl+c', () => {
+            DOM.focused.type(`${Key.Meta}c`);
+            DOM.focused.type(Key.ArrowDown);
+            DashTable.getCell(4, 3).should('have.class', 'focused');
+            DashTable.getCell(3, 3).should('not.have.class', 'focused');
+        });
+
         it('can move down', () => {
             DOM.focused.type(Key.ArrowDown);
             DashTable.getCell(4, 3).should('have.class', 'focused');