redhotmagma-visualization 1.46.0 → 1.46.2

package/Three/Three2D.js

@@ -303,9 +303,11 @@ var Three2D = exports.Three2D = /*#__PURE__*/function (_ThreeBase) {
         var _ref5,
           animate,
           duration,
+          getViewOffset,
           designArea,
           obj,
           zoom,
+          viewOffset,
           position,
           _args2 = arguments;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
@@ -314,25 +316,26 @@ var Three2D = exports.Three2D = /*#__PURE__*/function (_ThreeBase) {
               _ref5 = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : {
                 animate: false,
                 duration: {}
-              }, animate = _ref5.animate, duration = _ref5.duration;
+              }, animate = _ref5.animate, duration = _ref5.duration, getViewOffset = _ref5.getViewOffset;
               _context2.next = 3;
               return this.getScreenshotsReady();
             case 3:
               designArea = this._currentDesignArea || (0, _first["default"])(this._designAreaList);
               obj = designArea && this.findAreaObjectByName(designArea.identifier);
               zoom = this.calculateZoomForObject(obj);
+              viewOffset = getViewOffset && getViewOffset();
               position = new _three.Vector3();
               if (obj) {
                 obj.getWorldPosition(position);
               }
               position.z = this.camera.position.z;
               if (animate) {
-                this.moveCamera(position, zoom, duration);
+                this.moveCamera(position, zoom, duration, viewOffset);
               } else {
                 this.stopAnimation("camera");
-                this.setCameraPosition(position, zoom);
+                this.setCameraPosition(position, zoom, viewOffset);
               }
-            case 10:
+            case 11:
             case "end":
               return _context2.stop();
           }
