fix view stack bug (#1640)

2026-09-22 09:28:11 +08:00 · 2020-07-16 16:14:52 -07:00
parent f223d7504e
commit 18d0fd78cf
2 changed files with 105 additions and 78 deletions
@@ -0,0 +1,100 @@
+/*
+The following actions manage the view stack for annoMatrix.
+
+Conventions used and assumed elsewhere in the code base:
+  * there will be zero or one clip view, and it will be the TOP view always.
+  * there will be zero or more subset views
+
+In other words, in our current use, we do not stack multiple clip views but we do
+stack multiple subsets.
+
+If these conventions change, code elsewhere (eg. menubar/clip.js) will need to
+change as well.
+*/
+import { AnnoMatrixObsCrossfilter, clip, isubsetMask } from "../annoMatrix";
+
+export const clipAction = (min, max) => (dispatch, getState) => {
+  /*
+  apply a clip to the current annoMatrix.  By convention, the clip
+  view is ALWAYS the top view.
+  */
+  const { annoMatrix: prevAnnoMatrix } = getState();
+  const annoMatrix = prevAnnoMatrix.isClipped
+    ? clip(prevAnnoMatrix.viewOf, min, max)
+    : clip(prevAnnoMatrix, min, max);
+  const obsCrossfilter = new AnnoMatrixObsCrossfilter(annoMatrix);
+  dispatch({
+    type: "set clip quantiles",
+    clipQuantiles: { min, max },
+    annoMatrix,
+    obsCrossfilter,
+  });
+};
+
+export const subsetAction = () => (dispatch, getState) => {
+  /*
+  Subset the annoMatrix to the current crossfilter selection by pushing a 
+  subset view.
+
+  By convention, a clip view is ALWAYS the top view, so if present, pop
+  off and re-apply
+  */
+  const {
+    annoMatrix: prevAnnoMatrix,
+    obsCrossfilter: prevObsCrossfilter,
+  } = getState();
+
+  let annoMatrix;
+  if (prevAnnoMatrix.isClipped) {
+    // if there is a clip view, pop it and reapply after we subset
+    const { clipRange } = prevAnnoMatrix;
+    annoMatrix = isubsetMask(
+      prevAnnoMatrix.viewOf,
+      prevObsCrossfilter.allSelectedMask()
+    );
+    annoMatrix = clip(annoMatrix, ...clipRange);
+  } else {
+    // else just push a subset view.
+    annoMatrix = isubsetMask(
+      prevAnnoMatrix,
+      prevObsCrossfilter.allSelectedMask()
+    );
+  }
+
+  const obsCrossfilter = new AnnoMatrixObsCrossfilter(annoMatrix);
+  dispatch({
+    type: "subset to selection",
+    annoMatrix,
+    obsCrossfilter,
+  });
+};
+
+export const resetSubsetAction = () => (dispatch, getState) => {
+  /*
+  Reset the annoMatrix to all data.  Because we may have multiple views
+  stacked, we pop them all.  By convention, any clip transformation will
+  be the top of the stack, and must be preserved.
+  */
+
+  const { annoMatrix: prevAnnoMatrix } = getState();
+
+  const clipRange = prevAnnoMatrix.isClipped ? prevAnnoMatrix.clipRange : null;
+
+  /* pop all views */
+  let annoMatrix = prevAnnoMatrix;
+  while (annoMatrix.isView) {
+    annoMatrix = annoMatrix.viewOf;
+  }
+
+  /* re-apply the clip, if any */
+  if (clipRange !== null) {
+    annoMatrix = clip(annoMatrix, ...clipRange);
+  }
+
+  const obsCrossfilter = new AnnoMatrixObsCrossfilter(annoMatrix);
+  dispatch({
+    type: "reset subset",
+    annoMatrix,
+    obsCrossfilter,
+  });
+};