Build update

Bumps [resolve](https://github.com/browserify/resolve) from 1.15.0 to 1.15.1.
- [Release notes](https://github.com/browserify/resolve/releases)
- [Commits](https://github.com/browserify/resolve/compare/v1.15.0...v1.15.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

.eslintignore

@@ -0,0 +1 @@
+build/*

.eslintrc.json

@@ -0,0 +1,34 @@
+{
+    "parser": "babel-eslint",
+    "parserOptions": {
+        "ecmaVersion": 6,
+        "sourceType": "module",
+        "ecmaFeatures": {
+            "jsx": true,
+            "modules": true,
+            "experimentalObjectRestSpread": true
+        }
+    },
+    "plugins": [
+        "react"
+    ],
+    "extends": ["eslint:recommended", "plugin:react/recommended"],
+    "rules": {
+        "comma-dangle": 0,
+        "no-unused-vars": "warn",
+        "no-unexpected-multiline": "warn",
+        "prefer-const": "warn"
+    },
+    "settings": {
+        "react": {
+            "pragma": "React",
+            "version": "15.6.1"
+        }
+    },
+    "env": {
+        "browser": true,
+        "node": true,
+        "jasmine": true,
+        "jest": true
+    }
+}

.github/pull_request_template.md

@@ -5,4 +5,3 @@ A few sentences describing the overall goals of the pull request's commits.
 ## Checks
 
 - [ ] Tests ( `npm run test -- --coverage` ) Coverage at `./coverage/lcov-report/index.html` should be 100%
-- [ ] Documentation ( `npm run docs` ) Coverage at `./docs/source.html` should be 100%

.github/workflows/main.yml

@@ -0,0 +1,44 @@
+name: Build
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        node-version: [12.x]
+        os: [ubuntu-latest]
+    steps:
+    - uses: actions/checkout@v1
+    - name: Use Node.js ${{ matrix.node_version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node_version }}
+    - name: npm install, build, and test
+      run: |
+        npm install
+        npm run start -- --testMode
+        npm run demo
+        npm run coverage
+    - uses: codecov/codecov-action@v1.0.2
+      with:
+        token: ${{secrets.CODECOV_TOKEN}}
+      env:
+        CI: true
+        
+    - name: Discord notification
+      if: success()
+      env:
+        DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+      uses: Ilshidur/action-discord@master
+      with:
+        args: 'simple-keyboard - CI Build Passed'
+        
+    - name: Discord notification
+      if: failure()
+      env:
+        DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK }}
+      uses: Ilshidur/action-discord@master
+      with:
+        args: 'simple-keyboard - CI Build Failed'
+        

.github/workflows/publish.yml

@@ -0,0 +1,45 @@
+name: Publish
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+      - run: npm install
+      - run: npm run test -- --coverage --watchAll=false
+        
+      - name: Setup GIT
+        run: |
+          git reset --hard
+          git config --local --list
+          git checkout master
+          git config user.email "$GH_EMAIL"
+          git config user.name "Francisco Hodge"
+        env:
+            GH_EMAIL: ${{secrets.GH_EMAIL}}
+          
+      - name: Bump version
+        run: |
+          git reset --hard
+          npm version patch
+          npm run build
+          git add . || true
+          git commit -m "Build update" || true
+          git push "https://$GITHUB_ACTOR:$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY"
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+          
+      - name: npm publish
+        run: |
+          npm config set //registry.npmjs.org/:_authToken=$NODE_AUTH_TOKEN
+          npm run trypublish
+        env:
+            NODE_AUTH_TOKEN: ${{secrets.NODE_AUTH_TOKEN}}

.gitignore

@@ -17,6 +17,7 @@
 .env.development.local
 .env.test.local
 .env.production.local
+.vscode
 
 npm-debug.log*
 yarn-debug.log*

.travis.yml

@@ -1,6 +1,6 @@
 language: node_js
 node_js:
- - '11.2'
+ - node
 install:
   - npm install -g codecov
   - npm install

README.md

@@ -1,14 +1,37 @@
-<div align="center">
-  <a href="https://simple-keyboard.com/demo" title="View Demo" target="_blank"><img src="https://franciscohodge.com/project-pages/simple-keyboard/images/simplekeyboard-banner_B.png" align="center" width="100%"></a>
-  <a href="https://simple-keyboard.com/demo" title="View Demo" target="_blank"><img src="https://franciscohodge.com/project-pages/simple-keyboard/images/skdemo-4x2.gif" align="center" width="100%"></a>
-  <blockquote>The easily customisable and responsive on-screen virtual keyboard for Javascript projects.</blockquote>
-  <a href="https://www.npmjs.com/package/simple-keyboard" target="_blank"><img src="https://img.shields.io/npm/v/simple-keyboard.svg?style=flat" alt="npm version"></a>
-  <a href="https://travis-ci.org/hodgef/simple-keyboard" target="_blank"><img src="https://travis-ci.org/hodgef/simple-keyboard.svg?branch=master" alt="Build Status"></a>
-  <img src="https://img.shields.io/david/hodgef/js-library-boilerplate.svg" />
-  <a href="https://codecov.io/gh/hodgef/simple-keyboard" target="_blank"><img src="https://img.shields.io/codecov/c/github/hodgef/simple-keyboard/master.svg?style=flat" alt="Coverage Status"></a>
-  <a href="https://www.codacy.com/app/hodgef/simple-keyboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=hodgef/simple-keyboard&amp;utm_campaign=Badge_Grade" target="_blank"><img src="https://api.codacy.com/project/badge/Grade/5778fccc6a894701853d9a1f2fb44a76" alt="Codacy Badge"></a>
-  </p>
-</div>
+<p>
+  <a href="https://simple-keyboard.com/demo">
+	<img alt="simple-keyboard: Javscript Virtual Keyboard" src="https://i.imgur.com/Po6659n.gif">
+  </a>
+	
+  <a href="https://www.npmjs.com/package/simple-keyboard">
+    <img src="https://badgen.net/npm/v/simple-keyboard?color=blue" alt="npm version">
+  </a>
+
+  <a href="https://github.com/hodgef/simple-keyboard/actions">
+     <img alt="Build Status" src="https://github.com/hodgef/simple-keyboard/workflows/Build/badge.svg?color=green" />
+  </a>
+  
+  <a href="https://github.com/hodgef/simple-keyboard/actions">
+     <img alt="Publish Status" src="https://github.com/hodgef/simple-keyboard/workflows/Publish/badge.svg?color=green" />
+  </a>
+
+  <a href="https://bundlephobia.com/result?p=simple-keyboard">
+    <img src="https://badgen.net/bundlephobia/minzip/simple-keyboard/?color=green" alt="install size">
+  </a>
+  
+  <a href="https://david-dm.org/hodgef/simple-keyboard">
+    <img src="https://badgen.net/david/dep/hodgef/simple-keyboard" alt="coverage">
+  </a>
+
+  <a href="https://codecov.io/gh/hodgef/simple-keyboard">
+    <img src="https://badgen.net/codecov/c/github/hodgef/simple-keyboard" alt="coverage">
+  </a>
+</p>
+
+> The slick virtual keyboard for Javascript. Compatible with your JS, React, Angular or Vue projects.
+
+## 🚀 Demo
+[Demo Showcase (Vanilla, Angular, React, Vue)](https://simple-keyboard.com/demo)
 
 ## 📦 Installation & Usage
 You can use simple-keyboard as a `<script>` tag from a CDN, or install it from npm.
@@ -18,11 +41,7 @@ Check out the [Getting Started](https://simple-keyboard.com/getting-started) doc
 ## 📖 Documentation
 Check out the [simple-keyboard documentation](https://simple-keyboard.com/documentation) site.
 
-Feel free to browse the [Q&A / Use-cases](https://simple-keyboard.com/qa-use-cases/) page for advanced use-cases.
-
-## 🚀 Demo
-
-[https://simple-keyboard.com/demo](https://simple-keyboard.com/demo)
+Feel free to browse the [Questions & Answers (FAQ)](https://simple-keyboard.com/qa-use-cases/) page for common use-cases.
 
 
 ### To run demo on your own computer
@@ -42,6 +61,24 @@ Feel free to browse the [Q&A / Use-cases](https://simple-keyboard.com/qa-use-cas
 
 <a href="http://franciscohodge.com/simple-keyboard/chat/join" title="Join our Discord chat" target="_blank"><img src="https://franciscohodge.com/project-pages/simple-keyboard/images/discord.png" align="center" width="200"></a>
 
+## ✳️ Modules
+
+You can extend simple-keyboard's functionality with [modules](https://franciscohodge.com/projects/simple-keyboard/modules/). Such as:
+
+* [Autocorrect](https://franciscohodge.com/projects/simple-keyboard/demo-showcase/module-autocorrect/)
+* [Input Mask](https://franciscohodge.com/projects/simple-keyboard/demo-showcase/module-input-mask/)
+* [Key Navigation](https://franciscohodge.com/projects/simple-keyboard/demo-showcase/module-key-navigation/)
+* [Swipe Keyboard](https://franciscohodge.com/projects/simple-keyboard/demo-showcase/module-swipe-keyboard/)
+
+Want to create your own module? Check out the [Modules page](https://franciscohodge.com/projects/simple-keyboard/modules/) for instructions.
+
+## 🎯 Compatibility
+
+> Simple-keyboard is intended for modern, standards-compliant browsers.
+> Internet Explorer is sadly not one of them, and since its market-share is negligible (~2% for IE11), resources won't be spent in trying to support it.
+>
+> To learn more about the rationale for not supporting IE, check out [this link](https://techcommunity.microsoft.com/t5/Windows-IT-Pro-Blog/The-perils-of-using-Internet-Explorer-as-your-default-browser/ba-p/331732).
+
 ## ✅ Contributing
 
 PR's and issues are welcome. Feel free to submit any issues you have at:

bin/postinstall

@@ -1,10 +0,0 @@
-console.log('\x1b[36m%s\x1b[0m', `
-______________________________________\n`);
-
-console.log('\x1b[33m%s\x1b[0m', `Thank you for installing simple-keyboard !`);
-
-console.log('\x1b[36m%s\x1b[0m', `
-Please consider starring the repository so others can also find it.
-https://github.com/hodgef/simple-keyboard/stargazers
-______________________________________
-`);

build/css/index.css

@@ -1,6 +1,6 @@
 /*!
  * 
- *   simple-keyboard v2.22.0
+ *   simple-keyboard v2.28.1
  *   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-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}
+ */.hg-theme-default{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}.hg-theme-default .hg-button span{pointer-events:none}.hg-theme-default button.hg-button{border-width:0;outline:0;font-size:inherit}.hg-theme-default{font-family:HelveticaNeue-Light,Helvetica Neue Light,Helvetica Neue,Helvetica,Arial,Lucida Grande,sans-serif;background-color:rgba(0,0,0,.1);padding:5px;border-radius:5px}.hg-theme-default .hg-button{display:inline-block;flex-grow:1}.hg-theme-default .hg-row{display:flex}.hg-theme-default .hg-row:not(:last-child){margin-bottom:5px}.hg-theme-default .hg-row .hg-button-container,.hg-theme-default .hg-row .hg-button:not(:last-child){margin-right:5px}.hg-theme-default .hg-row>div:last-child{margin-right:0}.hg-theme-default .hg-row .hg-button-container{display:flex}.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:flex;align-items:center;justify-content:center;-webkit-tap-highlight-color:rgba(0,0,0,0)}.hg-theme-default .hg-button.hg-activeButton{background:#efefef}.hg-theme-default.hg-layout-numeric .hg-button{width:33.3%;height:60px;align-items:center;display:flex;justify-content:center}.hg-theme-default .hg-button.hg-button-numpadadd,.hg-theme-default .hg-button.hg-button-numpadenter{height:85px}.hg-theme-default .hg-button.hg-button-numpad0{width:105px}.hg-theme-default .hg-button.hg-button-com{max-width:85px}.hg-theme-default .hg-button.hg-standardBtn.hg-button-at{max-width:45px}.hg-theme-default .hg-button.hg-selectedButton{background:rgba(5,25,70,.53);color:#fff}.hg-theme-default .hg-button.hg-standardBtn[data-skbtn=".com"]{max-width:82px}.hg-theme-default .hg-button.hg-standardBtn[data-skbtn="@"]{max-width:60px}
 /*# sourceMappingURL=index.css.map */

build/css/simple-keyboard.css

@@ -1,11 +0,0 @@
-/*!
- * 
- *   simple-keyboard v2.22.0 (Non-minified build)
- *   https://github.com/hodgef/simple-keyboard
- * 
- *   Copyright (c) Francisco Hodge (https://github.com/hodgef)
- * 
- *   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-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}

build/index.d.ts

@@ -10,6 +10,12 @@ declare module 'simple-keyboard' {
     buttons: string;
   }
 
+  interface KeyboardButtonAttributes {
+    attribute: string;
+    value: string;
+    buttons: string;
+  }
+
   interface KeyboardOptions {
     /**
      * Modify the keyboard layout.
@@ -41,6 +47,11 @@ declare module 'simple-keyboard' {
      */
     buttonTheme?: KeyboardButtonTheme[];
 
+    /**
+     * A prop to add your own attributes to one or several buttons.
+     */
+    buttonAttributes?: KeyboardButtonAttributes[];
+
     /**
      * Runs a `console.log` every time a key is pressed. Displays the buttons pressed and the current input.
      */
@@ -82,6 +93,11 @@ declare module 'simple-keyboard' {
      * Calling preventDefault for the mousedown events keeps the focus on the input.
      */
     preventMouseDownDefault?: boolean;
+    
+    /**
+     * Stops pointer down events on simple-keyboard buttons from bubbling to parent elements.
+     */
+    stopMouseDownPropagation?: boolean;
 
     /**
      * Define the text color that the physical keyboard highlighted key should have.
@@ -123,11 +139,21 @@ declare module 'simple-keyboard' {
      */
     useMouseEvents?: boolean;
 
+    /**
+     * Disable button hold action.
+     */
+    disableButtonHold?: boolean;
+
     /**
      * Executes the callback function on key press. Returns button layout name (i.e.: "{shift}").
      */
     onKeyPress?: (button: string) => any;
 
+    /**
+     * Executes the callback function on key release.
+     */
+    onKeyReleased?: (button: string) => any;
+
     /**
      * Executes the callback function on input change. Returns the current input's string.
      */
@@ -162,6 +188,10 @@ declare module 'simple-keyboard' {
   class Keyboard {
     constructor(selector: string, options: KeyboardOptions);
     constructor(options: KeyboardOptions);
+
+    /**
+     * Options
+     */
     options: KeyboardOptions;
 
     /**
@@ -169,6 +199,11 @@ declare module 'simple-keyboard' {
      */
     utilities?: any;
 
+    /**
+     * caretPosition
+     */
+    caretPosition?: number;
+
     /**
      * Adds/Modifies an entry to the `buttonTheme`. Basically a way to add a class to a button.
      * @param  {string} buttons List of buttons to select (separated by a space).

config/jest/fileTransform.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const path = require('path');
+const camelcase = require('camelcase');
 
 // This is a custom Jest transformer turning file imports into filenames.
 // http://facebook.github.io/jest/docs/en/webpack.html
@@ -10,19 +11,27 @@ module.exports = {
     const assetFilename = JSON.stringify(path.basename(filename));
 
     if (filename.match(/\.svg$/)) {
+      // Based on how SVGR generates a component name:
+      // https://github.com/smooth-code/svgr/blob/01b194cf967347d43d4cbe6b434404731b87cf27/packages/core/src/state.js#L6
+      const pascalCaseFileName = camelcase(path.parse(filename).name, {
+        pascalCase: true,
+      });
+      const componentName = `Svg${pascalCaseFileName}`;
       return `const React = require('react');
       module.exports = {
         __esModule: true,
         default: ${assetFilename},
-        ReactComponent: React.forwardRef((props, ref) => ({
-          $$typeof: Symbol.for('react.element'),
-          type: 'svg',
-          ref: ref,
-          key: null,
-          props: Object.assign({}, props, {
-            children: ${assetFilename}
-          })
-        })),
+        ReactComponent: React.forwardRef(function ${componentName}(props, ref) {
+          return {
+            $$typeof: Symbol.for('react.element'),
+            type: 'svg',
+            ref: ref,
+            key: null,
+            props: Object.assign({}, props, {
+              children: ${assetFilename}
+            })
+          };
+        }),
       };`;
     }
 

config/modules.js

@@ -4,6 +4,7 @@ const fs = require('fs');
 const path = require('path');
 const paths = require('./paths');
 const chalk = require('react-dev-utils/chalk');
+const resolve = require('resolve');
 
 /**
  * Get the baseUrl of a compilerOptions object.
@@ -63,7 +64,10 @@ function getModules() {
   // TypeScript project and set up the config
   // based on tsconfig.json
   if (hasTsConfig) {
-    config = require(paths.appTsConfig);
+    const ts = require(resolve.sync('typescript', {
+      basedir: paths.appNodeModules,
+    }));
+    config = ts.readConfigFile(paths.appTsConfig, ts.sys.readFile).config;
     // Otherwise we'll check if there is jsconfig.json
     // for non TS projects.
   } else if (hasJsConfig) {

config/pnpTs.js

@@ -0,0 +1,35 @@
+'use strict';
+
+const { resolveModuleName } = require('ts-pnp');
+
+exports.resolveModuleName = (
+  typescript,
+  moduleName,
+  containingFile,
+  compilerOptions,
+  resolutionHost
+) => {
+  return resolveModuleName(
+    moduleName,
+    containingFile,
+    compilerOptions,
+    resolutionHost,
+    typescript.resolveModuleName
+  );
+};
+
+exports.resolveTypeReferenceDirective = (
+  typescript,
+  moduleName,
+  containingFile,
+  compilerOptions,
+  resolutionHost
+) => {
+  return resolveModuleName(
+    moduleName,
+    containingFile,
+    compilerOptions,
+    resolutionHost,
+    typescript.resolveTypeReferenceDirective
+  );
+};

config/webpack.config.demo.js

@@ -25,15 +25,23 @@ const getClientEnvironment = require('./env');
 const ModuleNotFoundPlugin = require('react-dev-utils/ModuleNotFoundPlugin');
 const ForkTsCheckerWebpackPlugin = require('react-dev-utils/ForkTsCheckerWebpackPlugin');
 const typescriptFormatter = require('react-dev-utils/typescriptFormatter');
+const getPackageJson = require('./getPackageJson');
+const eslint = require('eslint');
 
 const postcssNormalize = require('postcss-normalize');
 
+const appPackageJson = require(paths.appPackageJson);
+
 // Source maps are resource heavy and can cause out of memory issue for large source files.
 const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== 'false';
 // Some apps do not need the benefits of saving a web request, so not inlining the chunk
 // makes for a smoother build process.
 const shouldInlineRuntimeChunk = process.env.INLINE_RUNTIME_CHUNK !== 'false';
 
+const imageInlineSizeLimit = parseInt(
+  process.env.IMAGE_INLINE_SIZE_LIMIT || '10000'
+);
+
 // Check if TypeScript is setup
 const useTypeScript = fs.existsSync(paths.appTsConfig);
 
@@ -46,6 +54,7 @@ const sassModuleRegex = /\.module\.(scss|sass)$/;
 // This is the production and development configuration.
 // It is focused on developer experience, fast rebuilds, and a minimal bundle.
 module.exports = function(webpackEnv) {
+  const isEnvDevelopment = webpackEnv === 'development';
   const isEnvProduction = webpackEnv === 'production';
 
   // Webpack uses `publicPath` to determine where the app is being served from.
@@ -66,12 +75,10 @@ module.exports = function(webpackEnv) {
   // common function to get style loaders
   const getStyleLoaders = (cssOptions, preProcessor) => {
     const loaders = [
+      isEnvDevelopment && require.resolve('style-loader'),
       isEnvProduction && {
         loader: MiniCssExtractPlugin.loader,
-        options: Object.assign(
-          {},
-          shouldUseRelativeAssetPaths ? { publicPath: '../../' } : undefined
-        ),
+        options: shouldUseRelativeAssetPaths ? { publicPath: '../../' } : {},
       },
       {
         loader: require.resolve('css-loader'),
@@ -104,12 +111,20 @@ module.exports = function(webpackEnv) {
       },
     ].filter(Boolean);
     if (preProcessor) {
-      loaders.push({
-        loader: require.resolve(preProcessor),
+      loaders.push(
+        {
+          loader: require.resolve('resolve-url-loader'),
         options: {
           sourceMap: isEnvProduction && shouldUseSourceMap,
         },
-      });
+        },
+        {
+          loader: require.resolve(preProcessor),
+          options: {
+            sourceMap: true,
+          },
+    }
+      );
     }
     return loaders;
   };
@@ -118,10 +133,26 @@ module.exports = function(webpackEnv) {
     mode: 'production',
     // Stop compilation early in production
     bail: isEnvProduction,
-    devtool: shouldUseSourceMap ? 'source-map' : false,
+    devtool: isEnvProduction
+      ? shouldUseSourceMap
+        ? 'source-map'
+        : false
+      : isEnvDevelopment && 'cheap-module-source-map',
     // These are the "entry points" to our application.
     // This means they will be the "root" imports that are included in JS bundle.
     entry: isEnvProduction ? [paths.appDemoIndexJs] : [
+      // Include an alternative client for WebpackDevServer. A client's job is to
+      // connect to WebpackDevServer by a socket and get notified about changes.
+      // When you save a file, the client will either apply hot updates (in case
+      // of CSS changes), or refresh the page (in case of JS changes). When you
+      // make a syntax error, this client will display a syntax error overlay.
+      // Note: instead of the default WebpackDevServer client, we use a custom one
+      // to bring better experience for Create React App users. You can replace
+      // the line below with these two lines if you prefer the stock client:
+      // require.resolve('webpack-dev-server/client') + '?/',
+      // require.resolve('webpack/hot/dev-server'),
+      isEnvDevelopment &&
+        require.resolve('react-dev-utils/webpackHotDevClient'),
       // Finally, this is your app's code:
       paths.appDemoIndexJs,
       // We include the app code last so that if there is a runtime error during
@@ -132,6 +163,7 @@ module.exports = function(webpackEnv) {
       // The build folder.
       path: isEnvProduction ? paths.appDemo : undefined,
       // Add /* filename */ comments to generated require()s in the output.
+      pathinfo: isEnvDevelopment,
       // There will be one main bundle, and one file per asynchronous chunk.
       // In development, it does not produce real files.
       filename: 'index.js',
@@ -148,7 +180,11 @@ module.exports = function(webpackEnv) {
             path
               .relative(paths.appSrcDemo, info.absoluteResourcePath)
               .replace(/\\/g, '/')
-        : null,
+        : isEnvDevelopment &&
+          (info => path.resolve(info.absoluteResourcePath).replace(/\\/g, '/')),
+      // Prevents conflicts when multiple Webpack runtimes (from different apps)
+      // are used on the same page.
+      jsonpFunction: `webpackJsonp${appPackageJson.name}`,
     },
     optimization: {
       minimize: isEnvProduction,
@@ -157,8 +193,8 @@ module.exports = function(webpackEnv) {
         new TerserPlugin({
           terserOptions: {
             parse: {
-              // we want terser to parse ecma 8 code. However, we don't want it
-              // to apply any minfication steps that turns valid ecma 5 code
+              // We want terser to parse ecma 8 code. However, we don't want it
+              // to apply any minification steps that turns valid ecma 5 code
               // into invalid ecma 5 code. This is why the 'compress' and 'output'
               // sections only apply transformations that are ecma 5 safe
               // https://github.com/facebook/create-react-app/pull/4234
@@ -174,7 +210,7 @@ module.exports = function(webpackEnv) {
               comparisons: false,
               // Disabled because of an issue with Terser breaking valid code:
               // https://github.com/facebook/create-react-app/issues/5250
-              // Pending futher investigation:
+              // Pending further investigation:
               // https://github.com/terser-js/terser/issues/120
               inline: 2,
             },
@@ -236,7 +272,9 @@ module.exports = function(webpackEnv) {
       // We placed these paths second because we want `node_modules` to "win"
       // if there are any conflicts. This matches Node resolution mechanism.
       // https://github.com/facebook/create-react-app/issues/253
-      modules: ['node_modules', paths.appNodeModules].concat(modules.additionalModulePaths || []),
+      modules: ['node_modules', paths.appNodeModules].concat(
+        modules.additionalModulePaths || []
+      ),
       // These are the reasonable defaults supported by the Node ecosystem.
       // We also include JSX as a common component filename extension to support
       // some tools, although we do not recommend using it, see:
@@ -286,6 +324,7 @@ module.exports = function(webpackEnv) {
               options: {
                 formatter: require.resolve('react-dev-utils/eslintFormatter'),
                 eslintPath: require.resolve('eslint'),
+                resolvePluginsRelativeTo: __dirname,
                 
               },
               loader: require.resolve('eslint-loader'),
@@ -305,7 +344,7 @@ module.exports = function(webpackEnv) {
               test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
               loader: require.resolve('url-loader'),
               options: {
-                limit: 10000,
+                limit: imageInlineSizeLimit,
                 name: 'static/media/[name].[hash:8].[ext]',
               },
             },
@@ -461,24 +500,34 @@ module.exports = function(webpackEnv) {
     },
     plugins: [
       // Generates an `index.html` file with the <script> injected.
-      new HtmlWebpackPlugin({
-        inject: true,
-        template: paths.appHtml,
-        minify: {
-          removeComments: true,
-          collapseWhitespace: true,
-          removeRedundantAttributes: true,
-          useShortDoctype: true,
-          removeEmptyAttributes: true,
-          removeStyleLinkTypeAttributes: true,
-          keepClosingSlash: true,
-          minifyJS: true,
-          minifyCSS: true,
-          minifyURLs: true,
-        },
-      }),
+      new HtmlWebpackPlugin(
+        Object.assign(
+          {},
+          {
+            inject: true,
+            template: paths.appHtml
+          },
+          isEnvProduction
+            ? {
+                minify: {
+                  removeComments: true,
+                  collapseWhitespace: true,
+                  removeRedundantAttributes: true,
+                  useShortDoctype: true,
+                  removeEmptyAttributes: true,
+                  removeStyleLinkTypeAttributes: true,
+                  keepClosingSlash: true,
+                  minifyJS: true,
+                  minifyCSS: true,
+                  minifyURLs: true,
+                },
+              }
+            : undefined
+        )
+      ),
       // Inlines the webpack runtime script. This script is too small to warrant
       // a network request.
+      isEnvProduction &&
         shouldInlineRuntimeChunk &&
         new InlineChunkHtmlPlugin(HtmlWebpackPlugin, [/runtime~.+[.]js/]),
       // Makes some environment variables available in index.html.
@@ -497,6 +546,18 @@ module.exports = function(webpackEnv) {
       // during a production build.
       // Otherwise React will be compiled in the very slow development mode.
       new webpack.DefinePlugin(env.stringified),
+      // This is necessary to emit hot updates (currently CSS only):
+      isEnvDevelopment && new webpack.HotModuleReplacementPlugin(),
+      // Watcher doesn't work well if you mistype casing in a path so we use
+      // a plugin that prints an error when you attempt to do this.
+      // See https://github.com/facebook/create-react-app/issues/240
+      isEnvDevelopment && new CaseSensitivePathsPlugin(),
+      // If you require a missing module and then `npm install` it, you still have
+      // to restart the development server for Webpack to discover it. This plugin
+      // makes the discovery automatic so you don't have to restart.
+      // See https://github.com/facebook/create-react-app/issues/186
+      isEnvDevelopment &&
+        new WatchMissingNodeModulesPlugin(paths.appNodeModules),
       isEnvProduction &&
         new MiniCssExtractPlugin({
           // Options similar to the same options in webpackOptions.output
@@ -551,6 +612,12 @@ module.exports = function(webpackEnv) {
           }),
           useTypescriptIncrementalApi: true,
           checkSyntacticErrors: true,
+          resolveModuleNameModule: process.versions.pnp
+            ? `${__dirname}/pnpTs.js`
+            : undefined,
+          resolveTypeReferenceDirectiveModule: process.versions.pnp
+            ? `${__dirname}/pnpTs.js`
+            : undefined,
           tsconfig: paths.appTsConfig,
           reportFiles: [
             '**',

config/webpack.config.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const fs = require('fs');
 const isWsl = require('is-wsl');
 const path = require('path');
@@ -26,8 +24,8 @@ const typescriptFormatter = require('react-dev-utils/typescriptFormatter');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const getPackageJson = require('./getPackageJson');
 const PrettierPlugin = require("prettier-webpack-plugin");
-
 const postcssNormalize = require('postcss-normalize');
+const appPackageJson = require(paths.appPackageJson);
 
 // Source maps are resource heavy and can cause out of memory issue for large source files.
 const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== 'false';
@@ -35,6 +33,10 @@ const shouldUseSourceMap = process.env.GENERATE_SOURCEMAP !== 'false';
 // makes for a smoother build process.
 const shouldInlineRuntimeChunk = process.env.INLINE_RUNTIME_CHUNK !== 'false';
 
+const imageInlineSizeLimit = parseInt(
+  process.env.IMAGE_INLINE_SIZE_LIMIT || '10000'
+);
+
 // Check if TypeScript is setup
 const useTypeScript = fs.existsSync(paths.appTsConfig);
 
@@ -56,7 +58,7 @@ const banner = `
   ${name} v${version}
   ${repository.url}
 
-  Copyright (c) ${author.replace(/ *\<[^)]*\> */g, " ")}
+  Copyright (c) ${author.replace(/ *<[^)]*> */g, " ")}
 
   This source code is licensed under the ${license} license found in the
   LICENSE file in the root directory of this source tree.
@@ -93,10 +95,7 @@ module.exports = function(webpackEnv) {
       isEnvDevelopment && require.resolve('style-loader'),
       isEnvProduction && {
         loader: MiniCssExtractPlugin.loader,
-        options: Object.assign(
-          {},
-          shouldUseRelativeAssetPaths ? { publicPath: '../../' } : undefined
-        ),
+        options: shouldUseRelativeAssetPaths ? { publicPath: '../../' } : {},
       },
       {
         loader: require.resolve('css-loader'),
@@ -129,12 +128,20 @@ module.exports = function(webpackEnv) {
       },
     ].filter(Boolean);
     if (preProcessor) {
-      loaders.push({
-        loader: require.resolve(preProcessor),
+      loaders.push(
+        {
+          loader: require.resolve('resolve-url-loader'),
         options: {
           sourceMap: isEnvProduction && shouldUseSourceMap,
         },
-      });
+        },
+        {
+          loader: require.resolve(preProcessor),
+          options: {
+            sourceMap: true,
+          },
+    }
+      );
     }
     return loaders;
   };
@@ -199,6 +206,9 @@ module.exports = function(webpackEnv) {
               .replace(/\\/g, '/')
         : isEnvDevelopment &&
           (info => path.resolve(info.absoluteResourcePath).replace(/\\/g, '/')),
+      // Prevents conflicts when multiple Webpack runtimes (from different apps)
+      // are used on the same page.
+      jsonpFunction: `webpackJsonp${appPackageJson.name}`,
     },
     optimization: {
       minimize: isEnvProduction,
@@ -207,8 +217,8 @@ module.exports = function(webpackEnv) {
         new TerserPlugin({
           terserOptions: {
             parse: {
-              // we want terser to parse ecma 8 code. However, we don't want it
-              // to apply any minfication steps that turns valid ecma 5 code
+              // We want terser to parse ecma 8 code. However, we don't want it
+              // to apply any minification steps that turns valid ecma 5 code
               // into invalid ecma 5 code. This is why the 'compress' and 'output'
               // sections only apply transformations that are ecma 5 safe
               // https://github.com/facebook/create-react-app/pull/4234
@@ -224,14 +234,14 @@ module.exports = function(webpackEnv) {
               comparisons: false,
               // Disabled because of an issue with Terser breaking valid code:
               // https://github.com/facebook/create-react-app/issues/5250
-              // Pending futher investigation:
+              // Pending further investigation:
               // https://github.com/terser-js/terser/issues/120
               inline: 2,
             },
             mangle: {
               safari10: true,
-              //keep_classnames: true,
-              //keep_fnames: true,
+              keep_classnames: true,
+              keep_fnames: true,
               module: true
             },
             output: {
@@ -289,7 +299,9 @@ module.exports = function(webpackEnv) {
       // We placed these paths second because we want `node_modules` to "win"
       // if there are any conflicts. This matches Node resolution mechanism.
       // https://github.com/facebook/create-react-app/issues/253
-      modules: ['node_modules', paths.appNodeModules].concat(modules.additionalModulePaths || []),
+      modules: ['node_modules', paths.appNodeModules].concat(
+        modules.additionalModulePaths || []
+      ),
       // These are the reasonable defaults supported by the Node ecosystem.
       // We also include JSX as a common component filename extension to support
       // some tools, although we do not recommend using it, see:
@@ -339,6 +351,7 @@ module.exports = function(webpackEnv) {
               options: {
                 formatter: require.resolve('react-dev-utils/eslintFormatter'),
                 eslintPath: require.resolve('eslint'),
+                resolvePluginsRelativeTo: __dirname,
                 
               },
               loader: require.resolve('eslint-loader'),
@@ -358,7 +371,7 @@ module.exports = function(webpackEnv) {
               test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
               loader: require.resolve('url-loader'),
               options: {
-                limit: 10000,
+                limit: imageInlineSizeLimit,
                 name: 'static/media/[name].[hash:8].[ext]',
               },
             },
@@ -514,12 +527,8 @@ module.exports = function(webpackEnv) {
     },
     plugins: [
       isEnvDevelopment &&
-      new HtmlWebpackPlugin({
-        inject: true,
-        template: paths.appHtml,
-      }),
       // Generates an `index.html` file with the <script> injected.
-      /*new HtmlWebpackPlugin(
+      new HtmlWebpackPlugin(
         Object.assign(
           {},
           {
@@ -543,7 +552,7 @@ module.exports = function(webpackEnv) {
               }
             : undefined
         )
-      ),*/
+      ),
       // Inlines the webpack runtime script. This script is too small to warrant
       // a network request.
       isEnvProduction &&
@@ -639,6 +648,12 @@ module.exports = function(webpackEnv) {
           async: isEnvDevelopment,
           useTypescriptIncrementalApi: true,
           checkSyntacticErrors: true,
+          resolveModuleNameModule: process.versions.pnp
+            ? `${__dirname}/pnpTs.js`
+            : undefined,
+          resolveTypeReferenceDirectiveModule: process.versions.pnp
+            ? `${__dirname}/pnpTs.js`
+            : undefined,
           tsconfig: paths.appTsConfig,
           reportFiles: [
             '**',

config/webpack.config.unminified.js

@@ -1,579 +0,0 @@
-'use strict';
-
-const fs = require('fs');
-const isWsl = require('is-wsl');
-const path = require('path');
-const webpack = require('webpack');
-const resolve = require('resolve');
-const PnpWebpackPlugin = require('pnp-webpack-plugin');
-const HtmlWebpackPlugin = require('html-webpack-plugin');
-const InlineChunkHtmlPlugin = require('react-dev-utils/InlineChunkHtmlPlugin');
-const MiniCssExtractPlugin = require('mini-css-extract-plugin');
-const OptimizeCSSAssetsPlugin = require('optimize-css-assets-webpack-plugin');
-const safePostCssParser = require('postcss-safe-parser');
-const InterpolateHtmlPlugin = require('react-dev-utils/InterpolateHtmlPlugin');
-const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
-const getCSSModuleLocalIdent = require('react-dev-utils/getCSSModuleLocalIdent');
-const paths = require('./paths');
-const modules = require('./modules');
-const getClientEnvironment = require('./env');
-const ModuleNotFoundPlugin = require('react-dev-utils/ModuleNotFoundPlugin');
-const ForkTsCheckerWebpackPlugin = require('react-dev-utils/ForkTsCheckerWebpackPlugin');
-const typescriptFormatter = require('react-dev-utils/typescriptFormatter');
-const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
-const getPackageJson = require('./getPackageJson');
-
-const postcssNormalize = require('postcss-normalize');
-
-// Source maps are resource heavy and can cause out of memory issue for large source files.
-const shouldUseSourceMap = false;
-// Some apps do not need the benefits of saving a web request, so not inlining the chunk
-// makes for a smoother build process.
-const shouldInlineRuntimeChunk = process.env.INLINE_RUNTIME_CHUNK !== 'false';
-
-// Check if TypeScript is setup
-const useTypeScript = fs.existsSync(paths.appTsConfig);
-
-// style files regexes
-const cssRegex = /\.css$/;
-const cssModuleRegex = /\.module\.css$/;
-const sassRegex = /\.(scss|sass)$/;
-const sassModuleRegex = /\.module\.(scss|sass)$/;
-
-const {
-  version,
-  name,
-  license,
-  repository,
-  author,
-} = getPackageJson('version', 'name', 'license', 'repository', 'author');
-
-const banner = `
-  ${name} v${version} (Non-minified build)
-  ${repository.url}
-
-  Copyright (c) ${author.replace(/ *\<[^)]*\> */g, " ")}
-
-  This source code is licensed under the ${license} license found in the
-  LICENSE file in the root directory of this source tree.
-  `;
-
-// This is the production and development configuration.
-// It is focused on developer experience, fast rebuilds, and a minimal bundle.
-module.exports = function(webpackEnv) {
-  const isEnvDevelopment = webpackEnv === 'development';
-  const isEnvProduction = webpackEnv === 'production';
-
-  // Webpack uses `publicPath` to determine where the app is being served from.
-  // It requires a trailing slash, or the file assets will get an incorrect path.
-  // In development, we always serve from the root. This makes config easier.
-  const publicPath = isEnvProduction
-    ? paths.servedPath
-    : isEnvDevelopment && '/';
-  // Some apps do not use client-side routing with pushState.
-  // For these, "homepage" can be set to "." to enable relative asset paths.
-  const shouldUseRelativeAssetPaths = publicPath === './';
-
-  // `publicUrl` is just like `publicPath`, but we will provide it to our app
-  // as %PUBLIC_URL% in `index.html` and `process.env.PUBLIC_URL` in JavaScript.
-  // Omit trailing slash as %PUBLIC_URL%/xyz looks better than %PUBLIC_URL%xyz.
-  const publicUrl = isEnvProduction
-    ? publicPath.slice(0, -1)
-    : isEnvDevelopment && '';
-  // Get environment variables to inject into our app.
-  const env = getClientEnvironment(publicUrl);
-
-// common function to get style loaders
-const getStyleLoaders = (cssOptions, preProcessor) => {
-  const loaders = [
-      {
-      loader: MiniCssExtractPlugin.loader,
-      options: Object.assign(
-        {},
-        shouldUseRelativeAssetPaths ? { publicPath: '../../' } : undefined
-      ),
-    },
-    {
-      loader: require.resolve('css-loader'),
-      options: cssOptions,
-    },
-    {
-      // Options for PostCSS as we reference these options twice
-      // Adds vendor prefixing based on your specified browser support in
-      // package.json
-      loader: require.resolve('postcss-loader'),
-      options: {
-        // Necessary for external CSS imports to work
-        // https://github.com/facebook/create-react-app/issues/2677
-        ident: 'postcss',
-        plugins: () => [
-          require('postcss-flexbugs-fixes'),
-          require('postcss-preset-env')({
-            autoprefixer: {
-              flexbox: 'no-2009',
-            },
-            stage: 3,
-          }),
-            // Adds PostCSS Normalize as the reset css with default options,
-            // so that it honors browserslist config in package.json
-            // which in turn let's users customize the target behavior as per their needs.
-            postcssNormalize(),
-        ],
-          sourceMap: shouldUseSourceMap,
-      },
-    },
-    ].filter(Boolean);
-  if (preProcessor) {
-    loaders.push({
-      loader: require.resolve(preProcessor),
-      options: {
-          sourceMap: shouldUseSourceMap,
-      },
-    });
-  }
-  return loaders;
-};
-
-  return {
-    mode: 'production',
-    // Stop compilation early in production
-    bail: true,
-    devtool: false,
-    // These are the "entry points" to our application.
-    // This means they will be the "root" imports that are included in JS bundle.
-  entry: [paths.appLibIndexJs],
-  output: {
-    // The build folder.
-      path: paths.appBuild,
-      // Add /* filename */ comments to generated require()s in the output.
-      pathinfo: isEnvDevelopment,
-    // There will be one main bundle, and one file per asynchronous chunk.
-      // In development, it does not produce real files.
-      filename: 'simple-keyboard.js',
-      // TODO: remove this when upgrading to webpack 5
-      futureEmitAssets: true,
-      // There are also additional JS chunk files if you use code splitting.
-      chunkFilename: 'index.[chunkhash:8].chunk.js',
-    // We inferred the "public path" (such as / or /my-project) from homepage.
-      // We use "/" in development.
-    publicPath: publicPath,
-    library: "SimpleKeyboard",
-    libraryTarget: 'umd',
-    umdNamedDefine: true,
-    // Point sourcemap entries to original disk location (format as URL on Windows)
-      devtoolModuleFilenameTemplate: info =>
-        path
-          .relative(paths.appSrcLib, info.absoluteResourcePath)
-          .replace(/\\/g, '/'),
-  },
-  optimization: {
-    minimizer: [
-        // we specify a custom UglifyJsPlugin here to get source maps in production
-      new UglifyJsPlugin({
-        cache: false,
-        parallel: false,
-        uglifyOptions: {
-          output: {
-            comments: true,
-            beautify: true,
-            braces: true,
-            indent_level: 2
-          },
-          mangle: false,
-          compress: false
-        },
-        // Use multi-process parallel running to improve the build speed
-        // Default number of concurrent runs: os.cpus().length - 1
-        // Disabled on WSL (Windows Subsystem for Linux) due to an issue with Terser
-        // https://github.com/webpack-contrib/terser-webpack-plugin/issues/21
-        parallel: !isWsl,
-        // Enable file caching
-        cache: true,
-        sourceMap: false,
-      }),
-      new webpack.BannerPlugin({ 
-        banner: banner, 
-        entryOnly: true 
-        }),
-        new OptimizeCSSAssetsPlugin({
-          cssProcessorOptions: {
-            parser: safePostCssParser,
-            map: shouldUseSourceMap
-              ? {
-                  // `inline: false` forces the sourcemap to be output into a
-                  // separate file
-                  inline: false,
-                  // `annotation: true` appends the sourceMappingURL to the end of
-                  // the css file, helping the browser find the sourcemap
-                  annotation: true,
-                }
-              : false,
-          },
-        }),
-      ],
-      // Automatically split vendor and commons
-      // https://twitter.com/wSokra/status/969633336732905474
-      // https://medium.com/webpack/webpack-4-code-splitting-chunk-graph-and-the-splitchunks-optimization-be739a861366
-      splitChunks: {
-      //chunks: 'all',
-      cacheGroups: {
-        default: false,
-      }
-      },
-      // Keep the runtime chunk separated to enable long term caching
-      // https://twitter.com/wSokra/status/969679223278505985
-    runtimeChunk: false,
-  },
-  resolve: {
-    // This allows you to set a fallback for where Webpack should look for modules.
-    // We placed these paths second because we want `node_modules` to "win"
-    // if there are any conflicts. This matches Node resolution mechanism.
-    // https://github.com/facebook/create-react-app/issues/253
-      modules: ['node_modules', paths.appNodeModules].concat(modules.additionalModulePaths || []),
-    // These are the reasonable defaults supported by the Node ecosystem.
-    // We also include JSX as a common component filename extension to support
-    // some tools, although we do not recommend using it, see:
-    // https://github.com/facebook/create-react-app/issues/290
-    // `web` extension prefixes have been added for better support
-    // for React Native Web.
-    extensions: paths.moduleFileExtensions
-      .map(ext => `.${ext}`)
-      .filter(ext => useTypeScript || !ext.includes('ts')),
-    alias: {
-      // Support React Native Web
-      // https://www.smashingmagazine.com/2016/08/a-glimpse-into-the-future-with-react-native-for-web/
-      'react-native': 'react-native-web',
-    },
-    plugins: [
-      // Adds support for installing with Plug'n'Play, leading to faster installs and adding
-      // guards against forgotten dependencies and such.
-      PnpWebpackPlugin,
-      // Prevents users from importing files from outside of src/ (or node_modules/).
-      // This often causes confusion because we only process files within src/ with babel.
-      // To fix this, we prevent you from importing files out of src/ -- if you'd like to,
-      // please link the files into your node_modules/ and let module-resolution kick in.
-      // Make sure your source files are compiled, as they will not be processed in any way.
-        new ModuleScopePlugin(paths.appSrc, [paths.appPackageJson]),
-    ],
-  },
-  resolveLoader: {
-    plugins: [
-      // Also related to Plug'n'Play, but this time it tells Webpack to load its loaders
-      // from the current package.
-      PnpWebpackPlugin.moduleLoader(module),
-    ],
-  },
-  module: {
-    strictExportPresence: true,
-    rules: [
-      // Disable require.ensure as it's not a standard language feature.
-      { parser: { requireEnsure: false } },
-
-      // First, run the linter.
-      // It's important to do this before Babel processes the JS.
-      {
-          test: /\.(js|mjs|jsx|ts|tsx)$/,
-        enforce: 'pre',
-        use: [
-          {
-            options: {
-              formatter: require.resolve('react-dev-utils/eslintFormatter'),
-              eslintPath: require.resolve('eslint'),
-              
-            },
-            loader: require.resolve('eslint-loader'),
-          },
-        ],
-        include: paths.appSrcLib,
-      },
-      {
-        // "oneOf" will traverse all following loaders until one will
-        // match the requirements. When no loader matches it will fall
-        // back to the "file" loader at the end of the loader list.
-        oneOf: [
-            // "url" loader works like "file" loader except that it embeds assets
-            // smaller than specified limit in bytes as data URLs to avoid requests.
-            // A missing `test` is equivalent to a match.
-          {
-            test: [/\.bmp$/, /\.gif$/, /\.jpe?g$/, /\.png$/],
-            loader: require.resolve('url-loader'),
-            options: {
-              limit: 10000,
-              name: 'static/media/[name].[hash:8].[ext]',
-            },
-          },
-          // Process application JS with Babel.
-            // The preset includes JSX, Flow, TypeScript, and some ESnext features.
-          {
-            test: /\.(js|mjs|jsx|ts|tsx)$/,
-            include: paths.appSrcLib,
-            loader: require.resolve('babel-loader'),
-            options: {
-              customize: require.resolve(
-                'babel-preset-react-app/webpack-overrides'
-              ),
-              
-              plugins: [
-                [
-                  require.resolve('babel-plugin-named-asset-import'),
-                  {
-                    loaderMap: {
-                      svg: {
-                          ReactComponent: '@svgr/webpack?-prettier,-svgo,+ref![path]',
-                      },
-                    },
-                  },
-                ],
-              ],
-                // This is a feature of `babel-loader` for webpack (not Babel itself).
-                // It enables caching results in ./node_modules/.cache/babel-loader/
-                // directory for faster rebuilds.
-              cacheDirectory: true,
-                cacheCompression: true,
-                compact: true,
-            },
-          },
-          // Process any JS outside of the app with Babel.
-          // Unlike the application JS, we only compile the standard ES features.
-          {
-            test: /\.(js|mjs)$/,
-            exclude: /@babel(?:\/|\\{1,2})runtime/,
-            loader: require.resolve('babel-loader'),
-            options: {
-              babelrc: false,
-              configFile: false,
-              compact: false,
-              presets: [
-                [
-                  require.resolve('babel-preset-react-app/dependencies'),
-                  { helpers: true },
-                ],
-              ],
-              cacheDirectory: true,
-                cacheCompression: true,
-              
-              // If an error happens in a package, it's possible to be
-              // because it was compiled. Thus, we don't want the browser
-              // debugger to show the original code. Instead, the code
-              // being evaluated would be much more helpful.
-              sourceMaps: false,
-            },
-          },
-          // "postcss" loader applies autoprefixer to our CSS.
-          // "css" loader resolves paths in CSS and adds assets as dependencies.
-            // "style" loader turns CSS into JS modules that inject <style> tags.
-            // In production, we use MiniCSSExtractPlugin to extract that CSS
-            // to a file, but in development "style" loader enables hot editing
-            // of CSS.
-          // By default we support CSS Modules with the extension .module.css
-          {
-            test: cssRegex,
-            exclude: cssModuleRegex,
-              use: getStyleLoaders({
-              importLoaders: 1,
-                sourceMap: shouldUseSourceMap,
-            }),
-            // Don't consider CSS imports dead code even if the
-            // containing package claims to have no side effects.
-            // Remove this when webpack adds a warning or an error for this.
-            // See https://github.com/webpack/webpack/issues/6571
-            sideEffects: true,
-          },
-          // Adds support for CSS Modules (https://github.com/css-modules/css-modules)
-          // using the extension .module.css
-          {
-            test: cssModuleRegex,
-              use: getStyleLoaders({
-              importLoaders: 1,
-                sourceMap: shouldUseSourceMap,
-              modules: true,
-              getLocalIdent: getCSSModuleLocalIdent,
-            }),
-          },
-            // Opt-in support for SASS (using .scss or .sass extensions).
-          // By default we support SASS Modules with the
-          // extensions .module.scss or .module.sass
-          {
-            test: sassRegex,
-            exclude: sassModuleRegex,
-              use: getStyleLoaders(
-              {
-                importLoaders: 2,
-                  sourceMap: shouldUseSourceMap,
-              },
-              'sass-loader'
-            ),
-            // Don't consider CSS imports dead code even if the
-            // containing package claims to have no side effects.
-            // Remove this when webpack adds a warning or an error for this.
-            // See https://github.com/webpack/webpack/issues/6571
-            sideEffects: true,
-          },
-          // Adds support for CSS Modules, but using SASS
-          // using the extension .module.scss or .module.sass
-          {
-            test: sassModuleRegex,
-              use: getStyleLoaders(
-              {
-                importLoaders: 2,
-                  sourceMap: shouldUseSourceMap,
-                modules: true,
-                getLocalIdent: getCSSModuleLocalIdent,
-              },
-              'sass-loader'
-            ),
-          },
-            // "file" loader makes sure those assets get served by WebpackDevServer.
-            // When you `import` an asset, you get its (virtual) filename.
-            // In production, they would get copied to the `build` folder.
-          // This loader doesn't use a "test" so it will catch all modules
-          // that fall through the other loaders.
-          {
-            loader: require.resolve('file-loader'),
-            // Exclude `js` files to keep "css" loader working as it injects
-              // its runtime that would otherwise be processed through "file" loader.
-            // Also exclude `html` and `json` extensions so they get processed
-            // by webpacks internal loaders.
-            exclude: [/\.(js|mjs|jsx|ts|tsx)$/, /\.html$/, /\.json$/],
-            options: {
-              name: 'static/media/[name].[hash:8].[ext]',
-            },
-          },
-          // ** STOP ** Are you adding a new loader?
-          // Make sure to add the new loader(s) before the "file" loader.
-        ],
-      },
-    ],
-  },
-  plugins: [
-    // Generates an `index.html` file with the <script> injected.
-      /*new HtmlWebpackPlugin(
-        Object.assign(
-          {},
-          {
-      inject: true,
-      template: paths.appHtml,
-          },
-          isEnvProduction
-            ? {
-      minify: {
-        removeComments: true,
-        collapseWhitespace: true,
-        removeRedundantAttributes: true,
-        useShortDoctype: true,
-        removeEmptyAttributes: true,
-        removeStyleLinkTypeAttributes: true,
-        keepClosingSlash: true,
-        minifyJS: true,
-        minifyCSS: true,
-        minifyURLs: true,
-      },
-              }
-            : undefined
-        )
-      ),*/
-    // Inlines the webpack runtime script. This script is too small to warrant
-    // a network request.
-    shouldInlineRuntimeChunk &&
-      new InlineChunkHtmlPlugin(HtmlWebpackPlugin, [/runtime~.+[.]js/]),
-    // Makes some environment variables available in index.html.
-    // The public URL is available as %PUBLIC_URL% in index.html, e.g.:
-    // <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
-    // In production, it will be an empty string unless you specify "homepage"
-    // in `package.json`, in which case it will be the pathname of that URL.
-      // In development, this will be an empty string.
-    new InterpolateHtmlPlugin(HtmlWebpackPlugin, env.raw),
-    // This gives some necessary context to module not found errors, such as
-    // the requesting resource.
-    new ModuleNotFoundPlugin(paths.appPath),
-    // Makes some environment variables available to the JS code, for example:
-    // if (process.env.NODE_ENV === 'production') { ... }. See `./env.js`.
-      // It is absolutely essential that NODE_ENV is set to production
-      // during a production build.
-    // Otherwise React will be compiled in the very slow development mode.
-    new webpack.DefinePlugin(env.stringified),
-    new MiniCssExtractPlugin({
-      // Options similar to the same options in webpackOptions.output
-      // both options are optional
-          filename: 'css/simple-keyboard.css',
-          chunkFilename: 'css/index.[contenthash:8].chunk.css',
-    }),
-    // Generate a manifest file which contains a mapping of all asset filenames
-    // to their corresponding output file so that tools can pick it up without
-    // having to parse `index.html`.
-    /*new ManifestPlugin({
-      fileName: 'asset-manifest.json',
-      publicPath: publicPath,
-        generate: (seed, files) => {
-          const manifestFiles = files.reduce(function(manifest, file) {
-            manifest[file.name] = file.path;
-            return manifest;
-          }, seed);
-
-          return {
-            files: manifestFiles,
-          };
-        },
-    }),*/
-    // Moment.js is an extremely popular library that bundles large locale files
-    // by default due to how Webpack interprets its code. This is a practical
-    // solution that requires the user to opt into importing specific locales.
-    // https://github.com/jmblog/how-to-optimize-momentjs-with-webpack
-    // You can remove this if you don't use Moment.js:
-    new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
-    // Generate a service worker script that will precache, and keep up to date,
-    // the HTML & assets that are part of the Webpack build.
-      /*isEnvProduction &&
-        new WorkboxWebpackPlugin.GenerateSW({
-      clientsClaim: true,
-      exclude: [/\.map$/, /asset-manifest\.json$/],
-      importWorkboxFrom: 'cdn',
-      navigateFallback: publicUrl + '/index.html',
-      navigateFallbackBlacklist: [
-        // Exclude URLs starting with /_, as they're likely an API call
-        new RegExp('^/_'),
-        // Exclude URLs containing a dot, as they're likely a resource in
-        // public/ and not a SPA route
-        new RegExp('/[^/]+\\.[^/]+$'),
-      ],
-    }),*/
-    // TypeScript type checking
-      useTypeScript &&
-      new ForkTsCheckerWebpackPlugin({
-        typescript: resolve.sync('typescript', {
-          basedir: paths.appNodeModules,
-        }),
-          async: false,
-          useTypescriptIncrementalApi: true,
-        checkSyntacticErrors: true,
-        tsconfig: paths.appTsConfig,
-        reportFiles: [
-          '**',
-          '!**/__tests__/**',
-          '!**/?(*.)(spec|test).*',
-            '!**/src/setupProxy.*',
-            '!**/src/setupTests.*',
-        ],
-        watch: paths.appSrcLib,
-        silent: true,
-          // The formatter is invoked directly in WebpackDevServerUtils during development
-          formatter: isEnvProduction ? typescriptFormatter : undefined,
-      }),
-  ].filter(Boolean),
-  // Some libraries import Node modules but don't use them in the browser.
-  // Tell Webpack to provide empty mocks for them so importing them works.
-  node: {
-      module: 'empty',
-    dgram: 'empty',
-      dns: 'mock',
-    fs: 'empty',
-      http2: 'empty',
-    net: 'empty',
-    tls: 'empty',
-    child_process: 'empty',
-  },
-  // Turn off performance processing because we utilize
-  // our own hints via the FileSizeReporter
-  performance: false,
-};
-};

package.json

@@ -1,17 +1,17 @@
 {
   "name": "simple-keyboard",
-  "version": "2.22.0",
+  "version": "2.28.1",
   "description": "On-screen Javascript Virtual Keyboard",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "scripts": {
     "start": "node scripts/start.js",
-    "build": "node scripts/build.js && node scripts/buildUnminified.js",
+    "build": "node scripts/build.js",
     "demo": "node scripts/demo.js",
     "test": "node scripts/test.js",
     "coverage": "node scripts/test.js --coverage --watchAll=false",
-    "postinstall": "node bin/postinstall",
-    "prepare": "npm run build"
+    "prepare": "npm run build",
+    "trypublish": "npm publish || true"
   },
   "repository": {
     "type": "git",
@@ -40,81 +40,80 @@
   ],
   "license": "MIT",
   "devDependencies": {
-    "@babel/core": "7.4.5",
-    "@babel/plugin-proposal-class-properties": "^7.4.4",
-    "@babel/preset-env": "^7.4.4",
-    "@babel/preset-react": "^7.0.0",
-    "@babel/runtime": "^7.4.4",
-    "@svgr/webpack": "4.3.0",
-    "@typescript-eslint/eslint-plugin": "1.9.0",
-    "@typescript-eslint/parser": "1.9.0",
-    "babel-eslint": "10.0.1",
-    "babel-jest": "24.8.0",
+    "@babel/core": "7.8.4",
+    "@babel/plugin-proposal-class-properties": "^7.8.3",
+    "@babel/preset-env": "^7.8.4",
+    "@babel/preset-react": "^7.8.3",
+    "@svgr/webpack": "5.1.0",
+    "@typescript-eslint/eslint-plugin": "1.13.0",
+    "@typescript-eslint/parser": "1.13.0",
+    "babel-eslint": "^10.0.3",
+    "babel-jest": "^25.1.0",
     "babel-loader": "8.0.6",
-    "babel-plugin-named-asset-import": "^0.3.2",
-    "babel-preset-react-app": "^9.0.0",
-    "case-sensitive-paths-webpack-plugin": "2.2.0",
-    "copy-webpack-plugin": "^5.0.3",
-    "css-loader": "2.1.1",
-    "dotenv": "8.0.0",
+    "babel-plugin-named-asset-import": "^0.3.6",
+    "babel-preset-react-app": "^9.1.1",
+    "camelcase": "^5.2.0",
+    "case-sensitive-paths-webpack-plugin": "2.3.0",
+    "copy-webpack-plugin": "^5.1.1",
+    "css-loader": "3.4.2",
+    "dotenv": "8.2.0",
     "dotenv-expand": "5.1.0",
-    "eslint": "^5.16.0",
-    "eslint-config-react-app": "^4.0.1",
-    "eslint-loader": "2.1.2",
-    "eslint-plugin-flowtype": "3.9.1",
-    "eslint-plugin-import": "2.17.3",
-    "eslint-plugin-jsx-a11y": "6.2.1",
-    "eslint-plugin-react": "7.13.0",
-    "eslint-plugin-react-hooks": "^1.5.0",
-    "file-loader": "3.0.1",
-    "fs-extra": "8.0.1",
-    "html-webpack-plugin": "4.0.0-beta.5",
+    "eslint": "^6.8.0",
+    "eslint-config-react-app": "^5.0.1",
+    "eslint-loader": "3.0.3",
+    "eslint-plugin-flowtype": "3.13.0",
+    "eslint-plugin-import": "2.20.1",
+    "eslint-plugin-jsx-a11y": "6.2.3",
+    "eslint-plugin-react": "7.18.3",
+    "eslint-plugin-react-hooks": "^2.3.0",
+    "file-loader": "5.0.2",
+    "fs-extra": "8.1.0",
+    "html-webpack-plugin": "4.0.0-beta.11",
     "identity-obj-proxy": "3.0.0",
-    "is-wsl": "^2.0.0",
-    "jest": "24.8.0",
-    "jest-environment-jsdom-fourteen": "0.1.0",
-    "jest-resolve": "24.8.0",
-    "jest-watch-typeahead": "0.3.1",
-    "mini-css-extract-plugin": "0.7.0",
-    "optimize-css-assets-webpack-plugin": "5.0.1",
-    "pnp-webpack-plugin": "1.4.3",
-    "postcss-flexbugs-fixes": "4.1.0",
+    "is-wsl": "^2.1.0",
+    "jest": "25.1.0",
+    "jest-environment-jsdom-fourteen": "1.0.1",
+    "jest-resolve": "25.1.0",
+    "jest-watch-typeahead": "0.4.2",
+    "mini-css-extract-plugin": "0.9.0",
+    "optimize-css-assets-webpack-plugin": "5.0.3",
+    "pnp-webpack-plugin": "1.6.0",
+    "postcss-flexbugs-fixes": "4.2.0",
     "postcss-loader": "3.0.0",
-    "postcss-normalize": "7.0.1",
-    "postcss-preset-env": "6.6.0",
+    "postcss-normalize": "8.0.1",
+    "postcss-preset-env": "6.7.0",
     "postcss-safe-parser": "4.0.1",
-    "prettier": "^1.17.0",
+    "prettier": "^1.19.1",
     "prettier-webpack-plugin": "^1.2.0",
-    "react": "^16.8.6",
-    "react-app-polyfill": "^1.0.1",
-    "react-dev-utils": "^9.0.1",
-    "react-dom": "^16.8.6",
-    "resolve": "1.11.0",
-    "sass-loader": "7.1.0",
-    "semver": "6.1.1",
-    "style-loader": "0.23.1",
-    "terser-webpack-plugin": "1.3.0",
-    "uglifyjs-webpack-plugin": "^2.1.2",
-    "url-loader": "1.1.2",
-    "webpack": "4.32.2",
-    "webpack-dev-server": "3.5.0",
-    "webpack-manifest-plugin": "2.0.4",
-    "workbox-webpack-plugin": "4.3.1"
+    "react": "^16.12.0",
+    "react-app-polyfill": "^1.0.6",
+    "react-dev-utils": "^10.1.0",
+    "react-dom": "^16.12.0",
+    "resolve": "1.15.1",
+    "resolve-url-loader": "3.1.1",
+    "sass-loader": "8.0.2",
+    "semver": "7.1.2",
+    "simple-keyboard-autocorrect": "^2.1.3",
+    "simple-keyboard-input-mask": "^2.2.3",
+    "simple-keyboard-key-navigation": "^2.1.1",
+    "style-loader": "1.1.3",
+    "swipe-keyboard": "^2.1.4",
+    "terser-webpack-plugin": "2.3.4",
+    "ts-pnp": "1.1.5",
+    "uglifyjs-webpack-plugin": "^2.2.0",
+    "url-loader": "3.0.0",
+    "webpack": "4.41.5",
+    "webpack-dev-server": "3.10.3",
+    "webpack-manifest-plugin": "2.2.0",
+    "workbox-webpack-plugin": "5.0.0"
   },
   "eslintConfig": {
-    "extends": "react-app",
-    "settings": {
-      "react": {
-        "pragma": "React",
-        "version": "detect"
-      }
-    }
+    "extends": "react-app"
   },
   "browserslist": {
     "production": [
       ">0.2%",
       "not dead",
-      "not ie <= 11",
       "not op_mini all"
     ],
     "development": [
@@ -124,20 +123,25 @@
     ]
   },
   "jest": {
+    "roots": [
+      "<rootDir>/src"
+    ],
     "collectCoverageFrom": [
       "src/**/*.{js,jsx,ts,tsx}",
+      "!src/**/*.d.ts",
       "!src/lib/index.js",
+      "!src/demo/index.js",
       "!src/utils/**",
       "!src/**/*.d.ts",
       "!**/tests/**"
     ],
-    "resolver": "jest-pnp-resolver",
     "setupFiles": [
       "react-app-polyfill/jsdom"
     ],
     "setupFilesAfterEnv": [],
     "testMatch": [
-      "<rootDir>/src/**/tests/**/*.{js,jsx,ts,tsx}"
+      "<rootDir>/src/**/__tests__/**/*.{js,jsx,ts,tsx}",
+      "<rootDir>/src/**/*.{spec,test}.{js,jsx,ts,tsx}"
     ],
     "testEnvironment": "jest-environment-jsdom-fourteen",
     "transform": {
@@ -178,10 +182,7 @@
     ],
     "plugins": [
       [
-        "@babel/plugin-proposal-class-properties",
-        {
-          "loose": true
-        }
+        "@babel/plugin-proposal-class-properties"
       ]
     ]
   }

public/index.html

@@ -23,8 +23,6 @@
     <noscript>
       You need to enable JavaScript to run this app.
     </noscript>
-    <div id="root">
-      <div class="simple-keyboard"></div>
-    </div>
+    <div id="root"></div>
   </body>
 </html>

scripts/build.js

@@ -106,7 +106,7 @@ checkBrowsers(paths.appPath, isInteractive)
       );
     },
     err => {
-      console.log(chalk.red('Failed to compile.\n'));
+      console.error('Failed to compile');
       printBuildError(err);
       process.exit(1);
     }

scripts/buildUnminified.js

@@ -1,190 +0,0 @@
-'use strict';
-
-// Do this as the first thing so that any code reading it knows the right env.
-process.env.BABEL_ENV = 'production';
-process.env.NODE_ENV = 'production';
-
-// Makes the script crash on unhandled rejections instead of silently
-// ignoring them. In the future, promise rejections that are not handled will
-// terminate the Node.js process with a non-zero exit code.
-process.on('unhandledRejection', err => {
-  throw err;
-});
-
-// Ensure environment variables are read.
-require('../config/env');
-
-
-const path = require('path');
-const chalk = require('react-dev-utils/chalk');
-const fs = require('fs-extra');
-const webpack = require('webpack');
-const configFactory = require('../config/webpack.config.unminified');
-const paths = require('../config/paths');
-const checkRequiredFiles = require('react-dev-utils/checkRequiredFiles');
-const formatWebpackMessages = require('react-dev-utils/formatWebpackMessages');
-const printHostingInstructions = require('react-dev-utils/printHostingInstructions');
-const FileSizeReporter = require('react-dev-utils/FileSizeReporter');
-const printBuildError = require('react-dev-utils/printBuildError');
-
-const measureFileSizesBeforeBuild =
-  FileSizeReporter.measureFileSizesBeforeBuild;
-const printFileSizesAfterBuild = FileSizeReporter.printFileSizesAfterBuild;
-const useYarn = fs.existsSync(paths.yarnLockFile);
-
-// These sizes are pretty large. We'll warn for bundles exceeding them.
-const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
-const WARN_AFTER_CHUNK_GZIP_SIZE = 1024 * 1024;
-
-const isInteractive = process.stdout.isTTY;
-
-// Warn and crash if required files are missing
-if (!checkRequiredFiles([paths.appHtml, paths.appIndexJs])) {
-  process.exit(1);
-}
-
-// Generate configuration
-const config = configFactory('production');
-
-// We require that you explicitly set browsers and do not fall back to
-// browserslist defaults.
-const { checkBrowsers } = require('react-dev-utils/browsersHelper');
-checkBrowsers(paths.appPath, isInteractive)
-  .then(() => {
-    // First, read the current file sizes in build directory.
-    // This lets us display how much they changed later.
-    return measureFileSizesBeforeBuild(paths.appBuild);
-  })
-  .then(previousFileSizes => {
-    // Remove all content but keep the directory so that
-    // if you're in it, you don't end up in Trash
-    //fs.emptyDirSync(paths.appBuild);
-    // Merge with the public folder
-    //copyPublicFolder();
-    // Start the webpack build
-    return build(previousFileSizes);
-  })
-  .then(
-    ({ stats, previousFileSizes, warnings }) => {
-      if (warnings.length) {
-        console.log(chalk.yellow('Compiled with warnings.\n'));
-        console.log(warnings.join('\n\n'));
-        console.log(
-          '\nSearch for the ' +
-            chalk.underline(chalk.yellow('keywords')) +
-            ' to learn more about each warning.'
-        );
-        console.log(
-          'To ignore, add ' +
-            chalk.cyan('// eslint-disable-next-line') +
-            ' to the line before.\n'
-        );
-      } else {
-        console.log(chalk.green('Compiled successfully.\n'));
-      }
-
-      console.log('File sizes after gzip:\n');
-      printFileSizesAfterBuild(
-        stats,
-        previousFileSizes,
-        paths.appBuild,
-        WARN_AFTER_BUNDLE_GZIP_SIZE,
-        WARN_AFTER_CHUNK_GZIP_SIZE
-      );
-      console.log();
-
-      const appPackage = require(paths.appPackageJson);
-      const publicUrl = paths.publicUrl;
-      const publicPath = config.output.publicPath;
-      const buildFolder = path.relative(process.cwd(), paths.appBuild);
-      printHostingInstructions(
-        appPackage,
-        publicUrl,
-        publicPath,
-        buildFolder,
-        useYarn
-      );
-    },
-    err => {
-      console.log(chalk.red('Failed to compile.\n'));
-      printBuildError(err);
-      process.exit(1);
-    }
-  )
-  .catch(err => {
-    if (err && err.message) {
-      console.log(err.message);
-    }
-    process.exit(1);
-  });
-
-// Create the production build and print the deployment instructions.
-function build(previousFileSizes) {
-  console.log('Creating a non-minified production build...');
-  // We used to support resolving modules according to `NODE_PATH`.
-  // This now has been deprecated in favor of jsconfig/tsconfig.json
-  // This lets you use absolute paths in imports inside large monorepos:
-  if (process.env.NODE_PATH) {
-    console.log(
-      chalk.yellow(
-        'Setting NODE_PATH to resolve modules absolutely has been deprecated in favor of setting baseUrl in jsconfig.json (or tsconfig.json if you are using TypeScript) and will be removed in a future major release of create-react-app.'
-      )
-    );
-    console.log();
-  }
-
-  const compiler = webpack(config);
-  return new Promise((resolve, reject) => {
-    compiler.run((err, stats) => {
-      let messages;
-      if (err) {
-        if (!err.message) {
-          return reject(err);
-        }
-        messages = formatWebpackMessages({
-          errors: [err.message],
-          warnings: [],
-        });
-      } else {
-        messages = formatWebpackMessages(
-          stats.toJson({ all: false, warnings: true, errors: true })
-        );
-      }
-      if (messages.errors.length) {
-        // Only keep the first error. Others are often indicative
-        // of the same problem, but confuse the reader with noise.
-        if (messages.errors.length > 1) {
-          messages.errors.length = 1;
-        }
-        return reject(new Error(messages.errors.join('\n\n')));
-      }
-      if (
-        process.env.CI &&
-        (typeof process.env.CI !== 'string' ||
-          process.env.CI.toLowerCase() !== 'false') &&
-        messages.warnings.length
-      ) {
-        console.log(
-          chalk.yellow(
-            '\nTreating warnings as errors because process.env.CI = true.\n' +
-              'Most CI servers set it automatically.\n'
-          )
-        );
-        return reject(new Error(messages.warnings.join('\n\n')));
-      }
-
-      return resolve({
-        stats,
-        previousFileSizes,
-        warnings: messages.warnings,
-      });
-    });
-  });
-}
-
-function copyPublicFolder() {
-  fs.copySync(paths.appPublic, paths.appBuild, {
-    dereference: true,
-    filter: file => file !== paths.appHtml,
-  });
-}

scripts/demo.js

@@ -106,7 +106,7 @@ checkBrowsers(paths.appPath, isInteractive)
       );
     },
     err => {
-      console.log(chalk.red('Failed to compile.\n'));
+      console.error('Failed to compile');
       printBuildError(err);
       process.exit(1);
     }

scripts/start.js

@@ -139,6 +139,8 @@ checkBrowsers(paths.appPath, isInteractive)
           stats = stats.toJson();
       
           if (stats.errors && stats.errors.length > 0) {
+              devServer.close();
+              process.exit(1);
               return;
           }
   

scripts/test.js

@@ -41,7 +41,8 @@ function isInMercurialRepository() {
 // Watch unless on CI or explicitly running all tests
 if (
   !process.env.CI &&
-  argv.indexOf('--watchAll') === -1
+  argv.indexOf('--watchAll') === -1 &&
+  argv.indexOf('--watchAll=false') === -1
 ) {
   // https://github.com/facebook/create-react-app/issues/5210
   const hasSourceControl = isInGitRepository() || isInMercurialRepository();

src/demo/App.js

@@ -1,87 +0,0 @@
-import Keyboard from "../lib";
-import "./css/App.css";
-
-/**
- * simple-keyboard demo
- */
-class App {
-  /**
-   * Instantiates the demo class
-   */
-  constructor() {
-    document.addEventListener("DOMContentLoaded", this.onDOMLoaded);
-
-    /**
-     * Default input name
-     * @type {string}
-     */
-    this.layoutName = "default";
-  }
-
-  /**
-   * Executed when the DOM is ready
-   */
-  onDOMLoaded = () => {
-    /**
-     * Creates a new simple-keyboard instance
-     */
-    this.keyboard = new Keyboard({
-      debug: true,
-      layoutName: this.layoutName,
-      onChange: input => this.onChange(input),
-      onKeyPress: button => this.onKeyPress(button),
-      newLineOnEnter: true,
-      physicalKeyboardHighlight: true
-    });
-
-    /**
-     * Adding preview (demo only)
-     */
-    document.querySelector(".simple-keyboard").insertAdjacentHTML(
-      "beforebegin",
-      `
-    <div class="simple-keyboard-preview">
-      <textarea class="input"></textarea>
-    </div>
-    `
-    );
-
-    document.querySelector(".input").addEventListener("input", event => {
-      this.keyboard.setInput(event.target.value);
-    });
-  };
-
-  /**
-   * Handles shift functionality
-   */
-  handleShiftButton = () => {
-    let layoutName = this.layoutName;
-    let shiftToggle = (this.layoutName =
-      layoutName === "default" ? "shift" : "default");
-
-    this.keyboard.setOptions({
-      layoutName: shiftToggle
-    });
-  };
-
-  /**
-   * Called when simple-keyboard input has changed
-   */
-  onChange = input => {
-    document.querySelector(".input").value = input;
-  };
-
-  /**
-   * Called when a simple-keyboard key is pressed
-   */
-  onKeyPress = button => {
-    console.log("Button pressed", button);
-
-    /**
-     * Shift functionality
-     */
-    if (button === "{lock}" || button === "{shift}") this.handleShiftButton();
-  };
-}
-
-export default App;

src/demo/BasicDemo.js

@@ -0,0 +1,55 @@
+import Keyboard from "../lib";
+import "./css/BasicDemo.css";
+
+const setDOM = () => {
+  document.querySelector("#root").innerHTML = `
+    <input class="input" placeholder="Tap on the virtual keyboard to start" />
+    <div class="simple-keyboard"></div>
+  `;
+};
+
+class Demo {
+  constructor() {
+    setDOM();
+
+    /**
+     * Demo Start
+     */
+    this.keyboard = new Keyboard({
+      onChange: input => this.onChange(input),
+      onKeyPress: button => this.onKeyPress(button)
+    });
+
+    /**
+     * Update simple-keyboard when input is changed directly
+     */
+    document.querySelector(".input").addEventListener("input", event => {
+      this.keyboard.setInput(event.target.value);
+    });
+  }
+
+  onChange(input) {
+    document.querySelector(".input").value = input;
+    console.log("Input changed", input);
+  }
+
+  onKeyPress(button) {
+    console.log("Button pressed", button);
+
+    /**
+     * If you want to handle the shift and caps lock buttons
+     */
+    if (button === "{shift}" || button === "{lock}") this.handleShift();
+  }
+
+  handleShift() {
+    const currentLayout = this.keyboard.options.layoutName;
+    const shiftToggle = currentLayout === "default" ? "shift" : "default";
+
+    this.keyboard.setOptions({
+      layoutName: shiftToggle
+    });
+  }
+}
+
+export default Demo;

src/demo/ButtonThemeDemo.js

@@ -0,0 +1,73 @@
+import Keyboard from "../lib";
+import "./css/ButtonThemeDemo.css";
+
+const setDOM = () => {
+  document.querySelector("#root").innerHTML = `
+    <input class="input" placeholder="Tap on the virtual keyboard to start" />
+    <div class="simple-keyboard"></div>
+  `;
+};
+
+class Demo {
+  constructor() {
+    setDOM();
+
+    /**
+     * Demo Start
+     */
+    this.keyboard = new Keyboard({
+      theme: "hg-theme-default my-theme",
+      onChange: input => this.onChange(input),
+      onKeyPress: button => this.onKeyPress(button),
+      buttonTheme: [
+        {
+          class: "my-button",
+          buttons: "{enter} {bksp} q Q"
+        },
+        {
+          class: "my-button-outline",
+          buttons: "q Q b B"
+        }
+      ],
+      buttonAttributes: [
+        {
+          attribute: "aria-label",
+          value: "bee",
+          buttons: "b B"
+        }
+      ]
+    });
+
+    /**
+     * Update simple-keyboard when input is changed directly
+     */
+    document.querySelector(".input").addEventListener("input", event => {
+      this.keyboard.setInput(event.target.value);
+    });
+  }
+
+  onChange(input) {
+    document.querySelector(".input").value = input;
+    console.log("Input changed", input);
+  }
+
+  onKeyPress(button) {
+    console.log("Button pressed", button);
+
+    /**
+     * If you want to handle the shift and caps lock buttons
+     */
+    if (button === "{shift}" || button === "{lock}") this.handleShift();
+  }
+
+  handleShift() {
+    const currentLayout = this.keyboard.options.layoutName;
+    const shiftToggle = currentLayout === "default" ? "shift" : "default";
+
+    this.keyboard.setOptions({
+      layoutName: shiftToggle
+    });
+  }
+}
+
+export default Demo;

src/demo/DOMElementDemo.js

@@ -0,0 +1,31 @@
+import Keyboard from "../lib";
+import "./css/DOMElementDemo.css";
+
+class Demo {
+  constructor() {
+    const rootDOM =
+      document.querySelector("#root") || document.createElement("div");
+
+    const keyboard1DOM = document.createElement("div");
+    keyboard1DOM.className = "my-keyboard";
+
+    const keyboard2DOM = document.createElement("div");
+    keyboard2DOM.className = "my-keyboard2";
+
+    /**
+     * Demo Start
+     */
+    this.keyboard1 = new Keyboard(keyboard1DOM, {
+      onChange: input => console.log(this.keyboard1.keyboardDOMClass, input)
+    });
+
+    this.keyboard2 = new Keyboard(keyboard2DOM, {
+      onChange: input => console.log(this.keyboard2.keyboardDOMClass, input)
+    });
+
+    rootDOM.appendChild(keyboard1DOM);
+    rootDOM.appendChild(keyboard2DOM);
+  }
+}
+
+export default Demo;

src/demo/FullKeyboardDemo.js

@@ -0,0 +1,157 @@
+import Keyboard from "../lib";
+import "./css/FullKeyboardDemo.css";
+
+const setDOM = () => {
+  document.querySelector("#root").innerHTML = `
+    <input class="input" placeholder="Tap on the virtual keyboard to start" />
+    <div class="keyboardContainer">
+      <div class="simple-keyboard-main"></div>
+
+      <div class="controlArrows">
+        <div class="simple-keyboard-control"></div>
+        <div class="simple-keyboard-arrows"></div>
+      </div>
+
+      <div class="numPad">
+        <div class="simple-keyboard-numpad"></div>
+        <div class="simple-keyboard-numpadEnd"></div>
+      </div>
+    </div>
+  `;
+};
+
+class Demo {
+  constructor() {
+    setDOM();
+
+    /**
+     * Demo Start
+     */
+    const commonKeyboardOptions = {
+      onChange: input => this.onChange(input),
+      onKeyPress: button => this.onKeyPress(button),
+      theme: "simple-keyboard hg-theme-default hg-layout-default",
+      physicalKeyboardHighlight: true,
+      syncInstanceInputs: true,
+      mergeDisplay: true,
+      debug: true
+    };
+
+    this.keyboard = new Keyboard(".simple-keyboard-main", {
+      ...commonKeyboardOptions,
+      /**
+       * Layout by:
+       * Sterling Butters (https://github.com/SterlingButters)
+       */
+      layout: {
+        default: [
+          "{escape} {f1} {f2} {f3} {f4} {f5} {f6} {f7} {f8} {f9} {f10} {f11} {f12}",
+          "` 1 2 3 4 5 6 7 8 9 0 - = {backspace}",
+          "{tab} q w e r t y u i o p [ ] \\",
+          "{capslock} a s d f g h j k l ; ' {enter}",
+          "{shiftleft} z x c v b n m , . / {shiftright}",
+          "{controlleft} {altleft} {metaleft} {space} {metaright} {altright}"
+        ],
+        shift: [
+          "{escape} {f1} {f2} {f3} {f4} {f5} {f6} {f7} {f8} {f9} {f10} {f11} {f12}",
+          "~ ! @ # $ % ^ & * ( ) _ + {backspace}",
+          "{tab} Q W E R T Y U I O P { } |",
+          '{capslock} A S D F G H J K L : " {enter}',
+          "{shiftleft} Z X C V B N M < > ? {shiftright}",
+          "{controlleft} {altleft} {metaleft} {space} {metaright} {altright}"
+        ]
+      },
+      display: {
+        "{escape}": "esc ⎋",
+        "{tab}": "tab ⇥",
+        "{backspace}": "backspace ⌫",
+        "{enter}": "enter ↵",
+        "{capslock}": "caps lock ⇪",
+        "{shiftleft}": "shift ⇧",
+        "{shiftright}": "shift ⇧",
+        "{controlleft}": "ctrl ⌃",
+        "{controlright}": "ctrl ⌃",
+        "{altleft}": "alt ⌥",
+        "{altright}": "alt ⌥",
+        "{metaleft}": "cmd ⌘",
+        "{metaright}": "cmd ⌘"
+      }
+    });
+
+    this.keyboardControlPad = new Keyboard(".simple-keyboard-control", {
+      ...commonKeyboardOptions,
+      layout: {
+        default: [
+          "{prtscr} {scrolllock} {pause}",
+          "{insert} {home} {pageup}",
+          "{delete} {end} {pagedown}"
+        ]
+      }
+    });
+
+    this.keyboardArrows = new Keyboard(".simple-keyboard-arrows", {
+      ...commonKeyboardOptions,
+      layout: {
+        default: ["{arrowup}", "{arrowleft} {arrowdown} {arrowright}"]
+      }
+    });
+
+    this.keyboardNumPad = new Keyboard(".simple-keyboard-numpad", {
+      ...commonKeyboardOptions,
+      layout: {
+        default: [
+          "{numlock} {numpaddivide} {numpadmultiply}",
+          "{numpad7} {numpad8} {numpad9}",
+          "{numpad4} {numpad5} {numpad6}",
+          "{numpad1} {numpad2} {numpad3}",
+          "{numpad0} {numpaddecimal}"
+        ]
+      }
+    });
+
+    this.keyboardNumPadEnd = new Keyboard(".simple-keyboard-numpadEnd", {
+      ...commonKeyboardOptions,
+      layout: {
+        default: ["{numpadsubtract}", "{numpadadd}", "{numpadenter}"]
+      }
+    });
+
+    document.querySelector(".input").addEventListener("input", () => {
+      const input = document.querySelector(".input").value;
+      this.keyboard.setInput(input);
+    });
+  }
+
+  onChange(input) {
+    document.querySelector(".input").value = input;
+    this.keyboard.setInput(input);
+
+    console.log("Input changed", input);
+  }
+
+  onKeyPress(button) {
+    console.log("Button pressed", button);
+
+    /**
+     * If you want to handle the shift and caps lock buttons
+     */
+    if (
+      button === "{shift}" ||
+      button === "{shiftleft}" ||
+      button === "{shiftright}" ||
+      button === "{capslock}"
+    )
+      this.handleShift();
+  }
+
+  handleShift() {
+    const currentLayout = this.keyboard.options.layoutName;
+    const shiftToggle = currentLayout === "default" ? "shift" : "default";
+
+    this.keyboard.setOptions({
+      layoutName: shiftToggle
+    });
+  }
+}
+
+export default Demo;

src/demo/MultipleKeyboardsDestroyDemo.js

@@ -0,0 +1,89 @@
+import Keyboard from "../lib";
+import "./css/MultipleKeyboardsDestroyDemo.css";
+
+const setDOM = () => {
+  document.querySelector("#root").innerHTML = `
+    <input class="input" placeholder="Tap on the virtual keyboard to start" />
+    <div class="simple-keyboard"></div>
+
+    <input class="input2" placeholder="Tap on the virtual keyboard to start" />
+    <div class="keyboard2"></div>
+  `;
+};
+
+class Demo {
+  constructor() {
+    setDOM();
+
+    /**
+     * Demo Start
+     */
+    this.keyboard = new Keyboard({
+      onChange: input => this.onChange(input),
+      onKeyPress: button => this.onKeyPress(button),
+      debug: true
+    });
+
+    this.keyboard2 = new Keyboard(".keyboard2", {
+      theme: "simple-keyboard hg-theme-default",
+      onChange: input => this.onChange(input, "input2"),
+      onKeyPress: button => this.onKeyPress(button, "keyboard2"),
+      debug: true
+    });
+
+    console.log(this.keyboard);
+    setTimeout(this.keyboard.destroy, 10000);
+    setTimeout(() => {
+      this.keyboard = new Keyboard({
+        theme: "hg-theme-default myTheme",
+        onChange: input => this.onChange(input),
+        onKeyPress: button => this.onKeyPress(button),
+        debug: true,
+        onInit: () => {
+          console.log(
+            "Reinitialized simple-keyboard instance:",
+            this.keyboard.keyboardDOMClass
+          );
+        }
+      });
+    }, 15000);
+
+    /**
+     * Update simple-keyboard when input is changed directly
+     */
+    document.querySelector(".input").addEventListener("input", event => {
+      this.keyboard.setInput(event.target.value);
+    });
+
+    document.querySelector(".input2").addEventListener("input", event => {
+      this.keyboard2.setInput(event.target.value);
+    });
+  }
+
+  onChange(input, inputClass) {
+    document.querySelector(`.${inputClass || "input"}`).value = input;
+    console.log("Input changed", input);
+  }
+
+  onKeyPress(button, keyboardInstanceKey) {
+    console.log("Button pressed", button);
+
+    /**
+     * If you want to handle the shift and caps lock buttons
+     */
+    if (button === "{shift}" || button === "{lock}")
+      this.handleShift(keyboardInstanceKey);
+  }
+
+  handleShift(keyboardInstanceKey) {
+    const keyboard = this[keyboardInstanceKey || "keyboard"];
+    const currentLayout = keyboard.options.layoutName;
+    const shiftToggle = currentLayout === "default" ? "shift" : "default";
+
+    keyboard.setOptions({
+      layoutName: shiftToggle
+    });
+  }
+}
+
+export default Demo;

src/demo/css/App.css

@@ -1,33 +0,0 @@
-#root {
-  font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue",
-    Helvetica, Arial, "Lucida Grande", sans-serif;
-  max-width: 850px;
-  margin: 0 auto;
-  padding-top: 20px;
-}
-
-#root .simple-keyboard-preview {
-  background: rgba(0, 0, 0, 0.8);
-  border: 20px solid rgba(0, 0, 0, 0.1);
-  height: 200px;
-  border-top-right-radius: 5px;
-  border-top-left-radius: 5px;
-  padding: 10px;
-  box-sizing: border-box;
-}
-
-#root .input {
-  color: rgba(255, 255, 255, 0.9);
-  background: transparent;
-  border: none;
-  outline: none;
-  font-family: monospace;
-  width: 100%;
-  height: 100%;
-  font-size: 18px;
-}
-
-.simple-keyboard.hg-layout-custom {
-  border-top-left-radius: 0px;
-  border-top-right-radius: 0px;
-}

src/demo/css/BasicDemo.css

@@ -0,0 +1,12 @@
+input {
+  width: 100%;
+  height: 100px;
+  padding: 20px;
+  font-size: 20px;
+  border: none;
+  box-sizing: border-box;
+}
+
+.simple-keyboard {
+  max-width: 850px;
+}

src/demo/css/ButtonThemeDemo.css

@@ -0,0 +1,26 @@
+input {
+  width: 100%;
+  height: 100px;
+  padding: 20px;
+  font-size: 20px;
+  border: none;
+  box-sizing: border-box;
+}
+
+.simple-keyboard {
+  max-width: 850px;
+}
+
+.simple-keyboard.my-theme .hg-button.my-button {
+  background: blue;
+  color: white;
+}
+
+.simple-keyboard.my-theme .hg-button[aria-label] {
+  background: black;
+  color: white;
+}
+
+.simple-keyboard.my-theme .hg-button.my-button-outline {
+  border: 2px solid red;
+}

src/demo/css/DOMElementDemo.css

@@ -0,0 +1,14 @@
+input {
+  width: 100%;
+  height: 100px;
+  padding: 20px;
+  font-size: 20px;
+  border: none;
+  box-sizing: border-box;
+}
+
+.my-keyboard,
+.my-keyboard2 {
+  max-width: 850px;
+  margin-top: 20px;
+}

src/demo/css/FullKeyboardDemo.css

@@ -0,0 +1,132 @@
+input {
+  width: 100%;
+  height: 100px;
+  padding: 20px;
+  font-size: 20px;
+  border: none;
+  box-sizing: border-box;
+}
+
+.keyboardContainer {
+  display: flex;
+  background-color: rgba(0, 0, 0, 0.1);
+  justify-content: center;
+  width: 1024px;
+  border-radius: 5px;
+}
+
+.simple-keyboard.hg-theme-default {
+  display: inline-block;
+}
+
+.simple-keyboard-main.simple-keyboard {
+  width: 640px;
+  min-width: 640px;
+  background: none;
+}
+
+.simple-keyboard-main.simple-keyboard .hg-row:first-child {
+  margin-bottom: 10px;
+}
+
+.simple-keyboard-arrows.simple-keyboard {
+  align-self: flex-end;
+  background: none;
+}
+
+.simple-keyboard .hg-button.selectedButton {
+  background: rgba(5, 25, 70, 0.53);
+  color: white;
+}
+
+.simple-keyboard .hg-button.emptySpace {
+  pointer-events: none;
+  background: none;
+  border: none;
+  box-shadow: none;
+}
+
+.simple-keyboard-arrows .hg-row {
+  justify-content: center;
+}
+
+.simple-keyboard-arrows .hg-button {
+  width: 50px;
+  flex-grow: 0;
+  justify-content: center;
+  display: flex;
+  align-items: center;
+}
+
+.controlArrows {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  flex-flow: column;
+}
+
+.simple-keyboard-control.simple-keyboard {
+  background: none;
+}
+
+.simple-keyboard-control.simple-keyboard .hg-row:first-child {
+  margin-bottom: 10px;
+}
+
+.simple-keyboard-control .hg-button {
+  width: 50px;
+  flex-grow: 0;
+  justify-content: center;
+  display: flex;
+  align-items: center;
+}
+
+.numPad {
+  display: flex;
+  align-items: flex-end;
+}
+
+.simple-keyboard-numpad.simple-keyboard {
+  background: none;
+}
+
+.simple-keyboard-numpad.simple-keyboard {
+  width: 160px;
+}
+
+.simple-keyboard-numpad.simple-keyboard .hg-button {
+  width: 50px;
+  justify-content: center;
+  display: flex;
+  align-items: center;
+}
+
+.simple-keyboard-numpadEnd.simple-keyboard {
+  width: 50px;
+  background: none;
+  margin: 0;
+  padding: 5px 5px 5px 0;
+}
+
+.simple-keyboard-numpadEnd.simple-keyboard .hg-button {
+  align-items: center;
+  justify-content: center;
+  display: flex;
+}
+
+.simple-keyboard-numpadEnd .hg-button.hg-standardBtn.hg-button-plus {
+  height: 85px;
+}
+
+.simple-keyboard-numpadEnd.simple-keyboard .hg-button.hg-button-enter {
+  height: 85px;
+}
+
+.simple-keyboard.hg-theme-default .hg-button.hg-selectedButton {
+  background: rgba(5, 25, 70, 0.53);
+  color: white;
+}
+
+.hg-button.hg-functionBtn.hg-button-space {
+  width: 350px;
+}

src/demo/css/MultipleKeyboardsDestroyDemo.css

@@ -0,0 +1,16 @@
+input {
+  width: 100%;
+  height: 100px;
+  padding: 20px;
+  font-size: 20px;
+  border: none;
+  box-sizing: border-box;
+}
+
+.simple-keyboard {
+  max-width: 850px;
+}
+
+.simple-keyboard.hg-theme-default.myTheme {
+  background-color: #bde6c6;
+}

src/demo/css/index.css

@@ -0,0 +1,3 @@
+#root {
+  padding: 0px 40px;
+}

src/demo/index.js

@@ -1,6 +1,20 @@
-import App from "./App";
+import "./css/index.css";
 
 /**
- * Initializing demo
+ * Demos
  */
-new App();
+import BasicDemo from "./BasicDemo";
+// import ButtonThemeDemo from "./ButtonThemeDemo";
+// import DOMElementDemo from "./DOMElementDemo";
+// import FullKeyboardDemo from "./FullKeyboardDemo";
+// import MultipleKeyboardsDemo from "./MultipleKeyboardsDestroyDemo";
+
+/**
+ * Selected demo
+ */
+const SELECTED_DEMO = BasicDemo;
+
+/**
+ * Bootstrap
+ */
+new SELECTED_DEMO();

src/demo/tests/BasicDemo.test.js

@@ -1,20 +1,18 @@
 import TestUtility from '../../utils/TestUtility';
-import Index from '../index';
-import App from '../App';
+import BasicDemo from '../BasicDemo';
 
-let testUtil = new TestUtility();
+const testUtil = new TestUtility();
 
 it('Demo will load', () => {
   testUtil.setDOM();
 
-  let demo = new App();
+  new BasicDemo();
 });
 
 it('Demo onDOMLoaded will work', () => {
   testUtil.setDOM();
 
-  let demo = new App();
-  demo.onDOMLoaded();
+  const demo = new BasicDemo();
 
   expect(demo.keyboard).toBeTruthy();
 });
@@ -22,8 +20,7 @@ it('Demo onDOMLoaded will work', () => {
 it('Demo onChange will work', () => {
   testUtil.setDOM();
 
-  let demo = new App();
-  demo.onDOMLoaded();
+  const demo = new BasicDemo();
 
   demo.onChange("test");
   
@@ -33,8 +30,7 @@ it('Demo onChange will work', () => {
 it('Demo onChange will work', () => {
   testUtil.setDOM();
 
-  let demo = new App();
-  demo.onDOMLoaded();
+  const demo = new BasicDemo();
 
   demo.keyboard.getButtonElement("q").onclick();
   
@@ -44,8 +40,7 @@ it('Demo onChange will work', () => {
 it('Demo input change will work', () => {
   testUtil.setDOM();
 
-  let demo = new App();
-  demo.onDOMLoaded();
+  const demo = new BasicDemo();
 
   document.body.querySelector('.input').value = "test";
   document.body.querySelector('.input').dispatchEvent(new Event('input'));
@@ -56,8 +51,7 @@ it('Demo input change will work', () => {
 it('Demo handleShiftButton will work', () => {
   testUtil.setDOM();
 
-  let demo = new App();
-  demo.onDOMLoaded();
+  const demo = new BasicDemo();
 
   demo.keyboard.getButtonElement("{shift}")[0].onclick();
   expect(demo.keyboard.options.layoutName).toBe("shift");

src/demo/tests/ButtonThemeDemo.test.js

@@ -0,0 +1,77 @@
+import TestUtility from '../../utils/TestUtility';
+import ButtonThemeDemo from '../ButtonThemeDemo';
+
+const testUtil = new TestUtility();
+
+it('Demo will load', () => {
+  testUtil.setDOM();
+
+  new ButtonThemeDemo();
+});
+
+it('Demo onDOMLoaded will work', () => {
+  testUtil.setDOM();
+
+  const demo = new ButtonThemeDemo();
+
+  expect(demo.keyboard).toBeTruthy();
+});
+
+it('Demo onChange will work', () => {
+  testUtil.setDOM();
+
+  const demo = new ButtonThemeDemo();
+
+  demo.onChange("test");
+  
+  expect(document.body.querySelector('.input').value).toBe("test");
+});
+
+it('Demo onChange will work', () => {
+  testUtil.setDOM();
+
+  const demo = new ButtonThemeDemo();
+
+  demo.keyboard.getButtonElement("q").onclick();
+  
+  expect(document.body.querySelector('.input').value).toBe("q");
+});
+
+it('Demo input change will work', () => {
+  testUtil.setDOM();
+
+  const demo = new ButtonThemeDemo();
+
+  document.body.querySelector('.input').value = "test";
+  document.body.querySelector('.input').dispatchEvent(new Event('input'));
+  
+  expect(demo.keyboard.getInput()).toBe("test");
+});
+
+it('Demo handleShiftButton will work', () => {
+  testUtil.setDOM();
+
+  const demo = new ButtonThemeDemo();
+
+  demo.keyboard.getButtonElement("{shift}")[0].onclick();
+  expect(demo.keyboard.options.layoutName).toBe("shift");
+
+  demo.keyboard.getButtonElement("{shift}")[0].onclick();
+  expect(demo.keyboard.options.layoutName).toBe("default");
+});
+
+it('Demo buttons will have proper attributes and classes', () => {
+  testUtil.setDOM();
+
+  const demo = new ButtonThemeDemo();
+
+  const buttonDOM = demo.keyboard.getButtonElement("b");
+
+  console.log("buttonDOM", buttonDOM.outerHTML);
+
+  const hasAttribute = buttonDOM.hasAttribute("aria-label");
+  expect(hasAttribute).toBeTruthy();
+
+  const hasClass = buttonDOM.classList.contains("my-button-outline");
+  expect(hasClass).toBeTruthy();
+});

src/demo/tests/DOMElementDemo.test.js

@@ -0,0 +1,22 @@
+import DOMElementDemo from '../DOMElementDemo';
+import Keyboard from '../../lib/components/Keyboard';
+
+it('Demo will load', () => {
+  new DOMElementDemo();
+});
+
+it('Demo keyboards will be instantiated', () => {
+  const demo = new DOMElementDemo();
+  expect(demo.keyboard1).toBeInstanceOf(Keyboard);
+  expect(demo.keyboard2).toBeInstanceOf(Keyboard);
+});
+
+it('Demo input change will work', () => {
+  const demo = new DOMElementDemo();
+
+  demo.keyboard1.getButtonElement("q").onclick();
+  demo.keyboard2.getButtonElement("e").onclick();
+  
+  expect(demo.keyboard1.getInput()).toBe("q");
+  expect(demo.keyboard2.getInput()).toBe("e");
+});

src/demo/tests/FullKeyboardDemo.test.js

@@ -0,0 +1,61 @@
+import TestUtility from '../../utils/TestUtility';
+import FullKeyboardDemo from '../FullKeyboardDemo';
+
+const testUtil = new TestUtility();
+
+it('Demo will load', () => {
+  testUtil.setDOM();
+  new FullKeyboardDemo();
+});
+
+it('Demo onDOMLoaded will work', () => {
+  testUtil.setDOM();
+
+  const demo = new FullKeyboardDemo();
+
+  expect(demo.keyboard).toBeTruthy();
+});
+
+it('Demo onChange will work', () => {
+  testUtil.setDOM();
+
+  const demo = new FullKeyboardDemo();
+
+  demo.onChange("test");
+  
+  expect(document.body.querySelector('.input').value).toBe("test");
+});
+
+it('Demo onChange will work', () => {
+  testUtil.setDOM();
+
+  const demo = new FullKeyboardDemo();
+
+  demo.keyboard.getButtonElement("q").onclick();
+  
+  expect(document.body.querySelector('.input').value).toBe("q");
+});
+
+it('Demo input change will work', () => {
+  testUtil.setDOM();
+
+  const demo = new FullKeyboardDemo();
+
+  document.body.querySelector('.input').value = "test";
+  document.body.querySelector('.input').dispatchEvent(new Event('input'));
+  
+  expect(demo.keyboard.getInput()).toBe("test");
+  expect(demo.keyboardNumPad.getInput()).toBe("test");
+});
+
+it('Demo handleShiftButton will work', () => {
+  testUtil.setDOM();
+
+  const demo = new FullKeyboardDemo();
+
+  demo.keyboard.getButtonElement("{shiftleft}").onclick();
+  expect(demo.keyboard.options.layoutName).toBe("shift");
+
+  demo.keyboard.getButtonElement("{shiftright}").onclick();
+  expect(demo.keyboard.options.layoutName).toBe("default");
+});

src/demo/tests/ModuleSimpleKeyboardAutocorrect.test.js

@@ -0,0 +1,28 @@
+import Keyboard from '../../lib';
+import SimpleKeyboardAutocorrect from 'simple-keyboard-autocorrect';
+
+test('Module simple-keyboard-autocorrect runs without crashing', () => {
+  const div = document.createElement('div');
+  
+  div.className = "simple-keyboard";
+  document.body.appendChild(div);
+
+  const keyboard = new Keyboard({
+    debug: true,
+    onChange: input => input,
+    onKeyPress: button => button,
+    newLineOnEnter: true,
+    useMouseEvents: true,
+    autocorrectDict: ["dog", "house"],
+    modules: [
+      SimpleKeyboardAutocorrect
+    ]
+  });
+
+  keyboard.getButtonElement("d").onclick();
+  keyboard.getButtonElement("o").onclick();
+  keyboard.getButtonElement("{space}").onclick();
+  keyboard.getButtonElement("{bksp}").onclick();
+
+  expect(keyboard.getInput()).toBe("dog");
+});

src/demo/tests/ModuleSimpleKeyboardInputMask.test.js

@@ -0,0 +1,37 @@
+import Keyboard from '../../lib';
+import SimpleKeyboardInputMask from 'simple-keyboard-input-mask';
+
+test('Module simple-keyboard-input-mask runs without crashing', () => {
+  const div = document.createElement('div');
+  
+  div.className += "simple-keyboard";
+  document.body.appendChild(div);
+
+  const keyboard = new Keyboard({
+    debug: true,
+    onChange: input => input,
+    onKeyPress: button => button,
+    inputMask: "(99) 9999-9999",
+    useMouseEvents: true,
+    modules: [
+      SimpleKeyboardInputMask
+    ],
+  });
+
+  keyboard.getButtonElement("d").onclick();
+  keyboard.getButtonElement("o").onclick();
+  keyboard.getButtonElement("{space}").onclick();
+  keyboard.getButtonElement("1").onclick();
+  keyboard.getButtonElement("2").onclick();
+  keyboard.getButtonElement("3").onclick();
+  keyboard.getButtonElement("c").onclick();
+  keyboard.getButtonElement("4").onclick();
+  keyboard.getButtonElement("5").onclick();
+  keyboard.getButtonElement("6").onclick();
+  keyboard.getButtonElement("7").onclick();
+  keyboard.getButtonElement("8").onclick();
+  keyboard.getButtonElement("9").onclick();
+  keyboard.getButtonElement("0").onclick();
+
+  expect(keyboard.getInput()).toBe("(12) 3456-7890");
+});

src/demo/tests/ModuleSimpleKeyboardKeyNavigation.test.js

@@ -0,0 +1,25 @@
+import Keyboard from '../../lib';
+import SimpleKeyboardKeyNavigation from 'simple-keyboard-key-navigation';
+
+test('Module simple-keyboard-key-navigation runs without crashing', () => {
+  const div = document.createElement('div');
+  
+  div.className = "simple-keyboard";
+  document.body.appendChild(div);
+
+  const keyboard = new Keyboard({
+    debug: true,
+    onChange: input => input,
+    onKeyPress: button => button,
+    enableKeyNavigation: true,
+    modules: [
+      SimpleKeyboardKeyNavigation
+    ]
+  });
+
+  keyboard.modules.keyNavigation.right();
+  keyboard.modules.keyNavigation.down();
+  keyboard.modules.keyNavigation.press();
+
+  expect(keyboard.getInput()).toBe("q");
+});

src/demo/tests/ModuleSimpleKeyboardSwipe.test.js

@@ -0,0 +1,23 @@
+import Keyboard from '../../lib';
+import SimpleKeyboardSwipe from 'swipe-keyboard';
+
+test('Module swipe-keyboard runs without crashing', () => {
+  const containerDiv = document.createElement('div');
+  containerDiv.className = "keyboardContainer";
+
+  const keyboardDiv = document.createElement('div');
+  keyboardDiv.className = "simple-keyboard";
+
+  containerDiv.appendChild(keyboardDiv);
+  document.body.appendChild(containerDiv);
+
+  new Keyboard({
+    debug: true,
+    onChange: input => input,
+    onKeyPress: button => button,
+    useMouseEvents: true,
+    modules: [
+      SimpleKeyboardSwipe
+    ]
+  });
+});

src/demo/tests/MultipleKeyboardsDestroyDemo.test.js

@@ -0,0 +1,84 @@
+import TestUtility from '../../utils/TestUtility';
+import MultipleKeyboardsDestroyDemo from '../MultipleKeyboardsDestroyDemo';
+
+jest.useFakeTimers();
+
+const testUtil = new TestUtility();
+
+it('Demo will load', () => {
+  testUtil.setDOM();
+
+  new MultipleKeyboardsDestroyDemo();
+});
+
+it('Demo onDOMLoaded will work', () => {
+  testUtil.setDOM();
+
+  const demo = new MultipleKeyboardsDestroyDemo();
+
+  expect(demo.keyboard).toBeTruthy();
+});
+
+it('Demo onChange will work', () => {
+  testUtil.setDOM();
+
+  const demo = new MultipleKeyboardsDestroyDemo();
+
+  demo.onChange("test");
+  demo.keyboard2.getButtonElement("q").click();
+  
+  expect(document.body.querySelector('.input').value).toBe("test");
+  expect(document.body.querySelector('.input2').value).toBe("q");
+});
+
+it('Demo onChange will work', () => {
+  testUtil.setDOM();
+
+  const demo = new MultipleKeyboardsDestroyDemo();
+
+  demo.keyboard.getButtonElement("q").onclick();
+  
+  expect(document.body.querySelector('.input').value).toBe("q");
+});
+
+it('Demo input change will work', () => {
+  testUtil.setDOM();
+
+  const demo = new MultipleKeyboardsDestroyDemo();
+
+  document.body.querySelector('.input').value = "test";
+  document.body.querySelector('.input').dispatchEvent(new Event('input'));
+
+  document.body.querySelector('.input2').value = "test2";
+  document.body.querySelector('.input2').dispatchEvent(new Event('input'));
+  
+  expect(demo.keyboard.getInput()).toBe("test");
+  expect(demo.keyboard2.getInput()).toBe("test2");
+});
+
+it('Demo handleShiftButton will work', () => {
+  testUtil.setDOM();
+
+  const demo = new MultipleKeyboardsDestroyDemo();
+
+  demo.keyboard.getButtonElement("{shift}")[0].onclick();
+  expect(demo.keyboard.options.layoutName).toBe("shift");
+
+  demo.keyboard.getButtonElement("{shift}")[0].onclick();
+  expect(demo.keyboard.options.layoutName).toBe("default");
+});
+
+it('MultipleKeyboardsDestroyDemo will run all timers', () => {
+  testUtil.setDOM();
+
+  const demo = new MultipleKeyboardsDestroyDemo();
+  jest.runAllTimers();
+
+  expect(demo.keyboard.options.theme).toBe("hg-theme-default myTheme");
+
+  demo.keyboard.getButtonElement("{shift}")[0].onclick();
+  expect(demo.keyboard.options.layoutName).toBe("shift");
+
+  demo.keyboard.getButtonElement("A").onclick();
+  expect(demo.keyboard.input.default).toBe("A");
+});

src/lib/@types/index.d.ts

@@ -10,6 +10,12 @@ declare module 'simple-keyboard' {
     buttons: string;
   }
 
+  interface KeyboardButtonAttributes {
+    attribute: string;
+    value: string;
+    buttons: string;
+  }
+
   interface KeyboardOptions {
     /**
      * Modify the keyboard layout.
@@ -41,6 +47,11 @@ declare module 'simple-keyboard' {
      */
     buttonTheme?: KeyboardButtonTheme[];
 
+    /**
+     * A prop to add your own attributes to one or several buttons.
+     */
+    buttonAttributes?: KeyboardButtonAttributes[];
+
     /**
      * Runs a `console.log` every time a key is pressed. Displays the buttons pressed and the current input.
      */
@@ -82,6 +93,11 @@ declare module 'simple-keyboard' {
      * Calling preventDefault for the mousedown events keeps the focus on the input.
      */
     preventMouseDownDefault?: boolean;
+    
+    /**
+     * Stops pointer down events on simple-keyboard buttons from bubbling to parent elements.
+     */
+    stopMouseDownPropagation?: boolean;
 
     /**
      * Define the text color that the physical keyboard highlighted key should have.
@@ -123,11 +139,21 @@ declare module 'simple-keyboard' {
      */
     useMouseEvents?: boolean;
 
+    /**
+     * Disable button hold action.
+     */
+    disableButtonHold?: boolean;
+
     /**
      * Executes the callback function on key press. Returns button layout name (i.e.: "{shift}").
      */
     onKeyPress?: (button: string) => any;
 
+    /**
+     * Executes the callback function on key release.
+     */
+    onKeyReleased?: (button: string) => any;
+
     /**
      * Executes the callback function on input change. Returns the current input's string.
      */
@@ -162,6 +188,10 @@ declare module 'simple-keyboard' {
   class Keyboard {
     constructor(selector: string, options: KeyboardOptions);
     constructor(options: KeyboardOptions);
+
+    /**
+     * Options
+     */
     options: KeyboardOptions;
 
     /**
@@ -169,6 +199,11 @@ declare module 'simple-keyboard' {
      */
     utilities?: any;
 
+    /**
+     * caretPosition
+     */
+    caretPosition?: number;
+
     /**
      * Adds/Modifies an entry to the `buttonTheme`. Basically a way to add a class to a button.
      * @param  {string} buttons List of buttons to select (separated by a space).

src/lib/components/Keyboard.css

@@ -1,12 +1,8 @@
-body,
-html {
-  margin: 0;
-  padding: 0;
-}
-
-.simple-keyboard {
-  font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue",
-    Helvetica, Arial, "Lucida Grande", sans-serif;
+/**
+ * simple-keyboard
+ * Theme: hg-theme-default
+ */
+.hg-theme-default {
   width: 100%;
   user-select: none;
   box-sizing: border-box;
@@ -14,50 +10,56 @@ html {
   touch-action: manipulation;
 }
 
-.simple-keyboard .hg-row {
-  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-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: flex;
-}
-
-.simple-keyboard .hg-button {
-  display: inline-block;
-  flex-grow: 1;
-  cursor: pointer;
-}
-
-.simple-keyboard .hg-button span {
+.hg-theme-default .hg-button span {
   pointer-events: none;
 }
 
-/**
- * hg-theme-default theme
- */
-.simple-keyboard.hg-theme-default {
+/* When using option "useButtonTag" */
+.hg-theme-default button.hg-button {
+  border-width: 0;
+  outline: 0;
+  font-size: inherit;
+}
+
+.hg-theme-default {
+  font-family: "HelveticaNeue-Light", "Helvetica Neue Light", "Helvetica Neue",
+    Helvetica, Arial, "Lucida Grande", sans-serif;
   background-color: rgba(0, 0, 0, 0.1);
   padding: 5px;
   border-radius: 5px;
 }
 
-.simple-keyboard.hg-theme-default .hg-button {
+.hg-theme-default .hg-button {
+  display: inline-block;
+  flex-grow: 1;
+  cursor: pointer;
+}
+
+.hg-theme-default .hg-row {
+  display: flex;
+}
+
+.hg-theme-default .hg-row:not(:last-child) {
+  margin-bottom: 5px;
+}
+
+.hg-theme-default .hg-row .hg-button:not(:last-child) {
+  margin-right: 5px;
+}
+
+.hg-theme-default .hg-row .hg-button-container {
+  margin-right: 5px;
+}
+
+.hg-theme-default .hg-row > div:last-child {
+  margin-right: 0;
+}
+
+.hg-theme-default .hg-row .hg-button-container {
+  display: flex;
+}
+
+.hg-theme-default .hg-button {
   box-shadow: 0px 0px 3px -1px rgba(0, 0, 0, 0.3);
   height: 40px;
   border-radius: 5px;
@@ -69,20 +71,14 @@ html {
   display: flex;
   align-items: center;
   justify-content: center;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
 }
 
-/* When using option "useButtonTag" */
-.simple-keyboard button.hg-button {
-  border-width: 0;
-  outline: 0;
-  font-size: inherit;
+.hg-theme-default .hg-button.hg-activeButton {
+  background: #efefef;
 }
 
-.simple-keyboard.hg-theme-default:not(.hg-touch-events) .hg-button:active {
-  background: #e4e4e4;
-}
-
-.simple-keyboard.hg-theme-default.hg-layout-numeric .hg-button {
+.hg-theme-default.hg-layout-numeric .hg-button {
   width: 33.3%;
   height: 60px;
   align-items: center;
@@ -90,35 +86,35 @@ html {
   justify-content: center;
 }
 
-.simple-keyboard.hg-theme-default .hg-button.hg-button-numpadadd {
+.hg-theme-default .hg-button.hg-button-numpadadd {
   height: 85px;
 }
 
-.simple-keyboard.hg-theme-default .hg-button.hg-button-numpadenter {
+.hg-theme-default .hg-button.hg-button-numpadenter {
   height: 85px;
 }
 
-.simple-keyboard.hg-theme-default .hg-button.hg-button-numpad0 {
+.hg-theme-default .hg-button.hg-button-numpad0 {
   width: 105px;
 }
 
-.simple-keyboard.hg-theme-default .hg-button.hg-button-com {
+.hg-theme-default .hg-button.hg-button-com {
   max-width: 85px;
 }
 
-.simple-keyboard.hg-theme-default .hg-button.hg-standardBtn.hg-button-at {
+.hg-theme-default .hg-button.hg-standardBtn.hg-button-at {
   max-width: 45px;
 }
 
-.simple-keyboard.hg-theme-default .hg-button.hg-selectedButton {
+.hg-theme-default .hg-button.hg-selectedButton {
   background: rgba(5, 25, 70, 0.53);
   color: white;
 }
 
-.simple-keyboard.hg-theme-default .hg-button.hg-standardBtn[data-skbtn=".com"] {
+.hg-theme-default .hg-button.hg-standardBtn[data-skbtn=".com"] {
   max-width: 82px;
 }
 
-.simple-keyboard.hg-theme-default .hg-button.hg-standardBtn[data-skbtn="@"] {
+.hg-theme-default .hg-button.hg-standardBtn[data-skbtn="@"] {
   max-width: 60px;
 }

src/lib/components/Keyboard.js

@@ -1,8 +1,8 @@
 import "./Keyboard.css";
 
 // Services
+import { getDefaultLayout } from "../services/KeyboardLayout";
 import PhysicalKeyboard from "../services/PhysicalKeyboard";
-import KeyboardLayout from "../services/KeyboardLayout";
 import Utilities from "../services/Utilities";
 
 /**
@@ -18,21 +18,28 @@ class SimpleKeyboard {
    * @param {Array} params If first parameter is a string, it is considered the container class. The second parameter is then considered the options object. If first parameter is an object, it is considered the options object.
    */
   constructor(...params) {
-    let keyboardDOMQuery =
-      typeof params[0] === "string" ? params[0] : ".simple-keyboard";
-    let options = typeof params[0] === "object" ? params[0] : params[1];
-
-    if (!options) options = {};
+    const { keyboardDOMClass, keyboardDOM, options = {} } = this.handleParams(
+      params
+    );
 
     /**
      * Initializing Utilities
      */
-    this.utilities = new Utilities(this);
+    this.utilities = new Utilities({
+      getOptions: this.getOptions,
+      getCaretPosition: this.getCaretPosition,
+      dispatch: this.dispatch
+    });
+
+    /**
+     * Caret position
+     */
+    this.caretPosition = null;
 
     /**
      * Processing options
      */
-    this.keyboardDOM = document.querySelector(keyboardDOMQuery);
+    this.keyboardDOM = keyboardDOM;
 
     /**
      * @type {object}
@@ -42,6 +49,7 @@ class SimpleKeyboard {
      * @property {boolean} mergeDisplay By default, when you set the display property, you replace the default one. This setting merges them instead.
      * @property {string} theme A prop to add your own css classes to the keyboard wrapper. You can add multiple classes separated by a space.
      * @property {Array} buttonTheme A prop to add your own css classes to one or several buttons.
+     * @property {Array} buttonAttributes A prop to add your own attributes to one or several buttons.
      * @property {boolean} debug Runs a console.log every time a key is pressed. Displays the buttons pressed and the current input.
      * @property {boolean} newLineOnEnter Specifies whether clicking the “ENTER” button will input a newline (\n) or not.
      * @property {boolean} tabCharOnTab Specifies whether clicking the “TAB” button will input a tab character (\t) or not.
@@ -51,6 +59,7 @@ class SimpleKeyboard {
      * @property {boolean} syncInstanceInputs When set to true, this option synchronizes the internal input of every simple-keyboard instance.
      * @property {boolean} physicalKeyboardHighlight Enable highlighting of keys pressed on physical keyboard.
      * @property {boolean} preventMouseDownDefault Calling preventDefault for the mousedown events keeps the focus on the input.
+     * @property {boolean} stopMouseDownPropagation Stops pointer down events on simple-keyboard buttons from bubbling to parent elements.
      * @property {string} physicalKeyboardHighlightTextColor Define the text color that the physical keyboard highlighted key should have.
      * @property {string} physicalKeyboardHighlightBgColor Define the background color that the physical keyboard highlighted key should have.
      * @property {function(button: string):string} onKeyPress Executes the callback function on key press. Returns button layout name (i.e.: “{shift}”).
@@ -65,6 +74,8 @@ class SimpleKeyboard {
      * @property {boolean} autoUseTouchEvents Enable useTouchEvents automatically when touch device is detected.
      * @property {boolean} useMouseEvents Opt out of PointerEvents handling, falling back to the prior mouse event logic.
      * @property {function} destroy Clears keyboard listeners and DOM elements.
+     * @property {boolean} disableButtonHold Disable button hold action.
+     * @property {function} onKeyReleased Executes the callback function on key release.
      */
     this.options = options;
     this.options.layoutName = this.options.layoutName || "default";
@@ -88,7 +99,7 @@ class SimpleKeyboard {
      * This removes any dependency to input DOM elements. You can type and directly display the value in a div element, for example.
      * @example
      * // To get entered input
-     * let input = keyboard.getInput();
+     * const input = keyboard.getInput();
      *
      * // To clear entered input.
      * keyboard.clearInput();
@@ -103,7 +114,7 @@ class SimpleKeyboard {
     /**
      * @type {string} DOM class of the keyboard wrapper, normally "simple-keyboard" by default.
      */
-    this.keyboardDOMClass = keyboardDOMQuery.split(".").join("");
+    this.keyboardDOMClass = keyboardDOMClass;
 
     /**
      * @type {object} Contains the DOM elements of every rendered button, the key being the button's layout name (e.g.: "{enter}").
@@ -111,29 +122,39 @@ class SimpleKeyboard {
     this.buttonElements = {};
 
     /**
-     * Rendering keyboard
-     */
-    if (this.keyboardDOM) this.render();
-    else {
-      console.warn(`"${keyboardDOMQuery}" was not found in the DOM.`);
-      throw new Error("KEYBOARD_DOM_ERROR");
-    }
-
-    /**
-     * Saving instance
+     * Simple-keyboard Instances
      * This enables multiple simple-keyboard support with easier management
      */
     if (!window["SimpleKeyboardInstances"])
       window["SimpleKeyboardInstances"] = {};
 
-    window["SimpleKeyboardInstances"][
-      this.utilities.camelCase(this.keyboardDOMClass)
-    ] = this;
+    this.currentInstanceName = this.utilities.camelCase(this.keyboardDOMClass);
+    window["SimpleKeyboardInstances"][this.currentInstanceName] = this;
+
+    /**
+     * Instance vars
+     */
+    this.allKeyboardInstances = window["SimpleKeyboardInstances"];
+    this.keyboardInstanceNames = Object.keys(window["SimpleKeyboardInstances"]);
+    this.isFirstKeyboardInstance =
+      this.keyboardInstanceNames[0] === this.currentInstanceName;
 
     /**
      * Physical Keyboard support
      */
-    this.physicalKeyboardInterface = new PhysicalKeyboard(this);
+    this.physicalKeyboard = new PhysicalKeyboard({
+      dispatch: this.dispatch,
+      getOptions: this.getOptions
+    });
+
+    /**
+     * Rendering keyboard
+     */
+    if (this.keyboardDOM) this.render();
+    else {
+      console.warn(`".${keyboardDOMClass}" was not found in the DOM.`);
+      throw new Error("KEYBOARD_DOM_ERROR");
+    }
 
     /**
      * Modules
@@ -142,12 +163,68 @@ class SimpleKeyboard {
     this.loadModules();
   }
 
+  /**
+   * parseParams
+   */
+  handleParams = params => {
+    let keyboardDOMClass;
+    let keyboardDOM;
+    let options;
+
+    /**
+     * If first parameter is a string:
+     * Consider it as an element's class
+     */
+    if (typeof params[0] === "string") {
+      keyboardDOMClass = params[0].split(".").join("");
+      keyboardDOM = document.querySelector(`.${keyboardDOMClass}`);
+      options = params[1];
+
+      /**
+       * If first parameter is an HTMLDivElement
+       * Consider it as the keyboard DOM element
+       */
+    } else if (params[0] instanceof HTMLDivElement) {
+      /**
+       * This element must have a class, otherwise throw
+       */
+      if (!params[0].className) {
+        console.warn("Any DOM element passed as parameter must have a class.");
+        throw new Error("KEYBOARD_DOM_CLASS_ERROR");
+      }
+
+      keyboardDOMClass = params[0].className.split(" ")[0];
+      keyboardDOM = params[0];
+      options = params[1];
+
+      /**
+       * Otherwise, search for .simple-keyboard DOM element
+       */
+    } else {
+      keyboardDOMClass = "simple-keyboard";
+      keyboardDOM = document.querySelector(`.${keyboardDOMClass}`);
+      options = params[0];
+    }
+
+    return {
+      keyboardDOMClass,
+      keyboardDOM,
+      options
+    };
+  };
+
+  /**
+   * Getters
+   */
+  getOptions = () => this.options;
+  getCaretPosition = () => this.caretPosition;
+
   /**
    * Handles clicks made to keyboard buttons
    * @param  {string} button The button's layout name.
    */
   handleButtonClicked(button) {
-    let debug = this.options.debug;
+    const debug = this.options.debug;
 
     /**
      * Ignoring placeholder buttons
@@ -163,10 +240,9 @@ class SimpleKeyboard {
     if (!this.input[this.options.inputName])
       this.input[this.options.inputName] = "";
 
-    let updatedInput = this.utilities.getUpdatedInput(
+    const updatedInput = this.utilities.getUpdatedInput(
       button,
       this.input[this.options.inputName],
-      this.options,
       this.caretPosition
     );
 
@@ -184,7 +260,7 @@ class SimpleKeyboard {
        */
       if (
         this.options.maxLength &&
-        this.utilities.handleMaxLength(this.input, this.options, updatedInput)
+        this.utilities.handleMaxLength(this.input, updatedInput)
       ) {
         return false;
       }
@@ -192,7 +268,6 @@ class SimpleKeyboard {
       this.input[this.options.inputName] = this.utilities.getUpdatedInput(
         button,
         this.input[this.options.inputName],
-        this.options,
         this.caretPosition,
         true
       );
@@ -202,7 +277,7 @@ class SimpleKeyboard {
       /**
        * Enforce syncInstanceInputs, if set
        */
-      if (this.options.syncInstanceInputs) this.syncInstanceInputs(this.input);
+      if (this.options.syncInstanceInputs) this.syncInstanceInputs();
 
       /**
        * Calling onChange
@@ -233,6 +308,11 @@ class SimpleKeyboard {
     if (this.options.preventMouseDownDefault) e.preventDefault();
     if (this.options.stopMouseDownPropagation) e.stopPropagation();
 
+    /**
+     * Add active class
+     */
+    if (e) e.target.classList.add(this.activeButtonClass);
+
     /**
      * @type {boolean} Whether the mouse is being held onKeyPress
      */
@@ -245,30 +325,55 @@ class SimpleKeyboard {
     /**
      * @type {object} Time to wait until a key hold is detected
      */
-    this.holdTimeout = setTimeout(() => {
-      if (
-        this.isMouseHold &&
-        ((!button.includes("{") && !button.includes("}")) ||
-          button === "{delete}" ||
-          button === "{backspace}" ||
-          button === "{bksp}" ||
-          button === "{space}" ||
-          button === "{tab}")
-      ) {
-        if (this.options.debug) console.log("Button held:", button);
+    if (!this.options.disableButtonHold) {
+      this.holdTimeout = setTimeout(() => {
+        if (
+          this.isMouseHold &&
+          ((!button.includes("{") && !button.includes("}")) ||
+            button === "{delete}" ||
+            button === "{backspace}" ||
+            button === "{bksp}" ||
+            button === "{space}" ||
+            button === "{tab}")
+        ) {
+          if (this.options.debug) console.log("Button held:", button);
 
-        this.handleButtonHold(button, e);
-      }
-      clearTimeout(this.holdTimeout);
-    }, 500);
+          this.handleButtonHold(button, e);
+        }
+        clearTimeout(this.holdTimeout);
+      }, 500);
+    }
   }
 
   /**
    * Handles button mouseup
    */
-  handleButtonMouseUp() {
+  handleButtonMouseUp(button) {
+    /**
+     * Remove active class
+     */
+    this.recurseButtons(buttonElement => {
+      buttonElement.classList.remove(this.activeButtonClass);
+    });
+
     this.isMouseHold = false;
     if (this.holdInteractionTimeout) clearTimeout(this.holdInteractionTimeout);
+
+    /**
+     * Calling onKeyReleased
+     */
+    if (button && typeof this.options.onKeyReleased === "function")
+      this.options.onKeyReleased(button);
+  }
+
+  /**
+   * Handles container mousedown
+   */
+  handleKeyboardContainerMouseDown(e) {
+    /**
+     * Handle event options
+     */
+    if (this.options.preventMouseDownDefault) e.preventDefault();
   }
 
   /**
@@ -317,7 +422,7 @@ class SimpleKeyboard {
     /**
      * Enforce syncInstanceInputs, if set
      */
-    if (this.options.syncInstanceInputs) this.syncInstanceInputs(this.input);
+    if (this.options.syncInstanceInputs) this.syncInstanceInputs();
   }
 
   /**
@@ -330,7 +435,7 @@ class SimpleKeyboard {
     /**
      * Enforce syncInstanceInputs, if set
      */
-    if (this.options.syncInstanceInputs) this.syncInstanceInputs(this.input);
+    if (this.options.syncInstanceInputs) this.syncInstanceInputs();
 
     return this.input[inputName];
   }
@@ -347,7 +452,7 @@ class SimpleKeyboard {
     /**
      * Enforce syncInstanceInputs, if set
      */
-    if (this.options.syncInstanceInputs) this.syncInstanceInputs(this.input);
+    if (this.options.syncInstanceInputs) this.syncInstanceInputs();
   }
 
   /**
@@ -396,7 +501,7 @@ class SimpleKeyboard {
 
   /**
    * Remove all keyboard rows and reset keyboard values.
-   * Used interally between re-renders.
+   * Used internally between re-renders.
    */
   clear() {
     this.keyboardDOM.innerHTML = "";
@@ -442,7 +547,7 @@ class SimpleKeyboard {
           if (buttonTheme.class.split(" ").includes(classNameItem)) {
             classNameFound = true;
 
-            let buttonThemeArray = buttonTheme.buttons.split(" ");
+            const buttonThemeArray = buttonTheme.buttons.split(" ");
             if (!buttonThemeArray.includes(button)) {
               classNameFound = true;
               buttonThemeArray.push(button);
@@ -490,8 +595,8 @@ class SimpleKeyboard {
       Array.isArray(this.options.buttonTheme) &&
       this.options.buttonTheme.length
     ) {
-      let buttonArray = buttons.split(" ");
-      buttonArray.forEach((button, key) => {
+      const buttonArray = buttons.split(" ");
+      buttonArray.forEach(button => {
         this.options.buttonTheme.map((buttonTheme, index) => {
           /**
            * If className is set, we affect the buttons only for that class
@@ -501,7 +606,7 @@ class SimpleKeyboard {
             (className && className.includes(buttonTheme.class)) ||
             !className
           ) {
-            let filteredButtonArray = buttonTheme.buttons
+            const filteredButtonArray = buttonTheme.buttons
               .split(" ")
               .filter(item => item !== button);
 
@@ -531,7 +636,7 @@ class SimpleKeyboard {
   getButtonElement(button) {
     let output;
 
-    let buttonArr = this.buttonElements[button];
+    const buttonArr = this.buttonElements[button];
     if (buttonArr) {
       if (buttonArr.length > 1) {
         output = buttonArr;
@@ -548,7 +653,7 @@ class SimpleKeyboard {
    * by checking if the provided inputPattern passes
    */
   inputPatternIsValid(inputVal) {
-    let inputPatternRaw = this.options.inputPattern;
+    const inputPatternRaw = this.options.inputPattern;
     let inputPattern;
 
     /**
@@ -561,7 +666,7 @@ class SimpleKeyboard {
     }
 
     if (inputPattern && inputVal) {
-      let didInputMatch = inputPattern.test(inputVal);
+      const didInputMatch = inputPattern.test(inputVal);
 
       if (this.options.debug) {
         console.log(
@@ -581,33 +686,63 @@ class SimpleKeyboard {
   }
 
   /**
-   * Retrieves the current cursor position within a input or textarea (if any)
+   * Handles simple-keyboard event listeners
    */
-  handleCaret() {
+  setEventListeners() {
     /**
-     * Only first instance should insall the caret handling events
+     * Only first instance should set the event listeners
      */
-    this.caretPosition = null;
-    let simpleKeyboardInstances = window["SimpleKeyboardInstances"];
-
-    if (
-      (simpleKeyboardInstances &&
-        Object.keys(simpleKeyboardInstances)[0] ===
-          this.utilities.camelCase(this.keyboardDOMClass)) ||
-      !simpleKeyboardInstances
-    ) {
+    if (this.isFirstKeyboardInstance || !this.allKeyboardInstances) {
       if (this.options.debug) {
         console.log(`Caret handling started (${this.keyboardDOMClass})`);
       }
 
-      document.addEventListener("keyup", this.caretEventHandler);
-      document.addEventListener("mouseup", this.caretEventHandler);
-      document.addEventListener("touchend", this.caretEventHandler);
+      /**
+       * Event Listeners
+       */
+      document.addEventListener("keyup", this.handleKeyUp);
+      document.addEventListener("keydown", this.handleKeyDown);
+      document.addEventListener("mouseup", this.handleMouseUp);
+      document.addEventListener("touchend", this.handleTouchEnd);
     }
   }
 
   /**
-   * Called by {@link handleCaret} when an event that warrants a cursor position update is triggered
+   * Event Handler: KeyUp
+   */
+  handleKeyUp(event) {
+    this.caretEventHandler(event);
+
+    if (this.options.physicalKeyboardHighlight) {
+      this.physicalKeyboard.handleHighlightKeyUp(event);
+    }
+  }
+
+  /**
+   * Event Handler: KeyDown
+   */
+  handleKeyDown(event) {
+    if (this.options.physicalKeyboardHighlight) {
+      this.physicalKeyboard.handleHighlightKeyDown(event);
+    }
+  }
+
+  /**
+   * Event Handler: MouseUp
+   */
+  handleMouseUp(event) {
+    this.caretEventHandler(event);
+  }
+
+  /**
+   * Event Handler: TouchEnd
+   */
+  handleTouchEnd(event) {
+    this.caretEventHandler(event);
+  }
+
+  /**
+   * Called by {@link setEventListeners} when an event that warrants a cursor position update is triggered
    */
   caretEventHandler(event) {
     let targetTagName;
@@ -647,67 +782,147 @@ class SimpleKeyboard {
     });
   }
 
+  /**
+   * Execute an operation on each button
+   */
+  recurseButtons(fn) {
+    if (!fn) return false;
+
+    Object.keys(this.buttonElements).forEach(buttonName =>
+      this.buttonElements[buttonName].forEach(fn)
+    );
+  }
+
   /**
    * Destroy keyboard listeners and DOM elements
    */
   destroy() {
-    /**
-     * Remove listeners
-     */
-    document.removeEventListener("keyup", this.caretEventHandler);
-    document.removeEventListener("mouseup", this.caretEventHandler);
-    document.removeEventListener("touchend", this.caretEventHandler);
+    if (this.options.debug)
+      console.log(
+        `Destroying simple-keyboard instance: ${this.currentInstanceName}`
+      );
 
     /**
-     * Clear DOM
+     * Remove document listeners
+     */
+    document.removeEventListener("keyup", this.handleKeyUp);
+    document.removeEventListener("keydown", this.handleKeyDown);
+    document.removeEventListener("mouseup", this.handleMouseUp);
+    document.removeEventListener("touchend", this.handleTouchEnd);
+    document.onpointerup = null;
+    document.ontouchend = null;
+    document.ontouchcancel = null;
+    document.onmouseup = null;
+
+    /**
+     * Remove buttons
+     */
+    let deleteButton = buttonElement => {
+      buttonElement.onpointerdown = null;
+      buttonElement.onpointerup = null;
+      buttonElement.onpointercancel = null;
+      buttonElement.ontouchstart = null;
+      buttonElement.ontouchend = null;
+      buttonElement.ontouchcancel = null;
+      buttonElement.onclick = null;
+      buttonElement.onmousedown = null;
+      buttonElement.onmouseup = null;
+
+      buttonElement.remove();
+      buttonElement = null;
+    };
+
+    this.recurseButtons(deleteButton);
+
+    this.recurseButtons = null;
+    deleteButton = null;
+
+    /**
+     * Remove wrapper events
+     */
+    this.keyboardDOM.onpointerdown = null;
+    this.keyboardDOM.ontouchstart = null;
+    this.keyboardDOM.onmousedown = null;
+
+    /**
+     * Clearing keyboard wrapper
      */
     this.clear();
+
+    /**
+     * Remove instance
+     */
+    window["SimpleKeyboardInstances"][this.currentInstanceName] = null;
+    delete window["SimpleKeyboardInstances"][this.currentInstanceName];
+
+    /**
+     * Reset initialized flag
+     */
+    this.initialized = false;
   }
 
   /**
    * Process buttonTheme option
    */
-  getButtonTheme() {
-    let buttonThemesParsed = {};
+  getButtonThemeClasses(button) {
+    const buttonTheme = this.options.buttonTheme;
+    let buttonClasses = [];
 
-    this.options.buttonTheme.forEach(themeObj => {
-      if (themeObj.buttons && themeObj.class) {
-        let themeButtons;
+    if (Array.isArray(buttonTheme)) {
+      buttonTheme.forEach(themeObj => {
+        if (
+          themeObj.class &&
+          typeof themeObj.class === "string" &&
+          themeObj.buttons &&
+          typeof themeObj.buttons === "string"
+        ) {
+          const themeObjClasses = themeObj.class.split(" ");
+          const themeObjButtons = themeObj.buttons.split(" ");
 
-        if (typeof themeObj.buttons === "string") {
-          themeButtons = themeObj.buttons.split(" ");
+          if (themeObjButtons.includes(button)) {
+            buttonClasses = [...buttonClasses, ...themeObjClasses];
+          }
+        } else {
+          console.warn(
+            `Incorrect "buttonTheme". Please check the documentation.`,
+            themeObj
+          );
         }
+      });
+    }
 
-        if (themeButtons) {
-          themeButtons.forEach(themeButton => {
-            let themeParsed = buttonThemesParsed[themeButton];
+    return buttonClasses;
+  }
 
-            // If the button has already been added
-            if (themeParsed) {
-              // Making sure we don't add duplicate classes, even when buttonTheme has duplicates
-              if (
-                !this.utilities.countInArray(
-                  themeParsed.split(" "),
-                  themeObj.class
-                )
-              ) {
-                buttonThemesParsed[themeButton] = `${themeParsed} ${
-                  themeObj.class
-                }`;
-              }
-            } else {
-              buttonThemesParsed[themeButton] = themeObj.class;
-            }
-          });
+  /**
+   * Process buttonAttributes option
+   */
+  setDOMButtonAttributes(button, callback) {
+    const buttonAttributes = this.options.buttonAttributes;
+
+    if (Array.isArray(buttonAttributes)) {
+      buttonAttributes.forEach(attrObj => {
+        if (
+          attrObj.attribute &&
+          typeof attrObj.attribute === "string" &&
+          attrObj.value &&
+          typeof attrObj.value === "string" &&
+          attrObj.buttons &&
+          typeof attrObj.buttons === "string"
+        ) {
+          const attrObjButtons = attrObj.buttons.split(" ");
+
+          if (attrObjButtons.includes(button)) {
+            callback(attrObj.attribute, attrObj.value);
+          }
+        } else {
+          console.warn(
+            `Incorrect "buttonAttributes". Please check the documentation.`,
+            attrObj
+          );
         }
-      } else {
-        console.warn(
-          `buttonTheme row is missing the "buttons" or the "class". Please check the documentation.`
-        );
-      }
-    });
-
-    return buttonThemesParsed;
+      });
+    }
   }
 
   onTouchDeviceDetected() {
@@ -760,9 +975,9 @@ class SimpleKeyboard {
     }
 
     /**
-     * Caret handling
+     * setEventListeners
      */
-    this.handleCaret();
+    this.setEventListeners();
 
     if (typeof this.options.onInit === "function") this.options.onInit();
   }
@@ -785,6 +1000,7 @@ class SimpleKeyboard {
      * Notify about PointerEvents usage
      */
     if (
+      this.isFirstKeyboardInstance &&
       this.utilities.pointerEventsSupported() &&
       !this.options.useTouchEvents &&
       !this.options.useMouseEvents
@@ -843,19 +1059,22 @@ class SimpleKeyboard {
    */
   loadModules() {
     if (Array.isArray(this.options.modules)) {
-      this.options.modules.forEach(Module => {
-        let module = new Module();
+      this.options.modules.forEach(KeyboardModule => {
+        const keyboardModule = new KeyboardModule();
 
         /* istanbul ignore next */
-        if (module.constructor.name && module.constructor.name !== "Function") {
-          let classStr = `module-${this.utilities.camelCase(
-            module.constructor.name
+        if (
+          keyboardModule.constructor.name &&
+          keyboardModule.constructor.name !== "Function"
+        ) {
+          const classStr = `module-${this.utilities.camelCase(
+            keyboardModule.constructor.name
           )}`;
           this.keyboardPluginClasses =
             this.keyboardPluginClasses + ` ${classStr}`;
         }
 
-        module.init(this);
+        keyboardModule.init(this);
       });
 
       this.keyboardPluginClasses =
@@ -891,12 +1110,12 @@ class SimpleKeyboard {
     containerStartIndexes,
     containerEndIndexes
   ) {
-    let rowDOMArray = Array.from(rowDOM.children);
+    const rowDOMArray = Array.from(rowDOM.children);
     let removedElements = 0;
 
     if (rowDOMArray.length) {
       containerStartIndexes.forEach((startIndex, arrIndex) => {
-        let endIndex = containerEndIndexes[arrIndex];
+        const endIndex = containerEndIndexes[arrIndex];
 
         /**
          * If there exists a respective end index
@@ -911,23 +1130,21 @@ class SimpleKeyboard {
          * This is since the removal of buttons to place a single button container
          * results in a modified array size
          */
-        let updated_startIndex = startIndex - removedElements;
-        let updated_endIndex = endIndex - removedElements;
+        const updated_startIndex = startIndex - removedElements;
+        const updated_endIndex = endIndex - removedElements;
 
         /**
          * Create button container
          */
-        let containerDOM = document.createElement("div");
+        const containerDOM = document.createElement("div");
         containerDOM.className += "hg-button-container";
-        let containerUID = `${
-          this.options.layoutName
-        }-r${rowIndex}c${arrIndex}`;
+        const containerUID = `${this.options.layoutName}-r${rowIndex}c${arrIndex}`;
         containerDOM.setAttribute("data-skUID", containerUID);
 
         /**
          * Taking elements due to be inserted into container
          */
-        let containedElements = rowDOMArray.splice(
+        const containedElements = rowDOMArray.splice(
           updated_startIndex,
           updated_endIndex - updated_startIndex + 1
         );
@@ -968,6 +1185,17 @@ class SimpleKeyboard {
     return rowDOM;
   }
 
+  /**
+   * getKeyboardClassString
+   */
+  getKeyboardClassString = (...baseDOMClasses) => {
+    const keyboardClasses = [this.keyboardDOMClass, ...baseDOMClasses].filter(
+      DOMClass => !!DOMClass
+    );
+
+    return keyboardClasses.join(" ");
+  };
+
   /**
    * Renders rows and buttons as per options
    */
@@ -989,32 +1217,28 @@ class SimpleKeyboard {
      */
     this.beforeRender();
 
-    let layoutClass = `hg-layout-${this.options.layoutName}`;
-    let layout = this.options.layout || KeyboardLayout.getDefaultLayout();
-    let useTouchEvents = this.options.useTouchEvents || false;
-    let useTouchEventsClass = useTouchEvents ? "hg-touch-events" : "";
-    let useMouseEvents = this.options.useMouseEvents || false;
-    let disableRowButtonContainers = this.options.disableRowButtonContainers;
-
-    /**
-     * Account for buttonTheme, if set
-     */
-    let buttonThemesParsed = Array.isArray(this.options.buttonTheme)
-      ? this.getButtonTheme()
-      : {};
+    const layoutClass = `hg-layout-${this.options.layoutName}`;
+    const layout = this.options.layout || getDefaultLayout();
+    const useTouchEvents = this.options.useTouchEvents || false;
+    const useTouchEventsClass = useTouchEvents ? "hg-touch-events" : "";
+    const useMouseEvents = this.options.useMouseEvents || false;
+    const disableRowButtonContainers = this.options.disableRowButtonContainers;
 
     /**
      * Adding themeClass, layoutClass to keyboardDOM
      */
-    this.keyboardDOM.className += ` ${this.options.theme} ${layoutClass} ${
-      this.keyboardPluginClasses
-    } ${useTouchEventsClass}`;
+    this.keyboardDOM.className = this.getKeyboardClassString(
+      this.options.theme,
+      layoutClass,
+      this.keyboardPluginClasses,
+      useTouchEventsClass
+    );
 
     /**
      * Iterating through each row
      */
     layout[this.options.layoutName].forEach((row, rIndex) => {
-      let rowArray = row.split(" ");
+      const rowArray = row.split(" ");
 
       /**
        * Creating empty row
@@ -1025,8 +1249,8 @@ class SimpleKeyboard {
       /**
        * Tracking container indicators in rows
        */
-      let containerStartIndexes = [];
-      let containerEndIndexes = [];
+      const containerStartIndexes = [];
+      const containerEndIndexes = [];
 
       /**
        * Iterating through each button in row
@@ -1035,11 +1259,11 @@ class SimpleKeyboard {
         /**
          * Check if button has a container indicator
          */
-        let buttonHasContainerStart =
+        const buttonHasContainerStart =
           !disableRowButtonContainers &&
           button.includes("[") &&
           button.length > 1;
-        let buttonHasContainerEnd =
+        const buttonHasContainerEnd =
           !disableRowButtonContainers &&
           button.includes("]") &&
           button.length > 1;
@@ -1068,9 +1292,8 @@ class SimpleKeyboard {
         /**
          * Processing button options
          */
-        let fctBtnClass = this.utilities.getButtonClass(button);
-        let buttonThemeClass = buttonThemesParsed[button];
-        let buttonDisplayName = this.utilities.getButtonDisplayName(
+        const fctBtnClass = this.utilities.getButtonClass(button);
+        const buttonDisplayName = this.utilities.getButtonDisplayName(
           button,
           this.options.display,
           this.options.mergeDisplay
@@ -1079,11 +1302,23 @@ class SimpleKeyboard {
         /**
          * Creating button
          */
-        let buttonType = this.options.useButtonTag ? "button" : "div";
-        let buttonDOM = document.createElement(buttonType);
-        buttonDOM.className += `hg-button ${fctBtnClass}${
-          buttonThemeClass ? " " + buttonThemeClass : ""
-        }`;
+        const buttonType = this.options.useButtonTag ? "button" : "div";
+        const buttonDOM = document.createElement(buttonType);
+        buttonDOM.className += `hg-button ${fctBtnClass}`;
+
+        /**
+         * Adding buttonTheme
+         */
+        buttonDOM.classList.add(...this.getButtonThemeClasses(button));
+
+        /**
+         * Adding buttonAttributes
+         */
+        this.setDOMButtonAttributes(button, (attribute, value) => {
+          buttonDOM.setAttribute(attribute, value);
+        });
+
+        this.activeButtonClass = "hg-activeButton";
 
         /**
          * Handle button click event
@@ -1101,10 +1336,12 @@ class SimpleKeyboard {
             this.handleButtonClicked(button);
             this.handleButtonMouseDown(button, e);
           };
-          buttonDOM.onpointerup = e => {
-            this.handleButtonMouseUp();
+          buttonDOM.onpointerup = () => {
+            this.handleButtonMouseUp(button);
+          };
+          buttonDOM.onpointercancel = () => {
+            this.handleButtonMouseUp(button);
           };
-          buttonDOM.onpointercancel = e => this.handleButtonMouseUp();
         } else {
           /**
            * Fallback for browsers not supporting PointerEvents
@@ -1117,8 +1354,12 @@ class SimpleKeyboard {
               this.handleButtonClicked(button);
               this.handleButtonMouseDown(button, e);
             };
-            buttonDOM.ontouchend = e => this.handleButtonMouseUp();
-            buttonDOM.ontouchcancel = e => this.handleButtonMouseUp();
+            buttonDOM.ontouchend = () => {
+              this.handleButtonMouseUp(button);
+            };
+            buttonDOM.ontouchcancel = () => {
+              this.handleButtonMouseUp(button);
+            };
           } else {
             /**
              * Handle mouse events
@@ -1130,6 +1371,9 @@ class SimpleKeyboard {
             buttonDOM.onmousedown = e => {
               this.handleButtonMouseDown(button, e);
             };
+            buttonDOM.onmouseup = () => {
+              this.handleButtonMouseUp(button);
+            };
           }
         }
 
@@ -1142,18 +1386,13 @@ class SimpleKeyboard {
          * Adding unique id
          * Since there's no limit on spawning same buttons, the unique id ensures you can style every button
          */
-        let buttonUID = `${this.options.layoutName}-r${rIndex}b${bIndex}`;
+        const buttonUID = `${this.options.layoutName}-r${rIndex}b${bIndex}`;
         buttonDOM.setAttribute("data-skBtnUID", buttonUID);
 
-        /**
-         * Adding display label
-         */
-        buttonDOM.setAttribute("data-displayLabel", buttonDisplayName);
-
         /**
          * Adding button label to button
          */
-        let buttonSpanDOM = document.createElement("span");
+        const buttonSpanDOM = document.createElement("span");
         buttonSpanDOM.innerHTML = buttonDisplayName;
         buttonDOM.appendChild(buttonSpanDOM);
 
@@ -1198,7 +1437,7 @@ class SimpleKeyboard {
       this.initialized = true;
 
       /**
-       * Handling onpointerup
+       * Handling parent events
        */
       /* istanbul ignore next */
       if (
@@ -1207,17 +1446,24 @@ class SimpleKeyboard {
         !useMouseEvents
       ) {
         document.onpointerup = () => this.handleButtonMouseUp();
+        this.keyboardDOM.onpointerdown = e =>
+          this.handleKeyboardContainerMouseDown(e);
       } else if (useTouchEvents) {
         /**
          * Handling ontouchend, ontouchcancel
          */
-        document.ontouchend = e => this.handleButtonMouseUp();
-        document.ontouchcancel = e => this.handleButtonMouseUp();
+        document.ontouchend = () => this.handleButtonMouseUp();
+        document.ontouchcancel = () => this.handleButtonMouseUp();
+
+        this.keyboardDOM.ontouchstart = e =>
+          this.handleKeyboardContainerMouseDown(e);
       } else if (!useTouchEvents) {
         /**
          * Handling mouseup
          */
         document.onmouseup = () => this.handleButtonMouseUp();
+        this.keyboardDOM.onmousedown = e =>
+          this.handleKeyboardContainerMouseDown(e);
       }
 
       /**

src/lib/components/tests/Keyboard.test.js

@@ -1,7 +1,7 @@
 import Keyboard from '../Keyboard';
 import TestUtility from '../../../utils/TestUtility';
 
-let testUtil = new TestUtility();
+const testUtil = new TestUtility();
 
 it('Keyboard will not render without target element', () => {
   try {
@@ -38,7 +38,7 @@ it('Keyboard will run with custom DOM target', () => {
 it('Keyboard will run with debug option set', () => {
   testUtil.setDOM();
   
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     debug: true
   });
 
@@ -51,10 +51,10 @@ it('Keyboard will use touch events', () => {
   testUtil.clear()
 
   document.body.innerHTML = `
-    <div id="keyboard"></div>
+    <div class="keyboard"></div>
   `;
 
-  const keyboard = new Keyboard('#keyboard', {
+  const keyboard = new Keyboard('.keyboard', {
     useTouchEvents: true,
     onChange: () => touched = true,
     layout: {
@@ -73,7 +73,7 @@ it('Keyboard will use touch events', () => {
 
 it('Keyboard standard buttons will work', () => {
   testUtil.setDOM();
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     maxLength: {
       "default": 10
     }
@@ -85,7 +85,7 @@ it('Keyboard standard buttons will work', () => {
 
 it('Keyboard shift buttons will work', () => {
   testUtil.setDOM();
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
   keyboard.setOptions({
     layoutName: "shift",
@@ -97,7 +97,7 @@ it('Keyboard shift buttons will work', () => {
 
 it('Keyboard setOptions will work without a param', () => {
   testUtil.setDOM();
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
   keyboard.setOptions();
 });
@@ -105,7 +105,7 @@ it('Keyboard setOptions will work without a param', () => {
 it('Keyboard empty buttons wont do anything as expected', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     layout: {
       default: [
         "{//} {button} d",
@@ -122,7 +122,7 @@ it('Keyboard onKeyPress will work', () => {
 
   let pressed = false;
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     onKeyPress: () => {
       pressed = true;
     },
@@ -137,7 +137,7 @@ it('Keyboard onKeyPress will work', () => {
 it('Keyboard standard function buttons will not change input', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     useButtonTag: true
   });
 
@@ -158,7 +158,7 @@ it('Keyboard syncInstanceInputs will work', () => {
     <div class="keyboard2"></div>
   `;
 
-  let sharedOptions = {
+  const sharedOptions = {
     syncInstanceInputs: true
   };
 
@@ -195,7 +195,7 @@ it('Keyboard onChange will work', () => {
 
   let output = false;
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     onChange: (input) => {
       output = input;
     },
@@ -212,7 +212,7 @@ it('Keyboard onChangeAll will work', () => {
 
   let output;
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     onChangeAll: (input) => {
       output = input ? input.default : null;
     },
@@ -227,7 +227,7 @@ it('Keyboard onChangeAll will work', () => {
 it('Keyboard clearInput will work', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
   /**
    * Avoid setInput for this test
@@ -249,12 +249,12 @@ it('Keyboard clearInput will work with syncInstanceInputs', () => {
     <div class="keyboard2"></div>
   `;
 
-  let sharedOptions = {
+  const sharedOptions = {
     syncInstanceInputs: true
   };
 
-  let keyboard1 = new Keyboard(".keyboard1", sharedOptions);
-  let keyboard2 = new Keyboard(".keyboard2", sharedOptions);
+  const keyboard1 = new Keyboard(".keyboard1", sharedOptions);
+  const keyboard2 = new Keyboard(".keyboard2", sharedOptions);
 
   /**
    * Avoid setInput for this test
@@ -271,7 +271,7 @@ it('Keyboard clearInput will work with syncInstanceInputs', () => {
 it('Keyboard setInput will work', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
   keyboard.setInput("hello");
 
@@ -286,12 +286,12 @@ it('Keyboard setInput will work with syncInstanceInputs', () => {
     <div class="keyboard2"></div>
   `;
 
-  let sharedOptions = {
+  const sharedOptions = {
     syncInstanceInputs: true
   };
 
-  let keyboard1 = new Keyboard(".keyboard1", sharedOptions);
-  let keyboard2 = new Keyboard(".keyboard2", sharedOptions);
+  const keyboard1 = new Keyboard(".keyboard1", sharedOptions);
+  const keyboard2 = new Keyboard(".keyboard2", sharedOptions);
 
   keyboard1.setInput("hello");
 
@@ -306,8 +306,8 @@ it('Keyboard dispatch will work', () => {
     <div class="keyboard2"></div>
   `;
 
-  let keyboard1 = new Keyboard(".keyboard1");
-  let keyboard2 = new Keyboard(".keyboard2");
+  const keyboard1 = new Keyboard(".keyboard1");
+  const keyboard2 = new Keyboard(".keyboard2");
 
   keyboard1.dispatch(instance => {
     instance.setOptions({
@@ -331,8 +331,8 @@ it('Keyboard dispatch will not work without SimpleKeyboardInstances', () => {
     <div class="keyboard2"></div>
   `;
 
-  let keyboard1 = new Keyboard(".keyboard1");
-  let keyboard2 = new Keyboard(".keyboard2");
+  const keyboard1 = new Keyboard(".keyboard1");
+  new Keyboard(".keyboard2");
 
   window['SimpleKeyboardInstances'] = null;
 
@@ -357,8 +357,8 @@ it('Keyboard dispatch will not work without SimpleKeyboardInstances', () => {
 it('Keyboard addButtonTheme will work', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
-  let returnVal = keyboard.addButtonTheme("q", "test");
+  const keyboard = new Keyboard();
+  keyboard.addButtonTheme("q", "test");
 
   expect(keyboard.options.buttonTheme[0].class).toBe("test");
 });
@@ -366,8 +366,8 @@ it('Keyboard addButtonTheme will work', () => {
 it('Keyboard addButtonTheme will not work without params', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
-  let returnVal = keyboard.addButtonTheme();
+  const keyboard = new Keyboard();
+  const returnVal = keyboard.addButtonTheme();
 
   expect(returnVal).toBeFalsy();
 });
@@ -375,7 +375,7 @@ it('Keyboard addButtonTheme will not work without params', () => {
 it('Keyboard addButtonTheme will amend a buttonTheme', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     buttonTheme: [
       {
         class: "test",
@@ -392,7 +392,7 @@ it('Keyboard addButtonTheme will amend a buttonTheme', () => {
 it('Keyboard addButtonTheme will create a buttonTheme', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     buttonTheme: [
       {
         class: "blurb",
@@ -409,7 +409,7 @@ it('Keyboard addButtonTheme will create a buttonTheme', () => {
 it('Keyboard addButtonTheme will ignore a repeated buttonTheme', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     buttonTheme: [
       {
         class: "test",
@@ -426,7 +426,7 @@ it('Keyboard addButtonTheme will ignore a repeated buttonTheme', () => {
 it('Keyboard addButtonTheme will amend a buttonTheme', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     buttonTheme: [
       {
         class: "test",
@@ -444,7 +444,7 @@ it('Keyboard addButtonTheme will amend a buttonTheme', () => {
 it('Keyboard removeButtonTheme without params will remove all button themes', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     buttonTheme: [
       {
         class: "test",
@@ -462,7 +462,7 @@ it('Keyboard removeButtonTheme without params will remove all button themes', ()
 it('Keyboard removeButtonTheme will work', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     buttonTheme: [
       {
         class: "test",
@@ -479,7 +479,7 @@ it('Keyboard removeButtonTheme will work', () => {
 it('Keyboard removeButtonTheme will work wihtout a class', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     buttonTheme: [
       {
         class: "test",
@@ -496,7 +496,7 @@ it('Keyboard removeButtonTheme will work wihtout a class', () => {
 it('Keyboard removeButtonTheme will do nothing without a button param', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     buttonTheme: [
       {
         class: "test",
@@ -513,7 +513,7 @@ it('Keyboard removeButtonTheme will do nothing without a button param', () => {
 it('Keyboard removeButtonTheme does nothing if req button doesnt have a buttonTheme', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     buttonTheme: [
       {
         class: "test",
@@ -530,7 +530,7 @@ it('Keyboard removeButtonTheme does nothing if req button doesnt have a buttonTh
 it('Keyboard removeButtonTheme does nothing if buttonTheme class does not exist', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     buttonTheme: [
       {
         class: "testy",
@@ -547,7 +547,7 @@ it('Keyboard removeButtonTheme does nothing if buttonTheme class does not exist'
 it('Keyboard removeButtonTheme does nothing if buttonTheme doesnt have the requested buttons', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     buttonTheme: [
       {
         class: "test",
@@ -564,7 +564,7 @@ it('Keyboard removeButtonTheme does nothing if buttonTheme doesnt have the reque
 it('Keyboard getButtonElement will not return anything if empty match', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     layout: {
       default: [
         "{//} {button} d",
@@ -579,7 +579,7 @@ it('Keyboard getButtonElement will not return anything if empty match', () => {
 it('Keyboard getButtonElement will return multiple matched buttons', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
   expect(keyboard.getButtonElement("{shift}").length).toBe(2);
 });
@@ -606,7 +606,7 @@ it('Keyboard will receive physical keyboard events', () => {
 it('Keyboard caretEventHandler will detect input, textarea focus', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
   keyboard.caretEventHandler({
     charCode: 0,
@@ -625,7 +625,7 @@ it('Keyboard caretEventHandler will detect input, textarea focus', () => {
 it('Keyboard caretEventHandler will not set caretPosition on disableCaretPositioning', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
   keyboard.caretEventHandler({
     charCode: 0,
@@ -661,7 +661,7 @@ it('Keyboard caretEventHandler will not set caretPosition on disableCaretPositio
 it('Keyboard caretEventHandler ignore positioning if input, textarea is blur', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
   keyboard.isMouseHold = true;
 
@@ -682,7 +682,7 @@ it('Keyboard caretEventHandler ignore positioning if input, textarea is blur', (
 it('Keyboard caretEventHandler will work with debug', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     debug: true
   });
 
@@ -705,7 +705,7 @@ it('Keyboard onInit will work', () => {
 
   let passed = false;
 
-  let keyboard = new Keyboard({
+  new Keyboard({
     onInit: () => {
       passed = true
     }
@@ -719,7 +719,7 @@ it('Keyboard onRender will work', () => {
 
   let passed = false;
 
-  let keyboard = new Keyboard({
+  new Keyboard({
     onRender: () => {
       passed = true
     }
@@ -731,7 +731,7 @@ it('Keyboard onRender will work', () => {
 it('Keyboard buttonTheme that is invalid will be ignored and not throw', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  new Keyboard({
     buttonTheme: [
       {
         class: null,
@@ -744,7 +744,7 @@ it('Keyboard buttonTheme that is invalid will be ignored and not throw', () => {
 it('Keyboard buttonTheme buttons that are invalid will be ignored and not throw', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  new Keyboard({
     buttonTheme: [
       {
         class: null,
@@ -772,7 +772,7 @@ it('Keyboard buttonTheme will be ignored if buttons param not a string', () => {
 it('Keyboard buttonTheme will be ignored if already added', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  new Keyboard({
     buttonTheme: [
       {
         class: "test",
@@ -801,7 +801,7 @@ it('Keyboard buttonTheme will be ignored if already added', () => {
 it('Keyboard can set a module', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
   keyboard.registerModule(
     "test",
@@ -816,7 +816,7 @@ it('Keyboard can set a module', () => {
 it('Keyboard registerModule will return current module tree', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
   keyboard.modules.test = {
     testy: "test"
@@ -836,7 +836,7 @@ it('Keyboard registerModule will return current module tree', () => {
 it('Keyboard can set a module by amending the modules tree', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
   keyboard.modules = {
     testman: {
@@ -857,7 +857,7 @@ it('Keyboard can set a module by amending the modules tree', () => {
 it('Keyboard will not retrieve an option for an inexistent module', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
   expect(keyboard.getModuleProp("test", "foo")).toBeFalsy();
 });
@@ -865,7 +865,7 @@ it('Keyboard will not retrieve an option for an inexistent module', () => {
 it('Keyboard will get a list of modules', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
   keyboard.registerModule(
     "test",
@@ -886,7 +886,7 @@ it('Keyboard loadModules will load a simple module', () => {
     };
   }
 
-  let keyboard = new Keyboard({
+  new Keyboard({
     modules: [
       myClass
     ]
@@ -896,7 +896,7 @@ it('Keyboard loadModules will load a simple module', () => {
 it('Keyboard handleButtonMouseUp will set isMouseHold to false', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
   keyboard.isMouseHold = true;
 
@@ -908,7 +908,7 @@ it('Keyboard handleButtonMouseUp will set isMouseHold to false', () => {
 it('Keyboard handleButtonMouseUp clear holdInteractionTimeout', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
   keyboard.isMouseHold = true;
   keyboard.holdInteractionTimeout = setTimeout(() => {}, 10000);
@@ -919,7 +919,7 @@ it('Keyboard handleButtonMouseUp clear holdInteractionTimeout', () => {
 it('Keyboard handleButtonMouseDown will work', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
   keyboard.handleButtonMouseDown("q", {
     target: keyboard.getButtonElement("q"),
@@ -937,7 +937,7 @@ it('Keyboard handleButtonMouseDown will work', () => {
 it('Keyboard handleButtonMouseDown will work with preventMouseDownDefault', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
   keyboard.options.preventMouseDownDefault = true;
 
@@ -965,7 +965,7 @@ it('Keyboard onModulesLoaded will work', () => {
 
   let foo;
 
-  let keyboard = new Keyboard({
+  new Keyboard({
     modules: [
       myClass
     ],
@@ -980,7 +980,7 @@ it('Keyboard onModulesLoaded will work', () => {
 it('Keyboard inputPattern will work globally', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     inputPattern: /^\d+$/,
     useMouseEvents: true
   });
@@ -997,7 +997,7 @@ it('Keyboard inputPattern will work globally', () => {
 it('Keyboard inputPattern will work by input name', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     debug: true,
     inputName: "test1",
     inputPattern: {
@@ -1026,7 +1026,7 @@ it('Keyboard processAutoTouchEvents will work', () => {
 
   navigator.maxTouchPoints = true;
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     autoUseTouchEvents: true
   });
 
@@ -1038,7 +1038,7 @@ it('Keyboard processAutoTouchEvents will work with debugging enabled', () => {
 
   navigator.maxTouchPoints = true;
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     autoUseTouchEvents: true,
     debug: true
   });
@@ -1051,7 +1051,7 @@ it('Keyboard beforeFirstRender method will work', () => {
 
   let timesCalled = 0;
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     beforeFirstRender: () => {
       timesCalled++;
     }
@@ -1074,7 +1074,7 @@ it('Keyboard beforeFirstRender will show PointerEvents warning', () => {
 
   window.PointerEvent = window.PointerEvent ? window.PointerEvent : () => {};
 
-  let keyboard = new Keyboard({
+  new Keyboard({
     debug: true,
     beforeFirstRender: () => {
       timesCalled++;
@@ -1089,7 +1089,7 @@ it('Keyboard beforeRender method will work', () => {
 
   let timesCalled = 0;
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     beforeRender: () => {
       timesCalled++;
     }
@@ -1108,7 +1108,7 @@ it('Keyboard beforeRender method will work', () => {
 it('Keyboard parseRowDOMContainers will work', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     layout: {
       'default': [
         '` [1 2 3 4 5 6 7 8 9] 0 - = {bksp}',
@@ -1127,7 +1127,7 @@ it('Keyboard parseRowDOMContainers will work', () => {
     }
   });
 
-  let containers = Array.from(document.querySelectorAll(".hg-button-container"));
+  const containers = Array.from(document.querySelectorAll(".hg-button-container"));
 
   expect(containers.length).toBe(5);
 
@@ -1144,7 +1144,7 @@ it('Keyboard parseRowDOMContainers will ignore empty rows', () => {
   let failed = false;
 
   try {
-    let keyboard = new Keyboard();
+    const keyboard = new Keyboard();
     keyboard.parseRowDOMContainers({
       children: []
     });
@@ -1159,7 +1159,7 @@ it('Keyboard parseRowDOMContainers will ignore empty rows', () => {
 it('Keyboard parseRowDOMContainers will ignore missing endIndex or endIndex before startIndex', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  new Keyboard({
     layout: {
       'default': [
         '` [1 2 3 4 5 6 7 8 9 0 - = {bksp}',
@@ -1168,7 +1168,7 @@ it('Keyboard parseRowDOMContainers will ignore missing endIndex or endIndex befo
     }
   });
 
-  let containers = Array.from(document.querySelectorAll(".hg-button-container"));
+  const containers = Array.from(document.querySelectorAll(".hg-button-container"));
 
   expect(containers.length).toBe(0);
 });
@@ -1176,7 +1176,7 @@ it('Keyboard parseRowDOMContainers will ignore missing endIndex or endIndex befo
 it('Keyboard disableRowButtonContainers will bypass parseRowDOMContainers', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  new Keyboard({
     disableRowButtonContainers: true,
     layout: {
       'default': [
@@ -1196,7 +1196,7 @@ it('Keyboard disableRowButtonContainers will bypass parseRowDOMContainers', () =
     }
   });
 
-  let containers = Array.from(document.querySelectorAll(".hg-button-container"));
+  const containers = Array.from(document.querySelectorAll(".hg-button-container"));
 
   expect(containers.length).toBe(0);
 });
@@ -1204,7 +1204,7 @@ it('Keyboard disableRowButtonContainers will bypass parseRowDOMContainers', () =
 it('Keyboard inputName change will trigget caretPosition reset', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
   keyboard.caretPosition = 0;
 
@@ -1227,9 +1227,137 @@ it('Keyboard inputName change will trigget caretPosition reset', () => {
 it('Keyboard destroy will work', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
-
+  const keyboard = new Keyboard();
   keyboard.destroy();
+  expect(keyboard.keyboardDOM.innerHTML).toBe("");
+});
 
-  expect(keyboard.keyboardDOM.innerHTML).toBeFalsy();
+it('Keyboard destroy will work with debug option', () => {
+  testUtil.setDOM();
+
+  const keyboard = new Keyboard({ debug: true });
+  keyboard.destroy();
+  expect(keyboard.keyboardDOM.innerHTML).toBe("");
+});
+
+it('Keyboard disableButtonHold will work', () => {
+  testUtil.setDOM();
+
+  const keyboard = new Keyboard({
+    disableButtonHold: true
+  });
+
+  expect(keyboard.options.disableButtonHold).toBe(true);
+});
+
+it('Keyboard caretEventHandler will be triggered on mouseup and ontouchend', () => {
+  testUtil.setDOM();
+
+  const keyboard = new Keyboard({
+    disableCaretPositioning: true
+  });
+
+  keyboard.caretPosition = 6;
+
+  document.dispatchEvent(new MouseEvent('mouseup', {
+    target: {
+      tagName: "input"
+    }
+  }));
+
+  expect(keyboard.caretPosition).toBe(null);
+
+  keyboard.setOptions({
+    disableCaretPositioning: false
+  })
+
+  keyboard.caretPosition = 10;
+
+  document.dispatchEvent(new TouchEvent('touchend', {
+    target: {
+      tagName: "input"
+    }
+  }));
+
+  expect(keyboard.caretPosition).toBe(10);
+});
+
+it('Keyboard onKeyReleased will work', () => {
+  testUtil.setDOM();
+
+  let pressed = false;
+  let firedTimes = 0;
+  let buttonPressed;
+
+  const keyboard = new Keyboard({
+    onKeyReleased: button => {
+      pressed = true;
+      buttonPressed = button;
+      firedTimes++;
+    },
+    debug: true
+  });
+
+  keyboard.getButtonElement("q").onpointerdown();
+  keyboard.getButtonElement("q").onpointerup();
+
+  expect(pressed).toBeTruthy();
+  expect(firedTimes).toBe(1);
+  expect(buttonPressed).toBe("q");
+});
+
+it('Keyboard buttonAttribute will work', () => {
+  testUtil.setDOM();
+
+  new Keyboard({
+    buttonAttributes: [
+      {
+        attribute: "aria-label",
+        value: "bee",
+        buttons: "b B"
+      }
+    ]
+  });
+});
+
+it('Keyboard buttonAttribute will warn about invalid entries', () => {
+  testUtil.setDOM();
+
+  new Keyboard({
+    buttonAttributes: [
+      {
+        attribute: false,
+        value: null
+      }
+    ]
+  });
+});
+
+it('Keyboard recurseButtons will not work without a valid param', () => {
+  testUtil.setDOM();
+  const keyboard = new Keyboard();
+  expect(keyboard.recurseButtons()).toBe(false);
+});
+
+it('Keyboard will not work with a DOM element param without class', () => {
+  try {
+    const keyboardDOM = document.createElement("div");
+    new Keyboard(keyboardDOM);
+    expect(true).toBe(false);
+  } catch (e) {
+    expect(e.message).toBe("KEYBOARD_DOM_CLASS_ERROR");
+  }
+});
+
+it('Keyboard will work with a DOM element param with class', () => {
+  try {
+    const keyboardClass = "my-keyboard";
+    const keyboardDOM = document.createElement("div");
+    keyboardDOM.className = keyboardClass;
+    const keyboard = new Keyboard(keyboardDOM);
+
+    expect(keyboard.keyboardDOMClass).toBe(keyboardClass);
+  } catch (e) {
+    expect(true).toBe(false);
+  }
 });

src/lib/services/KeyboardLayout.js

@@ -1,29 +1,18 @@
-/**
- * Keyboard Layout Service
- */
-class KeyboardLayout {
-  /**
-   * Get default simple-keyboard layout
-   * @return {object} The default layout (US-QWERTY)
-   */
-  static getDefaultLayout() {
-    return {
-      default: [
-        "` 1 2 3 4 5 6 7 8 9 0 - = {bksp}",
-        "{tab} q w e r t y u i o p [ ] \\",
-        "{lock} a s d f g h j k l ; ' {enter}",
-        "{shift} z x c v b n m , . / {shift}",
-        ".com @ {space}"
-      ],
-      shift: [
-        "~ ! @ # $ % ^ & * ( ) _ + {bksp}",
-        "{tab} Q W E R T Y U I O P { } |",
-        '{lock} A S D F G H J K L : " {enter}',
-        "{shift} Z X C V B N M < > ? {shift}",
-        ".com @ {space}"
-      ]
-    };
-  }
-}
-
-export default KeyboardLayout;
+export const getDefaultLayout = () => {
+  return {
+    default: [
+      "` 1 2 3 4 5 6 7 8 9 0 - = {bksp}",
+      "{tab} q w e r t y u i o p [ ] \\",
+      "{lock} a s d f g h j k l ; ' {enter}",
+      "{shift} z x c v b n m , . / {shift}",
+      ".com @ {space}"
+    ],
+    shift: [
+      "~ ! @ # $ % ^ & * ( ) _ + {bksp}",
+      "{tab} Q W E R T Y U I O P { } |",
+      '{lock} A S D F G H J K L : " {enter}',
+      "{shift} Z X C V B N M < > ? {shift}",
+      ".com @ {space}"
+    ]
+  };
+};

src/lib/services/PhysicalKeyboard.js

@@ -1,3 +1,5 @@
+import Utilities from "../services/Utilities";
+
 /**
  * Physical Keyboard Service
  */
@@ -5,66 +7,47 @@ class PhysicalKeyboard {
   /**
    * Creates an instance of the PhysicalKeyboard service
    */
-  constructor(simpleKeyboardInstance) {
+  constructor({ dispatch, getOptions }) {
     /**
      * @type {object} A simple-keyboard instance
      */
-    this.simpleKeyboardInstance = simpleKeyboardInstance;
+    this.dispatch = dispatch;
+    this.getOptions = getOptions;
 
     /**
      * Bindings
      */
-    this.initKeyboardListener = this.initKeyboardListener.bind(this);
-    this.getSimpleKeyboardLayoutKey = this.getSimpleKeyboardLayoutKey.bind(
-      this
-    );
-
-    /**
-     * Initialize key listeners
-     */
-    this.initKeyboardListener();
+    Utilities.bindMethods(PhysicalKeyboard, this);
   }
 
-  /**
-   * Initializes key event listeners
-   */
-  initKeyboardListener() {
-    // Adding button style on keydown
-    document.addEventListener("keydown", event => {
-      if (this.simpleKeyboardInstance.options.physicalKeyboardHighlight) {
-        let buttonPressed = this.getSimpleKeyboardLayoutKey(event);
+  handleHighlightKeyDown(event) {
+    const options = this.getOptions();
+    const buttonPressed = this.getSimpleKeyboardLayoutKey(event);
 
-        this.simpleKeyboardInstance.dispatch(instance => {
-          let buttonDOM =
-            instance.getButtonElement(buttonPressed) ||
-            instance.getButtonElement(`{${buttonPressed}}`);
+    this.dispatch(instance => {
+      const buttonDOM =
+        instance.getButtonElement(buttonPressed) ||
+        instance.getButtonElement(`{${buttonPressed}}`);
 
-          if (buttonDOM) {
-            buttonDOM.style.backgroundColor =
-              this.simpleKeyboardInstance.options
-                .physicalKeyboardHighlightBgColor || "#9ab4d0";
-            buttonDOM.style.color =
-              this.simpleKeyboardInstance.options
-                .physicalKeyboardHighlightTextColor || "white";
-          }
-        });
+      if (buttonDOM) {
+        buttonDOM.style.backgroundColor =
+          options.physicalKeyboardHighlightBgColor || "#9ab4d0";
+        buttonDOM.style.color =
+          options.physicalKeyboardHighlightTextColor || "white";
       }
     });
+  }
 
-    // Removing button style on keyup
-    document.addEventListener("keyup", event => {
-      if (this.simpleKeyboardInstance.options.physicalKeyboardHighlight) {
-        let buttonPressed = this.getSimpleKeyboardLayoutKey(event);
+  handleHighlightKeyUp(event) {
+    const buttonPressed = this.getSimpleKeyboardLayoutKey(event);
 
-        this.simpleKeyboardInstance.dispatch(instance => {
-          let buttonDOM =
-            instance.getButtonElement(buttonPressed) ||
-            instance.getButtonElement(`{${buttonPressed}}`);
+    this.dispatch(instance => {
+      const buttonDOM =
+        instance.getButtonElement(buttonPressed) ||
+        instance.getButtonElement(`{${buttonPressed}}`);
 
-          if (buttonDOM && buttonDOM.removeAttribute) {
-            buttonDOM.removeAttribute("style");
-          }
-        });
+      if (buttonDOM && buttonDOM.removeAttribute) {
+        buttonDOM.removeAttribute("style");
       }
     });
   }

src/lib/services/Utilities.js

@@ -5,11 +5,10 @@ class Utilities {
   /**
    * Creates an instance of the Utility service
    */
-  constructor(simpleKeyboardInstance) {
-    /**
-     * @type {object} A simple-keyboard instance
-     */
-    this.simpleKeyboardInstance = simpleKeyboardInstance;
+  constructor({ getOptions, getCaretPosition, dispatch }) {
+    this.getOptions = getOptions;
+    this.getCaretPosition = getCaretPosition;
+    this.dispatch = dispatch;
 
     /**
      * Bindings
@@ -24,11 +23,11 @@ class Utilities {
    * @return {string} The classes to be added to the button
    */
   getButtonClass(button) {
-    let buttonTypeClass =
+    const buttonTypeClass =
       button.includes("{") && button.includes("}") && button !== "{//}"
         ? "functionBtn"
         : "standardBtn";
-    let buttonWithoutBraces = button.replace("{", "").replace("}", "");
+    const buttonWithoutBraces = button.replace("{", "").replace("}", "");
     let buttonNormalized = "";
 
     if (buttonTypeClass !== "standardBtn")
@@ -125,11 +124,11 @@ class Utilities {
    *
    * @param  {string} button The button's layout name
    * @param  {string} input The input string
-   * @param  {object} options The simple-keyboard options object
    * @param  {number} caretPos The cursor's current position
    * @param  {boolean} moveCaret Whether to update simple-keyboard's cursor
    */
-  getUpdatedInput(button, input, options, caretPos, moveCaret) {
+  getUpdatedInput(button, input, caretPos, moveCaret) {
+    const options = this.getOptions();
     let output = input;
 
     if (
@@ -187,43 +186,34 @@ class Utilities {
    * @param  {boolean} minus Whether the cursor should be moved to the left or not.
    */
   updateCaretPos(length, minus) {
-    let newCaretPos = this.updateCaretPosAction(
-      this.simpleKeyboardInstance,
-      length,
-      minus
-    );
+    const newCaretPos = this.updateCaretPosAction(length, minus);
 
-    if (this.simpleKeyboardInstance.options.syncInstanceInputs) {
-      this.simpleKeyboardInstance.dispatch(instance => {
-        instance.caretPosition = newCaretPos;
-      });
-    }
+    this.dispatch(instance => {
+      instance.caretPosition = newCaretPos;
+    });
   }
 
   /**
    * Action method of updateCaretPos
    *
-   * @param  {object} instance The instance whose position should be updated
    * @param  {number} length Represents by how many characters the input should be moved
    * @param  {boolean} minus Whether the cursor should be moved to the left or not.
    */
-  updateCaretPosAction(instance, length, minus) {
+  updateCaretPosAction(length, minus) {
+    const options = this.getOptions();
+    let caretPosition = this.getCaretPosition();
+
     if (minus) {
-      if (instance.caretPosition > 0)
-        instance.caretPosition = instance.caretPosition - length;
+      if (caretPosition > 0) caretPosition = caretPosition - length;
     } else {
-      instance.caretPosition = instance.caretPosition + length;
+      caretPosition = caretPosition + length;
     }
 
-    if (this.simpleKeyboardInstance.options.debug) {
-      console.log(
-        "Caret at:",
-        instance.caretPosition,
-        `(${instance.keyboardDOMClass})`
-      );
+    if (options.debug) {
+      console.log("Caret at:", caretPosition, `(${this.keyboardDOMClass})`);
     }
 
-    return instance.caretPosition;
+    return caretPosition;
   }
 
   /**
@@ -263,14 +253,16 @@ class Utilities {
    * @param  {boolean} moveCaret Whether to update simple-keyboard's cursor
    */
   removeAt(source, position, moveCaret) {
-    if (this.simpleKeyboardInstance.caretPosition === 0) {
+    const caretPosition = this.getCaretPosition();
+
+    if (caretPosition === 0) {
       return source;
     }
 
     let output;
     let prevTwoChars;
     let emojiMatched;
-    let emojiMatchedReg = /([\uD800-\uDBFF][\uDC00-\uDFFF])/g;
+    const emojiMatchedReg = /([\uD800-\uDBFF][\uDC00-\uDFFF])/g;
 
     /**
      * Emojis are made out of two characters, so we must take a custom approach to trim them.
@@ -306,13 +298,13 @@ class Utilities {
    * Determines whether the maxLength has been reached. This function is called when the maxLength option it set.
    *
    * @param  {object} inputObj
-   * @param  {object} options
    * @param  {string} updatedInput
    */
-  handleMaxLength(inputObj, options, updatedInput) {
-    let maxLength = options.maxLength;
-    let currentInput = inputObj[options.inputName];
-    let condition = currentInput.length === maxLength;
+  handleMaxLength(inputObj, updatedInput) {
+    const options = this.getOptions();
+    const maxLength = options.maxLength;
+    const currentInput = inputObj[options.inputName];
+    const condition = updatedInput.length - 1 >= maxLength;
 
     if (
       /**
@@ -342,7 +334,7 @@ class Utilities {
     }
 
     if (typeof maxLength === "object") {
-      let condition = currentInput.length === maxLength[options.inputName];
+      const condition = currentInput.length === maxLength[options.inputName];
 
       if (options.debug) {
         console.log("maxLength (obj) reached:", condition);
@@ -384,8 +376,9 @@ class Utilities {
    */
 
   static bindMethods(myClass, instance) {
-    for (let myMethod of Object.getOwnPropertyNames(myClass.prototype)) {
-      let excludeMethod =
+    // eslint-disable-next-line no-unused-vars
+    for (const myMethod of Object.getOwnPropertyNames(myClass.prototype)) {
+      const excludeMethod =
         myMethod === "constructor" || myMethod === "bindMethods";
       if (!excludeMethod) {
         instance[myMethod] = instance[myMethod].bind(instance);
@@ -399,6 +392,8 @@ class Utilities {
    * @param  {string} string The string to transform.
    */
   camelCase(string) {
+    if (!string) return false;
+
     return string
       .toLowerCase()
       .trim()
@@ -407,16 +402,6 @@ class Utilities {
         word.length ? string + word[0].toUpperCase() + word.slice(1) : string
       );
   }
-
-  /**
-   * Counts the number of duplicates in a given array
-   *
-   * @param  {Array} array The haystack to search in
-   * @param  {string} value The needle to search for
-   */
-  countInArray(array, value) {
-    return array.reduce((n, x) => n + (x === value), 0);
-  }
 }
 
 export default Utilities;

src/lib/services/tests/PhysicalKeyboard.test.js

@@ -1,12 +1,12 @@
 import Keyboard from '../../components/Keyboard';
 import TestUtility from '../../../utils/TestUtility';
 
-let testUtil = new TestUtility();
+const testUtil = new TestUtility();
 
 it('PhysicalKeyboard keydown will be handled with physicalKeyboardHighlight', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  new Keyboard({
     physicalKeyboardHighlight: true
   });
 
@@ -22,7 +22,7 @@ it('PhysicalKeyboard keydown will be handled with physicalKeyboardHighlight', ()
 it('PhysicalKeyboard keydown will be handled without physicalKeyboardHighlight', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  new Keyboard({
     physicalKeyboardHighlight: false
   });
 
@@ -38,7 +38,7 @@ it('PhysicalKeyboard keydown will be handled without physicalKeyboardHighlight',
 it('PhysicalKeyboard keydown will not style non-existent buttons', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  new Keyboard({
     physicalKeyboardHighlight: true
   });
 
@@ -54,7 +54,7 @@ it('PhysicalKeyboard keydown will not style non-existent buttons', () => {
 it('PhysicalKeyboard keyup will be handled with physicalKeyboardHighlight', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  new Keyboard({
     physicalKeyboardHighlight: true
   });
 
@@ -70,7 +70,7 @@ it('PhysicalKeyboard keyup will be handled with physicalKeyboardHighlight', () =
 it('PhysicalKeyboard keyup will be handle special buttons', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  new Keyboard({
     physicalKeyboardHighlight: true
   });
 
@@ -86,7 +86,7 @@ it('PhysicalKeyboard keyup will be handle special buttons', () => {
 it('PhysicalKeyboard keyup will not style non-existent buttons', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  new Keyboard({
     physicalKeyboardHighlight: true,
     debug: true
   });
@@ -103,7 +103,7 @@ it('PhysicalKeyboard keyup will not style non-existent buttons', () => {
 it('PhysicalKeyboard will work with F1-F12 keys', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  new Keyboard({
     physicalKeyboardHighlight: true,
     debug: true
   });

src/lib/services/tests/Utilities.test.js

@@ -1,19 +1,19 @@
 import Keyboard from '../../components/Keyboard';
 import TestUtility from '../../../utils/TestUtility';
 
-let testUtil = new TestUtility();
+const testUtil = new TestUtility();
 
 it('Keyboard mergeDisplay will work', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     mergeDisplay: true,
     display: {
       "q": "qreplaced"
     }
   });
   
-  expect(keyboard.getButtonElement("q").getAttribute("data-displaylabel")).toBe("qreplaced");
+  expect(keyboard.getButtonElement("q").querySelector("span").innerHTML).toBe("qreplaced");
 });
 
 it('Keyboard function buttons will work', () => {
@@ -29,9 +29,9 @@ it('Keyboard function buttons will work', () => {
 it('Keyboard {bksp} button will work', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
-  let output = keyboard.utilities.getUpdatedInput("{bksp}", "test", keyboard.options);
+  const output = keyboard.utilities.getUpdatedInput("{bksp}", "test");
   
   expect(output).toBe("tes");
 });
@@ -39,9 +39,9 @@ it('Keyboard {bksp} button will work', () => {
 it('Keyboard {space} button will work', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
-  let output = keyboard.utilities.getUpdatedInput("{space}", "test", keyboard.options);
+  const output = keyboard.utilities.getUpdatedInput("{space}", "test");
   
   expect(output).toBe("test ");
 });
@@ -49,9 +49,9 @@ it('Keyboard {space} button will work', () => {
 it('Keyboard {tab} button will work', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
-  let output = keyboard.utilities.getUpdatedInput("{tab}", "test", keyboard.options);
+  const output = keyboard.utilities.getUpdatedInput("{tab}", "test");
   
   expect(output).toBe("test\t");
 });
@@ -59,11 +59,11 @@ it('Keyboard {tab} button will work', () => {
 it('Keyboard {tab} button will work with tabCharOnTab:false', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     tabCharOnTab: false
   });
 
-  let output = keyboard.utilities.getUpdatedInput("{tab}", "test", keyboard.options);
+  const output = keyboard.utilities.getUpdatedInput("{tab}", "test");
   
   expect(output).toBe("test");
 });
@@ -71,9 +71,9 @@ it('Keyboard {tab} button will work with tabCharOnTab:false', () => {
 it('Keyboard {enter} button will work', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
-  let output = keyboard.utilities.getUpdatedInput("{enter}", "test", keyboard.options);
+  const output = keyboard.utilities.getUpdatedInput("{enter}", "test");
   
   expect(output).toBe("test");
 });
@@ -81,11 +81,11 @@ it('Keyboard {enter} button will work', () => {
 it('Keyboard {enter} button will work with newLineOnEnter:true', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     newLineOnEnter: true
   });
 
-  let output = keyboard.utilities.getUpdatedInput("{enter}", "test", keyboard.options);
+  const output = keyboard.utilities.getUpdatedInput("{enter}", "test");
   
   expect(output).toBe("test\n");
 });
@@ -93,10 +93,10 @@ it('Keyboard {enter} button will work with newLineOnEnter:true', () => {
 it('Keyboard {numpadX} buttons will work', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
   for(let i = 0;i<=9;i++){
-    let output = keyboard.utilities.getUpdatedInput(`{numpad${i}}`, "test", keyboard.options);
+    const output = keyboard.utilities.getUpdatedInput(`{numpad${i}}`, "test");
     expect(output).toBe(`test${i}`);
   }
 });
@@ -104,9 +104,9 @@ it('Keyboard {numpadX} buttons will work', () => {
 it('Keyboard {numpaddivide} button will work', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
-  let output = keyboard.utilities.getUpdatedInput("{numpaddivide}", "test", keyboard.options);
+  const output = keyboard.utilities.getUpdatedInput("{numpaddivide}", "test");
   
   expect(output).toBe("test/");
 });
@@ -114,9 +114,9 @@ it('Keyboard {numpaddivide} button will work', () => {
 it('Keyboard {numpadmultiply} button will work', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
-  let output = keyboard.utilities.getUpdatedInput("{numpadmultiply}", "test", keyboard.options);
+  const output = keyboard.utilities.getUpdatedInput("{numpadmultiply}", "test");
   
   expect(output).toBe("test*");
 });
@@ -124,9 +124,9 @@ it('Keyboard {numpadmultiply} button will work', () => {
 it('Keyboard {numpadsubtract} button will work', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
-  let output = keyboard.utilities.getUpdatedInput("{numpadsubtract}", "test", keyboard.options);
+  const output = keyboard.utilities.getUpdatedInput("{numpadsubtract}", "test");
   
   expect(output).toBe("test-");
 });
@@ -134,9 +134,9 @@ it('Keyboard {numpadsubtract} button will work', () => {
 it('Keyboard {numpadadd} button will work', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
-  let output = keyboard.utilities.getUpdatedInput("{numpadadd}", "test", keyboard.options);
+  const output = keyboard.utilities.getUpdatedInput("{numpadadd}", "test");
   
   expect(output).toBe("test+");
 });
@@ -144,9 +144,9 @@ it('Keyboard {numpadadd} button will work', () => {
 it('Keyboard {numpadadd} button will work', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
-  let output = keyboard.utilities.getUpdatedInput("{numpadadd}", "test", keyboard.options);
+  const output = keyboard.utilities.getUpdatedInput("{numpadadd}", "test");
   
   expect(output).toBe("test+");
 });
@@ -154,9 +154,9 @@ it('Keyboard {numpadadd} button will work', () => {
 it('Keyboard {numpaddecimal} button will work', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
-  let output = keyboard.utilities.getUpdatedInput("{numpaddecimal}", "test", keyboard.options);
+  const output = keyboard.utilities.getUpdatedInput("{numpaddecimal}", "test");
   
   expect(output).toBe("test.");
 });
@@ -164,7 +164,7 @@ it('Keyboard {numpaddecimal} button will work', () => {
 it('Keyboard custom function buttons will work', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     layout: {
       default: [
         "{randombuttontest}"
@@ -172,7 +172,7 @@ it('Keyboard custom function buttons will work', () => {
     }
   });
 
-  let output = keyboard.utilities.getUpdatedInput("{randombuttontest}", "test", keyboard.options);
+  const output = keyboard.utilities.getUpdatedInput("{randombuttontest}", "test");
   
   expect(output).toBe("test");
   expect(keyboard.getButtonElement("{randombuttontest}").onclick).toBeTruthy();
@@ -181,9 +181,9 @@ it('Keyboard custom function buttons will work', () => {
 it('Keyboard "{" button will work', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
-  let output = keyboard.utilities.getUpdatedInput("{", "test", keyboard.options);
+  const output = keyboard.utilities.getUpdatedInput("{", "test");
   
   expect(output).toBe("test{");
 });
@@ -191,9 +191,9 @@ it('Keyboard "{" button will work', () => {
 it('Keyboard "}" button will work', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
-  let output = keyboard.utilities.getUpdatedInput("}", "test", keyboard.options);
+  const output = keyboard.utilities.getUpdatedInput("}", "test");
   
   expect(output).toBe("test}");
 });
@@ -201,11 +201,11 @@ it('Keyboard "}" button will work', () => {
 it('Keyboard standard button will affect input', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
   for (let i = 65; i <= 90; i++) {
-    let char = String.fromCharCode(i);
-    let output = keyboard.utilities.getUpdatedInput(char, "test", keyboard.options);
+    const char = String.fromCharCode(i);
+    const output = keyboard.utilities.getUpdatedInput(char, "test");
     expect(output).toBe(`test${char}`);
   }
 });
@@ -213,8 +213,9 @@ it('Keyboard standard button will affect input', () => {
 it('Keyboard updateCaretPos will work with minus', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
-  keyboard.options.syncInstanceInputs = true;
+  const keyboard = new Keyboard({
+    syncInstanceInputs: true
+  });
 
   keyboard.caretPosition = 5;
   keyboard.utilities.updateCaretPos(2, true);
@@ -225,7 +226,7 @@ it('Keyboard updateCaretPos will work with minus', () => {
 it('Keyboard updateCaretPos will work with minus', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
   keyboard.caretPosition = 5;
   keyboard.utilities.updateCaretPos(2, true);
@@ -236,7 +237,7 @@ it('Keyboard updateCaretPos will work with minus', () => {
 it('Keyboard updateCaretPos will work with plus', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
   keyboard.caretPosition = 5;
   keyboard.utilities.updateCaretPos(2);
@@ -247,7 +248,7 @@ it('Keyboard updateCaretPos will work with plus', () => {
 it('Keyboard addStringAt will work with debug', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     debug: true
   });
 
@@ -259,7 +260,7 @@ it('Keyboard addStringAt will work with debug', () => {
 it('Keyboard addStringAt will work with position', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     debug: true
   });
 
@@ -274,7 +275,7 @@ it('Keyboard addStringAt will work with position', () => {
 it('Keyboard addStringAt will respect maxLength', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     debug: true,
     maxLength: 4
   });
@@ -282,7 +283,7 @@ it('Keyboard addStringAt will respect maxLength', () => {
   keyboard.setInput("test");
   keyboard.caretPosition = 4;
 
-  keyboard.utilities.handleMaxLength(keyboard.input, keyboard.options, "testq")
+  keyboard.utilities.handleMaxLength(keyboard.input, "testq")
   keyboard.utilities.addStringAt("test", "q", 4);
 
   expect(keyboard.caretPosition).toBe(4);
@@ -291,13 +292,13 @@ it('Keyboard addStringAt will respect maxLength', () => {
 it('Keyboard handleMaxLength will exit out on same updatedInput', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     debug: true
   });
 
   keyboard.setInput("test");
 
-  let output = keyboard.utilities.handleMaxLength(keyboard.input, keyboard.options, "test")
+  const output = keyboard.utilities.handleMaxLength(keyboard.input, "test")
 
   expect(output).toBeFalsy();
 });
@@ -305,7 +306,7 @@ it('Keyboard handleMaxLength will exit out on same updatedInput', () => {
 it('Keyboard handleMaxLength will work with object maxLength', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     maxLength: {
       default: 4
     }
@@ -313,7 +314,7 @@ it('Keyboard handleMaxLength will work with object maxLength', () => {
 
   keyboard.setInput("test");
   
-  let output = keyboard.utilities.handleMaxLength(keyboard.input, keyboard.options, "testq");
+  const output = keyboard.utilities.handleMaxLength(keyboard.input, "testq");
 
   expect(output).toBeTruthy();
 });
@@ -321,7 +322,7 @@ it('Keyboard handleMaxLength will work with object maxLength', () => {
 it('Keyboard handleMaxLength will work with object maxLength and debug', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     maxLength: {
       default: 4
     },
@@ -330,7 +331,7 @@ it('Keyboard handleMaxLength will work with object maxLength and debug', () => {
 
   keyboard.setInput("test");
   
-  let output = keyboard.utilities.handleMaxLength(keyboard.input, keyboard.options, "testq");
+  const output = keyboard.utilities.handleMaxLength(keyboard.input, "testq");
 
   expect(output).toBeTruthy();
 });
@@ -338,7 +339,7 @@ it('Keyboard handleMaxLength will work with object maxLength and debug', () => {
 it('Keyboard handleMaxLength will return false if obj maxLength not reached', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     maxLength: {
       default: 7
     }
@@ -346,7 +347,7 @@ it('Keyboard handleMaxLength will return false if obj maxLength not reached', ()
 
   keyboard.setInput("test");
   
-  let output = keyboard.utilities.handleMaxLength(keyboard.input, keyboard.options, "testq");
+  const output = keyboard.utilities.handleMaxLength(keyboard.input, "testq");
 
   expect(output).toBeFalsy();
 });
@@ -355,13 +356,13 @@ it('Keyboard handleMaxLength will return false if obj maxLength not reached', ()
 it('Keyboard handleMaxLength will work without debug', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     maxLength: 4
   });
 
   keyboard.setInput("test");
   
-  let output = keyboard.utilities.handleMaxLength(keyboard.input, keyboard.options, "testq");
+  const output = keyboard.utilities.handleMaxLength(keyboard.input, "testq");
 
   expect(output).toBeTruthy();
 });
@@ -370,27 +371,27 @@ it('Keyboard handleMaxLength will work without debug', () => {
 it('Keyboard handleMaxLength will work with numeric maxLength', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     maxLength: 3
   });
 
   keyboard.setInput("test");
   
-  let output = keyboard.utilities.handleMaxLength(keyboard.input, keyboard.options, "testq");
+  const output = keyboard.utilities.handleMaxLength(keyboard.input, "testq");
 
-  expect(output).toBeFalsy();
+  expect(output).toBe(true);
 });
 
 it('Keyboard handleMaxLength wont work with non numeric or object maxLength', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     maxLength: "wrong"
   });
 
   keyboard.setInput("test");
   
-  let output = keyboard.utilities.handleMaxLength(keyboard.input, keyboard.options, "testq");
+  const output = keyboard.utilities.handleMaxLength(keyboard.input, "testq");
 
   expect(output).toBeFalsy();
 });
@@ -398,14 +399,14 @@ it('Keyboard handleMaxLength wont work with non numeric or object maxLength', ()
 it('Keyboard handleMaxLength wont work with non numeric or object maxLength (with debug)', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     maxLength: "wrong",
     debug: true
   });
 
   keyboard.setInput("test");
   
-  let output = keyboard.utilities.handleMaxLength(keyboard.input, keyboard.options, "testq");
+  const output = keyboard.utilities.handleMaxLength(keyboard.input, "testq");
 
   expect(output).toBeFalsy();
 });
@@ -413,11 +414,11 @@ it('Keyboard handleMaxLength wont work with non numeric or object maxLength (wit
 it('Keyboard isMaxLengthReached will work', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     maxLength: 5
   });
 
-  let output = keyboard.utilities.isMaxLengthReached();
+  const output = keyboard.utilities.isMaxLengthReached();
 
   expect(output).toBeFalsy();
 });
@@ -425,7 +426,7 @@ it('Keyboard isMaxLengthReached will work', () => {
 it('Keyboard removeAt will exit out on caretPosition:0', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
   keyboard.setInput("test");
   keyboard.caretPosition = 0;
@@ -441,7 +442,7 @@ it('Keyboard removeAt will exit out on caretPosition:0', () => {
 it('Keyboard removeAt will remove multi-byte unicodes with caretPos>0', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
 
   keyboard.caretPosition = 6;
   let output = keyboard.utilities.removeAt("test\uD83D\uDE00", 6);
@@ -455,7 +456,7 @@ it('Keyboard removeAt will remove multi-byte unicodes with caretPos>0', () => {
 it('Keyboard removeAt will not remove multi-byte unicodes with caretPos:0', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard();
+  const keyboard = new Keyboard();
   let output = keyboard.utilities.removeAt("\uD83D\uDE00");
   expect(output).toBeFalsy();
 
@@ -466,7 +467,7 @@ it('Keyboard removeAt will not remove multi-byte unicodes with caretPos:0', () =
 it('Keyboard removeAt will remove regular strings', () => {
   testUtil.setDOM();
 
-  let keyboard = new Keyboard({
+  const keyboard = new Keyboard({
     debug: true
   });
 
@@ -481,6 +482,12 @@ it('Keyboard removeAt will remove regular strings', () => {
 
 it('Keyboard will work with custom (and weird) class', () => {
   testUtil.setDOM("my--weird--class");
-  let keyboard = new Keyboard(".my--weird--class");
+  const keyboard = new Keyboard(".my--weird--class");
   expect(keyboard.keyboardDOMClass).toBe("my--weird--class");
-});
+});
+
+it('Keyboard camelCase will work with empty strings', () => {
+  testUtil.setDOM();
+  const keyboard = new Keyboard();
+  expect(keyboard.utilities.camelCase()).toBeFalsy();
+});

src/utils/TestUtility.js

@@ -3,13 +3,18 @@
  */
 export default class TestUtility {
   /**
-   * Set's a basic DOM structure to test in
+   * Sets a basic DOM structure to test in
    */
   setDOM = (divClass) => {
     this.clear();
-    const div = document.createElement('div');
-    div.className += divClass || "simple-keyboard";
-    document.body.appendChild(div);
+    const wrapperDOM = document.createElement('div');
+    wrapperDOM.setAttribute("id", "root");
+
+    const keyboardDOM = document.createElement('div');
+    keyboardDOM.className = divClass || "simple-keyboard";
+
+    wrapperDOM.appendChild(keyboardDOM);
+    document.body.appendChild(wrapperDOM);
   }
 
   /**
@@ -104,4 +109,4 @@ export default class TestUtility {
       });
     });
   }
-}
+}