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

package/index.js

@@ -36,8 +36,12 @@
     var isFunction = function isFunction(x) {
         return 'function' === typeof x;
     };
-    var isInstance = function isInstance(x, of) {
-        return x && isSet(of) && x instanceof of ;
+    var isInstance = function isInstance(x, of, exact) {
+        if (!x || 'object' !== typeof x) {
+            return false;
+        } {
+            return isSet(of) && isSet(x.constructor) && of === x.constructor;
+        }
     };
     var isNull = function isNull(x) {
         return null === x;
@@ -46,7 +50,7 @@
         if (isPlain === void 0) {
             isPlain = true;
         }
-        if ('object' !== typeof x) {
+        if (!x || 'object' !== typeof x) {
             return false;
         }
         return isPlain ? isInstance(x, Object) : true;
@@ -57,55 +61,14 @@
     var isString = function isString(x) {
         return 'string' === typeof x;
     };
-    var hasValue = function hasValue(x, data) {
-        return -1 !== data.indexOf(x);
-    };
-    var _fromStates = function fromStates() {
-        for (var _len = arguments.length, lot = new Array(_len), _key = 0; _key < _len; _key++) {
-            lot[_key] = arguments[_key];
-        }
-        var out = lot.shift();
-        for (var i = 0, j = toCount(lot); i < j; ++i) {
-            for (var k in lot[i]) {
-                // Assign value
-                if (!isSet(out[k])) {
-                    out[k] = lot[i][k];
-                    continue;
-                }
-                // Merge array
-                if (isArray(out[k]) && isArray(lot[i][k])) {
-                    out[k] = [ /* Clone! */ ].concat(out[k]);
-                    for (var ii = 0, jj = toCount(lot[i][k]); ii < jj; ++ii) {
-                        if (!hasValue(lot[i][k][ii], out[k])) {
-                            out[k].push(lot[i][k][ii]);
-                        }
-                    }
-                    // Merge object recursive
-                } else if (isObject(out[k]) && isObject(lot[i][k])) {
-                    out[k] = _fromStates({
-                        /* Clone! */ }, out[k], lot[i][k]);
-                    // Replace value
-                } else {
-                    out[k] = lot[i][k];
-                }
-            }
-        }
-        return out;
-    };
-    var toCount = function toCount(x) {
-        return x.length;
-    };
-    var toObjectKeys = function toObjectKeys(x) {
-        return Object.keys(x);
-    };
 
     function Key(self) {
         var $ = this;
         $.commands = {};
         $.key = null;
         $.keys = {};
-        $.queue = {};
         $.self = self || $;
+        $.set = new Set();
         return $;
     }
     var $$ = Key.prototype;
@@ -141,16 +104,19 @@
         var $ = this;
         $.key = null;
         if (!isSet(key)) {
-            return $.queue = {}, $;
+            return $.set = new Set(), $;
         }
-        return delete $.queue[key], $;
+        return $.set.delete(key), $;
     };
     $$.push = function (key) {
         var $ = this;
-        return $.queue[$.key = key] = 1, $;
+        return $.set.add($.key = key, 1), $;
+    };
+    $$.toArray = function () {
+        return Array.from(this.set);
     };
     $$.toString = function () {
-        return toObjectKeys(this.queue).join('-');
+        return this.toArray().join('-');
     };
     Object.defineProperty(Key, 'name', {
         value: 'Key'
@@ -166,14 +132,57 @@
             }, time);
         };
     };
+    var hasValue = function hasValue(x, data) {
+        return -1 !== data.indexOf(x);
+    };
+    var toCount = function toCount(x) {
+        return x.length;
+    };
+    var _fromStates = function fromStates() {
+        for (var _len = arguments.length, lot = new Array(_len), _key = 0; _key < _len; _key++) {
+            lot[_key] = arguments[_key];
+        }
+        var out = lot.shift();
+        for (var i = 0, j = toCount(lot); i < j; ++i) {
+            for (var k in lot[i]) {
+                // Assign value
+                if (!isSet(out[k])) {
+                    out[k] = lot[i][k];
+                    continue;
+                }
+                // Merge array
+                if (isArray(out[k]) && isArray(lot[i][k])) {
+                    out[k] = [ /* Clone! */ ].concat(out[k]);
+                    for (var ii = 0, jj = toCount(lot[i][k]); ii < jj; ++ii) {
+                        if (!hasValue(lot[i][k][ii], out[k])) {
+                            out[k].push(lot[i][k][ii]);
+                        }
+                    }
+                    // Merge object recursive
+                } else if (isObject(out[k]) && isObject(lot[i][k])) {
+                    out[k] = _fromStates({
+                        /* Clone! */ }, out[k], lot[i][k]);
+                    // Replace value
+                } else {
+                    out[k] = lot[i][k];
+                }
+            }
+        }
+        return out;
+    };
     var offEventDefault = function offEventDefault(e) {
         return e && e.preventDefault();
     };
     var offEventPropagation = function offEventPropagation(e) {
         return e && e.stopPropagation();
     };
