Revert "Feat: Highlight currently selected row in table. (covid19indi…

…a#1482)" This reverts commit df8f2fd.
nayakrahul · Apr 25, 2020 · a298645 · a298645
1 parent 1259f76
commit a298645
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 46 deletions.
diff --git a/src/App.scss b/src/App.scss
@@ -1545,13 +1545,10 @@ table {
     tr {
       cursor: pointer;
 
-      &.is-highlighted {
-        background: $gray-hover !important;
-      }
-
       &:hover {
         background: $gray-hover !important;
 
+
         .dropdown {
           background: $gray-hover;
         }

diff --git a/src/components/home.js b/src/components/home.js
@@ -29,11 +29,6 @@ function Home(props) {
   const [fetched, setFetched] = useState(false);
   const [activeStateCode, setActiveStateCode] = useState('TT');
   const [regionHighlighted, setRegionHighlighted] = useState(undefined);
-  const [rowHighlighted, setRowHighlighted] = useState({
-    statecode: undefined,
-    isDistrict: false,
-    districtName: undefined,
-  });
   const [showUpdates, setShowUpdates] = useState(false);
   const [anchor, setAnchor] = useState(null);
   const [lastViewedLog, setLastViewedLog] = useLocalStorage(
@@ -115,20 +110,8 @@ function Home(props) {
     setRegionHighlighted({district, state, index});
   };
 
-  const onMapHighlightChange = useCallback((region) => {
-    setActiveStateCode(region.statecode);
-    if ('districtName' in region)
-      setRowHighlighted({
-        statecode: region.statecode,
-        isDistrict: true,
-        districtName: region.districtName,
-      });
-    else
-      setRowHighlighted({
-        statecode: region.statecode,
-        isDistrict: false,
-        districtName: undefined,
-      });
+  const onMapHighlightChange = useCallback(({statecode}) => {
+    setActiveStateCode(statecode);
   }, []);
 
   return (
@@ -176,7 +159,6 @@ function Home(props) {
               states={states}
               summary={false}
               stateDistrictWiseData={stateDistrictWiseData}
-              rowHighlighted={rowHighlighted}
               onHighlightState={onHighlightState}
               onHighlightDistrict={onHighlightDistrict}
             />

diff --git a/src/components/mapexplorer.js b/src/components/mapexplorer.js
@@ -123,7 +123,6 @@ function MapExplorer({
         setPanelRegion(panelRegion);
         currentHoveredRegion.statecode = panelRegion.statecode;
         setCurrentHoveredRegion(currentHoveredRegion);
-        panelRegion.districtName = currentHoveredRegion.name;
         if (onMapHighlightChange) onMapHighlightChange(panelRegion);
       }
     },

diff --git a/src/components/row.js b/src/components/row.js
@@ -98,7 +98,7 @@ function Row(props) {
       <tr
         className={`state ${props.total ? 'is-total' : ''} ${
           props.index % 2 === 0 ? 'is-odd' : ''
-        } ${props.isHighlighted ? 'is-highlighted' : ''}`}
+        }`}
         onMouseEnter={() => props.onHighlightState?.(state, props.index)}
         onMouseLeave={() => props.onHighlightState?.()}
         onClick={!props.total ? handleReveal : null}
@@ -275,11 +275,7 @@ function Row(props) {
               return (
                 <tr
                   key={index}
-                  className={`district ${index % 2 === 0 ? 'is-odd' : ''} ${
-                    props.highlightedDistrict === district
-                      ? 'is-highlighted'
-                      : ''
-                  }`}
+                  className={`district ${index % 2 === 0 ? 'is-odd' : ''}`}
                   style={{
                     background: index % 2 === 0 ? '#f8f9fa' : '',
                   }}

diff --git a/src/components/table.js b/src/components/table.js
@@ -3,11 +3,8 @@ import Row from './row';
 import React, {useState, useEffect} from 'react';
 import {Link} from 'react-router-dom';
 
-const isEqual = (prevProps, currProps) => {
-  return (
-    JSON.stringify(prevProps.rowHighlighted) ===
-    JSON.stringify(currProps.rowHighlighted)
-  );
+const isEqual = () => {
+  return true;
 };
 
 function Table(props) {
@@ -274,16 +271,6 @@ function Table(props) {
                         ? districts[state.state].districtData
                         : []
                     }
-                    isHighlighted={
-                      !props.rowHighlighted.isDistrict &&
-                      props.rowHighlighted.statecode === state.statecode
-                    }
-                    highlightedDistrict={
-                      props.rowHighlighted.isDistrict &&
-                      props.rowHighlighted.statecode === state.statecode
-                        ? props.rowHighlighted.districtName
-                        : null
-                    }
                     onHighlightState={props.onHighlightState}
                     onHighlightDistrict={props.onHighlightDistrict}
                     handleReveal={handleReveal}