figureone 1.2.1 → 1.4.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));
       }
@@ -17218,6 +17225,10 @@ function offsetLocationForGlyphs(glyphs, offset) {
   });
 }
 var BaseAnnotationFunction = /*#__PURE__*/function () {
+  // Optional caller-supplied identifier, assigned post-dispatch by
+  // EquationFunctions.eqnMethod. Has no layout effect; used by
+  // Equation.getElementsInForm to look up the contents of a sub-tree.
+
   function BaseAnnotationFunction(content, annotations, glyphs, options) {
     var showContent = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : true;
     _classCallCheck(this, BaseAnnotationFunction);
@@ -17229,6 +17240,7 @@ var BaseAnnotationFunction = /*#__PURE__*/function () {
     this.showContent = showContent;
     this.scale = 1;
     this.color = null;
+    this.functionName = null;
   }
   return _createClass(BaseAnnotationFunction, [{
     key: "_dup",
@@ -17863,6 +17875,10 @@ function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf
 
 
 var BaseEquationFunction = /*#__PURE__*/function (_Elements) {
+  // Optional caller-supplied identifier, assigned post-dispatch by
+  // EquationFunctions.eqnMethod. Has no layout effect; used by
+  // Equation.getElementsInForm to look up the contents of a sub-tree.
+
   function BaseEquationFunction(content, glyph, options) {
     var _this;
     var showContent = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
@@ -17901,6 +17917,7 @@ var BaseEquationFunction = /*#__PURE__*/function (_Elements) {
     });
     _this.options = options;
     _this.showContent = showContent;
+    _this.functionName = null;
     return _this;
   }
   _inherits(BaseEquationFunction, _Elements);
@@ -18467,20 +18484,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 +18556,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 +18575,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);
       }
     }
@@ -19417,11 +19451,12 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _DrawingObjects_TextObject_TextObject__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../DrawingObjects/TextObject/TextObject */ "./src/js/figure/DrawingObjects/TextObject/TextObject.ts");
 /* harmony import */ var _Elements_Element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ./Elements/Element */ "./src/js/figure/Equation/Elements/Element.ts");
 /* harmony import */ var _Elements_BaseAnnotationFunction__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ./Elements/BaseAnnotationFunction */ "./src/js/figure/Equation/Elements/BaseAnnotationFunction.ts");
-/* harmony import */ var _EquationForm__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./EquationForm */ "./src/js/figure/Equation/EquationForm.ts");
-/* harmony import */ var _tools_htmlGenerator__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../../tools/htmlGenerator */ "./src/js/tools/htmlGenerator.ts");
-/* harmony import */ var _EquationSymbols__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./EquationSymbols */ "./src/js/figure/Equation/EquationSymbols.ts");
-/* harmony import */ var _EquationFunctions__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./EquationFunctions */ "./src/js/figure/Equation/EquationFunctions.ts");
-/* harmony import */ var _Animation_Animation__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../Animation/Animation */ "./src/js/figure/Animation/Animation.ts");
+/* harmony import */ var _Elements_BaseEquationFunction__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! ./Elements/BaseEquationFunction */ "./src/js/figure/Equation/Elements/BaseEquationFunction.ts");
+/* harmony import */ var _EquationForm__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./EquationForm */ "./src/js/figure/Equation/EquationForm.ts");
+/* harmony import */ var _tools_htmlGenerator__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../tools/htmlGenerator */ "./src/js/tools/htmlGenerator.ts");
+/* harmony import */ var _EquationSymbols__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./EquationSymbols */ "./src/js/figure/Equation/EquationSymbols.ts");
+/* harmony import */ var _EquationFunctions__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./EquationFunctions */ "./src/js/figure/Equation/EquationFunctions.ts");
+/* harmony import */ var _Animation_Animation__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ../Animation/Animation */ "./src/js/figure/Animation/Animation.ts");
 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 _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -19456,6 +19491,7 @@ function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf
 
 
 
+
 // import HTMLObject from '../DrawingObjects/HTMLObject/HTMLObject';
 
 
@@ -20154,7 +20190,7 @@ var NextFormAnimationStep = /*#__PURE__*/function (_TriggerAnimationStep) {
   }
   _inherits(NextFormAnimationStep, _TriggerAnimationStep);
   return _createClass(NextFormAnimationStep);
-}(_Animation_Animation__WEBPACK_IMPORTED_MODULE_10__.TriggerAnimationStep);
+}(_Animation_Animation__WEBPACK_IMPORTED_MODULE_11__.TriggerAnimationStep);
 /**
  * GoToForm form animation step
  *
@@ -20205,7 +20241,7 @@ var GoToFormAnimationStep = /*#__PURE__*/function (_TriggerAnimationStep2) {
   }
   _inherits(GoToFormAnimationStep, _TriggerAnimationStep2);
   return _createClass(GoToFormAnimationStep);
