Inline three borderline wing helpers.

Author: mstange

src/components/calltree/WingTreeView.tsx

@@ -321,44 +321,6 @@ class WingTreeViewImpl extends PureComponent<Props> {
   }
 }
 
-// Build the StateProps for a given wing. Both wings have the same prop
-// shape; only the wing-specific selector identifiers differ.
-function makeMapStateToProps(
-  getView: (state: State) => WingViewType,
-  selectors: {
-    getCallTree: (state: State) => CallTreeType;
-    getCallNodeInfo: (state: State) => CallNodeInfo;
-    getSelectedCallNodeIndex: (state: State) => IndexIntoCallNodeTable | null;
-    getRightClickedCallNodeIndex: (
-      state: State
-    ) => IndexIntoCallNodeTable | null;
-    getExpandedCallNodeIndexes: (
-      state: State
-    ) => Array<IndexIntoCallNodeTable | null>;
-  }
-) {
-  return (state: State): StateProps => ({
-    threadsKey: getSelectedThreadsKey(state),
-    scrollToSelectionGeneration: getScrollToSelectionGeneration(state),
-    tree: selectors.getCallTree(state),
-    callNodeInfo: selectors.getCallNodeInfo(state),
-    categories: getCategories(state),
-    selectedCallNodeIndex: selectors.getSelectedCallNodeIndex(state),
-    rightClickedCallNodeIndex: selectors.getRightClickedCallNodeIndex(state),
-    expandedCallNodeIndexes: selectors.getExpandedCallNodeIndexes(state),
-    searchStringsRegExp: getSearchStringsAsRegExp(state),
-    disableOverscan: getPreviewSelectionIsBeingModified(state),
-    // Use the filtered call node max depth, rather than the preview filtered
-    // call node max depth so that the width of the TreeView component is stable
-    // across preview selections.
-    callNodeMaxDepthPlusOne:
-      selectedThreadSelectors.getFilteredCallNodeMaxDepthPlusOne(state),
-    weightType: selectedThreadSelectors.getWeightTypeForCallTree(state),
-    tableViewOptions: getCurrentTableViewOptions(state),
-    view: getView(state),
-  });
-}
-
 function makeMapDispatchToProps(wing: WingName) {
   return {
     changeSelectedCallNode: (
@@ -415,30 +377,53 @@ function LowerWingComponent(
 }
 
 export const UpperWing = explicitConnect<{}, StateProps, DispatchProps>({
-  mapStateToProps: makeMapStateToProps(getUpperWingView, {
-    getCallTree: selectedThreadSelectors.getUpperWingCallTree,
-    getCallNodeInfo: selectedThreadSelectors.getUpperWingCallNodeInfo,
-    getSelectedCallNodeIndex:
-      selectedThreadSelectors.getUpperWingSelectedCallNodeIndex,
-    getRightClickedCallNodeIndex:
-      selectedThreadSelectors.getUpperWingRightClickedCallNodeIndex,
-    getExpandedCallNodeIndexes:
-      selectedThreadSelectors.getUpperWingExpandedCallNodeIndexes,
+  mapStateToProps: (state: State): StateProps => ({
+    threadsKey: getSelectedThreadsKey(state),
+    scrollToSelectionGeneration: getScrollToSelectionGeneration(state),
+    tree: selectedThreadSelectors.getUpperWingCallTree(state),
+    callNodeInfo: selectedThreadSelectors.getUpperWingCallNodeInfo(state),
+    categories: getCategories(state),
+    selectedCallNodeIndex:
+      selectedThreadSelectors.getUpperWingSelectedCallNodeIndex(state),
+    rightClickedCallNodeIndex:
+      selectedThreadSelectors.getUpperWingRightClickedCallNodeIndex(state),
+    expandedCallNodeIndexes:
+      selectedThreadSelectors.getUpperWingExpandedCallNodeIndexes(state),
+    searchStringsRegExp: getSearchStringsAsRegExp(state),
+    disableOverscan: getPreviewSelectionIsBeingModified(state),
+    // Use the filtered call node max depth, rather than the preview filtered
+    // call node max depth so that the width of the TreeView component is stable
+    // across preview selections.
+    callNodeMaxDepthPlusOne:
+      selectedThreadSelectors.getFilteredCallNodeMaxDepthPlusOne(state),
+    weightType: selectedThreadSelectors.getWeightTypeForCallTree(state),
+    tableViewOptions: getCurrentTableViewOptions(state),
+    view: getUpperWingView(state),
   }),
   mapDispatchToProps: makeMapDispatchToProps('upper'),
   component: UpperWingComponent,
 });
 
 export const LowerWing = explicitConnect<{}, StateProps, DispatchProps>({
-  mapStateToProps: makeMapStateToProps(getLowerWingView, {
-    getCallTree: selectedThreadSelectors.getLowerWingCallTree,
-    getCallNodeInfo: selectedThreadSelectors.getLowerWingCallNodeInfo,
-    getSelectedCallNodeIndex:
-      selectedThreadSelectors.getLowerWingSelectedCallNodeIndex,
-    getRightClickedCallNodeIndex:
-      selectedThreadSelectors.getLowerWingRightClickedCallNodeIndex,
-    getExpandedCallNodeIndexes:
-      selectedThreadSelectors.getLowerWingExpandedCallNodeIndexes,
+  mapStateToProps: (state: State): StateProps => ({
+    threadsKey: getSelectedThreadsKey(state),
+    scrollToSelectionGeneration: getScrollToSelectionGeneration(state),
+    tree: selectedThreadSelectors.getLowerWingCallTree(state),
+    callNodeInfo: selectedThreadSelectors.getLowerWingCallNodeInfo(state),
+    categories: getCategories(state),
+    selectedCallNodeIndex:
+      selectedThreadSelectors.getLowerWingSelectedCallNodeIndex(state),
+    rightClickedCallNodeIndex:
+      selectedThreadSelectors.getLowerWingRightClickedCallNodeIndex(state),
+    expandedCallNodeIndexes:
+      selectedThreadSelectors.getLowerWingExpandedCallNodeIndexes(state),
+    searchStringsRegExp: getSearchStringsAsRegExp(state),
+    disableOverscan: getPreviewSelectionIsBeingModified(state),
+    callNodeMaxDepthPlusOne:
+      selectedThreadSelectors.getFilteredCallNodeMaxDepthPlusOne(state),
+    weightType: selectedThreadSelectors.getWeightTypeForCallTree(state),
+    tableViewOptions: getCurrentTableViewOptions(state),
+    view: getLowerWingView(state),
   }),
   mapDispatchToProps: makeMapDispatchToProps('lower'),
   component: LowerWingComponent,

src/selectors/per-thread/stack-sample.ts

@@ -243,23 +243,6 @@ export function getStackAndSampleSelectorsPerThread(
       ProfileData.getLowerWingCallNodeInfo
     );
 
-  // Returns the selected call node path stored under the given area in this
-  // thread's ThreadViewOptions.
-  const makeSelectedPathSelector = (
-    area: CallNodeArea
-  ): Selector<CallNodePath> =>
-    createSelector(
-      threadSelectors.getViewOptions,
-      (threadViewOptions) => threadViewOptions.selectedCallNodePaths[area]
-    );
-
-  // Returns the expanded call node paths stored under the given area.
-  const makeExpandedPathsSelector = (area: CallNodeArea): Selector<PathSet> =>
-    createSelector(
-      threadSelectors.getViewOptions,
-      (threadViewOptions) => threadViewOptions.expandedCallNodePaths[area]
-    );
-
   // Combines a CallNodeInfo selector with a CallNodePath selector to produce
   // the corresponding call node index.
   const makeCallNodeIndexFromPathSelector = (
@@ -282,10 +265,17 @@ export function getStackAndSampleSelectorsPerThread(
       )
     );
 
-  const getLowerWingSelectedCallNodePath =
-    makeSelectedPathSelector('LOWER_WING');
-  const getUpperWingSelectedCallNodePath =
-    makeSelectedPathSelector('UPPER_WING');
+  const getLowerWingSelectedCallNodePath: Selector<CallNodePath> =
+    createSelector(
+      threadSelectors.getViewOptions,
+      (threadViewOptions) => threadViewOptions.selectedCallNodePaths.LOWER_WING
+    );
+
+  const getUpperWingSelectedCallNodePath: Selector<CallNodePath> =
+    createSelector(
+      threadSelectors.getViewOptions,
+      (threadViewOptions) => threadViewOptions.selectedCallNodePaths.UPPER_WING
+    );
 
   const getSelectedCallNodePath: Selector<CallNodePath> = createSelector(
     threadSelectors.getViewOptions,
@@ -318,10 +308,15 @@ export function getStackAndSampleSelectorsPerThread(
         : threadViewOptions.expandedCallNodePaths.NON_INVERTED_TREE
   );
 
-  const getLowerWingExpandedCallNodePaths =
-    makeExpandedPathsSelector('LOWER_WING');
-  const getUpperWingExpandedCallNodePaths =
-    makeExpandedPathsSelector('UPPER_WING');
+  const getLowerWingExpandedCallNodePaths: Selector<PathSet> = createSelector(
+    threadSelectors.getViewOptions,
+    (threadViewOptions) => threadViewOptions.expandedCallNodePaths.LOWER_WING
+  );
+
+  const getUpperWingExpandedCallNodePaths: Selector<PathSet> = createSelector(
+    threadSelectors.getViewOptions,
+    (threadViewOptions) => threadViewOptions.expandedCallNodePaths.UPPER_WING
+  );
 
   const getExpandedCallNodeIndexes = makeExpandedIndexesSelector(
     getCallNodeInfo,