typescript error fixes in table components

City-of-Helsinki · Jul 1, 2024 · edc3696 · edc3696
1 parent 1e16005
commit edc3696
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/components/table/SortableTableGroup.tsx b/src/components/table/SortableTableGroup.tsx
@@ -1,5 +1,5 @@
 import { $Shape } from "utility-types";
-import React, { PureComponent } from "react";
+import React, { PureComponent, KeyboardEventHandler } from "react";
 import classNames from "classnames";
 import get from "lodash/get";
 import isArray from "lodash/isArray";
@@ -32,7 +32,7 @@ class SortableTableGroup extends PureComponent<Props, State> {
       collapse: !this.state.collapse
     });
   };
-  handleCollapseArrowIconKeyDown: (arg0: KeyboardEvent) => void = (e: any) => {
+  handleCollapseArrowIconKeyDown: KeyboardEventHandler<HTMLAnchorElement> = (e: any) => {
     if (e.keyCode === 13) {
       e.preventDefault();
       this.handleCollapseArrowIconClick();
@@ -75,7 +75,7 @@ class SortableTableGroup extends PureComponent<Props, State> {
           {showCollapseArrowColumn && <td className={classNames('collapse-arrow-column', {
           'no-icon': !showCollapseArrowIcon
         })}>
-              { // @ts-ignore: Type '(arg0: KeyboardEvent) => void' is not assignable to type 'KeyboardEventHandler<HTMLAnchorElement>'.
+              {
               showCollapseArrowIcon && <a className='sortable-table-row-collapse-link' onClick={this.handleCollapseArrowIconClick} onKeyDown={this.handleCollapseArrowIconKeyDown} tabIndex={0}>
                   <AccordionIcon className='sortable-table-row-collapse-icon' />
                 </a>}

diff --git a/src/components/table/SortableTableRow.tsx b/src/components/table/SortableTableRow.tsx
@@ -1,5 +1,5 @@
 import { $Shape } from "utility-types";
-import React, { PureComponent } from "react";
+import React, { PureComponent, KeyboardEventHandler } from "react";
 import classNames from "classnames";
 import get from "lodash/get";
 import isArray from "lodash/isArray";
@@ -68,7 +68,7 @@ class SortableTableRow extends PureComponent<Props, State> {
     this.isClicked = false;
     clearTimeout(this.buttonPressTimer);
   };
-  handleKeyDown: (arg0: KeyboardEvent) => void = (e: any) => {
+  handleKeyDown: KeyboardEventHandler<HTMLTableRowElement> = (e: any) => {
     if (e.target === this.component && e.keyCode === 13) {
       e.preventDefault();
       this.handleRowClick();
@@ -79,7 +79,7 @@ class SortableTableRow extends PureComponent<Props, State> {
       collapse: !this.state.collapse
     });
   };
-  handleCollapseArrowIconKeyDown: (arg0: KeyboardEvent) => void = (e: any) => {
+  handleCollapseArrowIconKeyDown: KeyboardEventHandler<HTMLAnchorElement> = (e: any) => {
     if (e.keyCode === 13) {
       e.preventDefault();
       this.handleCollapseArrowIconClick();
@@ -120,7 +120,6 @@ class SortableTableRow extends PureComponent<Props, State> {
     } = this.state;
     const showCollapseArrowIcon = this.shouldShowCollapseArrowIcon();
 
-    // @ts-ignore: Type '(arg0: KeyboardEvent) => void' is not assignable to type 'KeyboardEventHandler<HTMLAnchorElement>'.
     return <tr ref={this.setRef} id={id} tabIndex={onRowClick ? 0 : undefined} onKeyDown={this.handleKeyDown} className={classNames(className, {
       'selected': isSelected
     }, {
@@ -129,7 +128,7 @@ class SortableTableRow extends PureComponent<Props, State> {
         {showCollapseArrowColumn && <td className={classNames('collapse-arrow-column', {
         'no-icon': !showCollapseArrowIcon
       })}>
-            { // @ts-ignore: Type '(arg0: KeyboardEvent) => void' is not assignable to type 'KeyboardEventHandler<HTMLAnchorElement>'.
+            {
             showCollapseArrowIcon && <a className='sortable-table-row-collapse-link' onClick={this.handleCollapseArrowIconClick} onKeyDown={this.handleCollapseArrowIconKeyDown} tabIndex={0}>
                 <AccordionIcon className='sortable-table-row-collapse-icon' />
               </a>}