figureone 1.2.0 → 1.3.0

package/index.js

@@ -11254,6 +11254,12 @@ var FigureElement = /*#__PURE__*/function () {
   // lastDrawElementTransformPosition: {parentCount: number, elementCount: number};
 
   // True if should be shown in figure
+  // True if equation forms should not initiate any new state changes on this
+  // element: it is excluded from form layout, show/hide, transform/color sets,
+  // and elementMods. Note: form-driven animations on the equation collection
+  // (collectionMethods.stop()) still cancel any in-flight animations on the
+  // element — the contract is "no new form-driven changes", not full isolation.
+
   // Used to reference element in a collection
 
   // Element is able to be moved
@@ -11371,6 +11377,7 @@ var FigureElement = /*#__PURE__*/function () {
     this.uid = (Math.random() * 1e18).toString(36);
     this.uniqueColor = null;
     this.isShown = true;
+    this.isFormIgnored = false;
     this.simple = false;
     this.allowSetColor = 'all';
     this.transform = transform._dup();
@@ -11566,7 +11573,7 @@ var FigureElement = /*#__PURE__*/function () {
         return ['animations', 'color', 'opacity', 'dimColor', 'defaultColor', 'transform', '_custom', 'scene',
         // 'lastDrawTransform',
         // 'parentTransform',
-        'isShown', 'isMovable', 'isTouchable', 'state', 'pulseSettings', 'setTransformCallback', 'move', 'notifications',
+        'isShown', 'isMovable', 'isTouchable', 'isFormIgnored', 'state', 'pulseSettings', 'setTransformCallback', 'move', 'notifications',
         // 'finishAnimationOnPause',
         'pulseTransforms', 'frozenPulseTransforms', 'customState'].concat(_toConsumableArray(this.stateProperties));
       }
@@ -18467,20 +18474,31 @@ var Element = /*#__PURE__*/function () {
         if (content.measureAndAlignText != null) {
           content.measureAndAlignText();
         }
-        content.transform.updateTranslation([location.x, location.y]);
-        content.transform.updateScale([scale, scale]);
-        if (content.internalSetTransformCallback != null) {
-          this.fnMap.exec(content.internalSetTransformCallback, content.transform);
-        }
+        if (content.isFormIgnored) {
+          // Form-ignored elements contribute zero size to the layout so adjacent
+          // elements aren't sized off whatever transform the user has applied.
+          this.location = location._dup();
+          this.scale = scale;
+          this.ascent = 0;
+          this.descent = 0;
+          this.height = 0;
+          this.width = 0;
+        } else {
+          content.transform.updateTranslation([location.x, location.y]);
+          content.transform.updateScale([scale, scale]);
+          if (content.internalSetTransformCallback != null) {
+            this.fnMap.exec(content.internalSetTransformCallback, content.transform);
+          }
 
-        // Get the boundaries of element
-        var r = content.getRelativeBoundingRect('draw', 'border', null, false);
-        this.location = location._dup();
-        this.scale = scale;
-        this.ascent = r.top * scale;
-        this.descent = -r.bottom * scale;
-        this.height = r.height * scale;
-        this.width = r.width * scale;
+          // Get the boundaries of element
+          var r = content.getRelativeBoundingRect('draw', 'border', null, false);
+          this.location = location._dup();
+          this.scale = scale;
+          this.ascent = r.top * scale;
+          this.descent = -r.bottom * scale;
+          this.height = r.height * scale;
+          this.width = r.width * scale;
+        }
       }
       this.fullSize = {
         leftOffset: 0,
@@ -18528,6 +18546,9 @@ var Element = /*#__PURE__*/function () {
     value: function setPositions() {
       var content = this.content;
       if (content instanceof _Element__WEBPACK_IMPORTED_MODULE_3__.FigureElementCollection || content instanceof _Element__WEBPACK_IMPORTED_MODULE_3__.FigureElementPrimitive) {
+        if (content.isFormIgnored) {
+          return;
+        }
         content.transform.updateTranslation([this.location.x, this.location.y]);
         content.transform.updateScale([this.scale, this.scale]);
       }
@@ -18544,6 +18565,9 @@ var Element = /*#__PURE__*/function () {
       }
       var content = this.content;
       if (content instanceof _Element__WEBPACK_IMPORTED_MODULE_3__.FigureElementCollection || content instanceof _Element__WEBPACK_IMPORTED_MODULE_3__.FigureElementPrimitive) {
+        if (content.isFormIgnored) {
+          return;
+        }
         content.setColor(color);
       }
     }
@@ -22312,9 +22336,11 @@ var EquationForm = /*#__PURE__*/function (_Elements) {
     value: function getElementsToShowAndHide() {
       var allElements = this.collectionMethods.getAllElements();
       var elementsShown = allElements.filter(function (e) {
-        return e.isShown;
+        return e.isShown && !e.isFormIgnored;
+      });
+      var elementsShownTarget = this.getAllElements(false).filter(function (e) {
+        return !e.isFormIgnored;
       });
-      var elementsShownTarget = this.getAllElements(false);
       var elementsToHide = elementsShown.filter(function (e) {
         return elementsShownTarget.indexOf(e) === -1;
       });
@@ -22405,9 +22431,11 @@ var EquationForm = /*#__PURE__*/function (_Elements) {
       this.collectionMethods.stop();
       var allElements = this.collectionMethods.getAllElements();
       var elementsShown = allElements.filter(function (e) {
-        return e.isShown;
+        return e.isShown && !e.isFormIgnored;
+      });
+      var elementsToShow = this.getAllElements(false).filter(function (e) {
+        return !e.isFormIgnored;
       });
-      var elementsToShow = this.getAllElements(false);
       var elementsToDelayShowing = elementsToShow.filter(function (e) {
         return !e.isShown;
       });
@@ -22473,6 +22501,9 @@ var EquationForm = /*#__PURE__*/function (_Elements) {
           var _elementMods$elementN = elementMods[elementName],
             element = _elementMods$elementN.element,
             mods = _elementMods$elementN.mods;
+          if (element != null && element.isFormIgnored) {
+            return;
+          }
           if (element != null && mods != null) {
             element.setProperties(mods);
             if (mods.color != null) {
@@ -22499,7 +22530,9 @@ var EquationForm = /*#__PURE__*/function (_Elements) {
       var dissolveInBeforeMove = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
       var allElements = this.collectionMethods.getAllElements();
       this.collectionMethods.stop();
-      var elementsShownTarget = this.getAllElements(false);
+      var elementsShownTarget = this.getAllElements(false).filter(function (e) {
+        return !e.isFormIgnored;
+      });
       elementsShownTarget.forEach(function (e) {
         if (e.opacity === 0.001) {
           e.hide();
@@ -22509,7 +22542,7 @@ var EquationForm = /*#__PURE__*/function (_Elements) {
         }
       });
       var elementsShown = allElements.filter(function (e) {
-        return e.isShown;
+        return e.isShown && !e.isFormIgnored;
       });
       var elementsToHide = elementsShown.filter(function (e) {
         return elementsShownTarget.indexOf(e) === -1;
@@ -64767,6 +64800,7 @@ var Atlas = /*#__PURE__*/function () {
       if (Math.pow(dimension, 2) > 16777216 && isIOS()) {
         var mDim = Math.sqrt(16777216);
         fontSizePX *= mDim / dimension * 0.95;
+        this.fontSize = fontSizePX;
         dimension = Math.floor(Math.ceil(Math.sqrt(glyphs.length) + 2) * fontSizePX * 1.5);
       }
       var canvas = document.createElement('canvas');
@@ -80648,8 +80682,8 @@ var tools = {
  */
 
 var Fig = {
-  version: "1.2.0",
-  gitHash: "b3f17c9ba",
+  version: "1.3.0",
+  gitHash: "3aa02f880",
   tools: tools,
   Figure: _js_figure_Figure__WEBPACK_IMPORTED_MODULE_5__["default"],
   Recorder: _js_figure_Recorder_Recorder__WEBPACK_IMPORTED_MODULE_7__.Recorder,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "figureone",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "description": "Draw, animate and interact with shapes, text, plots and equations in Javascript. Create interactive slide shows, and interactive videos.",
   "main": "index.js",
   "types": "types/index.d.ts",

package/types/js/figure/Element.d.ts

@@ -414,6 +414,7 @@ declare class FigureElement {
     lastDrawOpacity: number;
     parent: FigureElement | null;
     isShown: boolean;
+    isFormIgnored: boolean;
     name: string;
     isMovable: boolean;
     isTouchable: boolean;