highmark-cli 0.0.139 → 0.0.140

package/src/client.js

@@ -11,22 +11,24 @@ import View from "./view";
 import createMethods from "./createMethods";
 
 import { setOrientation } from "./state";
-import { DIV_SELECTOR, LOADING_DIV_SELECTOR } from "./selectors";
+import { DIVS_SELECTOR, LOADING_DIV_SELECTOR } from "./selectors";
 import { getOrientation, onOrientationChange } from "./utilities/orientation";
 
 const { renderStyles } = withStyle;
 
 renderStyles();
 
-const divDOMElement = document.querySelector(DIV_SELECTOR);
+const divDOMElements = [ ...document.querySelectorAll(DIVS_SELECTOR) ];  ///
 
-divDOMElement.remove();
+divDOMElements.forEach((divDOMElement) => {
+  divDOMElement.remove();
+});
 
 const scheduler = null,
       model = null,
       view =
 
-        <View divDOMElement={divDOMElement} />
+        <View divDOMElements={divDOMElements} />
 
       ;
 

package/src/constants.js

@@ -9,7 +9,6 @@ export const ZOOM_RATIO = 1.1;
 export const PI_OVER_TWO = PI / 2;
 export const SCROLL_DELAY = 10;
 export const DECELERATION = 0.0333333;
-export const SINGLE_SPACE = " ";
 export const UP_DIRECTION = +1;
 export const DOWN_DIRECTION = -1;
 export const MAXIMUM_SPREAD = PI / 4;

package/src/selectors.js

@@ -1,5 +1,4 @@
 "use strict";
 
-export const DIV_SELECTOR = "body > div:not(.loading)"; ///
-export const DIVS_SELECTOR = "div"; ///
+export const DIVS_SELECTOR = "body > div:not(.loading)"; ///
 export const LOADING_DIV_SELECTOR = "body > div.loading";

package/src/utilities/element.js

@@ -1,7 +1,5 @@
 "use strict";
 
