@kitware/vtk.js 24.7.1 → 24.8.0

package/Widgets/Widgets3D/LineWidget.js

@@ -1,3 +1,4 @@
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { f as distance2BetweenPoints } from '../../Common/Core/Math/index.js';
 import macro from '../../macros.js';
 import generateState from './LineWidget/state.js';
@@ -11,11 +12,17 @@ import { Behavior } from '../Representations/WidgetRepresentation/Constants.js';
 import { ViewTypes } from '../Core/WidgetManager/Constants.js';
 import { getPoint, updateTextPosition } from './LineWidget/helpers.js';
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 // Factory
 // ----------------------------------------------------------------------------
 
 function vtkLineWidget(publicAPI, model) {
   model.classHierarchy.push('vtkLineWidget');
+
+  var superClass = _objectSpread({}, publicAPI);
+
   model.widgetState = generateState();
   model.behavior = widgetBehavior; // --- Widget Requirement ---------------------------------------------------
 
@@ -135,6 +142,13 @@ function vtkLineWidget(publicAPI, model) {
     var p1 = getPoint(0, model.widgetState);
     var p2 = getPoint(1, model.widgetState);
     return p1 && p2 ? Math.sqrt(distance2BetweenPoints(p1, p2)) : 0;
+  };
+
+  publicAPI.setManipulator = function (manipulator) {
+    superClass.setManipulator(manipulator);
+    model.widgetState.getMoveHandle().setManipulator(manipulator);
+    model.widgetState.getHandle1().setManipulator(manipulator);
+    model.widgetState.getHandle2().setManipulator(manipulator);
   }; // --------------------------------------------------------------------------
   // initialization
   // --------------------------------------------------------------------------
@@ -152,11 +166,14 @@ function vtkLineWidget(publicAPI, model) {
     updateTextPosition(model);
   }); // Default manipulator
 
-  model.manipulator = vtkPlanePointManipulator.newInstance();
+  publicAPI.setManipulator(model.manipulator || vtkPlanePointManipulator.newInstance({
+    useCameraNormal: true
+  }));
 } // ----------------------------------------------------------------------------
 
 
 var DEFAULT_VALUES = {
+  // manipulator: null,
   isDragging: false
 }; // ----------------------------------------------------------------------------
 

package/Widgets/Widgets3D/PaintWidget/behavior.js