-    var bounce = debounce(function (map) {
-        return map.pull();
+    var bounce = debounce(function (map, e) {
+        // Remove all keys
+        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).
+        e.altKey && map.push('Alt');
+        e.ctrlKey && map.push('Control');
+        e.shiftKey && map.push('Shift');
     }, 1000);
     var name = 'TextEditor.Key';
     var references = new WeakMap();
@@ -202,7 +211,12 @@
         var command,
             map = getReference($),
             v;
-        map.push(e.key); // Add current key to the queue
+        // 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).
+        map[e.altKey ? 'push' : 'pull']('Alt');
+        map[e.ctrlKey ? 'push' : 'pull']('Control');
+        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;
         if (command = map.command()) {
             v = map.fire(command);
@@ -213,14 +227,14 @@
                 console.warn('Unknown command: `' + command + '`');
             }
         }
-        bounce(map); // Reset all key(s) after 1 second idle
+        bounce(map, e); // Reset all key(s) after 1 second idle.
     }
 
     function onKeyUp(e) {
         var $ = this,
             map = getReference($);
         $._event = e;
-        map.pull(e.key); // Reset current key
+        map.pull(e.key); // Reset current key.
     }
 
     function setReference(key, value) {
@@ -240,21 +254,8 @@
         !isFunction($$.k) && ($$.k = function (join) {
             var $ = this,
                 map = getReference($),
-                key = map + "",
-                keys;
-            if (isSet(join) && '-' !== join) {
-                keys = "" !== key ? key.split(/-(?!$)/) : [];
-                if (false !== join) {
-                    return keys.join(join);
-                }
-            }
-            if (false === join) {
-                if ('-' === key) {
-                    return [key];
-                }
-                return keys;
-            }
-            return key;
+                keys = map.toArray();
+            return false === join ? keys : keys.join(join || '-');
         });
         !isFunction($$.key) && ($$.key = function (key, of) {
             var $ = this;

package/index.min.js

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

package/index.mjs

@@ -4,7 +4,15 @@ import {fromStates} from '@taufik-nurrohman/from';
 import {isFunction, isSet} from '@taufik-nurrohman/is';
 import {offEventDefault, offEventPropagation} from '@taufik-nurrohman/event';
 
-const bounce = debounce(map => map.pull(), 1000);
+const bounce = debounce((map, e) => {
+    // Remove all keys
+    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).
+    e.altKey && map.push('Alt');
+    e.ctrlKey && map.push('Control');
+    e.shiftKey && map.push('Shift');
+}, 1000);
+
 const name = 'TextEditor.Key';
 const references = new WeakMap;
 
@@ -30,7 +38,12 @@ function onInput(e) {
 function onKeyDown(e) {
     let $ = this;
     let command, map = getReference($), v;
-    map.push(e.key); // Add current key to the queue
+    // 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).
+    map[e.altKey ? 'push' : 'pull']('Alt');
+    map[e.ctrlKey ? 'push' : 'pull']('Control');
+    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;
     if (command = map.command()) {
         v = map.fire(command);
@@ -41,14 +54,14 @@ function onKeyDown(e) {
             console.warn('Unknown command: `' + command + '`');
         }
     }
-    bounce(map); // Reset all key(s) after 1 second idle
+    bounce(map, e); // Reset all key(s) after 1 second idle.
 }
 
 function onKeyUp(e) {
     let $ = this,
         map = getReference($);
     $._event = e;
-    map.pull(e.key); // Reset current key
+    map.pull(e.key); // Reset current key.
 }
 
 function setReference(key, value) {
@@ -68,20 +81,8 @@ function attach() {
     !isFunction($$.k) && ($$.k = function (join) {
         let $ = this,
             map = getReference($),
-            key = map + "", keys;
-        if (isSet(join) && '-' !== join) {
-            keys = "" !== key ? key.split(/-(?!$)/) : [];
-            if (false !== join) {
-                return keys.join(join);
-            }
-        }
-        if (false === join) {
-            if ('-' === key) {
-                return [key];
-            }
-            return keys;
-        }
-        return key;
+            keys = map.toArray();
+        return false === join ? keys : keys.join(join || '-');
     });
     !isFunction($$.key) && ($$.key = function (key, of) {
         let $ = this;

package/package.json

@@ -46,5 +46,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.8"
+  "version": "1.0.9"
 }