@taufik-nurrohman/text-editor.key 1.0.9 → 1.0.11

package/index.js

@@ -80,19 +80,24 @@
         var command = $.keys[$.toString()];
         return isSet(command) ? command : false;
     };
-    $$.fire = function (command) {
+    $$.fire = function (command, data) {
         var $ = this;
         var self = $.self || $,
             value,
             exist;
+        data = data || [];
         if (isFunction(command)) {
-            value = command.call(self);
+            value = command.apply(self, data);
             exist = true;
         } else if (isString(command) && (command = $.commands[command])) {
-            value = command.call(self);
+            value = command.apply(self, data);
             exist = true;
         } else if (isArray(command)) {
-            var data = command[1] || [];
+            if (isArray(command[1])) {
+                command[1].forEach(function (v, k) {
+                    return isSet(v) && (data[k] = v);
+                });
+            }
             if (command = $.commands[command[0]]) {
                 value = command.apply(self, data);
                 exist = true;
@@ -177,11 +182,12 @@
         return e && e.stopPropagation();
     };
     var bounce = debounce(function (map, e) {
-        // Remove all keys
+        // Remove all key(s)
         map.pull();
-        // Make the `Alt`, `Control`, and `Shift` keys sticky (does not require the user to release all keys first to repeat or change the current key combination).
+        // Make the `Alt`, `Control`, `Meta`, and `Shift` key(s) sticky (does not require the user to release all key(s) first to repeat or change the current key combination).
         e.altKey && map.push('Alt');
         e.ctrlKey && map.push('Control');
+        e.metaKey && map.push('Meta');
         e.shiftKey && map.push('Shift');
     }, 1000);
     var name = 'TextEditor.Key';
@@ -198,33 +204,33 @@
     function onBlur(e) {
         var $ = this,
             map = getReference($);
-        $._event = e;
         map.pull(); // Reset all key(s)
     }
 
-    function onInput(e) {
+    function onFocus(e) {
         onBlur.call(this, e);
     }
 
     function onKeyDown(e) {
-        var $ = this;
-        var command,
-            map = getReference($),
-            v;
-        // Make the `Alt`, `Control`, and `Shift` keys sticky (does not require the user to release all keys first to repeat or change the current key combination).
+        var $ = this,
+            command,
+            v,
+            key = e.key,
+            map = getReference($);
+        // Make the `Alt`, `Control`, `Meta`, and `Shift` key(s) sticky (does not require the user to release all key(s) first to repeat or change the current key combination).
         map[e.altKey ? 'push' : 'pull']('Alt');
         map[e.ctrlKey ? 'push' : 'pull']('Control');
+        map[e.metaKey ? 'push' : 'pull']('Meta');
         map[e.shiftKey ? 'push' : 'pull']('Shift');
         // Add the actual key to the queue. Don’t worry, this will not mistakenly add a key that already exists in the queue.
-        map.push(e.key);
-        $._event = e;
+        key && map.push(key);
         if (command = map.command()) {
             v = map.fire(command);
             if (false === v) {
                 offEventDefault(e);
                 offEventPropagation(e);
             } else if (null === v) {
-                console.warn('Unknown command: `' + command + '`');
+                console.warn('Unknown command:', command);
             }
         }
         bounce(map, e); // Reset all key(s) after 1 second idle.
@@ -232,9 +238,23 @@
 
     function onKeyUp(e) {
         var $ = this,
+            key = e.key,
             map = getReference($);
-        $._event = e;
-        map.pull(e.key); // Reset current key.
+        key && map.pull(key); // Reset current key.
+    }
+    // Partial mobile support
+    function onPutDown(e) {
+        var $ = this,
+            key = e.data,
+            map = getReference($);
+        if (isString(key) && 1 === toCount(key)) {
+            // Having 1 printable character to put will discard the other(s)
+            map.toArray().forEach(function (k) {
+                return isString(k) && 1 === toCount(k) && map.pull(k);
+            });
+            // Put the current printable character to the list
+            map.push(key);
+        }
     }
 
     function setReference(key, value) {
@@ -243,7 +263,7 @@
 
     function attach() {
         var $ = this;
-        var $$ = $.constructor.prototype;
+        var $$ = $.constructor._;
         var map = new Key($);
         $.commands = _fromStates($.commands = map.commands, $.state.commands || {});
         $.keys = _fromStates($.keys = map.keys, $.state.keys || {});
@@ -262,9 +282,10 @@
             return $.keys[key] = of, $;
         });
         $.on('blur', onBlur);
-        $.on('input', onInput);
+        $.on('focus', onFocus);
         $.on('key.down', onKeyDown);
         $.on('key.up', onKeyUp);
+        $.on('put.down', onPutDown);
         return setReference($, map), $;
     }
 
@@ -273,9 +294,10 @@
             map = getReference($);
         map.pull();
         $.off('blur', onBlur);
-        $.off('input', onInput);
+        $.off('focus', onFocus);
         $.off('key.down', onKeyDown);
         $.off('key.up', onKeyUp);
+        $.off('put.down', onPutDown);
         return letReference($), $;
     }
     var index_js = {

package/index.min.js

@@ -23,4 +23,4 @@
  * SOFTWARE.
  *
  */
-!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):((t="undefined"!=typeof globalThis?globalThis:t||self).TextEditor=t.TextEditor||{},t.TextEditor.Key=n())}(this,(function(){"use strict";var t=function(t){return Array.isArray(t)},n=function(t){return"function"==typeof t},e=function(t,n){return void 0===n&&(n=!0),!(!t||"object"!=typeof t)&&(!n||function(t,n){return!(!t||"object"!=typeof t)&&r(n)&&r(t.constructor)&&n===t.constructor}(t,Object))},r=function(t){return function(t){return void 0!==t}(t)&&!function(t){return null===t}(t)},o=function(t){return"string"==typeof t};function u(t){var n=this;return n.commands={},n.key=null,n.keys={},n.self=t||n,n.set=new Set,n}var i=u.prototype;i.command=function(t){var n=this;if(o(t))return t===n.toString();var e=n.keys[n.toString()];return!!r(e)&&e},i.fire=function(e){var u,i,f=this,s=f.self||f;if(n(e))u=e.call(s),i=!0;else if(o(e)&&(e=f.commands[e]))u=e.call(s),i=!0;else if(t(e)){var c=e[1]||[];(e=f.commands[e[0]])&&(u=e.apply(s,c),i=!0)}return i?!r(u)||u:null},i.pull=function(t){var n=this;return n.key=null,r(t)?(n.set.delete(t),n):(n.set=new Set,n)},i.push=function(t){var n=this;return n.set.add(n.key=t,1),n},i.toArray=function(){return Array.from(this.set)},i.toString=function(){return this.toArray().join("-")},Object.defineProperty(u,"name",{value:"Key"});var f,s,c,a=function(t){return t.length},l=function(){for(var n=arguments.length,o=Array(n),u=0;u<n;u++)o[u]=arguments[u];for(var i,f=o.shift(),s=0,c=a(o);s<c;++s)for(var y in o[s])if(r(f[y]))if(t(f[y])&&t(o[s][y])){f[y]=[].concat(f[y]);for(var p=0,h=a(o[s][y]);p<h;++p)i=o[s][y][p],-1===f[y].indexOf(i)&&f[y].push(o[s][y][p])}else e(f[y])&&e(o[s][y])?f[y]=l({},f[y],o[s][y]):f[y]=o[s][y];else f[y]=o[s][y];return f},y=(f=function(t,n){t.pull(),n.altKey&&t.push("Alt"),n.ctrlKey&&t.push("Control"),n.shiftKey&&t.push("Shift")},s=1e3,function(){var t=arguments,n=this;c&&clearTimeout(c),c=setTimeout((function(){return f.apply(n,t)}),s)}),p=new WeakMap;function h(t){return p.get(t)||null}function d(t){var n=h(this);this._event=t,n.pull()}function m(t){d.call(this,t)}function v(t){var n,e,r=h(this);r[t.altKey?"push":"pull"]("Alt"),r[t.ctrlKey?"push":"pull"]("Control"),r[t.shiftKey?"push":"pull"]("Shift"),r.push(t.key),this._event=t,(n=r.command())&&(!1===(e=r.fire(n))?(function(t){t&&t.preventDefault()}(t),function(t){t&&t.stopPropagation()}(t)):null===e&&console.warn("Unknown command: `"+n+"`")),y(r,t)}function k(t){var n=h(this);this._event=t,n.pull(t.key)}var g={attach:function(){var t,e,r=this,o=r.constructor.prototype,i=new u(r);return r.commands=l(r.commands=i.commands,r.state.commands||{}),r.keys=l(r.keys=i.keys,r.state.keys||{}),!n(o.command)&&(o.command=function(t,n){return this.commands[t]=n,this}),!n(o.k)&&(o.k=function(t){var n=h(this).toArray();return!1===t?n:n.join(t||"-")}),!n(o.key)&&(o.key=function(t,n){return this.keys[t]=n,this}),r.on("blur",d),r.on("input",m),r.on("key.down",v),r.on("key.up",k),t=r,e=i,p.set(t,e),r},detach:function(){var t,n=this;return h(n).pull(),n.off("blur",d),n.off("input",m),n.off("key.down",v),n.off("key.up",k),t=n,p.delete(t),n},name:"TextEditor.Key"};return g}));
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):((t="undefined"!=typeof globalThis?globalThis:t||self).TextEditor=t.TextEditor||{},t.TextEditor.Key=n())}(this,(function(){"use strict";var t=function(t){return Array.isArray(t)},n=function(t){return"function"==typeof t},e=function(t,n){return void 0===n&&(n=!0),!(!t||"object"!=typeof t)&&(!n||function(t,n){return!(!t||"object"!=typeof t)&&r(n)&&r(t.constructor)&&n===t.constructor}(t,Object))},r=function(t){return function(t){return void 0!==t}(t)&&!function(t){return null===t}(t)},o=function(t){return"string"==typeof t};function u(t){var n=this;return n.commands={},n.key=null,n.keys={},n.self=t||n,n.set=new Set,n}var i=u.prototype;i.command=function(t){var n=this;if(o(t))return t===n.toString();var e=n.keys[n.toString()];return!!r(e)&&e},i.fire=function(e,u){var i,f,s=this,c=s.self||s;return u=u||[],n(e)||o(e)&&(e=s.commands[e])?(i=e.apply(c,u),f=!0):t(e)&&(t(e[1])&&e[1].forEach((function(t,n){return r(t)&&(u[n]=t)})),(e=s.commands[e[0]])&&(i=e.apply(c,u),f=!0)),f?!r(i)||i:null},i.pull=function(t){var n=this;return n.key=null,r(t)?(n.set.delete(t),n):(n.set=new Set,n)},i.push=function(t){var n=this;return n.set.add(n.key=t,1),n},i.toArray=function(){return Array.from(this.set)},i.toString=function(){return this.toArray().join("-")},Object.defineProperty(u,"name",{value:"Key"});var f,s,c,a=function(t){return t.length},l=function(){for(var n=arguments.length,o=Array(n),u=0;u<n;u++)o[u]=arguments[u];for(var i,f=o.shift(),s=0,c=a(o);s<c;++s)for(var y in o[s])if(r(f[y]))if(t(f[y])&&t(o[s][y])){f[y]=[].concat(f[y]);for(var p=0,h=a(o[s][y]);p<h;++p)i=o[s][y][p],-1===f[y].indexOf(i)&&f[y].push(o[s][y][p])}else e(f[y])&&e(o[s][y])?f[y]=l({},f[y],o[s][y]):f[y]=o[s][y];else f[y]=o[s][y];return f},y=(f=function(t,n){t.pull(),n.altKey&&t.push("Alt"),n.ctrlKey&&t.push("Control"),n.metaKey&&t.push("Meta"),n.shiftKey&&t.push("Shift")},s=1e3,function(){var t=arguments,n=this;c&&clearTimeout(c),c=setTimeout((function(){return f.apply(n,t)}),s)}),p=new WeakMap;function h(t){return p.get(t)||null}function d(t){h(this).pull()}function m(t){d.call(this,t)}function v(t){var n,e,r=t.key,o=h(this);o[t.altKey?"push":"pull"]("Alt"),o[t.ctrlKey?"push":"pull"]("Control"),o[t.metaKey?"push":"pull"]("Meta"),o[t.shiftKey?"push":"pull"]("Shift"),r&&o.push(r),(n=o.command())&&(!1===(e=o.fire(n))?(function(t){t&&t.preventDefault()}(t),function(t){t&&t.stopPropagation()}(t)):null===e&&console.warn("Unknown command:",n)),y(o,t)}function k(t){var n=t.key,e=h(this);n&&e.pull(n)}function K(t){var n=t.data,e=h(this);o(n)&&1===a(n)&&(e.toArray().forEach((function(t){return o(t)&&1===a(t)&&e.pull(t)})),e.push(n))}var g={attach:function(){var t,e,r=this,o=r.constructor._,i=new u(r);return r.commands=l(r.commands=i.commands,r.state.commands||{}),r.keys=l(r.keys=i.keys,r.state.keys||{}),!n(o.command)&&(o.command=function(t,n){return this.commands[t]=n,this}),!n(o.k)&&(o.k=function(t){var n=h(this).toArray();return!1===t?n:n.join(t||"-")}),!n(o.key)&&(o.key=function(t,n){return this.keys[t]=n,this}),r.on("blur",d),r.on("focus",m),r.on("key.down",v),r.on("key.up",k),r.on("put.down",K),t=r,e=i,p.set(t,e),r},detach:function(){var t,n=this;return h(n).pull(),n.off("blur",d),n.off("focus",m),n.off("key.down",v),n.off("key.up",k),n.off("put.down",K),t=n,p.delete(t),n},name:"TextEditor.Key"};return g}));

