Add a selector called getPreviewSelectionIsBeingModified.

This replaces uses where we're assuming that we can access an isModifying
property both when we have a preview selection and when we don't have a
preview selection.

In a future commit I want to make us use null instead of hasSelection==false,
and this makes that easier.

Author: mstange

src/components/app/BottomBox.tsx

@@ -28,7 +28,7 @@ import {
   getSourceViewCode,
   getAssemblyViewCode,
 } from 'firefox-profiler/selectors/code';
-import { getPreviewSelection } from 'firefox-profiler/selectors/profile';
+import { getPreviewSelectionIsBeingModified } from 'firefox-profiler/selectors/profile';
 import explicitConnect from 'firefox-profiler/utils/connect';
 
 import type { ConnectedProps } from 'firefox-profiler/utils/connect';
@@ -295,7 +295,7 @@ export const BottomBox = explicitConnect<{}, StateProps, DispatchProps>({
       selectedNodeSelectors.getAssemblyViewAddressTimings(state),
     assemblyViewScrollGeneration: getAssemblyViewScrollGeneration(state),
     assemblyViewIsOpen: getAssemblyViewIsOpen(state),
-    disableOverscan: getPreviewSelection(state).isModifying,
+    disableOverscan: getPreviewSelectionIsBeingModified(state),
   }),
   mapDispatchToProps: {
     closeBottomBox,

src/components/calltree/CallTree.tsx

@@ -16,7 +16,7 @@ import {
 import {
   getScrollToSelectionGeneration,
   getFocusCallTreeGeneration,
-  getPreviewSelection,
+  getPreviewSelectionIsBeingModified,
   getCategories,
   getCurrentTableViewOptions,
 } from 'firefox-profiler/selectors/profile';
@@ -410,7 +410,7 @@ export const CallTree = explicitConnect<{}, StateProps, DispatchProps>({
     expandedCallNodeIndexes:
       selectedThreadSelectors.getExpandedCallNodeIndexes(state),
     searchStringsRegExp: getSearchStringsAsRegExp(state),
-    disableOverscan: getPreviewSelection(state).isModifying,
+    disableOverscan: getPreviewSelectionIsBeingModified(state),
     invertCallstack: getInvertCallstack(state),
     implementationFilter: getImplementationFilter(state),
     // Use the filtered call node max depth, rather than the preview filtered call node

src/components/network-chart/index.tsx

@@ -19,7 +19,7 @@ import {
 
 import {
   getScrollToSelectionGeneration,
-  getPreviewSelection,
+  getPreviewSelectionIsBeingModified,
   getPreviewSelectionRange,
 } from '../../selectors/profile';
 import { selectedThreadSelectors } from '../../selectors/per-thread';
@@ -422,7 +422,7 @@ export const NetworkChart = explicitConnect<
     hoveredMarkerIndexFromState:
       selectedThreadSelectors.getHoveredMarkerIndex(state),
     timeRange: getPreviewSelectionRange(state),
-    disableOverscan: getPreviewSelection(state).isModifying,
+    disableOverscan: getPreviewSelectionIsBeingModified(state),
     threadsKey: getSelectedThreadsKey(state),
   }),
   mapDispatchToProps: {

src/components/timeline/Markers.tsx

@@ -14,7 +14,7 @@ import { Tooltip } from 'firefox-profiler/components/tooltip/Tooltip';
 import { TooltipMarker } from 'firefox-profiler/components/tooltip/Marker';
 import { timeCode } from 'firefox-profiler/utils/time-code';
 import explicitConnect from 'firefox-profiler/utils/connect';
-import { getPreviewSelection } from 'firefox-profiler/selectors/profile';
+import { getPreviewSelectionIsBeingModified } from 'firefox-profiler/selectors/profile';
 import { getThreadSelectorsFromThreadsKey } from 'firefox-profiler/selectors/per-thread';
 import { getSelectedThreadIndexes } from 'firefox-profiler/selectors/url-state';
 import { changeRightClickedMarker } from 'firefox-profiler/actions/profile-view';
@@ -528,7 +528,7 @@ export const TimelineMarkersJank = explicitConnect<
       // These don't use marker schema as they are derived.
       markerIndexes: selectors.getTimelineJankMarkerIndexes(state),
       isSelected: _getTimelineMarkersIsSelected(selectedThreads, threadsKey),
-      isModifyingSelection: getPreviewSelection(state).isModifying,
+      isModifyingSelection: getPreviewSelectionIsBeingModified(state),
       testId: 'TimelineMarkersJank',
       rightClickedMarker: selectors.getRightClickedMarker(state),
     };
@@ -557,7 +557,7 @@ export const TimelineMarkersOverview = explicitConnect<
       getMarker: selectors.getMarkerGetter(state),
       markerIndexes: selectors.getTimelineOverviewMarkerIndexes(state),
       isSelected: _getTimelineMarkersIsSelected(selectedThreads, threadsKey),
-      isModifyingSelection: getPreviewSelection(state).isModifying,
+      isModifyingSelection: getPreviewSelectionIsBeingModified(state),
       testId: 'TimelineMarkersOverview',
       rightClickedMarker: selectors.getRightClickedMarker(state),
     };
@@ -583,7 +583,7 @@ export const TimelineMarkersFileIo = explicitConnect<
       getMarker: selectors.getMarkerGetter(state),
       markerIndexes: selectors.getTimelineFileIoMarkerIndexes(state),
       isSelected: _getTimelineMarkersIsSelected(selectedThreads, threadsKey),
-      isModifyingSelection: getPreviewSelection(state).isModifying,
+      isModifyingSelection: getPreviewSelectionIsBeingModified(state),
       testId: 'TimelineMarkersFileIo',
       rightClickedMarker: selectors.getRightClickedMarker(state),
     };
@@ -609,7 +609,7 @@ export const TimelineMarkersMemory = explicitConnect<
       getMarker: selectors.getMarkerGetter(state),
       markerIndexes: selectors.getTimelineMemoryMarkerIndexes(state),
       isSelected: _getTimelineMarkersIsSelected(selectedThreads, threadsKey),
-      isModifyingSelection: getPreviewSelection(state).isModifying,
+      isModifyingSelection: getPreviewSelectionIsBeingModified(state),
       additionalClassName: 'timelineMarkersMemory',
       testId: 'TimelineMarkersMemory',
       rightClickedMarker: selectors.getRightClickedMarker(state),
@@ -636,7 +636,7 @@ export const TimelineMarkersIPC = explicitConnect<
       getMarker: selectors.getMarkerGetter(state),
       markerIndexes: selectors.getTimelineIPCMarkerIndexes(state),
       isSelected: _getTimelineMarkersIsSelected(selectedThreads, threadsKey),
-      isModifyingSelection: getPreviewSelection(state).isModifying,
+      isModifyingSelection: getPreviewSelectionIsBeingModified(state),
       additionalClassName: 'timelineMarkersIPC',
       testId: 'TimelineMarkersIPC',
       rightClickedMarker: selectors.getRightClickedMarker(state),

src/components/timeline/TrackNetwork.tsx

@@ -14,7 +14,7 @@ import {
   getCommittedRange,
   getZeroAt,
   getInnerWindowIDToPageMap,
-  getPreviewSelection,
+  getPreviewSelectionIsBeingModified,
 } from 'firefox-profiler/selectors/profile';
 import { getThreadSelectors } from 'firefox-profiler/selectors/per-thread';
 import {
@@ -432,7 +432,7 @@ export const TrackNetwork = explicitConnect<
       rangeStart: start,
       rangeEnd: end,
       zeroAt: getZeroAt(state),
-      isModifyingSelection: getPreviewSelection(state).isModifying,
+      isModifyingSelection: getPreviewSelectionIsBeingModified(state),
       verticalMarkerIndexes: selectors.getTimelineVerticalMarkerIndexes(state),
       rightClickedMarkerIndex: selectors.getRightClickedMarkerIndex(state),
       selectedNetworkMarkerIndex:

src/components/timeline/TrackScreenshots.tsx

@@ -6,7 +6,7 @@ import { PureComponent } from 'react';
 import explicitConnect from 'firefox-profiler/utils/connect';
 import {
   getCommittedRange,
-  getPreviewSelection,
+  getPreviewSelectionIsBeingModified,
 } from 'firefox-profiler/selectors/profile';
 import { getThreadSelectors } from 'firefox-profiler/selectors/per-thread';
 import {
@@ -190,7 +190,6 @@ export const TimelineTrackScreenshots = explicitConnect<
     const { threadIndex, windowId } = ownProps;
     const selectors = getThreadSelectors(threadIndex);
     const { start, end } = getCommittedRange(state);
-    const previewSelection = getPreviewSelection(state);
     return {
       thread: selectors.getRangeFilteredThread(state),
       screenshots:
@@ -199,8 +198,7 @@ export const TimelineTrackScreenshots = explicitConnect<
       threadName: selectors.getFriendlyThreadName(state),
       rangeStart: start,
       rangeEnd: end,
-      isMakingPreviewSelection:
-        previewSelection.hasSelection && previewSelection.isModifying,
+      isMakingPreviewSelection: getPreviewSelectionIsBeingModified(state),
     };
   },
   mapDispatchToProps: {

src/selectors/profile.ts

@@ -140,6 +140,12 @@ export const getTableViewOptionSelectors: (
 export const getPreviewSelection: Selector<PreviewSelection> = (state) =>
   getProfileViewOptions(state).previewSelection;
 
+export const getPreviewSelectionIsBeingModified: Selector<boolean> = (
+  state
+) => {
+  return getPreviewSelection(state).isModifying;
+};
+
 /**
  * This selector returns the current range, taking into account the current
  * preview selection if any.