-}(_Animation_Animation__WEBPACK_IMPORTED_MODULE_10__.TriggerAnimationStep); // export const foo = () => {};
+}(_Animation_Animation__WEBPACK_IMPORTED_MODULE_11__.TriggerAnimationStep); // export const foo = () => {};
 // An Equation is a collection of elements that can be arranged into different
 // forms.
 // Equation allows setting of forms, and navigating through form series
@@ -20406,8 +20442,8 @@ var Equation = /*#__PURE__*/function (_FigureElementCollect) {
         layout: optionsToUse.formDefaults.layout,
         ignoreColor: optionsToUse.formDefaults.ignoreColor
       },
-      functions: new _EquationFunctions__WEBPACK_IMPORTED_MODULE_9__.EquationFunctions(_this.elements, _this.addElementFromKey.bind(_this), _this.getExistingOrAddSymbol.bind(_this), _this.makeInlineElement.bind(_this)),
-      symbols: new _EquationSymbols__WEBPACK_IMPORTED_MODULE_8__["default"](_this.shapes, _this.color),
+      functions: new _EquationFunctions__WEBPACK_IMPORTED_MODULE_10__.EquationFunctions(_this.elements, _this.addElementFromKey.bind(_this), _this.getExistingOrAddSymbol.bind(_this), _this.makeInlineElement.bind(_this)),
+      symbols: new _EquationSymbols__WEBPACK_IMPORTED_MODULE_9__["default"](_this.shapes, _this.color),
       font: optionsToUse.font,
       textFont: optionsToUse.textFont,
       // fontText: optionsToUse.fontText,
