@kitware/vtk.js 30.5.3 → 30.6.1

package/Widgets/Widgets3D/InteractiveOrientationWidget.d.ts

@@ -1,12 +1,17 @@
-import { vtkAbstractWidgetFactory, IAbstractWidgetFactoryInitialValues } from './../Core/AbstractWidgetFactory';
-import vtkAbstractWidget from './../Core/AbstractWidget'
+import {
+  vtkAbstractWidgetFactory,
+  IAbstractWidgetFactoryInitialValues,
+} from './../Core/AbstractWidgetFactory';
+import vtkAbstractWidget from './../Core/AbstractWidget';
 import { Bounds } from './../../types';
 import { ViewTypes } from './../Core/WidgetManager/Constants';
 
-export interface vtkInteractiveOrientationWidget<WidgetInstance extends vtkAbstractWidget = vtkAbstractWidget> extends vtkAbstractWidgetFactory<WidgetInstance> {
+export interface vtkInteractiveOrientationWidget<
+  WidgetInstance extends vtkAbstractWidget = vtkAbstractWidget
+> extends vtkAbstractWidgetFactory<WidgetInstance> {
   /**
    * Set the widget bounds
-   * 
+   *
    * @param {Bounds} bounds The widget bounds
    */
   setBounds(bounds: Bounds): void;
@@ -17,7 +22,9 @@ export interface vtkInteractiveOrientationWidget<WidgetInstance extends vtkAbstr
   getRepresentationForViewType(viewType: ViewTypes): unknown;
 }
 
-export interface IInteractiveOrientationWidgetInitialValues<WidgetInstance extends vtkAbstractWidget> extends IAbstractWidgetFactoryInitialValues<WidgetInstance> {}
+export interface IInteractiveOrientationWidgetInitialValues<
+  WidgetInstance extends vtkAbstractWidget
+> extends IAbstractWidgetFactoryInitialValues<WidgetInstance> {}
 
 /**
  * Method use to decorate a given object (publicAPI+model) with vtkInteractiveOrientationWidget characteristics.
@@ -26,18 +33,26 @@ export interface IInteractiveOrientationWidgetInitialValues<WidgetInstance exten
  * @param model object on which data structure will be bounds (protected)
  * @param {object} [initialValues] (default: {})
  */
-export function extend<WidgetInstance extends vtkAbstractWidget>(publicAPI: object, model: object, initialValues? : IInteractiveOrientationWidgetInitialValues<WidgetInstance>): void;
+export function extend<WidgetInstance extends vtkAbstractWidget>(
+  publicAPI: object,
+  model: object,
+  initialValues?: IInteractiveOrientationWidgetInitialValues<WidgetInstance>
+): void;
 
 /**
  * Creates a new instance of vtkInteractiveOrientationWidget
- * 
+ *
  * @param {object} [initialValues] for pre-setting some of its content
  */
-export function newInstance<WidgetInstance extends vtkAbstractWidget = vtkAbstractWidget>(initialValues? : IInteractiveOrientationWidgetInitialValues<WidgetInstance>): vtkInteractiveOrientationWidget<WidgetInstance>;
+export function newInstance<
+  WidgetInstance extends vtkAbstractWidget = vtkAbstractWidget
+>(
+  initialValues?: IInteractiveOrientationWidgetInitialValues<WidgetInstance>
+): vtkInteractiveOrientationWidget<WidgetInstance>;
 
 export declare const vtkInteractiveOrientationWidget: {
-	newInstance: typeof newInstance,
-	extend: typeof extend,
+  newInstance: typeof newInstance;
+  extend: typeof extend;
 };
 
 export default vtkInteractiveOrientationWidget;

package/Widgets/Widgets3D/LabelWidget/behavior.js

@@ -1,4 +1,5 @@
 import { m as macro } from '../../../macros2.js';
+import { k as add } from '../../../Common/Core/Math/index.js';
 
 function widgetBehavior(publicAPI, model) {
   model.classHierarchy.push('vtkLabelWidgetProp');
@@ -37,10 +38,10 @@ function widgetBehavior(publicAPI, model) {
       return macro.VOID;
     }
     const manipulator = model.activeState?.getManipulator?.() ?? model.manipulator;
+    const {
+      worldCoords
+    } = manipulator.handleEvent(e, model._apiSpecificRenderWindow);
     if (model.activeState === model.widgetState.getMoveHandle() && manipulator) {
-      const {
-        worldCoords
-      } = manipulator.handleEvent(e, model._apiSpecificRenderWindow);
       // Commit handle to location
       const moveHandle = model.widgetState.getMoveHandle();
       moveHandle.setOrigin(worldCoords);
@@ -87,14 +88,17 @@ function widgetBehavior(publicAPI, model) {
     const manipulator = model.activeState?.getManipulator?.() ?? model.manipulator;
     if (manipulator && model.pickable && model.dragable && model.activeState && model.activeState.getActive() && !ignoreKey(callData)) {
       const {
-        worldCoords
+        worldCoords,
+        worldDelta
       } = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
-      if (worldCoords.length && (model.activeState === model.widgetState.getMoveHandle() || model._isDragging)) {
-        model.activeState.setOrigin(worldCoords);
-        model.widgetState.getText().setOrigin(model.activeState.getOrigin());
-        publicAPI.invokeInteractionEvent();
-        return macro.EVENT_ABORT;
-      }
+      const isHandleMoving = model.widgetState.getMoveHandle() === model.activeState || model._isDragging;
+      if (!isHandleMoving || !worldCoords.length || !worldDelta.length) return macro.VOID;
+      const curOrigin = model.activeState.getOrigin();
+      const newOrigin = curOrigin ? add(curOrigin, worldDelta, []) : worldCoords;
+      model.activeState.setOrigin(newOrigin);
+      model.widgetState.getText().setOrigin(newOrigin);
+      publicAPI.invokeInteractionEvent();
+      return macro.EVENT_ABORT;
     }
     return macro.VOID;
   };

package/Widgets/Widgets3D/LineWidget/behavior.js

@@ -1,6 +1,6 @@
 import Constants from './Constants.js';
 import { m as macro } from '../../../macros2.js';
-import { s as subtract, k as add, l as normalize } from '../../../Common/Core/Math/index.js';
+import { k as add, s as subtract, l as normalize } from '../../../Common/Core/Math/index.js';
 import { getNumberOfPlacedHandles, isHandlePlaced, calculateTextPosition, updateTextPosition, getPoint } from './helpers.js';
 
 const {
@@ -47,7 +47,7 @@ function widgetBehavior(publicAPI, model) {
   function updateCursor(callData) {
     model._isDragging = true;
     const manipulator = model.activeState?.getManipulator?.() ?? model.manipulator;
-    model.previousPosition = manipulator.handleEvent(callData, model._apiSpecificRenderWindow).worldCoords;
+    manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
     model._apiSpecificRenderWindow.setCursor('grabbing');
     model._interactor.requestAnimation(publicAPI);
   }
@@ -181,22 +181,32 @@ function widgetBehavior(publicAPI, model) {
     const manipulator = model.activeState?.getManipulator?.() ?? model.manipulator;
     if (manipulator && model.pickable && model.dragable && model.activeState && model.activeState.getActive() && !ignoreKey(callData)) {
       const {
-        worldCoords
+        worldCoords,
+        worldDelta
       } = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
-      const translation = model.previousPosition ? subtract(worldCoords, model.previousPosition, []) : [0, 0, 0];
-      model.previousPosition = worldCoords;
-      if (
+      const isHandleMoving =
       // is placing first or second handle
       model.activeState === model.widgetState.getMoveHandle() ||
       // is dragging already placed first or second handle
-      model._isDragging) {
-        if (model.activeState.setOrigin) {
-          model.activeState.setOrigin(worldCoords);
+      model._isDragging;
+
+      // the line state doesn't have setOrigin
+      const isDraggingLine = !model.activeState.setOrigin;
+      if (isHandleMoving) {
+        if (!isDraggingLine) {
+          const curOrigin = model.activeState.getOrigin();
+          if (curOrigin) {
+            model.activeState.setOrigin(add(model.activeState.getOrigin(), worldDelta, []));
+          } else {
+            model.activeState.setOrigin(worldCoords);
+          }
           publicAPI.updateHandleVisibility(publicAPI.getHandleIndex(model.activeState));
         } else {
-          // Dragging line
-          publicAPI.getHandle(0).setOrigin(add(publicAPI.getHandle(0).getOrigin(), translation, []));
-          publicAPI.getHandle(1).setOrigin(add(publicAPI.getHandle(1).getOrigin(), translation, []));
+          // Dragging line; move all handles
+          for (let i = 0; i < 2; i++) {
+            const handleOrigin = publicAPI.getHandle(i).getOrigin();
+            publicAPI.getHandle(i).setOrigin(add(handleOrigin, worldDelta, []));
+          }
         }
         publicAPI.updateHandleOrientations();
         updateTextPosition(model);

package/Widgets/Widgets3D/PolyLineWidget/behavior.js

@@ -1,4 +1,5 @@
 import { m as macro } from '../../../macros2.js';
+import { k as add } from '../../../Common/Core/Math/index.js';
 
 function widgetBehavior(publicAPI, model) {
   model.classHierarchy.push('vtkPolyLineWidgetProp');
@@ -23,11 +24,20 @@ function widgetBehavior(publicAPI, model) {
       return macro.VOID;
     }
     const {
-      worldCoords
+      worldCoords,
+      worldDelta
     } = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
-    if (worldCoords.length && (model.activeState === model.widgetState.getMoveHandle() || model._isDragging) && model.activeState.setOrigin // e.g. the line is pickable but not draggable
-    ) {
-      model.activeState.setOrigin(worldCoords);
+    const isHandleMoving = model.activeState === model.widgetState.getMoveHandle() || model._isDragging;
+
+    // the line is pickable but not draggable
+    const isPickingLine = !model.activeState.setOrigin;
+    if (worldCoords.length && isHandleMoving && !isPickingLine) {
+      const curOrigin = model.activeState.getOrigin();
+      if (curOrigin) {
+        model.activeState.setOrigin(add(curOrigin, worldDelta, []));
+      } else {
+        model.activeState.setOrigin(worldCoords);
+      }
       publicAPI.invokeInteractionEvent();
       return macro.EVENT_ABORT;
     }
@@ -73,6 +83,8 @@ function widgetBehavior(publicAPI, model) {
       newHandle.setScale1(moveHandle.getScale1());
       newHandle.setManipulator(manipulator);
     } else if (model.dragable) {
+      // Update worldDelta
+      manipulator.handleEvent(e, model._apiSpecificRenderWindow);
       model._isDragging = true;
       model._apiSpecificRenderWindow.setCursor('grabbing');
       model._interactor.requestAnimation(publicAPI);

package/Widgets/Widgets3D/PolyLineWidget.js

@@ -53,11 +53,6 @@ function vtkPolyLineWidget(publicAPI, model) {
   // initialization
   // --------------------------------------------------------------------------
 
-  model.widgetState.onBoundsChange(bounds => {
-    const center = [(bounds[0] + bounds[1]) * 0.5, (bounds[2] + bounds[3]) * 0.5, (bounds[4] + bounds[5]) * 0.5];
-    model.widgetState.getMoveHandle().setOrigin(center);
-  });
-
   // Default manipulator
   publicAPI.setManipulator(model.manipulator || vtkPlanePointManipulator.newInstance({
     useCameraFocalPoint: true,

package/Widgets/Widgets3D/ResliceCursorWidget/Constants.d.ts

@@ -2,7 +2,10 @@ import { Vector3 } from '../../../types';
 import { ViewTypes } from '../../Core/WidgetManager/Constants';
 
 // Different types of plane from ViewTypes:
-export type PlaneViewType = ViewTypes.YZ_PLANE | ViewTypes.XZ_PLANE | ViewTypes.XY_PLANE;
+export type PlaneViewType =
+  | ViewTypes.YZ_PLANE
+  | ViewTypes.XZ_PLANE
+  | ViewTypes.XY_PLANE;
 
 // 0, 1, 2 for X, Y, Z
 export type AxisIndex = 0 | 1 | 2;
@@ -10,7 +13,6 @@ export type AxisIndex = 0 | 1 | 2;
 // Should be X, Y, Z
 export type PlaneName = typeof planeNames extends (infer U)[] ? U : never;
 
-
 export declare enum ScrollingMethods {
   MIDDLE_MOUSE_BUTTON = 0,
   LEFT_MOUSE_BUTTON = 1,
@@ -26,19 +28,36 @@ export declare enum InteractionMethodsName {
   TranslateCenterAndUpdatePlanes = 'translateCenterAndUpdatePlanes',
 }
 
-export declare const defaultViewUpFromViewType: { [plane in PlaneViewType]: Vector3 };
+export declare const defaultViewUpFromViewType: {
+  [plane in PlaneViewType]: Vector3;
+};
 
-export declare const xyzToViewType: [PlaneViewType, PlaneViewType, PlaneViewType];
+export declare const xyzToViewType: [
+  PlaneViewType,
+  PlaneViewType,
+  PlaneViewType
+];
 
 export declare const viewTypeToXYZ: { [plane in PlaneViewType]: AxisIndex };
 
 export declare const planeNames: ['X', 'Y', 'Z'];
 
-export declare const viewTypeToPlaneName: { [plane in PlaneViewType]: PlaneName };
+export declare const viewTypeToPlaneName: {
+  [plane in PlaneViewType]: PlaneName;
+};
 
-export declare const planeNameToViewType: { [planeName in PlaneName]: PlaneViewType };
+export declare const planeNameToViewType: {
+  [planeName in PlaneName]: PlaneViewType;
+};
 
-export declare const lineNames: ['YinX', 'ZinX', 'XinY', 'ZinY', 'XinZ', 'YinZ'];
+export declare const lineNames: [
+  'YinX',
+  'ZinX',
+  'XinY',
+  'ZinY',
+  'XinZ',
+  'YinZ'
+];
 
 declare const _default: {
   ScrollingMethods: typeof ScrollingMethods;

package/Widgets/Widgets3D/ResliceCursorWidget/behavior.d.ts

@@ -2,25 +2,26 @@ import { Nullable } from '../../../types';
 import { InteractionMethodsName, lineNames } from './Constants';
 import vtkAbstractWidget from '../../Core/AbstractWidget';
 
-type TLineName = (typeof lineNames)[number];
+type TLineName = typeof lineNames[number];
 
 type TCursorStyles = {
-    [key in InteractionMethodsName]?: string;
+  [key in InteractionMethodsName]?: string;
 } & {
-  default?: string
+  default?: string;
 };
 
-export default interface vtkResliceCursorWidgetDefaultInstance extends vtkAbstractWidget {
-    getActiveInteraction(): Nullable<InteractionMethodsName>;
+export default interface vtkResliceCursorWidgetDefaultInstance
+  extends vtkAbstractWidget {
+  getActiveInteraction(): Nullable<InteractionMethodsName>;
 
-    setKeepOrthogonality(keepOrthogonality: boolean): boolean;
-    getKeepOrthogonality(): boolean;
+  setKeepOrthogonality(keepOrthogonality: boolean): boolean;
+  getKeepOrthogonality(): boolean;
 
-    setCursorStyles(cursorStyles: TCursorStyles): boolean;
-    getCursorStyles(): TCursorStyles;
+  setCursorStyles(cursorStyles: TCursorStyles): boolean;
+  getCursorStyles(): TCursorStyles;
 
-    setEnableTranslation(enableTranslation: boolean): void;
-    setEnableRotation(enableRotation: boolean): void;
+  setEnableTranslation(enableTranslation: boolean): void;
+  setEnableRotation(enableRotation: boolean): void;
 
-    getActiveLineName(): TLineName | undefined;
+  getActiveLineName(): TLineName | undefined;
 }

package/Widgets/Widgets3D/ResliceCursorWidget.d.ts

@@ -1,7 +1,10 @@
 import { mat4 } from 'gl-matrix';
-import { vtkAbstractWidgetFactory, IAbstractWidgetFactoryInitialValues } from './../Core/AbstractWidgetFactory';
+import {
+  vtkAbstractWidgetFactory,
+  IAbstractWidgetFactoryInitialValues,
+} from './../Core/AbstractWidgetFactory';
 import vtkResliceCursorWidgetDefaultInstance from './ResliceCursorWidget/behavior';
-import vtkAbstractWidget from './../Core/AbstractWidget'
+import vtkAbstractWidget from './../Core/AbstractWidget';
 import vtkImageData from './../../Common/DataModel/ImageData';
 import vtkImageReslice from './../../Imaging/Core/ImageReslice';
 import vtkPlaneSource from './../../Filters/Sources/PlaneSource';
@@ -11,15 +14,16 @@ import { ViewTypes } from './../Core/WidgetManager/Constants';
 import { Vector2, Vector3 } from './../../types';
 
 export interface IDisplayScaleParams {
-  dispHeightFactor: number,
-  cameraPosition: Vector3,
-  cameraDir: Vector3,
-  isParallel: false,
-  rendererPixelDims: Vector2
+  dispHeightFactor: number;
+  cameraPosition: Vector3;
+  cameraDir: Vector3;
+  isParallel: false;
+  rendererPixelDims: Vector2;
 }
 
-export interface vtkResliceCursorWidget<WidgetInstance extends vtkAbstractWidget = vtkResliceCursorWidgetDefaultInstance> extends vtkAbstractWidgetFactory<WidgetInstance> {
-
+export interface vtkResliceCursorWidget<
+  WidgetInstance extends vtkAbstractWidget = vtkResliceCursorWidgetDefaultInstance
+> extends vtkAbstractWidgetFactory<WidgetInstance> {
   /**
    * @param {ViewTypes} viewType
    */
@@ -43,12 +47,14 @@ export interface vtkResliceCursorWidget<WidgetInstance extends vtkAbstractWidget
     keepCenterFocalDistance: boolean
   ): void;
 
-
   getPlaneSource(viewType: ViewTypes): vtkPlaneSource;
 
   getResliceAxes(viewType: ViewTypes): mat4;
 
-  updateReslicePlane(imageReslice: vtkImageReslice, viewType: ViewTypes): boolean;
+  updateReslicePlane(
+    imageReslice: vtkImageReslice,
+    viewType: ViewTypes
+  ): boolean;
 
   getPlaneSourceFromViewType(type: ViewTypes): vtkPlaneSource;
 
@@ -79,10 +85,11 @@ export interface vtkResliceCursorWidget<WidgetInstance extends vtkAbstractWidget
    * @returns {Array<Vector3>} two Vector3 arrays (first and last points)
    */
   getPlaneExtremities(viewType: ViewTypes): Array<Vector3>;
-
 }
 
-export interface IResliceCursorWidgetInitialValues<WidgetInstance extends vtkAbstractWidget> extends IAbstractWidgetFactoryInitialValues<WidgetInstance> {}
+export interface IResliceCursorWidgetInitialValues<
+  WidgetInstance extends vtkAbstractWidget
+> extends IAbstractWidgetFactoryInitialValues<WidgetInstance> {}
 
 /**
  * Method used to decorate a given object (publicAPI+model) with vtkResliceCursorWidget characteristics.
@@ -99,10 +106,14 @@ export function extend<WidgetInstance extends vtkAbstractWidget>(
 
 /**
  * Method used to create a new instance of vtkResliceCursorWidget
- * 
+ *
  * @param initialValues for pre-setting some of its content
  */
-export function newInstance<WidgetInstance extends vtkAbstractWidget = vtkResliceCursorWidgetDefaultInstance>(initialValues?: IResliceCursorWidgetInitialValues<WidgetInstance>): vtkResliceCursorWidget<WidgetInstance>;
+export function newInstance<
+  WidgetInstance extends vtkAbstractWidget = vtkResliceCursorWidgetDefaultInstance
+>(
+  initialValues?: IResliceCursorWidgetInitialValues<WidgetInstance>
+): vtkResliceCursorWidget<WidgetInstance>;
 
 export declare const vtkResliceCursorWidget: {
   newInstance: typeof newInstance;

package/Widgets/Widgets3D/SeedWidget/behavior.js

@@ -5,7 +5,6 @@ function widgetBehavior(publicAPI, model) {
   const moveHandle = model.widgetState.getMoveHandle();
   moveHandle.setVisible(true);
   model._isDragging = false;
-  model.previousPosition = null;
   function isValidHandle(handle) {
     return handle === moveHandle;
   }
@@ -32,7 +31,6 @@ function widgetBehavior(publicAPI, model) {
     if (model.activeState === moveHandle) {
       if (!moveHandle.getOrigin() && worldCoords) {
         moveHandle.setOrigin(worldCoords);
-        model.previousPosition = [...worldCoords];
       }
     }
     model._isDragging = true;
@@ -46,7 +44,6 @@ function widgetBehavior(publicAPI, model) {
       return macro.VOID;
     }
     if (isPlaced()) {
-      model.previousPosition = null;
       model._widgetManager.enablePicking();
       model._apiSpecificRenderWindow.setCursor('pointer');
       model._isDragging = false;
@@ -63,10 +60,7 @@ function widgetBehavior(publicAPI, model) {
     }
     if (!model.activeState) throw Error('no activestate');
     const worldCoords = currentWorldCoords(e);
-    if (worldCoords) {
-      model.activeState.setOrigin(worldCoords);
-      model.previousPosition = worldCoords;
-    }
+    model.activeState.setOrigin(worldCoords);
     return macro.VOID;
   };
   publicAPI.grabFocus = () => {

package/Widgets/Widgets3D/SeedWidget.d.ts

@@ -5,11 +5,11 @@ export interface ISeedWidgetHandleState {
   getOrigin(): Vector3;
   setOrigin(arg: Vector3): void;
   getColor3(): string;
-  setColor3(arg: string):void;
+  setColor3(arg: string): void;
   getScale1(): number;
   setScale1(arg: number): void;
   getVisible(): boolean;
-  setVisible(arg: boolean):void
+  setVisible(arg: boolean): void;
   setShape(arg: string): void;
   getShape(): string;
 }

package/Widgets/Widgets3D/ShapeWidget/behavior.js

@@ -295,7 +295,8 @@ function widgetBehavior(publicAPI, model) {
       model.shapeHandle.setDirection(normal);
     }
     const {
-      worldCoords
+      worldCoords,
+      worldDelta
     } = manipulator.handleEvent(callData, model._apiSpecificRenderWindow);
     if (!worldCoords.length) {
       return macro.VOID;
@@ -311,11 +312,11 @@ function widgetBehavior(publicAPI, model) {
       }
     } else if (model._isDragging) {
       if (model.activeState === model.point1Handle) {
-        model.point1Handle.setOrigin(worldCoords);
-        model.point1 = worldCoords;
+        vtkMath.add(model.point1Handle.getOrigin(), worldDelta, model.point1);
+        model.point1Handle.setOrigin(model.point1);
       } else {
-        model.point2Handle.setOrigin(worldCoords);
-        model.point2 = worldCoords;
+        vtkMath.add(model.point2Handle.getOrigin(), worldDelta, model.point2);
+        model.point2Handle.setOrigin(model.point2);
       }
       publicAPI.updateShapeBounds();
       publicAPI.invokeInteractionEvent();
@@ -332,10 +333,10 @@ function widgetBehavior(publicAPI, model) {
     if (!model.activeState || !model.activeState.getActive() || !model.pickable || !manipulator) {
       return macro.VOID;
     }
+    const {
+      worldCoords
+    } = manipulator.handleEvent(e, model._apiSpecificRenderWindow);
     if (model.hasFocus) {
-      const {
-        worldCoords
-      } = manipulator.handleEvent(e, model._apiSpecificRenderWindow);
       if (!model.point1) {
         model.point1Handle.setOrigin(worldCoords);
         publicAPI.placePoint1(model.point1Handle.getOrigin());

package/Widgets/Widgets3D/SphereWidget/behavior.js

@@ -1,4 +1,5 @@
 import { m as macro } from '../../../macros2.js';
+import { k as add } from '../../../Common/Core/Math/index.js';
 import { vec3 } from 'gl-matrix';
 
 function widgetBehavior(publicAPI, model) {
@@ -10,8 +11,6 @@ function widgetBehavior(publicAPI, model) {
 
   // Set while moving the center or border handle.
   model._isDragging = false;
-  // The last world coordinate of the mouse cursor during dragging.
-  model.previousPosition = null;
   model.classHierarchy.push('vtkSphereWidgetProp');
   moveHandle.setVisible(true);
   centerHandle.setVisible(false);
@@ -47,7 +46,7 @@ function widgetBehavior(publicAPI, model) {
   }
   function currentWorldCoords(e) {
     const manipulator = model.activeState?.getManipulator?.() ?? model.manipulator;
-    return manipulator.handleEvent(e, model._apiSpecificRenderWindow).worldCoords;
+    return manipulator.handleEvent(e, model._apiSpecificRenderWindow);
   }
 
   // Update the sphere's center and radius.  Example:
@@ -75,19 +74,22 @@ function widgetBehavior(publicAPI, model) {
       model.activeState = null;
       return macro.VOID;
     }
-    const worldCoords = currentWorldCoords(e);
+    const {
+      worldCoords
+    } = currentWorldCoords(e);
     if (model.activeState === moveHandle) {
       // Initial sphere placement.
       if (!centerHandle.getOrigin()) {
         centerHandle.setOrigin(worldCoords);
       } else if (!borderHandle.getOrigin()) {
         borderHandle.setOrigin(worldCoords);
+        publicAPI.loseFocus();
       }
       updateSphere();
+      return macro.EVENT_ABORT;
     }
     model._isDragging = true;
     model._apiSpecificRenderWindow.setCursor('grabbing');
-    model.previousPosition = [...currentWorldCoords(e)];
     publicAPI.invokeStartInteractionEvent();
     return macro.EVENT_ABORT;
   };
@@ -97,7 +99,6 @@ function widgetBehavior(publicAPI, model) {
       return macro.VOID;
     }
     if (isPlaced()) {
-      model.previousPosition = null;
       model._widgetManager.enablePicking();
       model._apiSpecificRenderWindow.setCursor('pointer');
       model._isDragging = false;
@@ -108,43 +109,33 @@ function widgetBehavior(publicAPI, model) {
     return macro.EVENT_ABORT;
   };
   publicAPI.handleMouseMove = e => {
-    if (!model._isDragging) {
-      model.activeState = null;
-      return macro.VOID;
+    if (!model.activeState) return macro.VOID;
+    const {
+      worldCoords,
+      worldDelta
+    } = currentWorldCoords(e);
+    if (model.hasFocus) {
+      model.activeState.setOrigin(worldCoords);
+    } else if (model._isDragging) {
+      model.activeState.setOrigin(add(model.activeState.getOrigin(), worldDelta, []));
     }
-    if (!model.activeState) throw Error('no activestate');
-    const worldCoords = currentWorldCoords(e);
-    model.activeState.setOrigin(worldCoords);
-    if (model.activeState === centerHandle) {
-      // When the sphere is fully placed, and the user is moving the
-      // center, we move the whole sphere.
-      if (borderHandle.getOrigin()) {
-        if (!model.previousPosition) {
-          // !previousPosition here happens only immediately
-          // after grabFocus, but grabFocus resets
-          // borderHandle.origin.
-          throw Error(`no pos ${model.activeState} ${model.previousPosition}`);
-        }
-        const translation = vec3.sub(vec3.create(), worldCoords, model.previousPosition);
-        borderHandle.setOrigin(vec3.add(vec3.create(), borderHandle.getOrigin(), translation));
-      }
-    }
-    model.previousPosition = worldCoords;
     updateSphere();
     return macro.VOID;
   };
+  const superGrabFocus = publicAPI.grabFocus;
   publicAPI.grabFocus = () => {
+    superGrabFocus();
     moveHandle.setVisible(true);
     centerHandle.setVisible(false);
     borderHandle.setVisible(false);
     centerHandle.setOrigin(null);
     borderHandle.setOrigin(null);
-    model._isDragging = true;
     model.activeState = moveHandle;
     model._interactor.render();
   };
+  const superLoseFocus = publicAPI.loseFocus;
   publicAPI.loseFocus = () => {
-    model._isDragging = false;
+    superLoseFocus();
     model.activeState = null;
   };
 }

package/Widgets/Widgets3D/SphereWidget.d.ts

@@ -5,11 +5,11 @@ export interface ISphereWidgetHandleState {
   getOrigin(): Vector3;
   setOrigin(arg: Vector3): void;
   getColor(): string;
-  setColor(arg: string):void;
+  setColor(arg: string): void;
   getScale1(): number;
   setScale1(arg: number): void;
   getVisible(): boolean;
-  setVisible(arg: boolean):void
+  setVisible(arg: boolean): void;
   setShape(arg: string): void;
   getShape(): string;
 }
@@ -41,7 +41,9 @@ export interface vtkSphereWidget {
 
 export interface ISphereWidgetInitialValues {}
 
-export function newInstance(props?: ISphereWidgetInitialValues): vtkSphereWidget;
+export function newInstance(
+  props?: ISphereWidgetInitialValues
+): vtkSphereWidget;
 
 export const vtkSphereWidget: {
   newInstance: typeof newInstance;