cx 24.8.2 → 24.8.3

package/dist/widgets.js

@@ -4326,7 +4326,7 @@ function tooltipParentWillUnmount(parentInstance) {
 }
 function tooltipParentDidUpdate(element, parentInstance, tooltip) {
 	var instance = getTooltipInstance(element, parentInstance, tooltip);
-	if (instance && instance.tooltipComponent)
+	if (instance && instance.visible && instance.data.alwaysVisible && instance.tooltipComponent)
 		instance.widget.updateDropdownPosition(instance, instance.tooltipComponent);
 }
 function enableTooltips() {

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "cx",
-   "version": "24.8.2",
+   "version": "24.8.3",
    "description": "Advanced JavaScript UI framework for admin and dashboard applications with ready to use grid, form and chart components.",
    "main": "index.js",
    "jsnext:main": "src/index.js",

package/src/charts/helpers/PointReducer.js

@@ -1,47 +1,43 @@
-import { PureContainer } from "../../ui/PureContainer";
-
-export class PointReducer extends PureContainer {
-   explore(context, instance) {
-      let parentPointReducer = context.pointReducer;
-      instance.parentPointTracker = parentPointReducer;
-      instance.accumulatorReset = false;
-
-      if (!instance.pointReducer) {
-         let onMap = this.onMap && instance.getCallback("onMap");
-         let accumulator = {};
-         instance.resetAccumulator = () => {
-            accumulator = {};
-            if (this.onInitAccumulator) instance.invoke("onInitAccumulator", accumulator, instance);
-         };
-
-         instance.pointReducer = (x, y, name, data, array, index) => {
-            if (!instance.accumulatorReset) {
-               instance.resetAccumulator();
-               instance.accumulatorReset = true;
-            }
-            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);
-         };
-      }
-
-      context.push("pointReducer", instance.pointReducer);
-
-      super.explore(context, instance);
-   }
-
-   exploreCleanup(context, instance) {
-      context.pop("pointReducer");
-   }
-
-   prepare(context, instance) {
-      context.push("pointReducer", instance.pointReducer);
-   }
-
-   prepareCleanup(context, instance) {
-      context.pop("pointReducer");
-      instance.write();
-   }
-}
+import { PureContainer } from "../../ui/PureContainer";
+
+export class PointReducer extends PureContainer {
+   explore(context, instance) {
+      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);
+         };
+
+         instance.pointReducer = (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);
+   }
+
+   exploreCleanup(context, instance) {
+      context.pop("pointReducer");
+   }
+
+   prepare(context, instance) {
+      context.push("pointReducer", instance.pointReducer);
+   }
+
+   prepareCleanup(context, instance) {
+      context.pop("pointReducer");
+      instance.write();
+   }
+}

package/src/charts/helpers/SnapPointFinder.js

@@ -1,61 +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.cursorX = data.cursorX != null ? xAxis?.map(this.convertX(data.cursorX)) : null;
-      acc.cursorY = data.cursorY != null ? yAxis?.map(this.convertY(data.cursorY)) : null;
-      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 } = acc;
-
-      let d = null;
-      let cx = x != null ? xAxis?.map(this.convertX(x)) : null;
-      let cy = y != null ? yAxis?.map(this.convertY(y)) : null;
-
-      if (acc.cursorX != null && cx != null) d = (d || 0) + Math.pow(Math.abs(cx - acc.cursorX), 2);
-
-      if (acc.cursorY != null && cy != null) d = (d || 0) + Math.pow(Math.abs(cy - acc.cursorY), 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";