Build update

2025-02-21 00:23:02 +08:00 · 2019-03-09 21:52:44 -05:00 · 2019-03-09 21:52:44 -05:00 · 0bea304528
commit 0bea304528
parent 652084cabb
6 changed files with 147 additions and 44 deletions
--- a/build/css/index.css
+++ b/build/css/index.css
@ -1,6 +1,6 @@
 /*!
 * 
- *   simple-keyboard v2.18.1
+ *   simple-keyboard v2.19.0
 *   https://github.com/hodgef/simple-keyboard
 * 
 *   Copyright (c) Francisco Hodge (https://github.com/hodgef)
@ -8,5 +8,5 @@
 *   This source code is licensed under the MIT license found in the
 *   LICENSE file in the root directory of this source tree.
 *   
- */body,html{margin:0;padding:0}.simple-keyboard{font-family:HelveticaNeue-Light,Helvetica Neue Light,Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif;width:100%;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;box-sizing:border-box;overflow:hidden;touch-action:manipulation}.simple-keyboard .hg-row{display:-webkit-flex;display:flex}.simple-keyboard .hg-row:not(:last-child){margin-bottom:5px}.simple-keyboard .hg-row .hg-button:not(:last-child){margin-right:5px}.simple-keyboard .hg-button{display:inline-block;-webkit-flex-grow:1;flex-grow:1;cursor:pointer}.simple-keyboard .hg-button span{pointer-events:none}.simple-keyboard.hg-theme-default{background-color:rgba(0,0,0,.1);padding:5px;border-radius:5px}.simple-keyboard.hg-theme-default .hg-button{box-shadow:0 0 3px -1px rgba(0,0,0,.3);height:40px;border-radius:5px;box-sizing:border-box;padding:5px;background:#fff;border-bottom:1px solid #b5b5b5;cursor:pointer;display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.simple-keyboard button.hg-button{border-width:0;outline:0;font-size:inherit}.simple-keyboard.hg-theme-default:not(.hg-touch-events) .hg-button:active{background:#e4e4e4}.simple-keyboard.hg-theme-default.hg-layout-numeric .hg-button{width:33.3%;height:60px;-webkit-align-items:center;align-items:center;display:-webkit-flex;display:flex;-webkit-justify-content:center;justify-content:center}.simple-keyboard.hg-theme-default .hg-button.hg-button-numpadadd,.simple-keyboard.hg-theme-default .hg-button.hg-button-numpadenter{height:85px}.simple-keyboard.hg-theme-default .hg-button.hg-button-numpad0{width:105px}.simple-keyboard.hg-theme-default .hg-button.hg-button-com{max-width:85px}.simple-keyboard.hg-theme-default .hg-button.hg-standardBtn.hg-button-at{max-width:45px}.simple-keyboard.hg-theme-default .hg-button.hg-selectedButton{background:rgba(5,25,70,.53);color:#fff}.simple-keyboard.hg-theme-default .hg-button.hg-standardBtn[data-skbtn=".com"]{max-width:82px}.simple-keyboard.hg-theme-default .hg-button.hg-standardBtn[data-skbtn="@"]{max-width:60px}
+ */body,html{margin:0;padding:0}.simple-keyboard{font-family:HelveticaNeue-Light,Helvetica Neue Light,Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif;width:100%;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;box-sizing:border-box;overflow:hidden;touch-action:manipulation}.simple-keyboard .hg-row{display:-webkit-flex;display:flex}.simple-keyboard .hg-row:not(:last-child){margin-bottom:5px}.simple-keyboard .hg-row .hg-button-container,.simple-keyboard .hg-row .hg-button:not(:last-child){margin-right:5px}.simple-keyboard .hg-row>div:last-child{margin-right:0}.simple-keyboard .hg-row .hg-button-container{display:-webkit-flex;display:flex}.simple-keyboard .hg-button{display:inline-block;-webkit-flex-grow:1;flex-grow:1;cursor:pointer}.simple-keyboard .hg-button span{pointer-events:none}.simple-keyboard.hg-theme-default{background-color:rgba(0,0,0,.1);padding:5px;border-radius:5px}.simple-keyboard.hg-theme-default .hg-button{box-shadow:0 0 3px -1px rgba(0,0,0,.3);height:40px;border-radius:5px;box-sizing:border-box;padding:5px;background:#fff;border-bottom:1px solid #b5b5b5;cursor:pointer;display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.simple-keyboard button.hg-button{border-width:0;outline:0;font-size:inherit}.simple-keyboard.hg-theme-default:not(.hg-touch-events) .hg-button:active{background:#e4e4e4}.simple-keyboard.hg-theme-default.hg-layout-numeric .hg-button{width:33.3%;height:60px;-webkit-align-items:center;align-items:center;display:-webkit-flex;display:flex;-webkit-justify-content:center;justify-content:center}.simple-keyboard.hg-theme-default .hg-button.hg-button-numpadadd,.simple-keyboard.hg-theme-default .hg-button.hg-button-numpadenter{height:85px}.simple-keyboard.hg-theme-default .hg-button.hg-button-numpad0{width:105px}.simple-keyboard.hg-theme-default .hg-button.hg-button-com{max-width:85px}.simple-keyboard.hg-theme-default .hg-button.hg-standardBtn.hg-button-at{max-width:45px}.simple-keyboard.hg-theme-default .hg-button.hg-selectedButton{background:rgba(5,25,70,.53);color:#fff}.simple-keyboard.hg-theme-default .hg-button.hg-standardBtn[data-skbtn=".com"]{max-width:82px}.simple-keyboard.hg-theme-default .hg-button.hg-standardBtn[data-skbtn="@"]{max-width:60px}
 /*# sourceMappingURL=index.css.map */
--- a/build/css/index.css.map
+++ b/build/css/index.css.map
--- a/build/css/simple-keyboard.css
+++ b/build/css/simple-keyboard.css
@ -1,6 +1,6 @@
 /*!
 * 
- *   simple-keyboard v2.18.1 (Non-minified build)
+ *   simple-keyboard v2.19.0 (Non-minified build)
 *   https://github.com/hodgef/simple-keyboard
 * 
 *   Copyright (c) Francisco Hodge (https://github.com/hodgef)
@ -41,6 +41,19 @@ html {
  margin-right: 5px;
 }

+.simple-keyboard .hg-row .hg-button-container {
+  margin-right: 5px;
+}
+
+.simple-keyboard .hg-row > div:last-child {
+  margin-right: 0;
+}
+
+.simple-keyboard .hg-row .hg-button-container {
+  display: -webkit-flex;
+  display: flex;
+}
+
 .simple-keyboard .hg-button {
  display: inline-block;
  -webkit-flex-grow: 1;
--- a/build/index.js
+++ b/build/index.js
--- a/build/index.js.map
+++ b/build/index.js.map
--- a/build/simple-keyboard.js
+++ b/build/simple-keyboard.js
@ -1,6 +1,6 @@
 /*!
 * 
- *   simple-keyboard v2.18.1 (Non-minified build)
+ *   simple-keyboard v2.19.0 (Non-minified build)
 *   https://github.com/hodgef/simple-keyboard
 * 
 *   Copyright (c) Francisco Hodge (https://github.com/hodgef)
@ -800,15 +800,6 @@
          }
          initCallback(_this.modules[name]);
        });
-        _defineProperty(this, "getModuleProp", function(name, prop) {
-          if (!_this.modules[name]) {
-            return false;
-          }
-          return _this.modules[name][prop];
-        });
-        _defineProperty(this, "getModulesList", function() {
-          return Object.keys(_this.modules);
-        });
        var keyboardDOMQuery = typeof (arguments.length <= 0 ? undefined : arguments[0]) === "string" ? arguments.length <= 0 ? undefined : arguments[0] : ".simple-keyboard";
        var options = Keyboard_typeof(arguments.length <= 0 ? undefined : arguments[0]) === "object" ? arguments.length <= 0 ? undefined : arguments[0] : arguments.length <= 1 ? undefined : arguments[1];
        if (!options) {
@ -1444,11 +1435,82 @@
        /**
   * Get module prop
   */      }, {
-        key: "render",
+        key: "getModuleProp",
+        value: function getModuleProp(name, prop) {
+          if (!this.modules[name]) {
+            return false;
+          }
+          return this.modules[name][prop];
+        }
+        /**
+   * getModulesList
+   */      }, {
+        key: "getModulesList",
+        value: function getModulesList() {
+          return Object.keys(this.modules);
+        }
+        /**
+   * Parse Row DOM containers
+   */      }, {
+        key: "parseRowDOMContainers",
+        value: function parseRowDOMContainers(rowDOM, rowIndex, containerStartIndexes, containerEndIndexes) {
+          var _this9 = this;
+          var rowDOMArray = Array.from(rowDOM.children);
+          var removedElements = 0;
+          if (rowDOMArray.length) {
+            containerStartIndexes.forEach(function(startIndex, arrIndex) {
+              var endIndex = containerEndIndexes[arrIndex];
+              /**
+         * If there exists a respective end index
+         * if end index comes after start index
+         */              if (!endIndex || !(endIndex > startIndex)) {
+                return false;
+              }
+              /**
+         * Updated startIndex, endIndex
+         * This is since the removal of buttons to place a single button container
+         * results in a modified array size
+         */              var updated_startIndex = startIndex - removedElements;
+              var updated_endIndex = endIndex - removedElements;
+              /**
+         * Create button container
+         */              var containerDOM = document.createElement("div");
+              containerDOM.className += "hg-button-container";
+              var containerUID = "".concat(_this9.options.layoutName, "-r").concat(rowIndex, "c").concat(arrIndex);
+              containerDOM.setAttribute("data-skUID", containerUID);
+              /**
+         * Taking elements due to be inserted into container
+         */              var containedElements = rowDOMArray.splice(updated_startIndex, updated_endIndex - updated_startIndex + 1);
+              removedElements = updated_endIndex - updated_startIndex;
+              /**
+         * Inserting elements to container
+         */              containedElements.forEach(function(element) {
+                return containerDOM.appendChild(element);
+              });
+              /**
+         * Adding container at correct position within rowDOMArray
+         */              rowDOMArray.splice(updated_startIndex, 0, containerDOM);
+              /**
+         * Clearing old rowDOM children structure
+         */              rowDOM.innerHTML = "";
+              /**
+         * Appending rowDOM new children list
+         */              rowDOMArray.forEach(function(element) {
+                return rowDOM.appendChild(element);
+              });
+              if (_this9.options.debug) {
+                console.log("rowDOMContainer", containedElements, updated_startIndex, updated_endIndex, removedElements + 1);
+              }
+            });
+          }
+          return rowDOM;
+        }
        /**
   * Renders rows and buttons as per options
-   */ value: function render() {
-          var _this9 = this;
+   */      }, {
+        key: "render",
+        value: function render() {
+          var _this10 = this;
          /**
     * Clear keyboard
     */          this.clear();
@ -1465,6 +1527,7 @@
          var useTouchEvents = this.options.useTouchEvents || false;
          var useTouchEventsClass = useTouchEvents ? "hg-touch-events" : "";
          var useMouseEvents = this.options.useMouseEvents || false;
+          var disableRowButtonContainers = this.options.disableRowButtonContainers;
          /**
     * Account for buttonTheme, if set
     */          var buttonThemesParsed = Array.isArray(this.options.buttonTheme) ? this.getButtonTheme() : {};
@ -1480,61 +1543,85 @@
       */            var rowDOM = document.createElement("div");
            rowDOM.className += "hg-row";
            /**
+       * Tracking container indicators in rows
+       */            var containerStartIndexes = [];
+            var containerEndIndexes = [];
+            /**
       * Iterating through each button in row
       */            rowArray.forEach(function(button, bIndex) {
-              var fctBtnClass = _this9.utilities.getButtonClass(button);
+              /**
+         * Check if button has a container indicator
+         */ var buttonHasContainerStart = !disableRowButtonContainers && button.includes("[") && button.length > 1;
+              var buttonHasContainerEnd = !disableRowButtonContainers && button.includes("]") && button.length > 1;
+              /**
+         * Save container start index, if applicable
+         */              if (buttonHasContainerStart) {
+                containerStartIndexes.push(bIndex);
+                /**
+           * Removing indicator
+           */                button = button.replace(/\[/g, "");
+              }
+              if (buttonHasContainerEnd) {
+                containerEndIndexes.push(bIndex);
+                /**
+           * Removing indicator
+           */                button = button.replace(/\]/g, "");
+              }
+              /**
+         * Processing button options
+         */              var fctBtnClass = _this10.utilities.getButtonClass(button);
              var buttonThemeClass = buttonThemesParsed[button];
-              var buttonDisplayName = _this9.utilities.getButtonDisplayName(button, _this9.options.display, _this9.options.mergeDisplay);
+              var buttonDisplayName = _this10.utilities.getButtonDisplayName(button, _this10.options.display, _this10.options.mergeDisplay);
              /**
         * Creating button
-         */              var buttonType = _this9.options.useButtonTag ? "button" : "div";
+         */              var buttonType = _this10.options.useButtonTag ? "button" : "div";
              var buttonDOM = document.createElement(buttonType);
              buttonDOM.className += "hg-button ".concat(fctBtnClass).concat(buttonThemeClass ? " " + buttonThemeClass : "");
              /**
         * Handle button click event
-         */ /* istanbul ignore next */              if (_this9.utilities.pointerEventsSupported() && !useTouchEvents && !useMouseEvents) {
+         */ /* istanbul ignore next */              if (_this10.utilities.pointerEventsSupported() && !useTouchEvents && !useMouseEvents) {
                /**
           * PointerEvents support
           */ buttonDOM.onpointerdown = function(e) {
-                  if (_this9.options.preventMouseDownDefault) {
+                  if (_this10.options.preventMouseDownDefault) {
                    e.preventDefault();
                  }
-                  _this9.handleButtonClicked(button);
-                  _this9.handleButtonMouseDown(button, e);
+                  _this10.handleButtonClicked(button);
+                  _this10.handleButtonMouseDown(button, e);
                };
                buttonDOM.onpointerup = function(e) {
-                  if (_this9.options.preventMouseDownDefault) {
+                  if (_this10.options.preventMouseDownDefault) {
                    e.preventDefault();
                  }
-                  _this9.handleButtonMouseUp();
+                  _this10.handleButtonMouseUp();
                };
                buttonDOM.onpointercancel = function(e) {
-                  return _this9.handleButtonMouseUp();
+                  return _this10.handleButtonMouseUp();
                };
              } else {
                /**
           * Fallback for browsers not supporting PointerEvents
           */ if (useTouchEvents) {
                  buttonDOM.ontouchstart = function(e) {
-                    _this9.handleButtonClicked(button);
-                    _this9.handleButtonMouseDown(button, e);
+                    _this10.handleButtonClicked(button);
+                    _this10.handleButtonMouseDown(button, e);
                  };
                  buttonDOM.ontouchend = function(e) {
-                    return _this9.handleButtonMouseUp();
+                    return _this10.handleButtonMouseUp();
                  };
                  buttonDOM.ontouchcancel = function(e) {
-                    return _this9.handleButtonMouseUp();
+                    return _this10.handleButtonMouseUp();
                  };
                } else {
                  buttonDOM.onclick = function() {
-                    _this9.isMouseHold = false;
-                    _this9.handleButtonClicked(button);
+                    _this10.isMouseHold = false;
+                    _this10.handleButtonClicked(button);
                  };
                  buttonDOM.onmousedown = function(e) {
-                    if (_this9.options.preventMouseDownDefault) {
+                    if (_this10.options.preventMouseDownDefault) {
                      e.preventDefault();
                    }
-                    _this9.handleButtonMouseDown(button, e);
+                    _this10.handleButtonMouseDown(button, e);
                  };
                }
              }
@ -1544,7 +1631,7 @@
              /**
         * Adding unique id
         * Since there's no limit on spawning same buttons, the unique id ensures you can style every button
-         */              var buttonUID = "".concat(_this9.options.layoutName, "-r").concat(rIndex, "b").concat(bIndex);
+         */              var buttonUID = "".concat(_this10.options.layoutName, "-r").concat(rIndex, "b").concat(bIndex);
              buttonDOM.setAttribute("data-skBtnUID", buttonUID);
              /**
         * Adding display label
@ -1556,17 +1643,20 @@
              buttonDOM.appendChild(buttonSpanDOM);
              /**
         * Adding to buttonElements
-         */              if (!_this9.buttonElements[button]) {
-                _this9.buttonElements[button] = [];
+         */              if (!_this10.buttonElements[button]) {
+                _this10.buttonElements[button] = [];
              }
-              _this9.buttonElements[button].push(buttonDOM);
+              _this10.buttonElements[button].push(buttonDOM);
              /**
         * Appending button to row
         */              rowDOM.appendChild(buttonDOM);
            });
            /**
+       * Parse containers in row
+       */            rowDOM = _this10.parseRowDOMContainers(rowDOM, rIndex, containerStartIndexes, containerEndIndexes);
+            /**
       * Appending row to keyboard
-       */            _this9.keyboardDOM.appendChild(rowDOM);
+       */            _this10.keyboardDOM.appendChild(rowDOM);
          });
          /**
     * Calling onRender
@ -1579,7 +1669,7 @@
       * Handling mouseup
       */            if (!useTouchEvents) {
              document.onmouseup = function() {
-                return _this9.handleButtonMouseUp();
+                return _this10.handleButtonMouseUp();
              };
            }
            /**