native-document 1.0.216 → 1.0.218

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "native-document",
-  "version": "1.0.216",
+  "version": "1.0.218",
   "description": "A reactive JavaScript framework that preserves native DOM simplicity without sacrificing modern features",
   "author": "AfroCodeur <https://github.com/afrocodeur>",
   "license": "MIT",

package/src/components/modal/createModal.js

@@ -1,9 +1,10 @@
 import { $ } from '../../core/data/Observable';
 import {createPortal} from '../../core/elements/anchor/anchor';
 import Modal from './Modal';
+import {once} from '../../core/utils/cache';
 
 export function createModal(builder) {
-    return Cache.once(() => {
+    return once(() => {
 
         const $modalRef = $.ref();
         let currentOnSelect = null;
@@ -37,7 +38,9 @@ export function createModal(builder) {
         createPortal(
             modal
                 .onClose(() => {
-                    finish(null);
+                    if(currentOnSelect !== null) {
+                        finish(null);
+                    }
                     events.onClose && events.onClose();
                 })
                 .ref($modalRef),

package/src/core/wrappers/NdPrototype.js

@@ -193,7 +193,7 @@ const _prevent = function(element, eventName, callback, options) {
         callback && callback.call(element, event);
     };
 
-    const inlineHandler = 'on' + eventName;
+    const inlineHandler = 'onPrevent' + eventName;
     if(!element[inlineHandler] && !options) {
         element[inlineHandler] = handler;
         return;
@@ -207,7 +207,7 @@ const _stop = function(element, eventName, callback, options) {
         callback && callback.call(element, event);
     };
 
-    const inlineHandler = 'on' + eventName;
+    const inlineHandler = 'onStop' + eventName;
     if(!element[inlineHandler] && !options) {
         element[inlineHandler] = handler;
         return;
@@ -223,7 +223,7 @@ const _preventStop = function(element, eventName, callback, options) {
         event.preventDefault();
         callback && callback.call(element, event);
     };
-    const inlineHandler = 'on' + eventName;
+    const inlineHandler = 'onPreventStop' + eventName;
     if(!element[inlineHandler] && !options) {
         element[inlineHandler] = handler;
         return;