@@ -32,8 +32,12 @@ function widgetBehavior(publicAPI, model) {
   };
 
   publicAPI.handleEvent = function (callData) {
-    if (model.manipulator && model.activeState && model.activeState.getActive()) {
-      var _model$activeState, _model$activeState2, _model$activeState3;
+    var _model$activeState$ge, _model$activeState, _model$activeState$ge2;
+
+    var manipulator = (_model$activeState$ge = (_model$activeState = model.activeState) === null || _model$activeState === void 0 ? void 0 : (_model$activeState$ge2 = _model$activeState.getManipulator) === null || _model$activeState$ge2 === void 0 ? void 0 : _model$activeState$ge2.call(_model$activeState)) !== null && _model$activeState$ge !== void 0 ? _model$activeState$ge : model.manipulator;
+
+    if (manipulator && model.activeState && model.activeState.getActive()) {
+      var _model$activeState2, _model$activeState3, _model$activeState4;
 
       var normal = model._camera.getDirectionOfProjection();
 
@@ -42,21 +46,20 @@ function widgetBehavior(publicAPI, model) {
       var right = [];
       vec3.cross(right, up, normal);
 
-      (_model$activeState = model.activeState).setUp.apply(_model$activeState, _toConsumableArray(up));
+      (_model$activeState2 = model.activeState).setUp.apply(_model$activeState2, _toConsumableArray(up));
 
-      (_model$activeState2 = model.activeState).setRight.apply(_model$activeState2, right);
+      (_model$activeState3 = model.activeState).setRight.apply(_model$activeState3, right);
 
-      (_model$activeState3 = model.activeState).setDirection.apply(_model$activeState3, _toConsumableArray(normal));
+      (_model$activeState4 = model.activeState).setDirection.apply(_model$activeState4, _toConsumableArray(normal));
 
-      model.manipulator.setNormal(normal);
-      var worldCoords = model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
+      var worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
       if (worldCoords.length) {
-        var _model$widgetState, _model$activeState4;
+        var _model$widgetState, _model$activeState5;
 
         (_model$widgetState = model.widgetState).setTrueOrigin.apply(_model$widgetState, _toConsumableArray(worldCoords));
 
-        (_model$activeState4 = model.activeState).setOrigin.apply(_model$activeState4, _toConsumableArray(worldCoords));
+        (_model$activeState5 = model.activeState).setOrigin.apply(_model$activeState5, _toConsumableArray(worldCoords));
 
         if (model.painting) {
           var trailCircle = model.widgetState.addTrail();

package/Widgets/Widgets3D/PaintWidget.js

@@ -1,3 +1,4 @@
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import macro from '../../macros.js';
 import vtkAbstractWidgetFactory from '../Core/AbstractWidgetFactory.js';
 import vtkCircleContextRepresentation from '../Representations/CircleContextRepresentation.js';
@@ -7,11 +8,17 @@ import widgetBehavior from './PaintWidget/behavior.js';
 import generateState from './PaintWidget/state.js';
 import { ViewTypes } from '../Core/WidgetManager/Constants.js';
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 // Factory
 // ----------------------------------------------------------------------------
 
 function vtkPaintWidget(publicAPI, model) {
-  model.classHierarchy.push('vtkPaintWidget'); // --- Widget Requirement ---------------------------------------------------
+  model.classHierarchy.push('vtkPaintWidget');
+
+  var superClass = _objectSpread({}, publicAPI); // --- Widget Requirement ---------------------------------------------------
+
 
   model.behavior = widgetBehavior;
   model.widgetState = generateState(model.radius);
@@ -33,26 +40,35 @@ function vtkPaintWidget(publicAPI, model) {
           labels: ['handle']
         }];
     }
-  }; // --- Widget Requirement ---------------------------------------------------
+  }; // --- Public methods -------------------------------------------------------
 
 
-  var handle = model.widgetState.getHandle(); // Default manipulator
+  publicAPI.setManipulator = function (manipulator) {
+    superClass.setManipulator(manipulator);
+    model.widgetState.getHandle().setManipulator(manipulator);
+  }; // override
 
-  model.manipulator = vtkPlanePointManipulator.newInstance();
-  handle.setManipulator(model.manipulator); // override
 
   var superSetRadius = publicAPI.setRadius;
 
   publicAPI.setRadius = function (r) {
     if (superSetRadius(r)) {
-      handle.setScale1(r);
+      model.widgetState.getHandle().setScale1(r);
     }
-  };
+  }; // --------------------------------------------------------------------------
+  // initialization
+  // --------------------------------------------------------------------------
+  // Default manipulator
+
+
+  publicAPI.setManipulator(model.manipulator || vtkPlanePointManipulator.newInstance({
+    useCameraNormal: true
+  }));
 } // ----------------------------------------------------------------------------
 
 
 var DEFAULT_VALUES = {
-  manipulator: null,
+  // manipulator: null,
   radius: 1,
   painting: false,
   color: [1]

package/Widgets/Widgets3D/PolyLineWidget/behavior.js

@@ -19,9 +19,15 @@ function widgetBehavior(publicAPI, model) {
   }
 
   function updateMoveHandle(callData) {
-    model.manipulator.setOrigin(model._camera.getFocalPoint());
-    model.manipulator.setNormal(model._camera.getDirectionOfProjection());
-    var worldCoords = model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
+    var _model$activeState$ge, _model$activeState, _model$activeState$ge2;
+
+    var manipulator = (_model$activeState$ge = (_model$activeState = model.activeState) === null || _model$activeState === void 0 ? void 0 : (_model$activeState$ge2 = _model$activeState.getManipulator) === null || _model$activeState$ge2 === void 0 ? void 0 : _model$activeState$ge2.call(_model$activeState)) !== null && _model$activeState$ge !== void 0 ? _model$activeState$ge : model.manipulator;
+
+    if (!manipulator) {
+      return macro.VOID;
+    }
+
+    var worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
     if (worldCoords.length && (model.activeState === model.widgetState.getMoveHandle() || isDragging)) {
       model.activeState.setOrigin(worldCoords);
@@ -72,6 +78,7 @@ function widgetBehavior(publicAPI, model) {
       newHandle.setOrigin.apply(newHandle, _toConsumableArray(moveHandle.getOrigin()));
       newHandle.setColor(moveHandle.getColor());
       newHandle.setScale1(moveHandle.getScale1());
+      newHandle.setManipulator(model.manipulator);
     } else {
       isDragging = true;
 
@@ -88,7 +95,7 @@ function widgetBehavior(publicAPI, model) {
 
 
   publicAPI.handleMouseMove = function (callData) {
-    if (model.pickable && model.dragable && model.manipulator && model.activeState && model.activeState.getActive() && !ignoreKey(callData)) {
+    if (model.pickable && model.dragable && model.activeState && model.activeState.getActive() && !ignoreKey(callData)) {
       if (updateMoveHandle(callData) === macro.EVENT_ABORT) {
         return macro.EVENT_ABORT;
       }

package/Widgets/Widgets3D/PolyLineWidget/state.js

@@ -3,7 +3,7 @@ import vtkStateBuilder from '../../Core/StateBuilder.js';
 function generateState() {
   return vtkStateBuilder.createBuilder().addStateFromMixin({
     labels: ['moveHandle'],
-    mixins: ['origin', 'color', 'scale1', 'visible'],
+    mixins: ['origin', 'color', 'scale1', 'visible', 'manipulator'],
     name: 'moveHandle',
     initialValues: {
       // when scaleInPixels=true, the handles have 30px height
@@ -12,7 +12,7 @@ function generateState() {
     }
   }).addDynamicMixinState({
     labels: ['handles'],
-    mixins: ['origin', 'color', 'scale1', 'visible'],
+    mixins: ['origin', 'color', 'scale1', 'visible', 'manipulator'],
     name: 'handle',
     initialValues: {
       scale1: 30

package/Widgets/Widgets3D/PolyLineWidget.js

@@ -1,3 +1,4 @@
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import macro from '../../macros.js';
 import vtkAbstractWidgetFactory from '../Core/AbstractWidgetFactory.js';
 import vtkPlanePointManipulator from '../Manipulators/PlaneManipulator.js';
@@ -8,11 +9,17 @@ import widgetBehavior from './PolyLineWidget/behavior.js';
 import generateState from './PolyLineWidget/state.js';
 import { ViewTypes } from '../Core/WidgetManager/Constants.js';
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 // Factory
 // ----------------------------------------------------------------------------
 
 function vtkPolyLineWidget(publicAPI, model) {
-  model.classHierarchy.push('vtkPolyLineWidget'); // --- Widget Requirement ---------------------------------------------------
+  model.classHierarchy.push('vtkPolyLineWidget');
+
+  var superClass = _objectSpread({}, publicAPI); // --- Widget Requirement ---------------------------------------------------
+
 
   model.methodsToLink = ['activeColor', 'activeScaleFactor', 'closePolyLine', 'defaultScale', 'glyphResolution', 'lineThickness', 'useActiveColor', 'scaleInPixels'];
   model.behavior = widgetBehavior;
@@ -51,6 +58,15 @@ function vtkPolyLineWidget(publicAPI, model) {
           labels: ['handles', 'moveHandle']
         }];
     }
+  }; // --- Public methods -------------------------------------------------------
+
+
+  publicAPI.setManipulator = function (manipulator) {
+    superClass.setManipulator(manipulator);
+    model.widgetState.getMoveHandle().setManipulator(manipulator);
+    model.widgetState.getHandleList().forEach(function (handle) {
+      handle.setManipulator(manipulator);
+    });
   }; // --------------------------------------------------------------------------
   // initialization
   // --------------------------------------------------------------------------
@@ -61,7 +77,10 @@ function vtkPolyLineWidget(publicAPI, model) {
     model.widgetState.getMoveHandle().setOrigin(center);
   }); // Default manipulator
 
-  model.manipulator = vtkPlanePointManipulator.newInstance();
+  publicAPI.setManipulator(model.manipulator || vtkPlanePointManipulator.newInstance({
+    useCameraFocalPoint: true,
+    useCameraNormal: true
+  }));
 } // ----------------------------------------------------------------------------
 
 

package/Widgets/Widgets3D/RectangleWidget.js

@@ -50,15 +50,16 @@ function vtkRectangleWidget(publicAPI, model) {
   }; // --------------------------------------------------------------------------
   // initialization
   // --------------------------------------------------------------------------
-  // Default manipulator
 
 
-  model.manipulator = vtkPlanePointManipulator.newInstance();
   model.widgetState = generateState();
+  model.manipulator = vtkPlanePointManipulator.newInstance({
+    useCameraNormal: true
+  });
 } // ----------------------------------------------------------------------------
 
 
-function defaultValues(initalValues) {
+function defaultValues(initialValues) {
   var _None;
 
   return _objectSpread({
@@ -67,14 +68,14 @@ function defaultValues(initalValues) {
       Shift: _defineProperty({}, BehaviorCategory.RATIO, ShapeBehavior[BehaviorCategory.RATIO].FIXED),
       Control: _defineProperty({}, BehaviorCategory.POINTS, ShapeBehavior[BehaviorCategory.POINTS].CENTER_TO_CORNER)
     }
-  }, initalValues);
+  }, initialValues);
 } // ----------------------------------------------------------------------------
 
 
 function extend(publicAPI, model) {
   var initialValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   vtkShapeWidget.extend(publicAPI, model, defaultValues(initialValues));
-  macro.setGet(publicAPI, model, ['manipulator', 'widgetState']);
+  macro.setGet(publicAPI, model, ['widgetState']);
   vtkRectangleWidget(publicAPI, model);
 } // ----------------------------------------------------------------------------
 

package/Widgets/Widgets3D/ResliceCursorWidget/behavior.js

@@ -63,8 +63,8 @@ function widgetBehavior(publicAPI, model) {
       isDragging = true;
       var viewType = model.widgetState.getActiveViewType();
       var currentPlaneNormal = model.widgetState.getPlanes()[viewType].normal;
-      model.planeManipulator.setOrigin(model.widgetState.getCenter());
-      model.planeManipulator.setNormal(currentPlaneNormal);
+      model.planeManipulator.setWidgetOrigin(model.widgetState.getCenter());
+      model.planeManipulator.setWidgetNormal(currentPlaneNormal);
       publicAPI.startInteraction();
     } else if (model.widgetState.getScrollingMethod() === ScrollingMethods.LEFT_MOUSE_BUTTON) {
       publicAPI.startScrolling(callData.position);
@@ -215,7 +215,7 @@ function widgetBehavior(publicAPI, model) {
     var dot$1 = dot(currentLineVector, otherLineVector); // lines are colinear, translate along perpendicular axis from current line
 
     if (dot$1 === 1 || dot$1 === -1) {
-      cross(currentLineVector, model.planeManipulator.getNormal(), axisTranslation);
+      cross(currentLineVector, model.planeManipulator.getWidgetNormal(), axisTranslation);
     }
 
     var closestPoint = [];
@@ -249,7 +249,7 @@ function widgetBehavior(publicAPI, model) {
 
   publicAPI[InteractionMethodsName.RotateLine] = function (calldata) {
     var activeLine = model.widgetState.getActiveLineState();
-    var planeNormal = model.planeManipulator.getNormal();
+    var planeNormal = model.planeManipulator.getWidgetNormal();
     var worldCoords = model.planeManipulator.handleEvent(calldata, model._apiSpecificRenderWindow);
     var center = model.widgetState.getCenter();
     var previousLineDirection = subtract(activeLine.getPoint1(), activeLine.getPoint2(), []);

package/Widgets/Widgets3D/ShapeWidget/behavior.js

@@ -241,8 +241,9 @@ function widgetBehavior(publicAPI, model) {
     var _model$_apiSpecificRe, _model$_apiSpecificRe2, _model$_apiSpecificRe5;
 
     var worldMargin = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
-    var viewPlaneOrigin = model.manipulator.getOrigin();
-    var viewPlaneNormal = model.manipulator.getNormal();
+    var viewPlaneOrigin = vtkBoundingBox.getCenter(worldBounds);
+
+    var viewPlaneNormal = model._renderer.getActiveCamera().getDirectionOfProjection();
 
     var viewUp = model._renderer.getActiveCamera().getViewUp();
 
@@ -345,7 +346,11 @@ function widgetBehavior(publicAPI, model) {
 
 
   publicAPI.handleMouseMove = function (callData) {
-    if (!model.activeState || !model.activeState.getActive() || !model.pickable || !model.dragable || !model.manipulator) {
+    var _model$activeState$ge, _model$activeState, _model$activeState$ge2;
+
+    var manipulator = (_model$activeState$ge = (_model$activeState = model.activeState) === null || _model$activeState === void 0 ? void 0 : (_model$activeState$ge2 = _model$activeState.getManipulator) === null || _model$activeState$ge2 === void 0 ? void 0 : _model$activeState$ge2.call(_model$activeState)) !== null && _model$activeState$ge !== void 0 ? _model$activeState$ge : model.manipulator;
+
+    if (!manipulator || !model.activeState || !model.activeState.getActive() || !model.pickable || !model.dragable) {
       return macro.VOID;
     }
 
@@ -361,10 +366,9 @@ function widgetBehavior(publicAPI, model) {
       model.shapeHandle.setUp(up);
       model.shapeHandle.setRight(right);
       model.shapeHandle.setDirection(normal);
-      model.manipulator.setNormal(normal);
     }
 
-    var worldCoords = model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
+    var worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
 
     if (!worldCoords.length) {
       return macro.VOID;

package/Widgets/Widgets3D/ShapeWidget.js

@@ -9,14 +9,24 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function vtkShapeWidget(publicAPI, model) {
   model.classHierarchy.push('vtkShapeWidget');
+
+  var superClass = _objectSpread({}, publicAPI);
+
   model.methodsToLink = ['scaleInPixels', 'textProps', 'fontProperties'];
+
+  publicAPI.setManipulator = function (manipulator) {
+    superClass.setManipulator(manipulator);
+    model.widgetState.getStatesWithLabel('moveHandle').forEach(function (handle) {
+      return handle.setManipulator(manipulator);
+    });
+  };
 }
 
 function defaultValues(initialValues) {
   var _None;
 
   return _objectSpread({
-    manipulator: null,
+    // manipulator: null,
     modifierBehavior: {
       None: (_None = {}, _defineProperty(_None, BehaviorCategory.PLACEMENT, ShapeBehavior[BehaviorCategory.PLACEMENT].CLICK_AND_DRAG), _defineProperty(_None, BehaviorCategory.POINTS, ShapeBehavior[BehaviorCategory.POINTS].CORNER_TO_CORNER), _defineProperty(_None, BehaviorCategory.RATIO, ShapeBehavior[BehaviorCategory.RATIO].FREE), _None)
     },
@@ -29,7 +39,7 @@ function extend(publicAPI, model) {
   var initialValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   Object.assign(model, defaultValues(initialValues));
   vtkAbstractWidgetFactory.extend(publicAPI, model, initialValues);
-  macro.setGet(publicAPI, model, ['modifierBehavior', 'resetAfterPointPlacement']);
+  macro.setGet(publicAPI, model, ['manipulator', 'modifierBehavior', 'resetAfterPointPlacement']);
   vtkShapeWidget(publicAPI, model);
 } // ----------------------------------------------------------------------------
 

package/Widgets/Widgets3D/SphereWidget/behavior.js

@@ -12,8 +12,6 @@ function widgetBehavior(publicAPI, model) {
   model.isDragging = false; // The last world coordinate of the mouse cursor during dragging.
 
   model.previousPosition = null;
-  centerHandle.setManipulator(model.manipulator);
-  borderHandle.setManipulator(model.manipulator);
   model.classHierarchy.push('vtkSphereWidgetProp');
   moveHandle.setVisible(true);
   centerHandle.setVisible(false);
@@ -55,7 +53,10 @@ function widgetBehavior(publicAPI, model) {
   }
 
   function currentWorldCoords(e) {
-    return model.manipulator.handleEvent(e, model._apiSpecificRenderWindow);
+    var _model$activeState$ge, _model$activeState, _model$activeState$ge2;
+
+    var manipulator = (_model$activeState$ge = (_model$activeState = model.activeState) === null || _model$activeState === void 0 ? void 0 : (_model$activeState$ge2 = _model$activeState.getManipulator) === null || _model$activeState$ge2 === void 0 ? void 0 : _model$activeState$ge2.call(_model$activeState)) !== null && _model$activeState$ge !== void 0 ? _model$activeState$ge : model.manipulator;
+    return manipulator.handleEvent(e, model._apiSpecificRenderWindow);
   } // Update the sphere's center and radius.  Example:
   // handle.setCenterAndRadius([1,2,3], 10);
 

package/Widgets/Widgets3D/SphereWidget.js

@@ -1,3 +1,4 @@
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { f as distance2BetweenPoints } from '../../Common/Core/Math/index.js';
 import vtkAbstractWidgetFactory from '../Core/AbstractWidgetFactory.js';
 import vtkPlanePointManipulator from '../Manipulators/PlaneManipulator.js';
@@ -7,8 +8,15 @@ import macro from '../../macros.js';
 import widgetBehavior from './SphereWidget/behavior.js';
 import stateGenerator from './SphereWidget/state.js';
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
 function vtkSphereWidget(publicAPI, model) {
   model.classHierarchy.push('vtkSphereWidget');
+
+  var superClass = _objectSpread({}, publicAPI);
+
   model.behavior = widgetBehavior;
 
   publicAPI.getRepresentationsForViewType = function (viewType) {
@@ -34,7 +42,8 @@ function vtkSphereWidget(publicAPI, model) {
       builder: vtkSphereContextRepresentation,
       labels: ['sphereHandle']
     }];
-  };
+  }; // --- Public methods -------------------------------------------------------
+
 
   publicAPI.getRadius = function () {
     var h1 = model.widgetState.getCenterHandle();
@@ -42,8 +51,20 @@ function vtkSphereWidget(publicAPI, model) {
     return Math.sqrt(distance2BetweenPoints(h1.getOrigin(), h2.getOrigin()));
   };
 
-  model.manipulator = vtkPlanePointManipulator.newInstance();
+  publicAPI.setManipulator = function (manipulator) {
+    superClass.setManipulator(manipulator);
+    model.widgetState.getMoveHandle().setManipulator(manipulator);
+    model.widgetState.getCenterHandle().setManipulator(manipulator);
+    model.widgetState.getBorderHandle().setManipulator(manipulator);
+  }; // --------------------------------------------------------------------------
+  // initialization
+  // --------------------------------------------------------------------------
+
+
   model.widgetState = stateGenerator();
+  publicAPI.setManipulator(model.manipulator || vtkPlanePointManipulator.newInstance({
+    useCameraNormal: true
+  }));
 }
 
 function extend(publicAPI, model) {

package/Widgets/Widgets3D/SplineWidget/behavior.js

@@ -32,6 +32,7 @@ function widgetBehavior(publicAPI, model) {
 
       model.lastHandle.setColor(model.moveHandle.getColor());
       model.lastHandle.setScale1(model.moveHandle.getScale1());
+      model.lastHandle.setManipulator(model.manipulator);
 
       if (!model.firstHandle) {
         model.firstHandle = model.lastHandle;
@@ -247,12 +248,15 @@ function widgetBehavior(publicAPI, model) {
 
 
   publicAPI.handleMouseMove = function (callData) {
-    if (!model.activeState || !model.activeState.getActive() || !model.pickable || !model.manipulator) {
+    var _model$activeState$ge, _model$activeState, _model$activeState$ge2;
+
+    var manipulator = (_model$activeState$ge = (_model$activeState = model.activeState) === null || _model$activeState === void 0 ? void 0 : (_model$activeState$ge2 = _model$activeState.getManipulator) === null || _model$activeState$ge2 === void 0 ? void 0 : _model$activeState$ge2.call(_model$activeState)) !== null && _model$activeState$ge !== void 0 ? _model$activeState$ge : model.manipulator;
+
+    if (!manipulator || !model.activeState || !model.activeState.getActive() || !model.pickable) {
       return macro.VOID;
     }
 
-    model.manipulator.setNormal(model._camera.getDirectionOfProjection());
-    var worldCoords = model.manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
+    var worldCoords = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
     var hoveredHandle = getHoveredHandle();
 
     if (hoveredHandle) {

package/Widgets/Widgets3D/SplineWidget/state.js

@@ -16,7 +16,7 @@ function generateState() {
     initialValue: 0
   }).addStateFromMixin({
     labels: ['moveHandle'],
-    mixins: ['origin', 'color', 'scale1', 'visible'],
+    mixins: ['origin', 'color', 'scale1', 'visible', 'manipulator'],
     name: 'moveHandle',
     initialValues: {
       scale1: 0.05,
@@ -24,7 +24,7 @@ function generateState() {
     }
   }).addDynamicMixinState({
     labels: ['handles'],
-    mixins: ['origin', 'color', 'scale1', 'visible'],
+    mixins: ['origin', 'color', 'scale1', 'visible', 'manipulator'],
     name: 'handle',
     initialValues: {
       scale1: 0.05

package/Widgets/Widgets3D/SplineWidget.js

@@ -1,3 +1,4 @@
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import macro from '../../macros.js';
 import vtkAbstractWidgetFactory from '../Core/AbstractWidgetFactory.js';
 import vtkPlanePointManipulator from '../Manipulators/PlaneManipulator.js';
@@ -7,11 +8,17 @@ import widgetBehavior from './SplineWidget/behavior.js';
 import generateState from './SplineWidget/state.js';
 import { ViewTypes } from '../Core/WidgetManager/Constants.js';
 
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 // Factory
 // ----------------------------------------------------------------------------
 
 function vtkSplineWidget(publicAPI, model) {
-  model.classHierarchy.push('vtkSplineWidget'); // --- Widget Requirement ---------------------------------------------------
+  model.classHierarchy.push('vtkSplineWidget');
+
+  var superClass = _objectSpread({}, publicAPI); // --- Widget Requirement ---------------------------------------------------
+
 
   model.methodsToLink = ['outputBorder', 'fill', 'borderColor', 'errorBorderColor'];
   model.behavior = widgetBehavior;
@@ -35,17 +42,29 @@ function vtkSplineWidget(publicAPI, model) {
           labels: ['handles', 'moveHandle']
         }];
     }
+  }; // --- Public methods -------------------------------------------------------
+
+
+  publicAPI.setManipulator = function (manipulator) {
+    superClass.setManipulator(manipulator);
+    model.widgetState.getMoveHandle().setManipulator(manipulator);
+    model.widgetState.getHandleList().forEach(function (handle) {
+      handle.setManipulator(manipulator);
+    });
   }; // --------------------------------------------------------------------------
   // initialization
   // --------------------------------------------------------------------------
   // Default manipulator
 
 
-  model.manipulator = vtkPlanePointManipulator.newInstance();
+  publicAPI.setManipulator(model.manipulator || model.manipulator || vtkPlanePointManipulator.newInstance({
+    useCameraNormal: true
+  }));
 } // ----------------------------------------------------------------------------
 
 
 var DEFAULT_VALUES = {
+  // manipulator: null,
   freehandMinDistance: 0.1,
   allowFreehand: true,
   resolution: 32,

package/index.d.ts

@@ -42,8 +42,8 @@
 /// <reference path="./Filters/General/AppendPolyData.d.ts" />
 /// <reference path="./Filters/General/ImageCropFilter.d.ts" />
 /// <reference path="./Filters/General/ImageOutlineFilter.d.ts" />
-/// <reference path="./Filters/General/ImageStreamline.d.ts" />
 /// <reference path="./Filters/General/ImageSliceFilter.d.ts" />
+/// <reference path="./Filters/General/ImageStreamline.d.ts" />
 /// <reference path="./Filters/General/LineFilter.d.ts" />
 /// <reference path="./Filters/General/OutlineFilter.d.ts" />
 /// <reference path="./Filters/General/TriangleFilter.d.ts" />
@@ -138,6 +138,7 @@
 /// <reference path="./Rendering/SceneGraph/RenderPass.d.ts" />
 /// <reference path="./Rendering/SceneGraph/ViewNode.d.ts" />
 /// <reference path="./Rendering/SceneGraph/ViewNodeFactory.d.ts" />
+/// <reference path="./Widgets/Manipulators/AbstractManipulator.d.ts" />
 /// <reference path="./Widgets/Manipulators/LineManipulator.d.ts" />
 /// <reference path="./Widgets/Manipulators/PlaneManipulator.d.ts" />
 /// <reference path="./Widgets/Manipulators/TrackballManipulator.d.ts" />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitware/vtk.js",
-  "version": "24.7.1",
+  "version": "24.8.0",
   "description": "Visualization Toolkit for the Web",
   "keywords": [
     "3d",