@@ -20507,7 +20543,7 @@ var Equation = /*#__PURE__*/function (_FigureElementCollect) {
       o.delay = 0;
       o.setToEnd = '_showForm';
       o.timeKeeper = _this.timeKeeper;
-      return new _Animation_Animation__WEBPACK_IMPORTED_MODULE_10__.TriggerAnimationStep(o);
+      return new _Animation_Animation__WEBPACK_IMPORTED_MODULE_11__.TriggerAnimationStep(o);
     };
     _this.animations.customSteps.push({
       step: _this.animations.goToForm.bind(_this),
@@ -20553,7 +20589,7 @@ var Equation = /*#__PURE__*/function (_FigureElementCollect) {
       o.delay = 0;
       o.setToEnd = '_showForm';
       o.timeKeeper = _this.timeKeeper;
-      return new _Animation_Animation__WEBPACK_IMPORTED_MODULE_10__.TriggerAnimationStep(o);
+      return new _Animation_Animation__WEBPACK_IMPORTED_MODULE_11__.TriggerAnimationStep(o);
     };
     _this.animations.customSteps.push({
       step: _this.animations.nextForm.bind(_this),
@@ -21197,7 +21233,7 @@ var Equation = /*#__PURE__*/function (_FigureElementCollect) {
     key: "checkFixTo",
     value: function checkFixTo(fixTo, formElements) {
       if (typeof fixTo === 'string') {
-        var element = (0,_EquationFunctions__WEBPACK_IMPORTED_MODULE_9__.getFigureElement)(this, fixTo);
+        var element = (0,_EquationFunctions__WEBPACK_IMPORTED_MODULE_10__.getFigureElement)(this, fixTo);
         if (element != null && formElements.indexOf(element) >= 0) {
           return element;
         }
@@ -21215,7 +21251,7 @@ var Equation = /*#__PURE__*/function (_FigureElementCollect) {
     key: "createForm",
     value: function createForm() {
       var elements = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.elements;
-      return new _EquationForm__WEBPACK_IMPORTED_MODULE_6__["default"](elements, {
+      return new _EquationForm__WEBPACK_IMPORTED_MODULE_7__["default"](elements, {
         getAllElements: this.getChildren.bind(this),
         hideAll: this.hideAll.bind(this),
         show: this.show.bind(this),
@@ -21245,6 +21281,87 @@ var Equation = /*#__PURE__*/function (_FigureElementCollect) {
       return this.eqn.forms[form].content[0].getAllElements(includeHidden);
     }
 
+    /**
+     * Return all the elements inside the named equation function within a given
+     * form.
+     *
+     * Any equation function (container, fraction, matrix, etc.) can be tagged
+     * with a `name` property in its options — this has no layout effect, but
+     * makes the function's sub-tree addressable here.
+     *
+     * With `mode: 'first'` (default), returns the elements inside the first
+     * matching function found by a depth-first traversal. With `mode: 'all'`,
+     * walks the entire tree, collects every matching function (including those
+     * nested inside other matches), and returns the de-duplicated union of
+     * their elements.
+     *
+     * Returns an empty array if the form does not exist, or no matching
+     * function is found.
+     *
+     * @param {string} formName
+     * @param {string} name
+     * @param {'first' | 'all'} [mode] (`'first'`)
+     * @param {boolean} [includeHidden] (`false`)
+     * @return {Array<FigureElement>}
+     */
+  }, {
+    key: "getElementsInForm",
+    value: function getElementsInForm(formName, name) {
+      var mode = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'first';
+      var includeHidden = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
+      var form = this.eqn.forms[formName];
+      if (form == null) {
+        return [];
+      }
+      // Single typed accessor that hides the structural differences between
+      // Elements (.content: ElementInterface[]) and BaseAnnotationFunction
+      // (.content: ElementInterface + .annotations[].content). All `as any`
+      // casts for this walk live here.
+      var childrenOf = function childrenOf(node) {
+        var out = [];
+        var c = node.content;
+        if (Array.isArray(c)) {
+          out.push.apply(out, _toConsumableArray(c));
+        } else if (c != null) {
+          out.push(c);
+        }
+        var annotations = node.annotations;
+        if (Array.isArray(annotations)) {
+          annotations.forEach(function (a) {
+            if (a != null && a.content != null) out.push(a.content);
+          });
+        }
+        return out;
+      };
+      var matches = [];
+      var _walk = function walk(nodes) {
+        for (var i = 0; i < nodes.length; i += 1) {
+          var node = nodes[i];
+          if ((node instanceof _Elements_BaseEquationFunction__WEBPACK_IMPORTED_MODULE_6__["default"] || node instanceof _Elements_BaseAnnotationFunction__WEBPACK_IMPORTED_MODULE_5__["default"]) && node.functionName === name) {
+            matches.push(node);
+            if (mode === 'first') return true;
+          }
+          if (_walk(childrenOf(node))) return true;
+        }
+        return false;
+      };
+      _walk(form.content);
+      if (matches.length === 0) {
+        return [];
+      }
+      var seen = new Set();
+      var out = [];
+      matches.forEach(function (m) {
+        m.getAllElements(includeHidden).forEach(function (el) {
+          if (!seen.has(el)) {
+            seen.add(el);
+            out.push(el);
+          }
+        });
+      });
+      return out;
+    }
+
     /**
      * Return all the elements that are used in an equation phrase.
      * @param {TypeEquationPhrase} phrase
@@ -21379,7 +21496,7 @@ var Equation = /*#__PURE__*/function (_FigureElementCollect) {
         var newMods = {};
         Object.keys(elementMods).forEach(function (elementName) {
           var mods = elementMods[elementName];
-          var figureElement = (0,_EquationFunctions__WEBPACK_IMPORTED_MODULE_9__.getFigureElement)(_this9, elementName);
+          var figureElement = (0,_EquationFunctions__WEBPACK_IMPORTED_MODULE_10__.getFigureElement)(_this9, elementName);
           if (figureElement != null) {
             newMods[elementName] = {
               element: figureElement,
@@ -21392,7 +21509,7 @@ var Equation = /*#__PURE__*/function (_FigureElementCollect) {
       var transformTranslation = function transformTranslation(trans) {
         var newTranslation = {};
         Object.keys(trans).forEach(function (elementName) {
-          var figureElement = (0,_EquationFunctions__WEBPACK_IMPORTED_MODULE_9__.getFigureElement)(_this9, elementName);
+          var figureElement = (0,_EquationFunctions__WEBPACK_IMPORTED_MODULE_10__.getFigureElement)(_this9, elementName);
           var mods = trans[elementName];
           var direction;
           var style;
@@ -21570,7 +21687,7 @@ var Equation = /*#__PURE__*/function (_FigureElementCollect) {
     value: function getForm(formOrName
     // subForm: ?string,
     ) {
-      if (formOrName instanceof _EquationForm__WEBPACK_IMPORTED_MODULE_6__["default"]) {
+      if (formOrName instanceof _EquationForm__WEBPACK_IMPORTED_MODULE_7__["default"]) {
         return formOrName;
       }
       if (formOrName in this.eqn.forms) {
@@ -21914,7 +22031,7 @@ var Equation = /*#__PURE__*/function (_FigureElementCollect) {
     ) {
       var form = this.getForm(formOrName);
       if (form != null && form.description != null) {
-        return _tools_htmlGenerator__WEBPACK_IMPORTED_MODULE_7__.applyModifiers(form.description, form.modifiers);
+        return _tools_htmlGenerator__WEBPACK_IMPORTED_MODULE_8__.applyModifiers(form.description, form.modifiers);
       }
       return '';
     }
@@ -22312,9 +22429,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 +22524,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 +22594,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 +22623,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 +22635,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;
@@ -22708,9 +22834,10 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _Elements_Scale__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ./Elements/Scale */ "./src/js/figure/Equation/Elements/Scale.ts");
 /* harmony import */ var _Elements_Container__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ./Elements/Container */ "./src/js/figure/Equation/Elements/Container.ts");
 /* harmony import */ var _Elements_BaseAnnotationFunction__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ./Elements/BaseAnnotationFunction */ "./src/js/figure/Equation/Elements/BaseAnnotationFunction.ts");
-/* harmony import */ var _Symbols_Line__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./Symbols/Line */ "./src/js/figure/Equation/Symbols/Line.ts");
-/* harmony import */ var _Elements_Offset__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./Elements/Offset */ "./src/js/figure/Equation/Elements/Offset.ts");
-/* harmony import */ var _Elements_Color__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./Elements/Color */ "./src/js/figure/Equation/Elements/Color.ts");
+/* harmony import */ var _Elements_BaseEquationFunction__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./Elements/BaseEquationFunction */ "./src/js/figure/Equation/Elements/BaseEquationFunction.ts");
+/* harmony import */ var _Symbols_Line__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./Symbols/Line */ "./src/js/figure/Equation/Symbols/Line.ts");
+/* harmony import */ var _Elements_Offset__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! ./Elements/Offset */ "./src/js/figure/Equation/Elements/Offset.ts");
+/* harmony import */ var _Elements_Color__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(/*! ./Elements/Color */ "./src/js/figure/Equation/Elements/Color.ts");
 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 _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -22740,6 +22867,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 
 
 
+
 // import type {
 //   EQN_Annotation, EQN_EncompassGlyph, EQN_LeftRightGlyph, EQN_TopBottomGlyph,
 // } from './Elements/BaseAnnotationFunction';
@@ -22860,6 +22988,9 @@ function getFigureElement(elementsObject, name) {
  * @property {boolean} [fullContentBounds] - (`false`)
  * @property {boolean} [showContent] - if `false`, a container will be created
  * around the content, but the content will not be shown (`true`)
+ * @property {string} [name] - optional identifier (available on every equation
+ * function). Has no effect on layout, but allows the function's contents to be
+ * looked up later with {@link Equation.getElementsInForm} (`null`)
  *
  * @see To test examples, append them to the
  * <a href="#drawing-boilerplate">boilerplate</a>
@@ -25496,6 +25627,18 @@ var EquationFunctions = /*#__PURE__*/function () {
   }, {
     key: "eqnMethod",
     value: function eqnMethod(name, params) {
+      var result = this.dispatchEqnMethod(name, params);
+      // Allow any equation function to be tagged with a caller-supplied
+      // `name` via its options object. The tag has no layout effect; it's
+      // used by Equation.getElementsInForm to look up the function's sub-tree.
+      if (result != null && params != null && !Array.isArray(params) && _typeof(params) === 'object' && params.name != null && (result instanceof _Elements_BaseEquationFunction__WEBPACK_IMPORTED_MODULE_10__["default"] || result instanceof _Elements_BaseAnnotationFunction__WEBPACK_IMPORTED_MODULE_9__["default"])) {
+        result.functionName = params.name;
+      }
+      return result;
+    }
+  }, {
+    key: "dispatchEqnMethod",
+    value: function dispatchEqnMethod(name, params) {
       if (name === 'frac') {
         return this.frac(params);
       }
@@ -25690,7 +25833,7 @@ var EquationFunctions = /*#__PURE__*/function () {
           fullContentBounds: fullContentBounds
         };
         var o = (0,_tools_tools__WEBPACK_IMPORTED_MODULE_1__.joinObjects)(defaultOptions, optionsIn);
-        return new _Elements_Offset__WEBPACK_IMPORTED_MODULE_11__["default"]([this.contentToElement(content)], [], o);
+        return new _Elements_Offset__WEBPACK_IMPORTED_MODULE_12__["default"]([this.contentToElement(content)], [], o);
       } catch (e) {
         throw new Error("FigureOne Equation Offset Error: ".concat(e.message));
       }
@@ -26196,7 +26339,7 @@ var EquationFunctions = /*#__PURE__*/function () {
           fullContentBounds: fullContentBounds
         };
         var o = (0,_tools_tools__WEBPACK_IMPORTED_MODULE_1__.joinObjects)(defaultOptions, optionsIn);
-        return new _Elements_Color__WEBPACK_IMPORTED_MODULE_12__["default"]([this.contentToElement(content)], [], o);
+        return new _Elements_Color__WEBPACK_IMPORTED_MODULE_13__["default"]([this.contentToElement(content)], [], o);
       } catch (e) {
         throw new Error("FigureOne Equation Color Error: ".concat(e.message));
       }
@@ -27429,7 +27572,7 @@ var EquationFunctions = /*#__PURE__*/function () {
           });
         }
         var glyph = this.getExistingOrAddSymbol(symbol);
-        if (glyph instanceof _Symbols_Line__WEBPACK_IMPORTED_MODULE_10__["default"]) {
+        if (glyph instanceof _Symbols_Line__WEBPACK_IMPORTED_MODULE_11__["default"]) {
           annotations[0].offset = [0, commentSpaceToUse + contentSpaceToUse];
           return this.annotate({
             content: content,
@@ -27512,7 +27655,7 @@ var EquationFunctions = /*#__PURE__*/function () {
           });
         }
         var glyph = this.getExistingOrAddSymbol(symbol);
-        if (glyph instanceof _Symbols_Line__WEBPACK_IMPORTED_MODULE_10__["default"]) {
+        if (glyph instanceof _Symbols_Line__WEBPACK_IMPORTED_MODULE_11__["default"]) {
           annotations[0].offset = [0, -commentSpaceToUse - contentSpaceToUse];
           return this.annotate({
             content: content,
@@ -80649,8 +80792,8 @@ var tools = {
  */
 
 var Fig = {
-  version: "1.2.1",
-  gitHash: "40843fa58",
+  version: "1.4.0",
+  gitHash: "77f124c53",
   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.1",
+  "version": "1.4.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;

package/types/js/figure/Equation/Elements/BaseAnnotationFunction.d.ts

@@ -101,6 +101,7 @@ export default class BaseAnnotationFunction implements ElementInterface {
     annotations: Array<EQN_Annotation>;
     glyphs: EQN_Glyphs;
     options: Record<string, any>;
+    functionName: string | null;
     constructor(content: ElementInterface, annotations: Array<EQN_Annotation>, glyphs: EQN_Glyphs, options: Record<string, any>, showContent?: boolean);
     _dup(namedCollection?: Record<string, any>): any;
     cleanup(): void;

package/types/js/figure/Equation/Elements/BaseEquationFunction.d.ts

@@ -10,6 +10,7 @@ export default class BaseEquationFunction extends Elements {
     glyphHeights: Array<number>;
     showContent: boolean;
     options: Record<string, any>;
+    functionName: string | null;
     constructor(content: Elements | null | Array<Elements | null>, glyph: Symbol | null | undefined | Array<Symbol | null | undefined>, options: Record<string, any>, showContent?: boolean);
     _dup(namedCollection?: Record<string, any>): any;
     getAllElements(includeHidden?: boolean): any[];

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

@@ -906,6 +906,30 @@ export declare class Equation extends FigureElementCollection {
      * @return {Array<FigureElement>}
      */
     getFormElements(form: string, includeHidden?: boolean): (FigureElementCollection | FigureElementPrimitive | ElementInterface)[];
+    /**
+     * Return all the elements inside the named equation function within a given
+     * form.
+     *
+     * Any equation function (container, fraction, matrix, etc.) can be tagged
+     * with a `name` property in its options — this has no layout effect, but
+     * makes the function's sub-tree addressable here.
+     *
+     * With `mode: 'first'` (default), returns the elements inside the first
+     * matching function found by a depth-first traversal. With `mode: 'all'`,
+     * walks the entire tree, collects every matching function (including those
+     * nested inside other matches), and returns the de-duplicated union of
+     * their elements.
+     *
+     * Returns an empty array if the form does not exist, or no matching
+     * function is found.
+     *
+     * @param {string} formName
+     * @param {string} name
+     * @param {'first' | 'all'} [mode] (`'first'`)
+     * @param {boolean} [includeHidden] (`false`)
+     * @return {Array<FigureElement>}
+     */
+    getElementsInForm(formName: string, name: string, mode?: 'first' | 'all', includeHidden?: boolean): any[];
     /**
      * Return all the elements that are used in an equation phrase.
      * @param {TypeEquationPhrase} phrase