@taufik-nurrohman/text-editor.key 1.0.2 → 1.0.3

package/index.js

@@ -158,33 +158,25 @@
             }, time);
         };
     };
-    var offEvent = function offEvent(name, node, then) {
-        node.removeEventListener(name, then);
-    };
     var offEventDefault = function offEventDefault(e) {
         return e && e.preventDefault();
     };
-    var onEvent = function onEvent(name, node, then, options) {
-        if (options === void 0) {
-            options = false;
-        }
-        node.addEventListener(name, then, options);
-    };
     var bounce = debounce(function (map) {
         return map.pull();
     }, 1000);
+    var id = 'Key_' + Date.now();
 
     function onBlur(e) {
-        this.Key.pull(); // Reset all key(s)
+        this[id].pull(); // Reset all key(s)
     }
 
     function onInput(e) {
-        this.Key.pull(); // Reset all key(s)
+        onBlur.call(this);
     }
 
     function onKeyDown(e) {
         var command,
-            map = this.Key,
+            map = this[id],
             v;
         map.push(e.key); // Add current key to the queue
         if (command = map.command()) {
@@ -199,43 +191,54 @@
     }
 
     function onKeyUp(e) {
-        this.Key.pull(e.key); // Reset current key
+        this[id].pull(e.key); // Reset current key
     }
 
-    function attach(self) {
+    function attach() {
         var $ = this;
         var map = new Key($);
         $.command = function (command, of) {
             return $.commands[command] = of, $;
         };
-        $.commands = fromStates(map.commands, $.state.commands || {});
+        $.commands = fromStates($.commands = map.commands, $.state.commands || {});
         $.k = function (join) {
-            var key = map + "";
-            if (!join || '-' === join) {
-                return key;
+            var key = map + "",
+                keys;
+            if (isSet(join) && '-' !== join) {
+                keys = "" !== key ? key.split(/(?<!-)-/) : [];
+                if (false !== join) {
+                    return keys.join(join);
+                }
             }
-            return key.split(/(?<!-)-/).join(join);
+            if (false === join) {
+                if ('-' === key) {
+                    return [key];
+                }
+                return keys;
+            }
+            return key;
         };
         $.key = function (key, of) {
             return $.keys[key] = of, $;
         };
-        $.keys = fromStates(map.keys, $.state.keys || {});
-        onEvent('blur', self, onBlur);
-        onEvent('input', self, onInput);
-        onEvent('keydown', self, onKeyDown);
-        onEvent('keyup', self, onKeyUp);
-        self.Key = map;
+        $.keys = fromStates($.keys = map.keys, $.state.keys || {});
+        $.on('blur', onBlur);
+        $.on('input', onInput);
+        $.on('key.down', onKeyDown);
+        $.on('key.up', onKeyUp);
+        $[id] = map;
+        return $;
     }
 
-    function detach(self) {
+    function detach() {
         var $ = this;
-        delete $.commands;
-        delete $.keys;
-        delete self.Key;
-        offEvent('blur', self, onBlur);
-        offEvent('input', self, onInput);
-        offEvent('keydown', self, onKeyDown);
-        offEvent('keyup', self, onKeyUp);
+        $[id].pull();
+        $.off('blur', onBlur);
+        $.off('input', onInput);
+        $.off('key.down', onKeyDown);
+        $.off('key.up', onKeyUp);
+        delete $[id];
+        return $;
     }
     var index_js = {
         attach: attach,

package/index.min.js

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

package/index.mjs

@@ -1,20 +1,22 @@
 import Key from '@taufik-nurrohman/key';
 import {debounce} from '@taufik-nurrohman/tick';
 import {fromStates} from '@taufik-nurrohman/from';
-import {onEvent, offEvent, offEventDefault} from '@taufik-nurrohman/event';
+import {isSet} from '@taufik-nurrohman/is';
+import {offEventDefault} from '@taufik-nurrohman/event';
 
 const bounce = debounce(map => map.pull(), 1000);
+const id = 'Key_' + Date.now();
 
 function onBlur(e) {
-    this.Key.pull(); // Reset all key(s)
+    this[id].pull(); // Reset all key(s)
 }
 
 function onInput(e) {
-    this.Key.pull(); // Reset all key(s)
+    onBlur.call(this);
 }
 
 function onKeyDown(e) {
-    let command, map = this.Key, v;
+    let command, map = this[id], v;
     map.push(e.key); // Add current key to the queue
     if (command = map.command()) {
         v = map.fire(command);
@@ -28,39 +30,50 @@ function onKeyDown(e) {
 }
 
 function onKeyUp(e) {
-    this.Key.pull(e.key); // Reset current key
+    this[id].pull(e.key); // Reset current key
 }
 
-function attach(self) {
+function attach() {
     let $ = this;
     let map = new Key($);
     $.command = (command, of) => (($.commands[command] = of), $);
-    $.commands = fromStates(map.commands, $.state.commands || {});
+    $.commands = fromStates($.commands = map.commands, $.state.commands || {});
     $.k = join => {
-        let key = map + "";
-        if (!join || '-' === join) {
-            return key;
+        let key = map + "",
+            keys;
+        if (isSet(join) && '-' !== join) {
+            keys = "" !== key ? key.split(/(?<!-)-/) : [];
+            if (false !== join) {
+                return keys.join(join);
+            }
         }
-        return key.split(/(?<!-)-/).join(join);
+        if (false === join) {
+            if ('-' === key) {
+                return [key];
+            }
+            return keys;
+        }
+        return key;
     };
     $.key = (key, of) => (($.keys[key] = of), $);
-    $.keys = fromStates(map.keys, $.state.keys || {});
-    onEvent('blur', self, onBlur);
-    onEvent('input', self, onInput);
-    onEvent('keydown', self, onKeyDown);
-    onEvent('keyup', self, onKeyUp);
-    self.Key = map;
+    $.keys = fromStates($.keys = map.keys, $.state.keys || {});
+    $.on('blur', onBlur);
+    $.on('input', onInput);
+    $.on('key.down', onKeyDown);
+    $.on('key.up', onKeyUp);
+    $[id] = map;
+    return $;
 }
 
-function detach(self) {
+function detach() {
     let $ = this;
-    delete $.commands;
-    delete $.keys;
-    delete self.Key;
-    offEvent('blur', self, onBlur);
-    offEvent('input', self, onInput);
-    offEvent('keydown', self, onKeyDown);
-    offEvent('keyup', self, onKeyUp);
+    $[id].pull();
+    $.off('blur', onBlur);
+    $.off('input', onInput);
+    $.off('key.down', onKeyDown);
+    $.off('key.up', onKeyUp);
+    delete $[id];
+    return $;
 }
 
 export default {attach, detach};

package/package.json

@@ -5,6 +5,7 @@
   "dependencies": {
     "@taufik-nurrohman/event": "*",
     "@taufik-nurrohman/from": "*",
+    "@taufik-nurrohman/is": "*",
     "@taufik-nurrohman/key": "*",
     "@taufik-nurrohman/text-editor": "*",
     "@taufik-nurrohman/tick": "*"
@@ -45,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.2"
+  "version": "1.0.3"
 }