revert unrelated changes

setchy · Jul 17, 2023 · 93528e6 · 93528e6
1 parent 0ea3dcc
commit 93528e6
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 42 deletions.
diff --git a/src/graphing/components/quadrantTables.js b/src/graphing/components/quadrantTables.js
@@ -16,7 +16,6 @@ function highlightBlipInTable(selectedBlip) {
 }
 
 function highlightBlipInGraph(blipIdToFocus) {
-  console.log('blipIdToFocus: ', blipIdToFocus)
   fadeOutAllBlips()
   const selectedBlipOnGraph = d3.select(`g > a.blip-link[data-blip-id='${blipIdToFocus}'`)
   fadeInSelectedBlip(selectedBlipOnGraph)
@@ -110,16 +109,37 @@ function renderBlipDescription(blip, ring, quadrant, tip, groupBlipTooltipText)
   }
 
   const blipClick = function (e) {
-    console.log('here')
-    console.log('e: ', e)
     const isQuadrantView = d3.select('svg#radar-plot').classed('quadrant-view')
     const targetElement = e.target.classList.contains('blip-link') ? e.target : e.target.parentElement
     if (isQuadrantView) {
       e.stopPropagation()
     }
 
     const blipId = d3.select(targetElement).attr('data-blip-id')
-    scrollToBlip(blipId)
+    highlightBlipInGraph(blipId)
+
+    d3.selectAll('.blip-list__item-container.expand').classed('expand', false)
+
+    let selectedBlipContainer = d3.select(`.blip-list__item-container[data-blip-id="${blipId}"`)
+    selectedBlipContainer.classed('expand', true)
+
+    setTimeout(
+      () => {
+        if (window.innerWidth >= uiConfig.tabletViewWidth) {
+          stickQuadrantOnScroll()
+        }
+
+        const isGroupBlip = isNaN(parseInt(blipId))
+        if (isGroupBlip) {
+          selectedBlipContainer = d3.select(`.blip-list__item-container[data-group-id="${blipId}"`)
+        }
+        const elementToFocus = selectedBlipContainer.select('button.blip-list__item-container__name')
+        elementToFocus.node()?.scrollIntoView({
+          behavior: 'smooth',
+        })
+      },
+      isQuadrantView ? 0 : 1500,
+    )
   }
 
   !groupBlipTooltipText &&
@@ -184,36 +204,8 @@ function renderQuadrantTables(quadrants, rings) {
   })
 }
 
-function scrollToBlip(blipId) {
-  highlightBlipInGraph(blipId)
-
-  d3.selectAll('.blip-list__item-container.expand').classed('expand', false)
-
-  let selectedBlipContainer = d3.select(`.blip-list__item-container[data-blip-id="${blipId}"`)
-  selectedBlipContainer.classed('expand', true)
-
-  setTimeout(
-    () => {
-      if (window.innerWidth >= uiConfig.tabletViewWidth) {
-        stickQuadrantOnScroll()
-      }
-
-      const isGroupBlip = isNaN(parseInt(blipId))
-      if (isGroupBlip) {
-        selectedBlipContainer = d3.select(`.blip-list__item-container[data-group-id="${blipId}"`)
-      }
-      const elementToFocus = selectedBlipContainer.select('button.blip-list__item-container__name')
-      elementToFocus.node()?.scrollIntoView({
-        behavior: 'smooth',
-      })
-    },
-    // isQuadrantView ? 0 : 1500,
-  )
-}
-
 module.exports = {
   renderQuadrantTables,
   renderBlipDescription,
   highlightBlipInGraph,
-  scrollToBlip,
 }
diff --git a/src/graphing/radar.js b/src/graphing/radar.js
@@ -21,10 +21,10 @@ const {
   renderRadarLegends,
   removeScrollListener,
 } = require('./components/quadrants')
-const { renderQuadrantTables, scrollToBlip } = require('./components/quadrantTables')
+const { renderQuadrantTables } = require('./components/quadrantTables')
 const { addQuadrantNameInPdfView, addRadarLinkInPdfView } = require('./pdfPage')
 
-const { constructSheetUrl, getBlipIdFromUrl } = require('../util/urlUtils')
+const { constructSheetUrl } = require('../util/urlUtils')
 const { toRadian } = require('../util/mathUtils')
 
 const MIN_BLIP_WIDTH = 12
@@ -832,17 +832,9 @@ const Radar = function (size, radar) {
       hideTooltipOnScroll(tip)
       addRadarLinkInPdfView()
     }
-
-    selectBlipDescriptionToShow()
   }
 
   return self
 }
 
-function selectBlipDescriptionToShow() {
-  console.log('here')
-  const blipId = getBlipIdFromUrl()
-  scrollToBlip(blipId)
-}
-
 module.exports = Radar