@kitware/vtk.js 25.1.1 → 25.2.0

package/Widgets/Widgets3D/RectangleWidget.js

@@ -21,8 +21,6 @@ function vtkRectangleWidget(publicAPI, model) {
   model.classHierarchy.push('vtkRectangleWidget');
   model.methodsToLink = [].concat(_toConsumableArray(model.methodsToLink), ['activeScaleFactor', 'activeColor', 'useActiveColor', 'drawBorder', 'drawFace', 'opacity']); // --- Widget Requirement ---------------------------------------------------
 
-  model.behavior = widgetBehavior;
-
   publicAPI.getRepresentationsForViewType = function (viewType) {
     switch (viewType) {
       case ViewTypes.DEFAULT:
@@ -49,7 +47,6 @@ function vtkRectangleWidget(publicAPI, model) {
   // --------------------------------------------------------------------------
 
 
-  model.widgetState = generateState();
   model.manipulator = vtkPlanePointManipulator.newInstance({
     useCameraNormal: true
   });
@@ -60,6 +57,8 @@ function defaultValues(initialValues) {
   var _None;
 
   return _objectSpread({
+    behavior: widgetBehavior,
+    widgetState: generateState(),
     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),
       Shift: _defineProperty({}, BehaviorCategory.RATIO, ShapeBehavior[BehaviorCategory.RATIO].FIXED),

package/Widgets/Widgets3D/ResliceCursorWidget.js

@@ -1,3 +1,4 @@
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import macro from '../../macros.js';
 import vtkAbstractWidgetFactory from '../Core/AbstractWidgetFactory.js';
@@ -12,6 +13,9 @@ import { ViewTypes } from '../Core/WidgetManager/Constants.js';
 import { mat4, vec4 } from 'gl-matrix';
 import vtkMatrixBuilder from '../../Common/Core/MatrixBuilder.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; }
 var VTK_INT_MAX = 2147483647;
 var vtkErrorMacro = macro.vtkErrorMacro; // ----------------------------------------------------------------------------
 // Factory
@@ -136,9 +140,6 @@ function vtkResliceCursorWidget(publicAPI, model) {
   // --------------------------------------------------------------------------
 
 
-  model.behavior = widgetBehavior;
-  model.widgetState = generateState();
-
   publicAPI.getRepresentationsForViewType = function (viewType) {
     switch (viewType) {
       case ViewTypes.XY_PLANE:
@@ -400,11 +401,17 @@ function vtkResliceCursorWidget(publicAPI, model) {
 } // ----------------------------------------------------------------------------
 
 
-var DEFAULT_VALUES = {}; // ----------------------------------------------------------------------------
+var defaultValues = function defaultValues(initialValues) {
+  return _objectSpread({
+    behavior: widgetBehavior,
+    widgetState: generateState()
+  }, initialValues);
+}; // ----------------------------------------------------------------------------
+
 
 function extend(publicAPI, model) {
   var initialValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  Object.assign(model, DEFAULT_VALUES, initialValues);
+  Object.assign(model, defaultValues(initialValues));
   vtkAbstractWidgetFactory.extend(publicAPI, model, initialValues);
   vtkResliceCursorWidget(publicAPI, model);
 } // ----------------------------------------------------------------------------

package/Widgets/Widgets3D/SphereWidget.js

@@ -17,7 +17,6 @@ function vtkSphereWidget(publicAPI, model) {
 
   var superClass = _objectSpread({}, publicAPI);
 
-  model.behavior = widgetBehavior;
   model.methodsToLink = ['scaleInPixels'];
 
   publicAPI.getRepresentationsForViewType = function (viewType) {
@@ -53,15 +52,21 @@ function vtkSphereWidget(publicAPI, model) {
   // --------------------------------------------------------------------------
 
 
-  model.widgetState = stateGenerator();
   publicAPI.setManipulator(model.manipulator || vtkPlanePointManipulator.newInstance({
     useCameraNormal: true
   }));
 }
 
+var defaultValues = function defaultValues(initialValues) {
+  return _objectSpread({
+    behavior: widgetBehavior,
+    widgetState: stateGenerator()
+  }, initialValues);
+};
+
 function extend(publicAPI, model) {
   var initialValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  Object.assign(model, {}, initialValues);
+  Object.assign(model, defaultValues(initialValues));
   vtkAbstractWidgetFactory.extend(publicAPI, model, initialValues);
   macro.setGet(publicAPI, model, ['manipulator', 'widgetState']);
   vtkSphereWidget(publicAPI, model);

package/Widgets/Widgets3D/SplineWidget.js

@@ -21,8 +21,6 @@ function vtkSplineWidget(publicAPI, model) {
 
 
   model.methodsToLink = ['boundaryCondition', 'close', 'outputBorder', 'fill', 'borderColor', 'errorBorderColor', 'scaleInPixels'];
-  model.behavior = widgetBehavior;
-  model.widgetState = generateState();
 
   publicAPI.getRepresentationsForViewType = function (viewType) {
     switch (viewType) {
@@ -60,21 +58,26 @@ function vtkSplineWidget(publicAPI, model) {
 } // ----------------------------------------------------------------------------
 
 
-var DEFAULT_VALUES = {
-  // manipulator: null,
-  freehandMinDistance: 0.1,
-  allowFreehand: true,
-  resolution: 32,
-  // propagates to SplineContextRepresentation
-  defaultCursor: 'pointer',
-  handleSizeInPixels: 10,
-  // propagates to SplineContextRepresentation
-  resetAfterPointPlacement: false
+var defaultValues = function defaultValues(initialValues) {
+  return _objectSpread({
+    // manipulator: null,
+    freehandMinDistance: 0.1,
+    allowFreehand: true,
+    resolution: 32,
+    // propagates to SplineContextRepresentation
+    defaultCursor: 'pointer',
+    handleSizeInPixels: 10,
+    // propagates to SplineContextRepresentation
+    resetAfterPointPlacement: false,
+    behavior: widgetBehavior,
+    widgetState: generateState()
+  }, initialValues);
 }; // ----------------------------------------------------------------------------
 
+
 function extend(publicAPI, model) {
   var initialValues = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-  Object.assign(model, DEFAULT_VALUES, initialValues);
+  Object.assign(model, defaultValues(initialValues));
   vtkAbstractWidgetFactory.extend(publicAPI, model, initialValues);
   macro.setGet(publicAPI, model, ['manipulator', 'freehandMinDistance', 'allowFreehand', 'resolution', 'defaultCursor', 'handleSizeInPixels', 'resetAfterPointPlacement']);
   vtkSplineWidget(publicAPI, model);

package/package.json

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