highmark-yapp 2.0.301 → 2.0.304

package/lib/blockListing.js

@@ -10,6 +10,7 @@ Object.defineProperty(exports, "default", {
 });
 var _yapp = /*#__PURE__*/ _interop_require_default(require("yapp"));
 var _highmarkmarkdown = require("highmark-markdown");
+var _easy = require("easy");
 function _assert_this_initialized(self) {
     if (self === void 0) {
         throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
@@ -101,7 +102,7 @@ function _is_native_reflect_construct() {
         return !!result;
     })();
 }
-var remove = _highmarkmarkdown.domUtilities.remove, insertAfter = _highmarkmarkdown.domUtilities.insertAfter, insertBeforehand = _highmarkmarkdown.domUtilities.insertBeforehand;
+var mountElement = _easy.elementUtilities.mountElement, unmountElement = _easy.elementUtilities.unmountElement, remove = _highmarkmarkdown.domUtilities.remove, insertAfter = _highmarkmarkdown.domUtilities.insertAfter, insertBeforehand = _highmarkmarkdown.domUtilities.insertBeforehand;
 var BlockListing = /*#__PURE__*/ function(Yapp) {
     _inherits(BlockListing, Yapp);
     function BlockListing() {
@@ -114,7 +115,8 @@ var BlockListing = /*#__PURE__*/ function(Yapp) {
             value: function mount(parentDOMElement, siblingDOMElement, context) {
                 var domElement = this.getDOMElement();
                 siblingDOMElement !== null ? insertAfter(domElement, parentDOMElement, siblingDOMElement) : insertBeforehand(domElement, parentDOMElement);
-                this.didMount();
+                var element = this; ///
+                mountElement(element);
                 siblingDOMElement = domElement; ///
                 return siblingDOMElement;
             }
@@ -122,6 +124,8 @@ var BlockListing = /*#__PURE__*/ function(Yapp) {
         {
             key: "unmount",
             value: function unmount(parentDOMElement, context) {
+                var element = this; ///
+                unmountElement(element);
                 var domElement = this.getDOMElement();
                 remove(domElement, parentDOMElement);
             }
@@ -143,4 +147,4 @@ _define_property(BlockListing, "defaultProperties", {
     hiddenScrollbars: true
 });
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9ibG9ja0xpc3RpbmcuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBZYXBwIGZyb20gXCJ5YXBwXCI7XG5cbmltcG9ydCB7IGRvbVV0aWxpdGllcyB9IGZyb20gXCJoaWdobWFyay1tYXJrZG93blwiO1xuXG5jb25zdCB7IHJlbW92ZSwgaW5zZXJ0QWZ0ZXIsIGluc2VydEJlZm9yZWhhbmQgfSA9IGRvbVV0aWxpdGllcztcblxuZXhwb3J0IGRlZmF1bHQgY2xhc3MgQmxvY2tMaXN0aW5nIGV4dGVuZHMgWWFwcCB7XG4gIG1vdW50KHBhcmVudERPTUVsZW1lbnQsIHNpYmxpbmdET01FbGVtZW50LCBjb250ZXh0KSB7XG4gICAgY29uc3QgZG9tRWxlbWVudCA9IHRoaXMuZ2V0RE9NRWxlbWVudCgpO1xuXG4gICAgKHNpYmxpbmdET01FbGVtZW50ICE9PSBudWxsKSA/XG4gICAgICBpbnNlcnRBZnRlcihkb21FbGVtZW50LCBwYXJlbnRET01FbGVtZW50LCBzaWJsaW5nRE9NRWxlbWVudCkgOlxuICAgICAgICBpbnNlcnRCZWZvcmVoYW5kKGRvbUVsZW1lbnQsIHBhcmVudERPTUVsZW1lbnQpO1xuXG4gICAgdGhpcy5kaWRNb3VudCgpO1xuXG4gICAgc2libGluZ0RPTUVsZW1lbnQgPSBkb21FbGVtZW50OyAgLy8vXG5cbiAgICByZXR1cm4gc2libGluZ0RPTUVsZW1lbnQ7XG4gIH1cblxuICB1bm1vdW50KHBhcmVudERPTUVsZW1lbnQsIGNvbnRleHQpIHtcbiAgICBjb25zdCBkb21FbGVtZW50ID0gdGhpcy5nZXRET01FbGVtZW50KCk7XG5cbiAgICByZW1vdmUoZG9tRWxlbWVudCwgcGFyZW50RE9NRWxlbWVudCk7XG4gIH1cblxuICBzdGF0aWMgZGVmYXVsdFByb3BlcnRpZXMgPSB7XG4gICAgZWRpdGFibGU6IGZhbHNlLFxuICAgIGZpcmFDb2RlOiB0cnVlLFxuICAgIGhpZGRlbkd1dHRlcjogdHJ1ZSxcbiAgICBoaWRkZW5TY3JvbGxiYXJzOiB0cnVlXG4gIH07XG5cbiAgc3RhdGljIGZyb21Db250ZW50QW5kQ29uZmlndXJhdGlvbihjb250ZW50LCBjb25maWd1cmF0aW9uKSB7IHJldHVybiBZYXBwLmZyb21Db250ZW50QW5kQ29uZmlndXJhdGlvbihCbG9ja0xpc3RpbmcsIGNvbnRlbnQsIGNvbmZpZ3VyYXRpb24pOyB9XG59XG4iXSwibmFtZXMiOlsiQmxvY2tMaXN0aW5nIiwicmVtb3ZlIiwiZG9tVXRpbGl0aWVzIiwiaW5zZXJ0QWZ0ZXIiLCJpbnNlcnRCZWZvcmVoYW5kIiwibW91bnQiLCJwYXJlbnRET01FbGVtZW50Iiwic2libGluZ0RPTUVsZW1lbnQiLCJjb250ZXh0IiwiZG9tRWxlbWVudCIsImdldERPTUVsZW1lbnQiLCJkaWRNb3VudCIsInVubW91bnQiLCJmcm9tQ29udGVudEFuZENvbmZpZ3VyYXRpb24iLCJjb250ZW50IiwiY29uZmlndXJhdGlvbiIsIllhcHAiLCJkZWZhdWx0UHJvcGVydGllcyIsImVkaXRhYmxlIiwiZmlyYUNvZGUiLCJoaWRkZW5HdXR0ZXIiLCJoaWRkZW5TY3JvbGxiYXJzIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztlQVFxQkE7OzsyREFOSjtnQ0FFWTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFN0IsSUFBUUMsU0FBMENDLDhCQUFZLENBQXRERCxRQUFRRSxjQUFrQ0QsOEJBQVksQ0FBOUNDLGFBQWFDLG1CQUFxQkYsOEJBQVksQ0FBakNFO0FBRWQsSUFBQSxBQUFNSiw2QkFBTjtjQUFNQTthQUFBQTtnQ0FBQUE7UUFBTixPQUFBLGtCQUFNQTs7a0JBQUFBOztZQUNuQkssS0FBQUE7bUJBQUFBLFNBQUFBLE1BQU1DLGdCQUFnQixFQUFFQyxpQkFBaUIsRUFBRUMsT0FBTztnQkFDaEQsSUFBTUMsYUFBYSxJQUFJLENBQUNDLGFBQWE7Z0JBRXBDSCxzQkFBc0IsT0FDckJKLFlBQVlNLFlBQVlILGtCQUFrQkMscUJBQ3hDSCxpQkFBaUJLLFlBQVlIO2dCQUVqQyxJQUFJLENBQUNLLFFBQVE7Z0JBRWJKLG9CQUFvQkUsWUFBYSxHQUFHO2dCQUVwQyxPQUFPRjtZQUNUOzs7WUFFQUssS0FBQUE7bUJBQUFBLFNBQUFBLFFBQVFOLGdCQUFnQixFQUFFRSxPQUFPO2dCQUMvQixJQUFNQyxhQUFhLElBQUksQ0FBQ0MsYUFBYTtnQkFFckNULE9BQU9RLFlBQVlIO1lBQ3JCOzs7O1lBU09PLEtBQUFBO21CQUFQLFNBQU9BLDRCQUE0QkMsT0FBTyxFQUFFQyxhQUFhO2dCQUFJLE9BQU9DLGFBQUksQ0FBQ0gsMkJBQTJCLENBNUJqRmIsY0E0QmdHYyxTQUFTQztZQUFnQjs7O1dBNUJ6SGY7RUFBcUJnQixhQUFJO0FBcUI1QyxpQkFyQm1CaEIsY0FxQlppQixxQkFBb0I7SUFDekJDLFVBQVU7SUFDVkMsVUFBVTtJQUNWQyxjQUFjO0lBQ2RDLGtCQUFrQjtBQUNwQiJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9ibG9ja0xpc3RpbmcuanMiXSwic291cmNlc0NvbnRlbnQiOlsiXCJ1c2Ugc3RyaWN0XCI7XG5cbmltcG9ydCBZYXBwIGZyb20gXCJ5YXBwXCI7XG5cbmltcG9ydCB7IGRvbVV0aWxpdGllcyB9IGZyb20gXCJoaWdobWFyay1tYXJrZG93blwiO1xuaW1wb3J0IHsgZWxlbWVudFV0aWxpdGllcyB9IGZyb20gXCJlYXN5XCI7XG5cbmNvbnN0IHsgbW91bnRFbGVtZW50LCB1bm1vdW50RWxlbWVudCB9ID0gZWxlbWVudFV0aWxpdGllcyxcbiAgICAgIHsgcmVtb3ZlLCBpbnNlcnRBZnRlciwgaW5zZXJ0QmVmb3JlaGFuZCB9ID0gZG9tVXRpbGl0aWVzO1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBCbG9ja0xpc3RpbmcgZXh0ZW5kcyBZYXBwIHtcbiAgbW91bnQocGFyZW50RE9NRWxlbWVudCwgc2libGluZ0RPTUVsZW1lbnQsIGNvbnRleHQpIHtcbiAgICBjb25zdCBkb21FbGVtZW50ID0gdGhpcy5nZXRET01FbGVtZW50KCk7XG5cbiAgICAoc2libGluZ0RPTUVsZW1lbnQgIT09IG51bGwpID9cbiAgICAgIGluc2VydEFmdGVyKGRvbUVsZW1lbnQsIHBhcmVudERPTUVsZW1lbnQsIHNpYmxpbmdET01FbGVtZW50KSA6XG4gICAgICAgIGluc2VydEJlZm9yZWhhbmQoZG9tRWxlbWVudCwgcGFyZW50RE9NRWxlbWVudCk7XG5cbiAgICBjb25zdCBlbGVtZW50ID0gdGhpczsgLy8vXG5cbiAgICBtb3VudEVsZW1lbnQoZWxlbWVudCk7XG5cbiAgICBzaWJsaW5nRE9NRWxlbWVudCA9IGRvbUVsZW1lbnQ7ICAvLy9cblxuICAgIHJldHVybiBzaWJsaW5nRE9NRWxlbWVudDtcbiAgfVxuXG4gIHVubW91bnQocGFyZW50RE9NRWxlbWVudCwgY29udGV4dCkge1xuICAgIGNvbnN0IGVsZW1lbnQgPSB0aGlzOyAvLy9cblxuICAgIHVubW91bnRFbGVtZW50KGVsZW1lbnQpO1xuXG4gICAgY29uc3QgZG9tRWxlbWVudCA9IHRoaXMuZ2V0RE9NRWxlbWVudCgpO1xuXG4gICAgcmVtb3ZlKGRvbUVsZW1lbnQsIHBhcmVudERPTUVsZW1lbnQpO1xuICB9XG5cbiAgc3RhdGljIGRlZmF1bHRQcm9wZXJ0aWVzID0ge1xuICAgIGVkaXRhYmxlOiBmYWxzZSxcbiAgICBmaXJhQ29kZTogdHJ1ZSxcbiAgICBoaWRkZW5HdXR0ZXI6IHRydWUsXG4gICAgaGlkZGVuU2Nyb2xsYmFyczogdHJ1ZVxuICB9O1xuXG4gIHN0YXRpYyBmcm9tQ29udGVudEFuZENvbmZpZ3VyYXRpb24oY29udGVudCwgY29uZmlndXJhdGlvbikgeyByZXR1cm4gWWFwcC5mcm9tQ29udGVudEFuZENvbmZpZ3VyYXRpb24oQmxvY2tMaXN0aW5nLCBjb250ZW50LCBjb25maWd1cmF0aW9uKTsgfVxufVxuIl0sIm5hbWVzIjpbIkJsb2NrTGlzdGluZyIsIm1vdW50RWxlbWVudCIsImVsZW1lbnRVdGlsaXRpZXMiLCJ1bm1vdW50RWxlbWVudCIsInJlbW92ZSIsImRvbVV0aWxpdGllcyIsImluc2VydEFmdGVyIiwiaW5zZXJ0QmVmb3JlaGFuZCIsIm1vdW50IiwicGFyZW50RE9NRWxlbWVudCIsInNpYmxpbmdET01FbGVtZW50IiwiY29udGV4dCIsImRvbUVsZW1lbnQiLCJnZXRET01FbGVtZW50IiwiZWxlbWVudCIsInVubW91bnQiLCJmcm9tQ29udGVudEFuZENvbmZpZ3VyYXRpb24iLCJjb250ZW50IiwiY29uZmlndXJhdGlvbiIsIllhcHAiLCJkZWZhdWx0UHJvcGVydGllcyIsImVkaXRhYmxlIiwiZmlyYUNvZGUiLCJoaWRkZW5HdXR0ZXIiLCJoaWRkZW5TY3JvbGxiYXJzIl0sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7OztlQVVxQkE7OzsyREFSSjtnQ0FFWTtvQkFDSTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFakMsSUFBUUMsZUFBaUNDLHNCQUFnQixDQUFqREQsY0FBY0UsaUJBQW1CRCxzQkFBZ0IsQ0FBbkNDLGdCQUNkQyxTQUEwQ0MsOEJBQVksQ0FBdERELFFBQVFFLGNBQWtDRCw4QkFBWSxDQUE5Q0MsYUFBYUMsbUJBQXFCRiw4QkFBWSxDQUFqQ0U7QUFFZCxJQUFBLEFBQU1QLDZCQUFOO2NBQU1BO2FBQUFBO2dDQUFBQTtRQUFOLE9BQUEsa0JBQU1BOztrQkFBQUE7O1lBQ25CUSxLQUFBQTttQkFBQUEsU0FBQUEsTUFBTUMsZ0JBQWdCLEVBQUVDLGlCQUFpQixFQUFFQyxPQUFPO2dCQUNoRCxJQUFNQyxhQUFhLElBQUksQ0FBQ0MsYUFBYTtnQkFFcENILHNCQUFzQixPQUNyQkosWUFBWU0sWUFBWUgsa0JBQWtCQyxxQkFDeENILGlCQUFpQkssWUFBWUg7Z0JBRWpDLElBQU1LLFVBQVUsSUFBSSxFQUFFLEdBQUc7Z0JBRXpCYixhQUFhYTtnQkFFYkosb0JBQW9CRSxZQUFhLEdBQUc7Z0JBRXBDLE9BQU9GO1lBQ1Q7OztZQUVBSyxLQUFBQTttQkFBQUEsU0FBQUEsUUFBUU4sZ0JBQWdCLEVBQUVFLE9BQU87Z0JBQy9CLElBQU1HLFVBQVUsSUFBSSxFQUFFLEdBQUc7Z0JBRXpCWCxlQUFlVztnQkFFZixJQUFNRixhQUFhLElBQUksQ0FBQ0MsYUFBYTtnQkFFckNULE9BQU9RLFlBQVlIO1lBQ3JCOzs7O1lBU09PLEtBQUFBO21CQUFQLFNBQU9BLDRCQUE0QkMsT0FBTyxFQUFFQyxhQUFhO2dCQUFJLE9BQU9DLGFBQUksQ0FBQ0gsMkJBQTJCLENBbENqRmhCLGNBa0NnR2lCLFNBQVNDO1lBQWdCOzs7V0FsQ3pIbEI7RUFBcUJtQixhQUFJO0FBMkI1QyxpQkEzQm1CbkIsY0EyQlpvQixxQkFBb0I7SUFDekJDLFVBQVU7SUFDVkMsVUFBVTtJQUNWQyxjQUFjO0lBQ2RDLGtCQUFrQjtBQUNwQiJ9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "highmark-yapp",
   "author": "James Smith",
-  "version": "2.0.301",
+  "version": "2.0.304",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/highmark-uapp",
   "description": "Highmark with Yapp listings.",
@@ -12,13 +12,13 @@
   "dependencies": {
     "easy": "^24.0.6",
     "highmark-markdown": "^1.2.63",
-    "yapp": "^5.1.289"
+    "yapp": "^5.1.290"
   },
   "devDependencies": {
     "@swc/core": "1.13.20",
     "esbuild": "0.11.14",
-    "easy-layout": "^6.0.285",
-    "easy-with-style": "^3.0.535",
+    "easy-layout": "^6.0.286",
+    "easy-with-style": "^3.0.536",
     "express": "^4.17.1",
     "juxtapose": "^4.0.128",
     "lively-cli": "^2.0.77",

package/src/blockListing.js

@@ -3,8 +3,10 @@
 import Yapp from "yapp";
 
 import { domUtilities } from "highmark-markdown";
+import { elementUtilities } from "easy";
 
-const { remove, insertAfter, insertBeforehand } = domUtilities;
+const { mountElement, unmountElement } = elementUtilities,
+      { remove, insertAfter, insertBeforehand } = domUtilities;
 
 export default class BlockListing extends Yapp {
   mount(parentDOMElement, siblingDOMElement, context) {
@@ -14,7 +16,9 @@ export default class BlockListing extends Yapp {
       insertAfter(domElement, parentDOMElement, siblingDOMElement) :
         insertBeforehand(domElement, parentDOMElement);
 
-    this.didMount();
+    const element = this; ///
+
+    mountElement(element);
 
     siblingDOMElement = domElement;  ///
 
@@ -22,6 +26,10 @@ export default class BlockListing extends Yapp {
   }
 
   unmount(parentDOMElement, context) {
+    const element = this; ///
+
+    unmountElement(element);
+
     const domElement = this.getDOMElement();
 
     remove(domElement, parentDOMElement);