package/index.mjs

@@ -1,15 +1,18 @@
 import Key from '@taufik-nurrohman/key';
-import {debounce} from '@taufik-nurrohman/tick';
+
+import {debounce, delay} from '@taufik-nurrohman/tick';
 import {fromStates} from '@taufik-nurrohman/from';
-import {isFunction, isSet} from '@taufik-nurrohman/is';
+import {isFunction, isSet, isString} from '@taufik-nurrohman/is';
 import {offEventDefault, offEventPropagation} from '@taufik-nurrohman/event';
+import {toCount} from '@taufik-nurrohman/to';
 
 const bounce = debounce((map, e) => {
-    // Remove all keys
+    // Remove all key(s)
     map.pull();
-    // Make the `Alt`, `Control`, and `Shift` keys sticky (does not require the user to release all keys first to repeat or change the current key combination).
+    // Make the `Alt`, `Control`, `Meta`, and `Shift` key(s) sticky (does not require the user to release all key(s) first to repeat or change the current key combination).
     e.altKey && map.push('Alt');
     e.ctrlKey && map.push('Control');
+    e.metaKey && map.push('Meta');
     e.shiftKey && map.push('Shift');
 }, 1000);
 
@@ -27,31 +30,31 @@ function letReference(key) {
 function onBlur(e) {
     let $ = this,
         map = getReference($);
-    $._event = e;
     map.pull(); // Reset all key(s)
 }
 
-function onInput(e) {
+function onFocus(e) {
     onBlur.call(this, e);
 }
 
 function onKeyDown(e) {
-    let $ = this;
-    let command, map = getReference($), v;
-    // Make the `Alt`, `Control`, and `Shift` keys sticky (does not require the user to release all keys first to repeat or change the current key combination).
+    let $ = this, command, v,
+        key = e.key,
+        map = getReference($);
+    // Make the `Alt`, `Control`, `Meta`, and `Shift` key(s) sticky (does not require the user to release all key(s) first to repeat or change the current key combination).
     map[e.altKey ? 'push' : 'pull']('Alt');
     map[e.ctrlKey ? 'push' : 'pull']('Control');
+    map[e.metaKey ? 'push' : 'pull']('Meta');
     map[e.shiftKey ? 'push' : 'pull']('Shift');
     // Add the actual key to the queue. Don’t worry, this will not mistakenly add a key that already exists in the queue.
-    map.push(e.key);
-    $._event = e;
+    key && map.push(key);
     if (command = map.command()) {
         v = map.fire(command);
         if (false === v) {
             offEventDefault(e);
             offEventPropagation(e);
         } else if (null === v) {
-            console.warn('Unknown command: `' + command + '`');
+            console.warn('Unknown command:', command);
         }
     }
     bounce(map, e); // Reset all key(s) after 1 second idle.
@@ -59,9 +62,22 @@ function onKeyDown(e) {
 
 function onKeyUp(e) {
     let $ = this,
+        key = e.key,
         map = getReference($);
-    $._event = e;
-    map.pull(e.key); // Reset current key.
+    key && map.pull(key); // Reset current key.
+}
+
+// Partial mobile support
+function onPutDown(e) {
+    let $ = this,
+        key = e.data,
+        map = getReference($);
+    if (isString(key) && 1 === toCount(key)) {
+        // Having 1 printable character to put will discard the other(s)
+        map.toArray().forEach(k => isString(k) && 1 === toCount(k) && map.pull(k));
+        // Put the current printable character to the list
+        map.push(key);
+    }
 }
 
 function setReference(key, value) {
@@ -70,7 +86,7 @@ function setReference(key, value) {
 
 function attach() {
     const $ = this;
-    const $$ = $.constructor.prototype;
+    const $$ = $.constructor._;
     const map = new Key($);
     $.commands = fromStates($.commands = map.commands, $.state.commands || {});
     $.keys = fromStates($.keys = map.keys, $.state.keys || {});
@@ -89,9 +105,10 @@ function attach() {
         return ($.keys[key] = of), $;
     });
     $.on('blur', onBlur);
-    $.on('input', onInput);
+    $.on('focus', onFocus);
     $.on('key.down', onKeyDown);
     $.on('key.up', onKeyUp);
+    $.on('put.down', onPutDown);
     return setReference($, map), $;
 }
 
@@ -100,9 +117,10 @@ function detach() {
         map = getReference($);
     map.pull();
     $.off('blur', onBlur);
-    $.off('input', onInput);
+    $.off('focus', onFocus);
     $.off('key.down', onKeyDown);
     $.off('key.up', onKeyUp);
+    $.off('put.down', onPutDown);
     return letReference($), $;
 }
 

package/package.json

@@ -8,7 +8,8 @@
     "@taufik-nurrohman/is": "*",
     "@taufik-nurrohman/key": "*",
     "@taufik-nurrohman/text-editor": "*",
-    "@taufik-nurrohman/tick": "*"
+    "@taufik-nurrohman/tick": "*",
+    "@taufik-nurrohman/to": "*"
   },
   "description": "Provides a feature to easily interact with the keyboard keys.",
   "devDependencies": {
@@ -46,5 +47,5 @@
   "scripts": {
     "pack": "pack --clean=false --from=.factory --js-format=umd --js-name=TextEditor.Key --js-top='%(js.license)' --mjs=true --to=."
   },
-  "version": "1.0.9"
+  "version": "1.0.11"
 }