@@ -856,13 +859,15 @@ var Three2D = exports.Three2D = /*#__PURE__*/function (_ThreeBase) {
      * Animates the camera position and zoom to the given target
      * @param {Vector3} position
      * @param {number} zoom
-     * @param {{[position]: number, [zoom]: number}} duration The animation duration in ms
+     * @param {{[position]: number, [zoom]: number, [viewOffset]: number}} duration The animation duration in ms
+     * @param {object} viewOffset
      */
   }, {
     key: "moveCamera",
     value: function moveCamera(position, zoom) {
       var _this7 = this;
       var duration = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+      var viewOffset = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
       this.cleanUpCameraAnimations();
       var animationDef = new _Deferred.DeferredGroup();
       if (zoom) {
@@ -875,6 +880,16 @@ var Three2D = exports.Three2D = /*#__PURE__*/function (_ThreeBase) {
       if (position) {
         new _tween["default"].Tween(this.camera.position, this.cameraTweenGroup).to(position, duration.position || 1000).easing(_tween["default"].Easing.Quadratic.Out).onComplete(animationDef.createResolver()).start();
       }
+      if (viewOffset) {
+        if (!this.camera.view) {
+          var _this$renderer$getSiz = this.renderer.getSize(new _three.Vector2()),
+            width = _this$renderer$getSiz.x,
+            height = _this$renderer$getSiz.y;
+          this.camera.setViewOffset(width, height, 0, 0, width, height);
+        }
+        var currentViewOffset = this.camera.view;
+        new _tween["default"].Tween(currentViewOffset, this.cameraTweenGroup).to(viewOffset, duration.viewOffset || 1000).easing(_tween["default"].Easing.Quadratic.Out).onComplete(animationDef.createResolver()).start();
+      }
       animationDef.then(function () {
         return _this7.stopAnimation("camera");
       });
@@ -1135,11 +1150,18 @@ var Three2D = exports.Three2D = /*#__PURE__*/function (_ThreeBase) {
     }
   }, {
     key: "setCameraPosition",
-    value: function setCameraPosition(position, zoom) {
+    value: function setCameraPosition(position, zoom, viewOffset) {
       Object.assign(this.camera.position, position);
       Object.assign(this.camera, {
         zoom: zoom
       });
+      if (viewOffset) {
+        var offsetX = viewOffset.offsetX,
+          offsetY = viewOffset.offsetY,
+          width = viewOffset.width,
+          height = viewOffset.height;
+        this.camera.setViewOffset(width, height, offsetX, offsetY, width, height);
+      }
       this.camera.updateProjectionMatrix();
     }
   }, {

package/Utils/updateFitSizeToElement.js

@@ -3,7 +3,48 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.updateFitSizeToElement = void 0;
+exports.updateFitSizeToElement = exports.getRectCenter = void 0;
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+var getRectCenter = exports.getRectCenter = function getRectCenter(_ref) {
+  var width = _ref.width,
+    height = _ref.height,
+    left = _ref.left,
+    top = _ref.top;
+  var x = left + width / 2;
+  var y = top + height / 2;
+  return {
+    x: x,
+    y: y
+  };
+};
+function calculateViewOffset(visualization, element) {
+  var canvas = visualization.renderer && visualization.renderer.domElement;
+  var containerRect = canvas.getBoundingClientRect();
+  var width = containerRect.width,
+    height = containerRect.height;
+  var _getRectCenter = getRectCenter(containerRect),
+    cx = _getRectCenter.x,
+    cy = _getRectCenter.y;
+  var _getRectCenter2 = getRectCenter(element.getBoundingClientRect()),
+    tx = _getRectCenter2.x,
+    ty = _getRectCenter2.y;
+  var offsetX = cx - tx;
+  var offsetY = cy - ty;
+  return {
+    offsetX: offsetX,
+    offsetY: offsetY,
+    width: width,
+    height: height,
+    fullWidth: width,
+    fullHeight: height
+  };
+}
+
 /**
  * @param {ThreeBase} visualization
  * @param {Element} element
@@ -28,7 +69,11 @@ var updateFitSizeToElement = exports.updateFitSizeToElement = function updateFit
     updateCameraPosition: function updateCameraPosition() {
       var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var updateFn = visualization.setCameraPositionToCurrentDesignArea;
-      updateFn && updateFn.call(visualization, options);
+      updateFn && updateFn.call(visualization, _objectSpread(_objectSpread({}, options), {}, {
+        getViewOffset: function getViewOffset() {
+          return calculateViewOffset(visualization, element);
+        }
+      }));
     }
   };
 };

package/VisualizationContainer.js

@@ -10,7 +10,6 @@ var _cssElementQueries = require("css-element-queries");
 var _VisualizationProvider = require("./VisualizationProvider");
 var _VisualizationInterface = require("./VisualizationInterface");
 var _AlignTargetProvider = require("./AlignTargetProvider");
-var _alignToElement = require("./Utils/alignToElement");
 var _updateFitSizeToElement = require("./Utils/updateFitSizeToElement");
 var _Constants = require("./Constants");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -30,6 +29,20 @@ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.g
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+var didBoundingRectChange = function () {
+  var prevRect;
+  return function (element) {
+    var rect = element.getBoundingClientRect();
+    if (!rect.width || !rect.height) {
+      return false;
+    }
+    var result = !prevRect || ["top", "bottom", "left", "right"].some(function (key) {
+      return rect[key] !== prevRect[key];
+    });
+    prevRect = rect;
+    return result;
+  };
+}();
 var defaultContainerStyle = {
   position: "absolute",
   top: 0,
@@ -66,21 +79,39 @@ var VisualizationContainer = exports.VisualizationContainer = /*#__PURE__*/funct
         loading: loading
       });
     });
-    _defineProperty(_assertThisInitialized(_this), "onSizeChange", function (size) {
+    _defineProperty(_assertThisInitialized(_this), "doAlignment", function () {
+      var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+      var _options$animate = options.animate,
+        animate = _options$animate === void 0 ? false : _options$animate;
       var _this$props = _this.props,
         visualization = _this$props.visualization,
         alignTargetElement = _this$props.alignTargetElement;
+      if (!alignTargetElement) {
+        return;
+      }
+      var _alignTargetElement$g = alignTargetElement.getBoundingClientRect(),
+        width = _alignTargetElement$g.width,
+        height = _alignTargetElement$g.height;
+      if (!width || !height) {
+        return;
+      }
+      (0, _updateFitSizeToElement.updateFitSizeToElement)(visualization, alignTargetElement).updateCameraPosition({
+        animate: visualization.isAnimating() || animate
+      });
+    });
+    _defineProperty(_assertThisInitialized(_this), "onSizeChange", function (size) {
+      var _this$props2 = _this.props,
+        visualization = _this$props2.visualization,
+        alignTargetElement = _this$props2.alignTargetElement;
       if (!visualization.isInitialized()) {
         return;
       }
       visualization.setSize(size);
       if (alignTargetElement && alignTargetElement.clientWidth > 0 && alignTargetElement.clientHeight > 0) {
-        (0, _alignToElement.alignToElement)(visualization, alignTargetElement);
-        (0, _updateFitSizeToElement.updateFitSizeToElement)(visualization, alignTargetElement).updateCameraPosition({
-          animate: visualization.isAnimating() || !!alignTargetElement
+        _this.doAlignment({
+          animate: true
         });
       }
-      visualization.render();
     });
     _defineProperty(_assertThisInitialized(_this), "containerRef", /*#__PURE__*/_react["default"].createRef());
     return _this;
@@ -98,12 +129,16 @@ var VisualizationContainer = exports.VisualizationContainer = /*#__PURE__*/funct
         throw new Error('The provided "three" prop should always be a subclass of VisualizationInterface!');
       }
       this.initResizeSensor();
-      this.updateVisualization();
+      this.updateVisualization({}, {
+        animate: false
+      });
     }
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps) {
-      this.updateVisualization(prevProps);
+      this.updateVisualization(prevProps, {
+        animate: true
+      });
     }
   }, {
     key: "initResizeSensor",
@@ -113,34 +148,37 @@ var VisualizationContainer = exports.VisualizationContainer = /*#__PURE__*/funct
     }
   }, {
     key: "initMutationObserver",
-    value: function initMutationObserver() {
+    value: function initMutationObserver(prevProps) {
+      var _this2 = this;
+      var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+        animate: true
+      };
       if (this.mutationObserver) {
         this.mutationObserver.disconnect();
       }
-      var _this$props2 = this.props,
-        visualization = _this$props2.visualization,
-        alignTargetElement = _this$props2.alignTargetElement;
+      var alignTargetElement = this.props.alignTargetElement;
       if (!alignTargetElement) {
         return;
       }
-      this.mutationObserver = new MutationObserver(function () {
-        (0, _updateFitSizeToElement.updateFitSizeToElement)(visualization, alignTargetElement).updateCameraPosition({
-          animate: true
+      if (alignTargetElement !== prevProps.alignTargetElement) {
+        this.mutationObserver = new MutationObserver(function () {
+          _this2.doAlignment(options);
         });
-        visualization.render();
-      });
-      // do the update only when attributes have changed (e.g. style)
-      this.mutationObserver.observe(alignTargetElement, {
-        attributes: true
-      });
+        // do the update only when attributes have changed (e.g. style)
+        this.mutationObserver.observe(alignTargetElement, {
+          attributes: true
+        });
+      }
+      if (didBoundingRectChange(alignTargetElement)) {
+        this.doAlignment(options);
+      }
     }
   }, {
     key: "updateVisualization",
     value: function updateVisualization() {
       var prevProps = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      var _this$props3 = this.props,
-        visualization = _this$props3.visualization,
-        alignTargetElement = _this$props3.alignTargetElement;
+      var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+      var visualization = this.props.visualization;
       var container = this.containerRef.current;
       if (visualization !== prevProps.visualization) {
         if (prevProps.visualization) {
@@ -155,21 +193,14 @@ var VisualizationContainer = exports.VisualizationContainer = /*#__PURE__*/funct
         // init resize sensor if it's not done in the componentDidUpdate
         !this.resizeSensor && this.initResizeSensor();
       }
-      if ((alignTargetElement && alignTargetElement !== prevProps.alignTargetElement || visualization && visualization !== prevProps.visualization) && alignTargetElement && alignTargetElement.clientWidth > 0 && alignTargetElement.clientHeight > 0) {
-        (0, _alignToElement.alignToElement)(visualization, alignTargetElement);
-        (0, _updateFitSizeToElement.updateFitSizeToElement)(visualization, alignTargetElement).updateCameraPosition({
-          animate: visualization.isAnimating() || !!prevProps.alignTargetElement
-        });
-        visualization.render();
-      }
-      this.initMutationObserver();
+      this.initMutationObserver(prevProps, options);
     }
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
-      var _this$props4 = this.props,
-        autoDispose = _this$props4.autoDispose,
-        visualization = _this$props4.visualization;
+      var _this$props3 = this.props,
+        autoDispose = _this$props3.autoDispose,
+        visualization = _this$props3.visualization;
       autoDispose && visualization.dispose();
       this.resizeSensor && this.resizeSensor.detach();
       this.offObservers && this.offObservers();
@@ -177,34 +208,34 @@ var VisualizationContainer = exports.VisualizationContainer = /*#__PURE__*/funct
   }, {
     key: "initVisualization",
     value: function initVisualization(container) {
-      var _this2 = this;
+      var _this3 = this;
       var visualization = this.props.visualization;
       visualization.init(container);
       var offLoadError = visualization.observable.on(_Constants.EventTypes.LoadError, function (_ref) {
         var screenshot = _ref.data.screenshot;
-        return !screenshot && _this2.setState({
+        return !screenshot && _this3.setState({
           broken: true
         });
       });
       var offLoadFinished = visualization.observable.on(_Constants.EventTypes.LoadFinished, function (_ref2) {
         var screenshot = _ref2.data.screenshot;
-        return !screenshot && _this2.setState({
+        return !screenshot && _this3.setState({
           broken: false
         });
       });
       this.offObservers = function () {
         offLoadError();
         offLoadFinished();
-        delete _this2.offObservers;
+        delete _this3.offObservers;
       };
     }
   }, {
     key: "render",
     value: function render() {
-      var _this$props5 = this.props,
-        className = _this$props5.className,
-        ProgressComponent = _this$props5.ProgressComponent,
-        BrokenComponent = _this$props5.BrokenComponent;
+      var _this$props4 = this.props,
+        className = _this$props4.className,
+        ProgressComponent = _this$props4.ProgressComponent,
+        BrokenComponent = _this$props4.BrokenComponent;
       var broken = this.state.broken;
       var style = _objectSpread(_objectSpread({}, className ? {} : defaultContainerStyle), broken && BrokenComponent && {
         display: "none"

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "redhotmagma-visualization",
-  "version": "1.46.0",
+  "version": "1.46.2",
   "license": "UNLICENSED",
   "private": false,
   "main": "./index.js",
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "@configuratorware/scripts": "1.46.0",
+    "@configuratorware/scripts": "1.46.2",
     "@tweenjs/tween.js": "^17.6.0",
     "console-polyfill": "^0.3.0",
     "css-element-queries": "^1.2.3",

package/src/Three/Three2D.js

@@ -16,8 +16,9 @@ import {
   WebGLRenderer,
   BufferGeometry,
   Float32BufferAttribute,
-  DoubleSide, LinearSRGBColorSpace,
-} from 'three';
+  DoubleSide,
+  LinearSRGBColorSpace,
+} from "three";
 import TWEEN from "@tweenjs/tween.js";
 import get from "lodash/get";
 import first from "lodash/first";
@@ -181,12 +182,15 @@ export class Three2D extends ThreeBase {
     this._fitSize = sizeObj;
   }
 
-  async setCameraPositionToCurrentDesignArea({ animate, duration } = { animate: false, duration: {} }) {
+  async setCameraPositionToCurrentDesignArea(
+    { animate, duration, getViewOffset } = { animate: false, duration: {} }
+  ) {
     await this.getScreenshotsReady();
     const designArea = this._currentDesignArea || first(this._designAreaList);
 
     const obj = designArea && this.findAreaObjectByName(designArea.identifier);
     const zoom = this.calculateZoomForObject(obj);
+    const viewOffset = getViewOffset && getViewOffset();
     const position = new Vector3();
     if (obj) {
       obj.getWorldPosition(position);
@@ -194,10 +198,10 @@ export class Three2D extends ThreeBase {
     position.z = this.camera.position.z;
 
     if (animate) {
-      this.moveCamera(position, zoom, duration);
+      this.moveCamera(position, zoom, duration, viewOffset);
     } else {
       this.stopAnimation("camera");
-      this.setCameraPosition(position, zoom);
+      this.setCameraPosition(position, zoom, viewOffset);
     }
   }
 
@@ -562,9 +566,10 @@ export class Three2D extends ThreeBase {
    * Animates the camera position and zoom to the given target
    * @param {Vector3} position
    * @param {number} zoom
-   * @param {{[position]: number, [zoom]: number}} duration The animation duration in ms
+   * @param {{[position]: number, [zoom]: number, [viewOffset]: number}} duration The animation duration in ms
+   * @param {object} viewOffset
    */
-  moveCamera(position, zoom, duration = {}) {
+  moveCamera(position, zoom, duration = {}, viewOffset = null) {
     this.cleanUpCameraAnimations();
 
     const animationDef = new DeferredGroup();
@@ -583,6 +588,18 @@ export class Three2D extends ThreeBase {
         .onComplete(animationDef.createResolver())
         .start();
     }
+    if (viewOffset) {
+      if (!this.camera.view) {
+        const { x: width, y: height } = this.renderer.getSize(new Vector2());
+        this.camera.setViewOffset(width, height, 0, 0, width, height);
+      }
+      const currentViewOffset = this.camera.view;
+      new TWEEN.Tween(currentViewOffset, this.cameraTweenGroup)
+        .to(viewOffset, duration.viewOffset || 1000)
+        .easing(TWEEN.Easing.Quadratic.Out)
+        .onComplete(animationDef.createResolver())
+        .start();
+    }
     animationDef.then(() => this.stopAnimation("camera"));
     this.startAnimation("camera");
   }
@@ -821,9 +838,13 @@ export class Three2D extends ThreeBase {
     this.setMaxZoom(maxZoom > this._minZoom ? maxZoom : this._minZoom);
   }
 
-  setCameraPosition(position, zoom) {
+  setCameraPosition(position, zoom, viewOffset) {
     Object.assign(this.camera.position, position);
     Object.assign(this.camera, { zoom });
+    if (viewOffset) {
+      const { offsetX, offsetY, width, height } = viewOffset;
+      this.camera.setViewOffset(width, height, offsetX, offsetY, width, height);
+    }
     this.camera.updateProjectionMatrix();
   }
 

package/src/Utils/updateFitSizeToElement.js

@@ -1,3 +1,23 @@
+export const getRectCenter = ({ width, height, left, top }) => {
+  const x = left + width / 2;
+  const y = top + height / 2;
+  return {
+    x,
+    y,
+  };
+};
+
+function calculateViewOffset(visualization, element) {
+  const canvas = visualization.renderer && visualization.renderer.domElement;
+  const containerRect = canvas.getBoundingClientRect();
+  const { width, height } = containerRect;
+  const { x: cx, y: cy } = getRectCenter(containerRect);
+  const { x: tx, y: ty } = getRectCenter(element.getBoundingClientRect());
+  const offsetX = cx - tx;
+  const offsetY = cy - ty;
+  return { offsetX, offsetY, width, height, fullWidth: width, fullHeight: height };
+}
+
 /**
  * @param {ThreeBase} visualization
  * @param {Element} element
@@ -16,7 +36,13 @@ export const updateFitSizeToElement = (visualization, element) => {
   return {
     updateCameraPosition: (options = {}) => {
       const { setCameraPositionToCurrentDesignArea: updateFn } = visualization;
-      updateFn && updateFn.call(visualization, options);
+      updateFn &&
+        updateFn.call(visualization, {
+          ...options,
+          getViewOffset() {
+            return calculateViewOffset(visualization, element);
+          },
+        });
     },
   };
 };

package/src/VisualizationContainer.js

@@ -4,10 +4,23 @@ import { ResizeSensor } from "css-element-queries";
 import { withVisualization } from "./VisualizationProvider";
 import { VisualizationInterface } from "./VisualizationInterface";
 import { withCurrentTarget } from "./AlignTargetProvider";
-import { alignToElement } from "./Utils/alignToElement";
 import { updateFitSizeToElement } from "./Utils/updateFitSizeToElement";
 import { EventTypes as VisualizationEventTypes } from "./Constants";
 
+const didBoundingRectChange = (function() {
+  let prevRect;
+  return function(element) {
+    const rect = element.getBoundingClientRect();
+    if (!rect.width || !rect.height) {
+      return false;
+    }
+    const result =
+      !prevRect || ["top", "bottom", "left", "right"].some(key => rect[key] !== prevRect[key]);
+    prevRect = rect;
+    return result;
+  };
+})();
+
 const defaultContainerStyle = {
   position: "absolute",
   top: 0,
@@ -63,11 +76,11 @@ export class VisualizationContainer extends React.Component {
 
     this.initResizeSensor();
 
-    this.updateVisualization();
+    this.updateVisualization({}, { animate: false });
   }
 
   componentDidUpdate(prevProps) {
-    this.updateVisualization(prevProps);
+    this.updateVisualization(prevProps, { animate: true });
   }
 
   initResizeSensor() {
@@ -75,26 +88,43 @@ export class VisualizationContainer extends React.Component {
     this.resizeSensor = new ResizeSensor(container, this.onSizeChange);
   }
 
-  initMutationObserver() {
+  doAlignment = (options = {}) => {
+    const { animate = false } = options;
+    const { visualization, alignTargetElement } = this.props;
+    if (!alignTargetElement) {
+      return;
+    }
+    const { width, height } = alignTargetElement.getBoundingClientRect();
+    if (!width || !height) {
+      return;
+    }
+    updateFitSizeToElement(visualization, alignTargetElement).updateCameraPosition({
+      animate: visualization.isAnimating() || animate,
+    });
+  };
+
+  initMutationObserver(prevProps, options = { animate: true }) {
     if (this.mutationObserver) {
       this.mutationObserver.disconnect();
     }
-    const { visualization, alignTargetElement } = this.props;
+    const { alignTargetElement } = this.props;
     if (!alignTargetElement) {
       return;
     }
-    this.mutationObserver = new MutationObserver(() => {
-      updateFitSizeToElement(visualization, alignTargetElement).updateCameraPosition({
-        animate: true,
+    if (alignTargetElement !== prevProps.alignTargetElement) {
+      this.mutationObserver = new MutationObserver(() => {
+        this.doAlignment(options);
       });
-      visualization.render();
-    });
-    // do the update only when attributes have changed (e.g. style)
-    this.mutationObserver.observe(alignTargetElement, { attributes: true });
+      // do the update only when attributes have changed (e.g. style)
+      this.mutationObserver.observe(alignTargetElement, { attributes: true });
+    }
+    if (didBoundingRectChange(alignTargetElement)) {
+      this.doAlignment(options);
+    }
   }
 
-  updateVisualization(prevProps = {}) {
-    const { visualization, alignTargetElement } = this.props;
+  updateVisualization(prevProps = {}, options = {}) {
+    const { visualization } = this.props;
     const container = this.containerRef.current;
 
     if (visualization !== prevProps.visualization) {
@@ -110,20 +140,7 @@ export class VisualizationContainer extends React.Component {
       // init resize sensor if it's not done in the componentDidUpdate
       !this.resizeSensor && this.initResizeSensor();
     }
-    if (
-      ((alignTargetElement && alignTargetElement !== prevProps.alignTargetElement) ||
-        (visualization && visualization !== prevProps.visualization)) &&
-      alignTargetElement &&
-      alignTargetElement.clientWidth > 0 &&
-      alignTargetElement.clientHeight > 0
-    ) {
-      alignToElement(visualization, alignTargetElement);
-      updateFitSizeToElement(visualization, alignTargetElement).updateCameraPosition({
-        animate: visualization.isAnimating() || !!prevProps.alignTargetElement,
-      });
-      visualization.render();
-    }
-    this.initMutationObserver();
+    this.initMutationObserver(prevProps, options);
   }
 
   componentWillUnmount() {
@@ -162,12 +179,8 @@ export class VisualizationContainer extends React.Component {
       alignTargetElement.clientWidth > 0 &&
       alignTargetElement.clientHeight > 0
     ) {
-      alignToElement(visualization, alignTargetElement);
-      updateFitSizeToElement(visualization, alignTargetElement).updateCameraPosition({
-        animate: visualization.isAnimating() || !!alignTargetElement,
-      });
+      this.doAlignment({ animate: true });
     }
-    visualization.render();
   };
 
   containerRef = React.createRef();

package/Utils/alignToElement.js

@@ -1,72 +0,0 @@
-"use strict";
-
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getRectCenter = exports.alignToElement = void 0;
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-var getRectCenter = exports.getRectCenter = function getRectCenter(_ref) {
-  var width = _ref.width,
-    height = _ref.height,
-    left = _ref.left,
-    top = _ref.top;
-  var x = left + width / 2;
-  var y = top + height / 2;
-  return {
-    x: x,
-    y: y
-  };
-};
-
-/**
- * Calculates the view offset to align the camera with the given element
- * @param {ThreeBase} visualization
- * @param {Element} element
- */
-var alignToElement = exports.alignToElement = /*#__PURE__*/function () {
-  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(visualization, element) {
-    var canvas, containerRect, width, height, _getRectCenter, cx, cy, _getRectCenter2, tx, ty, dx, dy;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _context.next = 2;
-          return visualization.getScreenshotsReady();
-        case 2:
-          canvas = visualization.renderer && visualization.renderer.domElement;
-          if (!(visualization && visualization.camera)) {
-            _context.next = 18;
-            break;
-          }
-          if (element) {
-            _context.next = 9;
-            break;
-          }
-          visualization.camera.clearViewOffset();
-          return _context.abrupt("return");
-        case 9:
-          if (canvas) {
-            _context.next = 11;
-            break;
-          }
-          return _context.abrupt("return");
-        case 11:
-          containerRect = canvas.getBoundingClientRect();
-          width = containerRect.width, height = containerRect.height;
-          _getRectCenter = getRectCenter(containerRect), cx = _getRectCenter.x, cy = _getRectCenter.y;
-          _getRectCenter2 = getRectCenter(element.getBoundingClientRect()), tx = _getRectCenter2.x, ty = _getRectCenter2.y;
-          dx = cx - tx;
-          dy = cy - ty;
-          visualization.camera.setViewOffset(width, height, dx, dy, width, height);
-        case 18:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return function alignToElement(_x, _x2) {
-    return _ref2.apply(this, arguments);
-  };
-}();

package/src/Utils/alignToElement.js

@@ -1,33 +0,0 @@
-export const getRectCenter = ({ width, height, left, top }) => {
-  const x = left + width / 2;
-  const y = top + height / 2;
-  return {
-    x,
-    y,
-  };
-};
-
-/**
- * Calculates the view offset to align the camera with the given element
- * @param {ThreeBase} visualization
- * @param {Element} element
- */
-export const alignToElement = async (visualization, element) => {
-  await visualization.getScreenshotsReady();
-  const canvas = visualization.renderer && visualization.renderer.domElement;
-  if (visualization && visualization.camera) {
-    if (!element) {
-      visualization.camera.clearViewOffset();
-      return;
-    } else if (!canvas) {
-      return;
-    }
-    const containerRect = canvas.getBoundingClientRect();
-    const { width, height } = containerRect;
-    const { x: cx, y: cy } = getRectCenter(containerRect);
-    const { x: tx, y: ty } = getRectCenter(element.getBoundingClientRect());
-    const dx = cx - tx;
-    const dy = cy - ty;
-    visualization.camera.setViewOffset(width, height, dx, dy, width, height);
-  }
-};