fix conditional styles regression

Marc-André Rivet · Marc-André Rivet · commit ce95cfc55841 · 2020-04-14T20:12:43.000-04:00
diff --git a/src/dash-table/components/Table/props.ts b/src/dash-table/components/Table/props.ts
@@ -84,7 +84,7 @@ export interface ICellCoordinates {
 export type ColumnId = string;
 export type Columns = IColumn[];
 export type Data = Datum[];
-export type Datum = IDatumObject | any;
+export type Datum = IDatumObject;
 export type Indices = number[];
 export type RowId = string | number;
 export type SelectedCells = ICellCoordinates[];
diff --git a/src/dash-table/derived/data/virtual.ts b/src/dash-table/derived/data/virtual.ts
@@ -22,7 +22,7 @@ const getter = (
     sort_by: SortBy = []
 ): IDerivedData => {
     const map = new Map<Datum, number>();
-    R.addIndex(R.forEach)((datum, index) => {
+    R.addIndex<Datum>(R.forEach)((datum, index) => {
         map.set(datum, index);
     }, data);
 
diff --git a/src/dash-table/derived/edges/data.ts b/src/dash-table/derived/edges/data.ts
@@ -81,14 +81,13 @@ const getter = (
         }
 
         const active = isActiveCell(activeCell, i, j);
-        const column_id = columns[jWithOffset].id;
 
         const priority = active ? ACTIVE_PRIORITY : SELECTED_PRIORITY;
         const defaultEdge = active ? Environment.activeEdge : Environment.defaultEdge;
 
         const style: BorderStyle = {
             ...getDataCellEdges(
-                data[iWithOffset][column_id],
+                data[iWithOffset],
                 iWithOffset,
                 columns[j],
                 active,
@@ -102,15 +101,15 @@ const getter = (
             borderTop: [defaultEdge, priority],
 
             ...getDataCellEdges(
-                data[iWithOffset][column_id],
+                data[iWithOffset],
                 iWithOffset,
                 columns[j],
                 active,
                 true,
                 priority
             )(selectedStyles),
             ...getDataCellEdges(
-                data[iWithOffset][column_id],
+                data[iWithOffset],
                 iWithOffset,
                 columns[j],
                 active,
diff --git a/src/dash-table/derived/header/operations.tsx b/src/dash-table/derived/header/operations.tsx
@@ -4,7 +4,6 @@ import React from 'react';
 import { memoizeOneFactory } from 'core/memoizer';
 
 import {
-    Datum,
     Selection
 } from 'dash-table/components/Table/props';
 
@@ -29,7 +28,7 @@ const getter = (
     headerRows: number,
     rowSelectable: Selection,
     rowDeletable: boolean
-): JSX.Element[][] => R.addIndex<Datum, JSX.Element[]>(R.map)(
+): JSX.Element[][] => R.addIndex<number, JSX.Element[]>(R.map)(
     () => [
         ...(rowDeletable ? [rowDeleteHeader()] : []),
         ...(rowSelectable ? [rowSelectCell()] : [])
