native-document 1.0.17-1.1 → 1.0.17-1.2

package/package.json

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

package/src/core/wrappers/AttributesWrapper.js

@@ -3,34 +3,6 @@ import NativeDocumentError from '../errors/NativeDocumentError';
 import {BOOL_ATTRIBUTES_NAME, BOOLEAN_ATTRIBUTES} from './constants.js';
 import {Observable} from '../data/Observable';
 
-
-const addNdDestroy = (element, observable, callback) => {
-    if(element.ndDestroy) {
-        element.ndAddDestroy(observable, callback);
-        return;
-    }
-    let destroyCallbacks = [];
-
-    element.ndAddDestroy = (observable, callback) => {
-        destroyCallbacks.push(observable);
-        destroyCallbacks.push(callback);
-    };
-    element.ndDestroy = () => {
-
-        for(let i = 0, len = destroyCallbacks.length; i < len; i+= 2) {
-            destroyCallbacks[i].unsubscribe(destroyCallbacks[i+1]);
-        }
-
-        destroyCallbacks.length = 0;
-        destroyCallbacks = null;
-        element.ndAddDestroy = null;
-        element.ndDestroy = null;
-        element = null;
-    };
-
-    element.ndAddDestroy(observable, callback);
-};
-
 /**
  * Applies a reactive class map to an HTMLElement.
  * Each key is a CSS class name; each value is a boolean or ObservableItem<boolean>.
@@ -47,22 +19,18 @@ export const bindClassAttribute = (element, data) => {
             let lastClass = value.val();
             if (typeof lastClass === 'string') {
                 element.classes.toggle(lastClass, true);
-                const callback = (currentValue) => {
+                value.subscribe((currentValue) => {
                     element.classes.remove(lastClass);
                     element.classes.toggle(currentValue, true);
                     lastClass = currentValue;
-                };
-                value.subscribe(callback);
-                addNdDestroy(element, value, callback);
+                });
                 continue;
             }
         }
 
         if (value.__$Observable) {
             element.classes.toggle(className, value.val());
-            const callback = (shouldAdd) => element.classes.toggle(className, shouldAdd);
-            value.subscribe(callback);
-            addNdDestroy(element, value, callback);
+            value.subscribe((shouldAdd) => element.classes.toggle(className, shouldAdd));
             continue;
         }
 
@@ -92,26 +60,22 @@ export const bindStyleAttribute = (element, data) => {
         if(value.__$Observable) {
             if(isCustomProperty) {
                 element.style.setProperty(styleName, value.val());
-                const callback = (newValue) => {
+                value.subscribe((newValue) => {
                     if(newValue === false) {
                         element.style.removeProperty(styleName);
                         return;
                     }
                     element.style.setProperty(styleName, newValue);
-                };
-                value.subscribe(callback);
-                addNdDestroy(element, value, callback);
+                });
             } else {
                 element.style[styleName] = value.val();
-                const callback = (newValue) => {
+                value.subscribe((newValue) => {
                     if(newValue === false) {
                         element.style.removeProperty(styleName);
                         return;
                     }
                     element.style[styleName] = newValue;
-                };
-                value.subscribe(callback);
-                addNdDestroy(element, value, callback);
+                });
             }
             continue;
         }
@@ -151,14 +115,10 @@ export const bindBooleanAttribute = (element, attributeName, value) => {
             else {
                 element.addEventListener('input', () => value.set(element.value));
             }
-            const callback = (newValue) => element[attributeRealName] = newValue;
-            value.subscribe(callback);
-            addNdDestroy(element, value, callback);
+            value.subscribe((newValue) => element[attributeRealName] = newValue);
             return;
         }
-        const callback = (newValue) => element[attributeRealName] = (newValue === element.value);
-        value.subscribe(callback);
-        addNdDestroy(element, value, callback);
+        value.subscribe((newValue) => element[attributeRealName] = (newValue === element.value));
     }
 };
 
@@ -173,15 +133,11 @@ export const bindAttributeWithObservable = (element, attributeName, value) => {
     if(attributeName === 'value') {
         element.value = value.val();
         element.addEventListener('input', () => value.set(element.value));
-        const callback = (newValue) => element.value = newValue;
-        value.subscribe(callback);
-        addNdDestroy(element, value, callback);
+        value.subscribe((newValue) => element.value = newValue);
         return;
     }
     element.setAttribute(attributeName, value.val());
-    const callback = (newValue) => element.setAttribute(attributeName, newValue);
-    value.subscribe(callback);
-    addNdDestroy(element, value, callback);
+    value.subscribe((newValue) => element.setAttribute(attributeName, newValue));
 };
 
 /**

package/src/core/wrappers/ElementCreator.js

@@ -1,7 +1,6 @@
 import Validator from '../utils/validator';
 import AttributesWrapper, { bindClassAttribute, bindStyleAttribute } from './AttributesWrapper';
 import PluginsManager from '../utils/plugins-manager';
-import {call} from '@babel/traverse/lib/path/context';
 
 let $textNodeCache = null;
 
@@ -20,32 +19,10 @@ export const ElementCreator = {
      * @returns {Text}
      */
     createObservableNode: (parent, observable) => {
-        const text = ElementCreator.createObservableNodeWithoutParent(observable);
-        if(parent) {
-            parent.appendChild(text);
-        }
-        return text;
-    },
-    /**
-     *
-     * @param {ObservableItem} observable
-     * @returns {Text}
-     */
-    createObservableNodeWithoutParent: (observable) => {
         const text = ElementCreator.createTextNode();
-        const callback = value => text.nodeValue = value;
-        observable.subscribe(callback);
+        observable.subscribe(value => text.nodeValue = value);
         text.nodeValue = observable.val();
-        let unsubscribe = () => {
-            observable.unsubscribe(callback);
-            observable = null;
-        };
-        text.ndDestroy = () => {
-            text.nodeValue = null;
-            unsubscribe();
-            unsubscribe = null;
-            text.ndDestroy = null;
-        };
+        parent && parent.appendChild(text);
         return text;
     },
     /**

package/src/core/wrappers/NDElement.js

@@ -195,7 +195,7 @@ NDElement.prototype.destroy = function() {
         observer.disconnect();
     }
 
-    const children = this.$element?.querySelectorAll('[data--nd-before-unmount]') || [];
+    const children = this.$element?.querySelectorAll('[data--nd-before-unmount]');
 
     for(let i = 0, length = children.length; i < length; i++) {
         const child = children[i];
@@ -205,14 +205,6 @@ NDElement.prototype.destroy = function() {
         $lifeCycleObservers.delete(child);
     }
 
-    const treeWalker = document.createTreeWalker(this.$element, NodeFilter.SHOW_ELEMENT | NodeFilter.SHOW_TEXT);
-    console.log(treeWalker);
-    while(treeWalker.nextNode()) {
-        const node = treeWalker.currentNode;
-        node.ndDestroy?.();
-    }
-
-    this.$element.ndDestroy?.();
     this.$element.__$controller?.abort();
     this.$element.__$controller = null;
     $lifeCycleObservers.delete(this.$element);