cx 25.5.2 → 25.6.1

package/src/charts/helpers/PointReducer.d.ts

@@ -10,6 +10,15 @@ export interface PointReducerProps extends Cx.PureContainerProps {
 
    /** A callback function used to process accumulated information and write results. */
    onReduce?: (accumulator: Cx.Record, instance?: Instance) => void;
+
+   /** Parameters that trigger filter predicate re-creation. */
+   filterParams?: StructuredProp;
+
+   /** A callback function used to create a predicate for filtering points. */
+   onCreatePointFilter?: (
+      filterParams: any,
+      instance: Instance,
+   ) => (x: number, y: number, name: string, data: any, array?: any[], index?: number) => boolean;
 }
 
 export class PointReducer extends Cx.Widget<PointReducerProps> {}

package/src/charts/helpers/PointReducer.js

@@ -1,34 +1,48 @@
 import { PureContainer } from "../../ui/PureContainer";
 
 export class PointReducer extends PureContainer {
+   declareData() {
+      super.declareData(...arguments, {
+         filterParams: {
+            structured: true,
+         },
+      });
+   }
+
+   prepareData(context, instance) {
+      super.prepareData(context, instance);
+
+      instance.resetAccumulator = () => {
+         let accumulator = {};
+         if (this.onInitAccumulator) {
+            instance.invoke("onInitAccumulator", accumulator, instance);
+            instance.accumulator = accumulator;
+         }
+      };
+
+      if (this.onCreatePointFilter)
+         instance.pointFilter = instance.invoke("onCreatePointFilter", instance.data.filterParams, instance);
+   }
+
    explore(context, instance) {
+      instance.resetAccumulator();
+
       let parentPointReducer = context.pointReducer;
       instance.parentPointTracker = parentPointReducer;
 
-      if (!instance.pointReducer) {
-         let onMap = this.onMap && instance.getCallback("onMap");
-         let accumulator = {};
-         instance.resetAccumulator = () => {
-            accumulator = {};
-            if (this.onInitAccumulator) instance.invoke("onInitAccumulator", accumulator, instance);
-         };
-
-         let pointFilter = null;
-         if (this.onCreatePointFilter) pointFilter = instance.invoke("onCreatePointFilter", instance);
-
-         instance.pointReducer = (x, y, name, data, array, index) => {
-            if (!pointFilter || pointFilter(x, y, name, data, array, index))
-               onMap(accumulator, x, y, name, data, array, index);
-            if (parentPointReducer) parentPointReducer(x, y, name, data, array, index);
-         };
-         instance.write = () => {
-            if (this.onReduce) instance.invoke("onReduce", accumulator, instance);
-         };
-      }
+      let pointFilter = instance.pointFilter;
+      let accumulator = instance.accumulator;
+      let onMap = this.onMap && instance.getCallback("onMap");
+      instance.pointReducer = (x, y, name, data, array, index) => {
+         if (!pointFilter || pointFilter(x, y, name, data, array, index))
+            onMap(accumulator, x, y, name, data, array, index);
+         if (parentPointReducer) parentPointReducer(x, y, name, data, array, index);
+      };
+      instance.write = () => {
+         if (this.onReduce) instance.invoke("onReduce", accumulator, instance);
+      };
 
-      instance.resetAccumulator();
       context.push("pointReducer", instance.pointReducer);
-
       super.explore(context, instance);
    }
 

package/src/charts/helpers/SnapPointFinder.js

@@ -1,69 +1,69 @@
-import { PointReducer } from "./PointReducer";
-
-export class SnapPointFinder extends PointReducer {
-   declareData() {
-      return super.declareData(...arguments, {
-         cursorX: undefined,
-         cursorY: undefined,
-         snapX: undefined,
-         snapY: undefined,
-         snapRecord: undefined,
-         maxDistance: undefined,
-      });
-   }
-
-   explore(context, instance) {
-      instance.xAxis = context.axes[this.xAxis];
-      instance.yAxis = context.axes[this.yAxis];
-      super.explore(context, instance);
-   }
-
-   onInitAccumulator(acc, { data, xAxis, yAxis }) {
-      acc.cursor = {
-         x: data.cursorX,
-         y: data.cursorY,
-         mapped: false,
-      };
-      acc.dist = data.maxDistance > 0 ? Math.pow(data.maxDistance, 2) : Number.POSITIVE_INFINITY;
-      acc.snapX = null;
-      acc.snapY = null;
-      acc.xAxis = xAxis;
-      acc.yAxis = yAxis;
-   }
-
-   onMap(acc, x, y, name, p) {
-      let { xAxis, yAxis, cursor } = acc;
-
-      if (!cursor.mapped) {
-         cursor.mappedX = cursor.x != null ? xAxis?.map(this.convertX(cursor.x)) : null;
-         cursor.mappedY = cursor.y != null ? yAxis?.map(this.convertY(cursor.y)) : null;
-         cursor.mapped = true;
-      }
-
-      let d = null;
-      let cx = x != null ? xAxis?.map(this.convertX(x)) : null;
-      let cy = y != null ? yAxis?.map(this.convertY(y)) : null;
-
-      if (cursor.mappedX != null && cx != null) d = (d || 0) + Math.pow(Math.abs(cx - cursor.mappedX), 2);
-      if (cursor.mappedY != null && cy != null) d = (d || 0) + Math.pow(Math.abs(cy - cursor.mappedY), 2);
-
-      if (d != null && d < acc.dist) {
-         acc.dist = d;
-         acc.snapX = x;
-         acc.snapY = y;
-         acc.snapRecord = p;
-      }
-   }
-
-   onReduce(acc, instance) {
-      instance.set("snapX", acc.snapX);
-      instance.set("snapY", acc.snapY);
-      instance.set("snapRecord", acc.snapRecord);
-   }
-}
-
-SnapPointFinder.prototype.maxDistance = 50;
-SnapPointFinder.prototype.convertX = (x) => x;
-SnapPointFinder.prototype.convertY = (y) => y;
-SnapPointFinder.prototype.xAxis = "x";
-SnapPointFinder.prototype.yAxis = "y";
+import { PointReducer } from "./PointReducer";
+
+export class SnapPointFinder extends PointReducer {
+   declareData() {
+      return super.declareData(...arguments, {
+         cursorX: undefined,
+         cursorY: undefined,
+         snapX: undefined,
+         snapY: undefined,
+         snapRecord: undefined,
+         maxDistance: undefined,
+      });
+   }
+
+   explore(context, instance) {
+      instance.xAxis = context.axes[this.xAxis];
+      instance.yAxis = context.axes[this.yAxis];
+      super.explore(context, instance);
+   }
+
+   onInitAccumulator(acc, { data, xAxis, yAxis }) {
+      acc.cursor = {
+         x: data.cursorX,
+         y: data.cursorY,
+         mapped: false,
+      };
+      acc.dist = data.maxDistance > 0 ? Math.pow(data.maxDistance, 2) : Number.POSITIVE_INFINITY;
+      acc.snapX = null;
+      acc.snapY = null;
+      acc.xAxis = xAxis;
+      acc.yAxis = yAxis;
+   }
+
+   onMap(acc, x, y, name, p) {
+      let { xAxis, yAxis, cursor } = acc;
+
+      if (!cursor.mapped) {
+         cursor.mappedX = cursor.x != null ? xAxis?.map(this.convertX(cursor.x)) : null;
+         cursor.mappedY = cursor.y != null ? yAxis?.map(this.convertY(cursor.y)) : null;
+         cursor.mapped = true;
+      }
+
+      let d = null;
+      let cx = x != null ? xAxis?.map(this.convertX(x)) : null;
+      let cy = y != null ? yAxis?.map(this.convertY(y)) : null;
+
+      if (cursor.mappedX != null && cx != null) d = (d || 0) + Math.pow(Math.abs(cx - cursor.mappedX), 2);
+      if (cursor.mappedY != null && cy != null) d = (d || 0) + Math.pow(Math.abs(cy - cursor.mappedY), 2);
+
+      if (d != null && d < acc.dist) {
+         acc.dist = d;
+         acc.snapX = x;
+         acc.snapY = y;
+         acc.snapRecord = p;
+      }
+   }
+
+   onReduce(acc, instance) {
+      instance.set("snapX", acc.snapX);
+      instance.set("snapY", acc.snapY);
+      instance.set("snapRecord", acc.snapRecord);
+   }
+}
+
+SnapPointFinder.prototype.maxDistance = 50;
+SnapPointFinder.prototype.convertX = (x) => x;
+SnapPointFinder.prototype.convertY = (y) => y;
+SnapPointFinder.prototype.xAxis = "x";
+SnapPointFinder.prototype.yAxis = "y";

package/src/data/Binding.spec.js

@@ -1,69 +1,69 @@
-import { Binding } from "./Binding";
-import assert from "assert";
-import { createAccessorModelProxy } from "./createAccessorModelProxy";
-
-describe("Binding", function () {
-   describe("#get()", function () {
-      it("should get value if value is defined", function () {
-         var state = { person: { name: "Joe" } };
-         var b = Binding.get("person.name");
-         assert.equal(b.value(state), "Joe");
-      });
-
-      it("allows non-standard property identifiers", function () {
-         var state = { person: { "@schema": "Person" } };
-         var b = Binding.get("person.@schema");
-         assert.equal(b.path, "person.@schema");
-         assert.equal(b.value(state), "Person");
-      });
-
-      it("properly resolves accessor models", function () {
-         var state = { person: { schema: "Person" } };
-         var b = Binding.get(createAccessorModelProxy("person.schema"));
-         assert.equal(b.value(state), "Person");
-      });
-   });
-
-   describe("#set()", function () {
-      it("produces new objects along the binding path", function () {
-         var state = { person: { name: "Joe" } };
-         var b = Binding.get("person.name");
-         var ns = b.set(state, "Jack");
-         assert.equal(ns.person.name, "Jack");
-         assert.notEqual(state, ns);
-         assert.notEqual(state.person, ns.person);
-         assert.notEqual(state.person.name, ns.person.name);
-      });
-
-      it("returns same state object if value does not change", function () {
-         var state = { person: { name: "Joe" } };
-         var b = Binding.get("person.name");
-         var ns = b.set(state, "Joe");
-         assert.equal(state, ns);
-      });
-
-      it("allows non-standard property identifiers", function () {
-         var state = { person: { "@schema": "Person" } };
-         var b = Binding.get("person.@schema");
-         var ns = b.set(state, "Test");
-         assert.equal(ns.person["@schema"], "Test");
-      });
-   });
-
-   describe(".delete()", function () {
-      it("correctly removes pointed properties", function () {
-         var state = { person: { name: "Joe" } };
-         var b = Binding.get("person.name");
-         var ns = b.delete(state);
-         assert("person" in ns);
-         assert(!("name" in ns.person));
-      });
-
-      it("does not change state if property is non-existent", function () {
-         var state = { person: { name: "Joe" } };
-         var b = Binding.get("person.name2");
-         var ns = b.delete(state);
-         assert(ns == state);
-      });
-   });
-});
+import { Binding } from "./Binding";
+import assert from "assert";
+import { createAccessorModelProxy } from "./createAccessorModelProxy";
+
+describe("Binding", function () {
+   describe("#get()", function () {
+      it("should get value if value is defined", function () {
+         var state = { person: { name: "Joe" } };
+         var b = Binding.get("person.name");
+         assert.equal(b.value(state), "Joe");
+      });
+
+      it("allows non-standard property identifiers", function () {
+         var state = { person: { "@schema": "Person" } };
+         var b = Binding.get("person.@schema");
+         assert.equal(b.path, "person.@schema");
+         assert.equal(b.value(state), "Person");
+      });
+
+      it("properly resolves accessor models", function () {
+         var state = { person: { schema: "Person" } };
+         var b = Binding.get(createAccessorModelProxy("person.schema"));
+         assert.equal(b.value(state), "Person");
+      });
+   });
+
+   describe("#set()", function () {
+      it("produces new objects along the binding path", function () {
+         var state = { person: { name: "Joe" } };
+         var b = Binding.get("person.name");
+         var ns = b.set(state, "Jack");
+         assert.equal(ns.person.name, "Jack");
+         assert.notEqual(state, ns);
+         assert.notEqual(state.person, ns.person);
+         assert.notEqual(state.person.name, ns.person.name);
+      });
+
+      it("returns same state object if value does not change", function () {
+         var state = { person: { name: "Joe" } };
+         var b = Binding.get("person.name");
+         var ns = b.set(state, "Joe");
+         assert.equal(state, ns);
+      });
+
+      it("allows non-standard property identifiers", function () {
+         var state = { person: { "@schema": "Person" } };
+         var b = Binding.get("person.@schema");
+         var ns = b.set(state, "Test");
+         assert.equal(ns.person["@schema"], "Test");
+      });
+   });
+
+   describe(".delete()", function () {
+      it("correctly removes pointed properties", function () {
+         var state = { person: { name: "Joe" } };
+         var b = Binding.get("person.name");
+         var ns = b.delete(state);
+         assert("person" in ns);
+         assert(!("name" in ns.person));
+      });
+
+      it("does not change state if property is non-existent", function () {
+         var state = { person: { name: "Joe" } };
+         var b = Binding.get("person.name2");
+         var ns = b.delete(state);
+         assert(ns == state);
+      });
+   });
+});