@xeokit/xeokit-sdk 2.6.7 → 2.6.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xeokit/xeokit-sdk",
-  "version": "2.6.7",
+  "version": "2.6.9",
   "description": "Web Programming Toolkit for 3D/2D BIM and AEC Graphics",
   "module": "./dist/xeokit-sdk.es.js",
   "main": "./dist/xeokit-sdk.cjs.js",

package/src/plugins/AngleMeasurementsPlugin/AngleMeasurementsMouseControl.js

@@ -193,8 +193,8 @@ export class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
         const mouseHoverCanvasPos = math.vec2();
         this._currentAngleMeasurement = null;
 
-        const getTop = el => el.offsetTop + (el.offsetParent && getTop(el.offsetParent));
-        const getLeft = el => el.offsetLeft + (el.offsetParent && getLeft(el.offsetParent));
+        const getTop = el => el.offsetTop + (el.offsetParent && (el.offsetParent !== canvas.parentNode) && getTop(el.offsetParent));
+        const getLeft = el => el.offsetLeft + (el.offsetParent && (el.offsetParent !== canvas.parentNode) && getLeft(el.offsetParent));
 
         const pagePos = math.vec2();
 

package/src/plugins/DistanceMeasurementsPlugin/DistanceMeasurementsMouseControl.js

@@ -199,8 +199,8 @@ export class DistanceMeasurementsMouseControl extends DistanceMeasurementsContro
 
         this._mouseState = MOUSE_FIRST_CLICK_EXPECTED;
 
-        const getTop = el => el.offsetTop + (el.offsetParent && getTop(el.offsetParent));
-        const getLeft = el => el.offsetLeft + (el.offsetParent && getLeft(el.offsetParent));
+        const getTop = el => el.offsetTop + (el.offsetParent && (el.offsetParent !== canvas.parentNode) && getTop(el.offsetParent));
+        const getLeft = el => el.offsetLeft + (el.offsetParent && (el.offsetParent !== canvas.parentNode) && getLeft(el.offsetParent));
 
         const pagePos = math.vec2();
         

package/types/plugins/AngleMeasurementsPlugin/AngleMeasurementsMouseControl.d.ts

@@ -1,4 +1,4 @@
-import { AngleMeasurementsControl } from "./AngleMeasurementsControl.js";
+import {AngleMeasurementsControl} from "./AngleMeasurementsControl.js";
 import {AngleMeasurementsPlugin} from "./AngleMeasurementsPlugin";
 import {PointerLens} from "../../extras/";
 
@@ -42,11 +42,13 @@ export class AngleMeasurementsMouseControl extends AngleMeasurementsControl {
      * @param {AngleMeasurementsPlugin} angleMeasurementsPlugin The AngleMeasurementsPlugin to control.
      * @param {Object} [cfg] Configuration options.
      * @param {PointerLens} [cfg.pointerLens] A PointerLens to use for providing a magnified view of the cursor when snapping is enabled.
+     * @param {function} [cfg.canvasToPagePos] Optional function to map canvas-space coordinates to page coordinates.
      * @param {boolean} [cfg.snapping=true] Whether to initially enable snap-to-vertex and snap-to-edge for this AngleMeasurementsMouseControl.
      */
     constructor(angleMeasurementsPlugin: AngleMeasurementsPlugin, cfg?: {
         pointerLens?: PointerLens;
         snapping?: boolean;
+        canvasToPagePos? : Function;
     });
 
     /**

package/types/plugins/AngleMeasurementsPlugin/AngleMeasurementsTouchControl.d.ts

@@ -42,11 +42,13 @@ export class AngleMeasurementsTouchControl extends AngleMeasurementsControl {
      * @param {AngleMeasurementsPlugin} angleMeasurementsPlugin The AngleMeasurementsPlugin to control.
      * @param {Object} [cfg] Configuration options.
      * @param {PointerLens} [cfg.pointerLens] A PointerLens to use for providing a magnified view of the cursor when snapping is enabled.
+     * @param {function} [cfg.canvasToPagePos] Optional function to map canvas-space coordinates to page coordinates.
      * @param {boolean} [cfg.snapping=true] Whether to initially enable snap-to-vertex and snap-to-edge for this AngleMeasurementsTouchControl.
      */
     constructor(angleMeasurementsPlugin: AngleMeasurementsPlugin, cfg?: {
         pointerLens?: PointerLens;
         snapping?: boolean;
+        canvasToPagePos? : Function;
     });
 
     /**

package/types/plugins/DistanceMeasurementsPlugin/DistanceMeasurementsMouseControl.d.ts

@@ -21,11 +21,13 @@ export class DistanceMeasurementsMouseControl extends DistanceMeasurementsContro
      * @param {DistanceMeasurementsPlugin} distanceMeasurementsPlugin The DistanceMeasurementsPlugin to control.
      * @param {Object} cfg Configuration options.
      * @param {PointerLens} [cfg.pointerLens] A PointerLens to provide a magnified view of the cursor when snapping is enabled.
+     * @param {function} [cfg.canvasToPagePos] Optional function to map canvas-space coordinates to page coordinates.
      * @param {boolean} [cfg.snapping=true] Whether to enable snap-to-vertex and snap-to-edge for this DistanceMeasurementsMouseControl.
      */
     constructor(distanceMeasurementsPlugin: DistanceMeasurementsPlugin, cfg?: {
         pointerLens?: PointerLens;
         snapping?: boolean;
+        canvasToPagePos? : Function;
     });
 
     /**

package/types/plugins/DistanceMeasurementsPlugin/DistanceMeasurementsTouchControl.d.ts

@@ -20,11 +20,13 @@ export class DistanceMeasurementsTouchControl extends DistanceMeasurementsContro
      * @param {DistanceMeasurementsPlugin} distanceMeasurementsPlugin The DistanceMeasurementsPlugin to control.
      * @param {Object} cfg Configuration options.
      * @param {PointerLens} [cfg.pointerLens] A PointerLens to provide a magnified view of the cursor when snapping is enabled.
+     * @param {function} [cfg.canvasToPagePos] Optional function to map canvas-space coordinates to page coordinates.
      * @param {boolean} [cfg.snapping=true] Whether to enable snap-to-vertex and snap-to-edge for this DistanceMeasurementsTouchControl.
      */
     constructor(distanceMeasurementsPlugin: DistanceMeasurementsPlugin, cfg?: {
         pointerLens?: PointerLens;
         snapping?: boolean;
+        canvasToPagePos? : Function;
     });
 
     /**