figureone 1.1.0 → 1.1.2

package/index.js

@@ -7065,7 +7065,9 @@ var DrawingObject = /*#__PURE__*/function () {
     /* eslint-disable class-methods-use-this */
   }, {
     key: "cleanup",
-    value: function cleanup() {}
+    value: function cleanup() {
+      var _deleteTexture = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+    }
 
     /* eslint-disable no-unused-vars, class-methods-use-this */
   }, {
@@ -7657,17 +7659,13 @@ var GLObject = /*#__PURE__*/function (_DrawingObject) {
         webgl = this.webgl,
         gl = this.gl;
       if (texture) {
-        if (deleteTexture && webgl.textures[texture.id].glTexture != null) {
-          gl.activeTexture(gl.TEXTURE0 + webgl.textures[texture.id].index);
-          gl.bindTexture(gl.TEXTURE_2D, null);
-          // gl.deleteTexture(webgl.textures[texture.id].glTexture);
-          webgl.textures[texture.id].glTexture = null;
+        if (deleteTexture && webgl.textures[texture.id] != null) {
+          webgl.deleteTexture(texture.id);
         }
         if (texture.buffer != null) {
           gl.deleteBuffer(texture.buffer);
           texture.buffer = null;
         }
-        // texture.glTexture = null;
       }
     }
   }, {
@@ -8296,6 +8294,13 @@ var HTMLObject = /*#__PURE__*/function (_DrawingObject) {
         this.element.setAttribute('style', "position: absolute; left: -10000px; top: -10000px; visibility: hidden; opacity: ".concat(opacity, ";"));
       }
     }
+  }, {
+    key: "cleanup",
+    value: function cleanup() {
+      if (this.element && this.element.parentNode) {
+        this.element.parentNode.removeChild(this.element);
+      }
+    }
   }, {
     key: "drawWithTransformMatrix",
     value: function drawWithTransformMatrix(scene, worldMatrix, color) {
@@ -10517,6 +10522,9 @@ function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstruct
 function _possibleConstructorReturn(t, e) { if (e && ("object" == _typeof(e) || "function" == typeof e)) return e; if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined"); return _assertThisInitialized(t); }
 function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _superPropGet(t, o, e, r) { var p = _get(_getPrototypeOf(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
+function _get() { return _get = "undefined" != typeof Reflect && Reflect.get ? Reflect.get.bind() : function (e, t, r) { var p = _superPropBase(e, t); if (p) { var n = Object.getOwnPropertyDescriptor(p, t); return n.get ? n.get.call(arguments.length < 3 ? e : r) : n.value; } }, _get.apply(null, arguments); }
+function _superPropBase(t, o) { for (; !{}.hasOwnProperty.call(t, o) && null !== (t = _getPrototypeOf(t));); return t; }
 function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
 function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
 function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); }
@@ -10583,12 +10591,24 @@ var VertexText = /*#__PURE__*/function (_VertexGeneric) {
     _this.drawTextIntoBuffer();
     return _this;
   }
-
-  // Text is positioned such that the text baseline will be at
-  // vertex space y = 0.
-  // The border will then cover the ascent and descent of the text.
   _inherits(VertexText, _VertexGeneric);
   return _createClass(VertexText, [{
+    key: "cleanup",
+    value: function cleanup() {
+      var deleteTexture = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+      // Free the 2D canvas backing store before parent deletes GL buffers
+      if (this.canvas) {
+        this.canvas.width = 0;
+        this.canvas.height = 0;
+      }
+      this.ctx = null;
+      _superPropGet(VertexText, "cleanup", this, 3)([deleteTexture]);
+    }
+
+    // Text is positioned such that the text baseline will be at
+    // vertex space y = 0.
+    // The border will then cover the ascent and descent of the text.
+  }, {
     key: "resizeText",
     value: function resizeText() {
       var _this2 = this;
@@ -12280,6 +12300,7 @@ var FigureElement = /*#__PURE__*/function () {
   }, {
     key: "cleanup",
     value: function cleanup() {
+      var deleteTexture = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
       this.stop();
       this.notifications.cleanup();
       this.animations.notifications.cleanup();
@@ -14426,8 +14447,9 @@ var FigureElementPrimitive = /*#__PURE__*/function (_FigureElement) {
   }, {
     key: "cleanup",
     value: function cleanup() {
-      _superPropGet(FigureElementPrimitive, "cleanup", this, 3)([]);
-      this.drawingObject.cleanup();
+      var deleteTexture = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
+      _superPropGet(FigureElementPrimitive, "cleanup", this, 3)([deleteTexture]);
+      this.drawingObject.cleanup(deleteTexture);
     }
   }, {
     key: "_getStateProperties",
@@ -20982,6 +21004,7 @@ var Equation = /*#__PURE__*/function (_FigureElementCollect) {
       form.content = [this.eqn.functions.contentToElement(fullLineHeightPrimitive)];
       form.arrange(this.eqn.scale, 'left', 'baseline', new _tools_g2__WEBPACK_IMPORTED_MODULE_0__.Point(0, 0));
       this.eqn.functions.fullLineHeight = form;
+      this.eqn.functions.fullLineHeightPrimitive = fullLineHeightPrimitive;
       this.setFirstTransform(this.transform);
     }
   }, {
@@ -21466,6 +21489,14 @@ var Equation = /*#__PURE__*/function (_FigureElementCollect) {
         _this0.eqn.forms[form].cleanup();
         delete _this0.eqn.forms[form];
       });
+      if (this.eqn.functions.fullLineHeightPrimitive != null) {
+        this.eqn.functions.fullLineHeightPrimitive.cleanup(false);
+        this.eqn.functions.fullLineHeightPrimitive = null;
+      }
+      if (this.eqn.functions.fullLineHeight != null) {
+        this.eqn.functions.fullLineHeight.cleanup();
+        this.eqn.functions.fullLineHeight = null;
+      }
     }
 
     /**
@@ -25262,6 +25293,7 @@ var EquationFunctions = /*#__PURE__*/function () {
     this.elements = elements;
     this.phrases = {};
     this.fullLineHeight = null;
+    this.fullLineHeightPrimitive = null;
     this.addElementFromKey = addElementFromKey;
     this.getExistingOrAddSymbol = getExistingOrAddSymbol;
     this.phraseElements = {};
@@ -34751,6 +34783,7 @@ var Figure = /*#__PURE__*/function () {
     this._boundResize = this.resize.bind(this);
     this._boundFocusGained = this.focusGained.bind(this);
     this._boundFocusLost = this.focusLost.bind(this);
+    this._boundScrollEvent = this.scrollEvent.bind(this);
     window.addEventListener('resize', this._boundResize);
     window.addEventListener('focus', this._boundFocusGained);
     window.addEventListener('blur', this._boundFocusLost);
@@ -34982,12 +35015,12 @@ var Figure = /*#__PURE__*/function () {
   }, {
     key: "enableScrolling",
     value: function enableScrolling() {
-      document.addEventListener('scroll', this.scrollEvent.bind(this), false);
+      document.addEventListener('scroll', this._boundScrollEvent, false);
     }
   }, {
     key: "disableScrolling",
     value: function disableScrolling() {
-      document.removeEventListener('scroll', this.scrollEvent.bind(this), false);
+      document.removeEventListener('scroll', this._boundScrollEvent, false);
     }
   }, {
     key: "init",
@@ -35457,10 +35490,11 @@ var Figure = /*#__PURE__*/function () {
       // Remove gesture listeners (canvas + window)
       this.gesture.destroy();
 
-      // Remove window listeners
+      // Remove window/document listeners
       window.removeEventListener('resize', this._boundResize);
       window.removeEventListener('focus', this._boundFocusGained);
       window.removeEventListener('blur', this._boundFocusLost);
+      this.disableScrolling();
 
       // Remove canvas listeners (only set when webgl !== 'manual')
       if (this.canvasLow && this._boundContextLost) {
@@ -35468,6 +35502,16 @@ var Figure = /*#__PURE__*/function () {
         this.canvasLow.removeEventListener('webglcontextrestored', this._boundContextRestored, false);
       }
 
+      // Clear pending timers
+      if (this.scrollTimeoutId) {
+        clearTimeout(this.scrollTimeoutId);
+        this.scrollTimeoutId = null;
+      }
+      this.clearDrawTimeout();
+
+      // Clean up recorder (audio listeners, worker, timeouts)
+      this.recorder.cleanup();
+
       // Clean up all elements recursively (notifications, drawing objects, children)
       this.elements.cleanup();
       this.elements = null;
@@ -51812,10 +51856,11 @@ var FigureElementPrimitiveGLText = /*#__PURE__*/function (_FigureElementPrimiti)
   }, {
     key: "cleanup",
     value: function cleanup() {
-      _superPropGet(FigureElementPrimitiveGLText, "cleanup", this, 3)([]);
+      var deleteTexture = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
       if (this.atlas != null && this.atlasNotificationsID != null) {
         this.atlas.notifications.remove('updated', this.atlasNotificationsID);
       }
+      _superPropGet(FigureElementPrimitiveGLText, "cleanup", this, 3)([deleteTexture]);
     }
   }, {
     key: "calcTouchBorder",
@@ -56749,6 +56794,46 @@ var Recorder = /*#__PURE__*/function () {
       this.queueSeekId = null;
       // this.useAutoEvents = false;
       this.timeUpdates = 100; // ms
+      this._boundParseMessage = null;
+      this._audioHandlers = null;
+    }
+  }, {
+    key: "cleanupAudio",
+    value: function cleanupAudio() {
+      if (this.audio && this._audioHandlers) {
+        this.audio.removeEventListener('pause', this._audioHandlers.pause);
+        this.audio.removeEventListener('play', this._audioHandlers.play);
+        this.audio.removeEventListener('playing', this._audioHandlers.playing, false);
+        this.audio.removeEventListener('ended', this._audioHandlers.ended, false);
+        this.audio.onloadedmetadata = null;
+        this.audio.oncanplaythrough = null;
+      }
+      this._audioHandlers = null;
+    }
+  }, {
+    key: "cleanup",
+    value: function cleanup() {
+      this.cleanupAudio();
+      this.audio = null;
+      if (this.worker && this._boundParseMessage) {
+        this.worker.removeEventListener('message', this._boundParseMessage);
+        this.worker.terminate();
+      }
+      this.worker = null;
+      this._boundParseMessage = null;
+      if (this.timeoutID != null) {
+        this.timeKeeper.clearTimeout(this.timeoutID);
+        this.timeoutID = null;
+      }
+      if (this.timeUpdatesTimeoutID != null) {
+        this.timeKeeper.clearTimeout(this.timeUpdatesTimeoutID);
+        this.timeUpdatesTimeoutID = null;
+      }
+      if (this.queueSeekId != null) {
+        this.timeKeeper.clearTimeout(this.queueSeekId);
+        this.queueSeekId = null;
+      }
+      this.notifications.cleanup();
     }
 
     // ////////////////////////////////////
@@ -56881,6 +56966,7 @@ var Recorder = /*#__PURE__*/function () {
     key: "loadAudioTrack",
     value: function loadAudioTrack(audio) {
       var _this3 = this;
+      this.cleanupAudio();
       this.audio = audio;
       this.audio.onloadedmetadata = function () {
         _this3.duration = _this3.calcDuration();
@@ -56889,24 +56975,30 @@ var Recorder = /*#__PURE__*/function () {
       this.audio.oncanplaythrough = function () {
         _this3.notifications.publish('audioLoaded');
       };
-      this.audio.addEventListener('pause', function () {
-        if (_this3.state === 'playing') {
-          _this3.pausePlayback();
-        }
-      });
-      this.audio.addEventListener('play', function () {
-        // This is here to handle audio triggered start/stop (like headphones
-        // being removed or inserted)
-        if (_this3.state === 'idle' && _this3.audioStartedCallback == null) {
-          _this3.resumePlayback();
+      this._audioHandlers = {
+        pause: function pause() {
+          if (_this3.state === 'playing') {
+            _this3.pausePlayback();
+          }
+        },
+        play: function play() {
+          // This is here to handle audio triggered start/stop (like headphones
+          // being removed or inserted)
+          if (_this3.state === 'idle' && _this3.audioStartedCallback == null) {
+            _this3.resumePlayback();
+          }
+        },
+        playing: function playing() {
+          return _this3.audioStarted();
+        },
+        ended: function ended() {
+          return _this3.audioEnded();
         }
-      });
-      audio.addEventListener('playing', function () {
-        return _this3.audioStarted();
-      }, false);
-      audio.addEventListener('ended', function () {
-        return _this3.audioEnded();
-      }, false);
+      };
+      this.audio.addEventListener('pause', this._audioHandlers.pause);
+      this.audio.addEventListener('play', this._audioHandlers.play);
+      this.audio.addEventListener('playing', this._audioHandlers.playing, false);
+      this.audio.addEventListener('ended', this._audioHandlers.ended, false);
     }
   }, {
     key: "loadEvents",
@@ -57148,7 +57240,8 @@ var Recorder = /*#__PURE__*/function () {
     value: function startWorker() {
       if (this.worker == null) {
         this.worker = new _recorder_worker__WEBPACK_IMPORTED_MODULE_3__["default"]();
-        this.worker.addEventListener('message', this.parseMessage.bind(this));
+        this._boundParseMessage = this.parseMessage.bind(this);
+        this.worker.addEventListener('message', this._boundParseMessage);
       }
     }
   }, {
@@ -80402,8 +80495,8 @@ var tools = {
  */
 
 var Fig = {
-  version: "1.1.0",
-  gitHash: "5b0735b51",
+  version: "1.1.2",
+  gitHash: "1444c13bc",
   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.1.0",
+  "version": "1.1.2",
   "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/DrawingObjects/DrawingObject.d.ts

@@ -36,7 +36,7 @@ declare class DrawingObject {
     updateBuffer(name: string, data: Array<number>): void;
     updateUniform(uniformName: string, value: number | Array<number>): void;
     getUniform(uniformName: string): void;
-    cleanup(): void;
+    cleanup(_deleteTexture?: boolean): void;
     change(drawingPrimitive: any, copy?: Array<CPY_Step>): void;
     _getStateProperties(): never[];
     _state(options: Record<string, any>): Record<string, any>;

package/types/js/figure/DrawingObjects/HTMLObject/HTMLObject.d.ts

@@ -24,6 +24,7 @@ declare class HTMLObject extends DrawingObject {
     glToPixelSpace(p: Point): Point;
     change(newHtml: any, lastDrawTransformMatrix?: any): void;
     transformHtml(transformMatrix: Type3DMatrix, opacity?: number): void;
+    cleanup(): void;
     drawWithTransformMatrix(scene: Scene, worldMatrix: Type3DMatrix, color: TypeColor): void;
 }
 export default HTMLObject;

package/types/js/figure/DrawingObjects/VertexObject/VertexText.d.ts

@@ -27,6 +27,7 @@ declare class VertexText extends VertexGeneric {
     height: number;
     width: number;
     constructor(webgl: WebGLInstance, textOptions: TypeVertexInputTextOptions);
+    cleanup(deleteTexture?: boolean): void;
     resizeText(pixelToVertexSpaceScale?: Point): void;
     calcAscentDescent(): void;
     drawTextIntoBuffer(pixelToVertexSpaceScale?: Point): void;

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

@@ -585,7 +585,7 @@ declare class FigureElement {
     transformSet(publish?: boolean, fromMovement?: boolean): void;
     nextMovingFreelyFrame(now: number): void;
     clear(_canvasIndex?: number): void;
-    cleanup(): void;
+    cleanup(deleteTexture?: boolean): void;
     willStartAnimating(): boolean;
     /**
      Set element color.
@@ -859,7 +859,7 @@ declare class FigureElementPrimitive extends FigureElement {
      */
     constructor(drawingObject: DrawingObject, transform?: Transform, color?: TypeColor, parent?: FigureElement | null, name?: string, timeKeeper?: TimeKeeper);
     init(webgl: WebGLInstance): void;
-    cleanup(): void;
+    cleanup(deleteTexture?: boolean): void;
     _getStateProperties(options: {
         ignoreShown?: boolean;
     }): string[];

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

@@ -3214,6 +3214,7 @@ export declare class EquationFunctions {
         [phraseName: string]: Array<FigureElementPrimitive>;
     };
     fullLineHeight: EquationForm | null;
+    fullLineHeightPrimitive: FigureElementPrimitive | null;
     addElementFromKey: (key: string, params: Record<string, any>) => FigureElementPrimitive | null | undefined;
     getExistingOrAddSymbol: (keyOrObj: string | Record<string, any>) => FigureElementPrimitive | null | undefined;
     /**

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

@@ -276,6 +276,7 @@ declare class Figure {
     _boundFocusLost: EventListener;
     _boundContextLost: EventListener;
     _boundContextRestored: EventListener;
+    _boundScrollEvent: EventListener;
     constructor(options?: OBJ_Figure);
     fontsLoaded(): void;
     /**

package/types/js/figure/FigurePrimitives/FigureElementPrimitiveGLText.d.ts

@@ -85,7 +85,7 @@ export default class FigureElementPrimitiveGLText extends FigureElementPrimitive
     calcBorderAndBounds(): void;
     calcBorder(): void;
     stateSet(): void;
-    cleanup(): void;
+    cleanup(deleteTexture?: boolean): void;
     calcTouchBorder(): void;
     _getStateProperties(options: {
         ignoreShown?: boolean;

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

@@ -135,10 +135,19 @@ declare class Recorder {
         play: TypePlaySettings;
     };
     worker: any;
+    _boundParseMessage: ((event: MessageEvent) => void) | null;
+    _audioHandlers: {
+        pause: () => void;
+        play: () => void;
+        playing: () => void;
+        ended: () => void;
+    } | null;
     timeKeeper: TimeKeeper;
     audioStartedCallback: (() => void) | null;
     constructor(timeKeeper: TimeKeeper);
     initialize(): void;
+    cleanupAudio(): void;
+    cleanup(): void;
     timeStamp(): number;
     now(): number;
     /**