-import { SINGLE_SPACE } from "../constants";
-
 export function elementsFromDOMElements(domElements, Element) {
   const elements = domElements.map((domElement) => {
     const element = elementFromDOMElement(domElement, Element);
@@ -13,22 +11,14 @@ export function elementsFromDOMElements(domElements, Element) {
 }
 
 export function elementFromDOMElement(domElement, Element) {
-  const element = <Element/>;
+  const element =
 
-  const { domElement: temporaryDOMElement } = element,
-        { className: classNamesString } = temporaryDOMElement,
-        classNames = classNamesString.split(SINGLE_SPACE);
+          <Element/>
 
-  const { classList } = domElement,
-        { childNodes } = temporaryDOMElement;
+        ,
+        className = classNameFromElement(element);
 
-  childNodes.forEach((childNode) => {
-    domElement.appendChild(childNode);
-  });
-
-  classNames.forEach((className) => {
-    classList.add(className);
-  });
+  addClassNameToDOMElement(domElement, className)
 
   element.domElement = domElement;  ///
 
@@ -36,3 +26,16 @@ export function elementFromDOMElement(domElement, Element) {
 
   return element;
 }
+
+function classNameFromElement(element) {
+  const domElement = element.getDOMElement(),
+        { className } = domElement;
+
+  return className;
+}
+
+function addClassNameToDOMElement(domElement, className) {
+  const { classList } = domElement;
+
+  classList.add(className);
+}

package/src/view/div/overlay.js

@@ -5,14 +5,12 @@ import withStyle from "easy-with-style";  ///
 import { window } from "easy";
 import { keyCodes } from "necessary";
 
+import Div from "../div";
 import Element from "../element";
-import LeafDiv from "../div/leaf";
 import touchMixins from "../../mixins/touch";
 import fullScreenMixins from "../../mixins/fullsrean";
 
 import { isFullScreen } from "../../utilities/fullScreen";
-import { DIVS_SELECTOR } from "../../selectors";
-import { leafNodesFromNodeList } from "../../utilities/tree";
 import { elementsFromDOMElements } from "../../utilities/element";
 import { SCROLL_DELAY, UP_DIRECTION, DECELERATION, DOWN_DIRECTION, OPEN_MENU_TAP_AREA_HEIGHT } from "../../constants";
 import { getViewZoom as getZoom, setViewZoom as setZoom, setColoursInverted, areColoursInverted } from "../../state";
@@ -63,11 +61,11 @@ class OverlayDiv extends Element {
   }
 
   swipeRightCustomHandler = (event, element) => {
-    this.showLeftLeafDiv();
+    this.showLeftDiv();
   }
 
   swipeLeftCustomHandler = (event, element) => {
-    this.showRightLeftDiv();
+    this.showRightDiv();
   }
 
   swipeDownCustomHandler = (event, element, top, left, speed) => {
@@ -138,14 +136,14 @@ class OverlayDiv extends Element {
     switch (keyCode) {
       case ENTER_KEY_CODE:
       case ARROW_RIGHT_KEY_CODE: {
-        this.showRightLeftDiv();
+        this.showRightDiv();
 
         break;
       }
 
       case BACKSPACE_KEY_CODE:
       case ARROW_LEFT_KEY_CODE: {
-        this.showLeftLeafDiv();
+        this.showLeftDiv();
 
         break;
       }
@@ -157,13 +155,13 @@ class OverlayDiv extends Element {
       }
 
       case ARROW_UP_KEY_CODE: {
-        this.showFirstLeafDiv();
+        this.showFirstDiv();
 
         break;
       }
 
       case ARROW_DOWN_KEY_CODE: {
-        this.showLastLeafDiv();
+        this.showLastDiv();
 
         break;
       }
@@ -182,9 +180,9 @@ class OverlayDiv extends Element {
 
   updateZoom() {
     const zoom = getZoom(),
-          displayedLeafDiv = this.findDisplayedLeafDiv();
+          displayedDiv = this.findDisplayedDiv();
 
-    displayedLeafDiv.zoom(zoom);
+    displayedDiv.zoom(zoom);
   }
 
   scrollToTop() {
@@ -271,22 +269,37 @@ class OverlayDiv extends Element {
     this.enableCustomGestures();
   }
 
-  showFirstLeafDiv() {
-    const displayedLeafDiv = this.findDisplayedLeafDiv(),
-          leafDivs = this.getLeafDivs(),
-          index = leafDivs.indexOf(displayedLeafDiv),
+  showRightDiv() {
+    const displayedDiv = this.findDisplayedDiv(),
+          divs = this.getDivs(),
+          divsLength = divs.length,
+          index = divs.indexOf(displayedDiv),
+          nextIndex = index + 1,
+          previousIndex = index;  ///
+
+    if (nextIndex === divsLength) {
+      return;
+    }
+
+    this.showNextDiv(nextIndex, previousIndex);
+  }
+
+  showFirstDiv() {
+    const displayedDiv = this.findDisplayedDiv(),
+          divs = this.getDivs(),
+          index = divs.indexOf(displayedDiv),
           nextIndex = 0,
           previousIndex = (index === -1) ?
                             nextIndex : ///
                               index;  ///
 
-    this.showNextLeafDiv(nextIndex, previousIndex);
+    this.showNextDiv(nextIndex, previousIndex);
   }
 
-  showLeftLeafDiv() {
-    const displayedLeafDiv = this.findDisplayedLeafDiv(),
-          leafDivs = this.getLeafDivs(),
-          index = leafDivs.indexOf(displayedLeafDiv),
+  showLeftDiv() {
+    const displayedDiv = this.findDisplayedDiv(),
+          divs = this.getDivs(),
+          index = divs.indexOf(displayedDiv),
           nextIndex = index - 1,
           previousIndex = index;  ///
 
@@ -294,54 +307,39 @@ class OverlayDiv extends Element {
       return;
     }
 
-    this.showNextLeafDiv(nextIndex, previousIndex);
-  }
-
-  showRightLeftDiv() {
-    const displayedLeafDiv = this.findDisplayedLeafDiv(),
-          leafDivs = this.getLeafDivs(),
-          leafDivsLength = leafDivs.length,
-          index = leafDivs.indexOf(displayedLeafDiv),
-          nextIndex = index + 1,
-          previousIndex = index;  ///
-
-    if (nextIndex === leafDivsLength) {
-      return;
-    }
-
-    this.showNextLeafDiv(nextIndex, previousIndex);
+    this.showNextDiv(nextIndex, previousIndex);
   }
 
-  showLastLeafDiv() {
-    const displayedLeafDiv = this.findDisplayedLeafDiv(),
-          leafDivs = this.getLeafDivs(),
-          index = leafDivs.indexOf(displayedLeafDiv),
-          leafDivsLength = leafDivs.length,
-          nextIndex = leafDivsLength - 1,
+  showLastDiv() {
+    const displayedDiv = this.findDisplayedDiv(),
+          divs = this.getDivs(),
+          index = divs.indexOf(displayedDiv),
+          divsLength = divs.length,
+          nextIndex = divsLength - 1,
           previousIndex = (index === -1) ?
                             nextIndex : ///
                               index;  ///
 
-    this.showNextLeafDiv(nextIndex, previousIndex);
+    this.showNextDiv(nextIndex, previousIndex);
   }
 
-  showNextLeafDiv(nextIndex, previousIndex) {
-    const leafDivs = this.getLeafDivs(),
-          nextLeafDiv = leafDivs[nextIndex],
-          previousLeafDiv = leafDivs[previousIndex],
-          backgroundColour = nextLeafDiv.getBackgroundColour();
+  showNextDiv(nextIndex, previousIndex) {
+    const divs = this.getDivs(),
+          nextDiv = divs[nextIndex],
+          previousDiv = divs[previousIndex],
+          backgroundColour = nextDiv.getBackgroundColour();
 
     let zoom;
 
     zoom = 1;
 
-    previousLeafDiv.zoom(zoom);
+    previousDiv.zoom(zoom);
 
     zoom = getZoom();
 
-    nextLeafDiv.zoom(zoom);
+    nextDiv.zoom(zoom);
 
-    previousLeafDiv.hide();
+    previousDiv.hide();
 
     this.setBackgroundColour(backgroundColour);
 
@@ -349,7 +347,7 @@ class OverlayDiv extends Element {
 
     this.scrollToTop();
 
-    nextLeafDiv.show();
+    nextDiv.show();
   }
 
   setBackgroundColour(backgroundColour) {
@@ -361,50 +359,24 @@ class OverlayDiv extends Element {
     this.css(css);
   }
 
-  hideAllLeafDivs() {
-    this.forEachLeafDiv((leafDiv) => {
-      leafDiv.hide();
-    });
-  }
-
-  findDisplayedLeafDiv() {
-    const leafDivs = this.getLeafDivs(),
-          displayedLeafDiv = leafDivs.find((leafDiv) => {
-            const displayed = leafDiv.isDisplayed();
+  findDisplayedDiv() {
+    const divs = this.getDivs(),
+          displayedDiv = divs.find((div) => {
+            const displayed = div.isDisplayed();
 
             if (displayed) {
               return true;
             }
           });
 
-    return displayedLeafDiv;
-  }
-
-  retrieveLeafDivs() {
-    const domElement = this.getDOMElement(),
-          divNodeList = domElement.querySelectorAll(DIVS_SELECTOR),
-          leafDivNodes = leafNodesFromNodeList(divNodeList),  ///
-          leafDivs = elementsFromDOMElements(leafDivNodes, LeafDiv);
-
-    return leafDivs;
+    return displayedDiv;
   }
 
-  forEachLeafDiv(callback) {
-    const leafDivs = this.getLeafDivs();
+  getDivs() {
+    const childElements = this.getChildElements(),
+          divs = childElements; ///
 
-    leafDivs.forEach(callback);
-  }
-
-  getLeafDivs() {
-    const { leafDivs } = this.getState();
-
-    return leafDivs;
-  }
-
-  setLeftDivs(leafDivs) {
-    this.updateState({
-      leafDivs
-    });
+    return divs;
   }
 
   getInterval() {
@@ -444,26 +416,17 @@ class OverlayDiv extends Element {
   }
 
   setInitialState() {
-    const leafDivs = this.retrieveLeafDivs(),
-          interval = null,
+    const interval = null,
           startZoom = null,
           startScrollTop = null;
 
     this.setState({
-      leafDivs,
       interval,
       startZoom,
       startScrollTop
     });
   }
 
-  appendDivDOMElement() {
-    const { divDOMElement  } = this.properties,
-          domElement = this.getDOMElement();
-
-    domElement.append(divDOMElement);
-  }
-
   didMount() {
     window.onKeyDown(this.keyDownHandler);
 
@@ -482,17 +445,17 @@ class OverlayDiv extends Element {
     this.onCustomFullScreenChange(this.fullScreenChangeCustomHandler);
 
     this.enableFullScreen();
+
     this.enableTouch();
 
-    this.showFirstLeafDiv();
+    this.updateZoom();
 
     this.updateColours();
-
-    this.updateZoom();
   }
 
   willUnmount() {
     this.disableTouch();
+
     this.disableFullScreen();
 
     this.offCustomTap(this.tapCustomHandler);
@@ -512,6 +475,16 @@ class OverlayDiv extends Element {
     window.offKeyDown(this.keyDownHandler);
   }
 
+  childElements() {
+    const { divDOMElements } = this.properties,
+          divs = elementsFromDOMElements(divDOMElements, Div),
+          childElements = [
+            ...divs
+          ];
+
+    return childElements;
+  }
+
   parentContext() {
     const invertColours = this.invertColours.bind(this),
           revertColours = this.revertColours.bind(this),
@@ -535,19 +508,15 @@ class OverlayDiv extends Element {
   initialise() {
     this.assignContext();
 
-    this.appendDivDOMElement();
-
     this.setInitialState();
 
-    this.suppressNativeGestures();
-
-    this.hideAllLeafDivs();
+    this.showFirstDiv();
   }
 
   static tagName = "div";
 
   static ignoredProperties = [
-    "divDOMElement"
+    "divDOMElements"
   ];
 
   static defaultProperties = {

package/src/view/{div/leaf.js → div.js}

@@ -4,9 +4,9 @@ import withStyle from "easy-with-style";  ///
 
 import { Element } from "easy";
 
-import { BACKGROUND_COLOUR } from "../../constants";
+import { BACKGROUND_COLOUR } from "../constants";
 
-class LeafDiv extends Element {
+class Div extends Element {
   getBackgroundColour() {
     const backgroundColour = this.css(BACKGROUND_COLOUR) || null;
 
@@ -26,15 +26,12 @@ class LeafDiv extends Element {
   }
 
   static tagName = "div";
-
-  static defaultProperties = {
-    className: "leaf"
-  };
 }
 
-export default withStyle(LeafDiv)`
+export default withStyle(Div)`
 
   width: 100%;
+  display: none;
   min-height: 100%;
   pointer-events: none;
   transform-origin: top left;

package/src/view.js

@@ -14,12 +14,12 @@ class View extends Element {
   }
 
   childElements() {
-    const { divDOMElement } = this.properties;
+    const { divDOMElements } = this.properties;
 
     return ([
 
       <PreloaderDiv/>,
-      <OverlayDiv divDOMElement={divDOMElement} />,
+      <OverlayDiv divDOMElements={divDOMElements} />,
       <MenuDiv/>
 
     ]);
@@ -34,7 +34,7 @@ class View extends Element {
   static tagName = "div";
 
   static ignoredProperties = [
-    "divDOMElement"
+    "divDOMElements"
   ];
 
   static defaultProperties = {

package/lib/utilities/tree.js

@@ -1,55 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-Object.defineProperty(exports, "leafNodesFromNodeList", {
-    enumerable: true,
-    get: function() {
-        return leafNodesFromNodeList;
-    }
-});
-var _necessary = require("necessary");
-function _array_like_to_array(arr, len) {
-    if (len == null || len > arr.length) len = arr.length;
-    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
-    return arr2;
-}
-function _array_without_holes(arr) {
-    if (Array.isArray(arr)) return _array_like_to_array(arr);
-}
-function _iterable_to_array(iter) {
-    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
-}
-function _non_iterable_spread() {
-    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _to_consumable_array(arr) {
-    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
-}
-function _unsupported_iterable_to_array(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _array_like_to_array(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
-}
-var filter = _necessary.arrayUtilities.filter;
-function leafNodesFromNodeList(nodeList) {
-    var nodes = _to_consumable_array(nodeList);
-    filter(nodes, function(node) {
-        var childNodeList = node.childNodes, childNodes = _to_consumable_array(childNodeList), childNodesIncludesNodes = nodes.some(function(node) {
-            var childNodesIncludesNode = childNodes.includes(node);
-            if (childNodesIncludesNode) {
-                return true;
-            }
-        });
-        if (!childNodesIncludesNodes) {
-            return true;
-        }
-    });
-    var leafNodes = nodes; ///
-    return leafNodes;
-}
-
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy91dGlsaXRpZXMvdHJlZS5qcyJdLCJzb3VyY2VzQ29udGVudCI6WyJcInVzZSBzdHJpY3RcIjtcblxuaW1wb3J0IHsgYXJyYXlVdGlsaXRpZXMgfSBmcm9tIFwibmVjZXNzYXJ5XCI7XG5cbmNvbnN0IHsgZmlsdGVyIH0gPSBhcnJheVV0aWxpdGllcztcblxuZXhwb3J0IGZ1bmN0aW9uIGxlYWZOb2Rlc0Zyb21Ob2RlTGlzdChub2RlTGlzdCkge1xuICBjb25zdCBub2RlcyA9IFsgLi4ubm9kZUxpc3QgXTtcblxuICBmaWx0ZXIobm9kZXMsIChub2RlKSA9PiB7XG4gICAgY29uc3QgeyBjaGlsZE5vZGVzOiBjaGlsZE5vZGVMaXN0IH0gPSBub2RlLFxuICAgICAgICAgIGNoaWxkTm9kZXMgPSBbIC4uLmNoaWxkTm9kZUxpc3QgXSxcbiAgICAgICAgICBjaGlsZE5vZGVzSW5jbHVkZXNOb2RlcyA9IG5vZGVzLnNvbWUoKG5vZGUpID0+IHtcbiAgICAgICAgICAgIGNvbnN0IGNoaWxkTm9kZXNJbmNsdWRlc05vZGUgPSBjaGlsZE5vZGVzLmluY2x1ZGVzKG5vZGUpO1xuXG4gICAgICAgICAgICBpZiAoY2hpbGROb2Rlc0luY2x1ZGVzTm9kZSkge1xuICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTtcbiAgICAgICAgICAgIH1cbiAgICAgICAgICB9KTtcblxuICAgIGlmICghY2hpbGROb2Rlc0luY2x1ZGVzTm9kZXMpIHtcbiAgICAgIHJldHVybiB0cnVlO1xuICAgIH1cbiAgfSk7XG5cbiAgY29uc3QgbGVhZk5vZGVzID0gbm9kZXM7ICAvLy9cblxuICByZXR1cm4gbGVhZk5vZGVzO1xufVxuIl0sIm5hbWVzIjpbImxlYWZOb2Rlc0Zyb21Ob2RlTGlzdCIsImZpbHRlciIsImFycmF5VXRpbGl0aWVzIiwibm9kZUxpc3QiLCJub2RlcyIsIm5vZGUiLCJjaGlsZE5vZGVzIiwiY2hpbGROb2RlTGlzdCIsImNoaWxkTm9kZXNJbmNsdWRlc05vZGVzIiwic29tZSIsImNoaWxkTm9kZXNJbmNsdWRlc05vZGUiLCJpbmNsdWRlcyIsImxlYWZOb2RlcyJdLCJyYW5nZU1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OyIsIm1hcHBpbmdzIjoiQUFBQTs7OzsrQkFNZ0JBOzs7ZUFBQUE7Ozt5QkFKZTs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFFL0IsSUFBTSxBQUFFQyxTQUFXQyx5QkFBYyxDQUF6QkQ7QUFFRCxTQUFTRCxzQkFBc0JHLFFBQVE7SUFDNUMsSUFBTUMsUUFBVSxxQkFBR0Q7SUFFbkJGLE9BQU9HLE9BQU8sU0FBQ0M7UUFDYixJQUFRQyxBQUFZQyxnQkFBa0JGLEtBQTlCQyxZQUNGQSxhQUFlLHFCQUFHQyxnQkFDbEJDLDBCQUEwQkosTUFBTUssSUFBSSxDQUFDLFNBQUNKO1lBQ3BDLElBQU1LLHlCQUF5QkosV0FBV0ssUUFBUSxDQUFDTjtZQUVuRCxJQUFJSyx3QkFBd0I7Z0JBQzFCLE9BQU87WUFDVDtRQUNGO1FBRU4sSUFBSSxDQUFDRix5QkFBeUI7WUFDNUIsT0FBTztRQUNUO0lBQ0Y7SUFFQSxJQUFNSSxZQUFZUixPQUFRLEdBQUc7SUFFN0IsT0FBT1E7QUFDVCJ9

package/src/utilities/tree.js

@@ -1,29 +0,0 @@
-"use strict";
-
-import { arrayUtilities } from "necessary";
-
-const { filter } = arrayUtilities;
-
-export function leafNodesFromNodeList(nodeList) {
-  const nodes = [ ...nodeList ];
-
-  filter(nodes, (node) => {
-    const { childNodes: childNodeList } = node,
-          childNodes = [ ...childNodeList ],
-          childNodesIncludesNodes = nodes.some((node) => {
-            const childNodesIncludesNode = childNodes.includes(node);
-
-            if (childNodesIncludesNode) {
-              return true;
-            }
-          });
-
-    if (!childNodesIncludesNodes) {
-      return true;
-    }
-  });
-
-  const leafNodes = nodes;  ///
-
-  return leafNodes;
-}