Remove key handler

Author: georgecwan

packages/dashboard-core-plugins/src/panels/IrisGridPanel.scss

@@ -31,3 +31,7 @@ $panel-message-overlay-top: 30px;
 .grid-cursor-linker {
   cursor: crosshair;
 }
+
+.grid-cursor-copy {
+  cursor: copy;
+}

packages/iris-grid/src/IrisGrid.tsx

@@ -113,7 +113,6 @@ import FilterInputField from './FilterInputField';
 import {
   ClearFilterKeyHandler,
   CopyKeyHandler,
-  CopyCursorKeyHandler,
   ReverseKeyHandler,
 } from './key-handlers';
 import {
@@ -312,6 +311,8 @@ export interface IrisGridProps {
 
   // eslint-disable-next-line react/no-unused-prop-types
   columnNotAllowedCursor: string;
+
+  // eslint-disable-next-line react/no-unused-prop-types
   copyCursor: string;
   name: string;
   onlyFetchVisibleColumns: boolean;
@@ -529,8 +530,6 @@ export class IrisGrid extends Component<IrisGridProps, IrisGridState> {
     this.handleAdvancedMenuOpened = this.handleAdvancedMenuOpened.bind(this);
     this.handleGotoRowOpened = this.handleGotoRowOpened.bind(this);
     this.handleGotoRowClosed = this.handleGotoRowClosed.bind(this);
-    this.handleShowCopyCursor = this.handleShowCopyCursor.bind(this);
-    this.handleHideCopyCursor = this.handleHideCopyCursor.bind(this);
     this.handleAdvancedMenuClosed = this.handleAdvancedMenuClosed.bind(this);
     this.handleAggregationChange = this.handleAggregationChange.bind(this);
     this.handleAggregationsChange = this.handleAggregationsChange.bind(this);
@@ -707,7 +706,6 @@ export class IrisGrid extends Component<IrisGridProps, IrisGridState> {
     ];
     if (canCopy) {
       keyHandlers.push(new CopyKeyHandler(this));
-      keyHandlers.push(new CopyCursorKeyHandler(this));
     }
     const { dh } = model;
     const mouseHandlers = [
@@ -2791,26 +2789,6 @@ export class IrisGrid extends Component<IrisGridProps, IrisGridState> {
     this.setState({ isGotoShown: false });
   }
 
-  handleShowCopyCursor(): void {
-    if (!this.grid) {
-      return;
-    }
-    const { copyCursor } = this.props;
-    const { cursor } = this.grid.state;
-    if (cursor !== copyCursor) {
-      this.isCopying = true;
-      this.grid.setState({ cursor: copyCursor });
-    }
-  }
-
-  handleHideCopyCursor(): void {
-    if (!this.grid) {
-      return;
-    }
-    this.isCopying = false;
-    this.grid.setState({ cursor: null });
-  }
-
   handleAdvancedMenuClosed(columnIndex: number): void {
     const { focusedFilterBarColumn, isFilterBarShown } = this.state;
     if (

packages/iris-grid/src/key-handlers/CopyCursorKeyHandler.ts

@@ -1,4 +1,3 @@
 export { default as CopyKeyHandler } from './CopyKeyHandler';
-export { default as CopyCursorKeyHandler } from './CopyCursorKeyHandler';
 export { default as ReverseKeyHandler } from './ReverseKeyHandler';
 export { default as ClearFilterKeyHandler } from './ClearFilterKeyHandler';

packages/iris-grid/src/key-handlers/index.ts

@@ -337,9 +337,7 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
     actions.push({
       title: 'Copy Column Name',
       group: IrisGridContextMenuHandler.GROUP_COPY,
-      shortcutText: ContextActionUtils.isMacPlatform()
-        ? 'Opt+Click'
-        : 'Alt+Click',
+      shortcutText: ContextActionUtils.isMacPlatform() ? '⌥Click' : 'Alt+Click',
       action: () => {
         copyToClipboard(model.textForColumnHeader(modelIndex) ?? '').catch(e =>
           log.error('Unable to copy header', e)
@@ -636,7 +634,7 @@ class IrisGridContextMenuHandler extends GridMouseHandler {
         title: 'Copy Cell',
         group: IrisGridContextMenuHandler.GROUP_COPY,
         shortcutText: ContextActionUtils.isMacPlatform()
-          ? 'Opt+Click'
+          ? '⌥Click'
           : 'Alt+Click',
         order: 10,
         action: () => {

packages/iris-grid/src/mousehandlers/IrisGridContextMenuHandler.tsx

@@ -39,8 +39,18 @@ class IrisGridCopyCellMouseHandler extends GridMouseHandler {
     return false;
   }
 
-  onMove(): EventHandlerResult {
-    if (this.irisGrid.isCopying) {
+  onMove(
+    gridPoint: GridPoint,
+    _grid: Grid,
+    event: GridMouseEvent
+  ): EventHandlerResult {
+    if (
+      event.altKey &&
+      !ContextActionUtils.isModifierKeyDown(event) &&
+      !event.shiftKey &&
+      gridPoint.column != null &&
+      (gridPoint.row != null || gridPoint.columnHeaderDepth != null)
+    ) {
       this.cursor = this.irisGrid.props.copyCursor;
       return true;
     }