native-document 1.0.88 → 1.0.89

package/dist/native-document.components.min.js

@@ -334,10 +334,10 @@ var NativeComponents = (function (exports) {
 
     ObservableChecker.prototype.__$isObservableChecker = true;
 
-    ObservableChecker.prototype.subscribe = function(callback) {
-        const unSubscribe = this.observable.subscribe((value) => {
-            callback && callback(this.checker(value));
-        });
+    ObservableChecker.prototype.subscribe = function(callback, context = null) {
+        const unSubscribe = this.observable.subscribe((value, _, __) => {
+            callback && callback(this.checker(value), _, __, context);
+        }, context);
         this.unSubscriptions.push(unSubscribe);
         return unSubscribe;
     };
@@ -369,8 +369,8 @@ var NativeComponents = (function (exports) {
 
     ObservableWhen.prototype.__$isObservableWhen = true;
 
-    ObservableWhen.prototype.subscribe = function(callback) {
-        return this.$observer.on(this.$target, callback);
+    ObservableWhen.prototype.subscribe = function(callback, context = null) {
+        return this.$observer.on(this.$target, callback, context);
     };
 
     ObservableWhen.prototype.val = function() {
@@ -508,7 +508,7 @@ var NativeComponents = (function (exports) {
     };
 
     ObservableItem.prototype.triggerFirstListener = function(operations) {
-        this.$firstListener(this.$currentValue, this.$previousValue, operations || {});
+        this.$firstListener.callback(this.$currentValue, this.$previousValue, operations || {}, this.$firstListener.context);
     };
 
     ObservableItem.prototype.triggerListeners = function(operations) {
@@ -518,14 +518,14 @@ var NativeComponents = (function (exports) {
 
         operations = operations || DEFAULT_OPERATIONS;
         for(let i = 0, length = $listeners.length; i < length; i++) {
-            $listeners[i];
-            $listeners[i]($currentValue, $previousValue, operations);
+            const listener = $listeners[i];
+            listener.callback($currentValue, $previousValue, operations, listener.context);
         }
     };
 
     const handleWatcherCallback = function(callbacks, value) {
-        if(typeof callbacks === "function") {
-            callbacks(value);
+        if(callbacks.callback) {
+            callbacks.callback(value, null, null, callbacks.context);
             return;
         }
         if (callbacks.set) {
@@ -533,7 +533,9 @@ var NativeComponents = (function (exports) {
             return;
         }
         callbacks.forEach(callback => {
-            callback.set ? callback.set(value) : callback(value);
+            callback.callback
+                ? callback.callback(value, null, null, callback.context)
+                : callback.set(value);
         });
     };
 
@@ -656,10 +658,11 @@ var NativeComponents = (function (exports) {
     /**
      *
      * @param {Function} callback
+     * @param {?Object} context
      * @param {any} target
      * @returns {(function(): void)}
      */
-    ObservableItem.prototype.subscribe = function(callback, target = null) {
+    ObservableItem.prototype.subscribe = function(callback, context = null, target = null) {
         this.$listeners = this.$listeners ?? [];
         if (this.$isCleanedUp) {
             DebugManager.warn('Observable subscription', '⚠️ Attempted to subscribe to a cleaned up observable.');
@@ -669,32 +672,34 @@ var NativeComponents = (function (exports) {
             throw new NativeDocumentError('Callback must be a function');
         }
 
-        this.$listeners.push(callback);
+
+        const finalCallback = { callback, context };
+        this.$listeners.push(finalCallback);
         this.assocTrigger();
         return () => {
-            this.unsubscribe(callback);
+            this.unsubscribe(finalCallback);
             this.assocTrigger();
         };
     };
 
-    ObservableItem.prototype.on = function(value, callback) {
+    ObservableItem.prototype.on = function(value, callback, context = null) {
         this.$watchers = this.$watchers ?? new Map();
 
         let watchValueList = this.$watchers.get(value);
+        const finalCallback = { callback, context };
 
         if(!watchValueList) {
-            this.$watchers.set(value, callback);
+            this.$watchers.set(value, finalCallback);
         } else if(!Validator.isArray(watchValueList)) {
-            watchValueList = [watchValueList];
+            watchValueList = [watchValueList, finalCallback];
             this.$watchers.set(value, watchValueList);
-            return;
         } else {
-            watchValueList.push(callback);
+            watchValueList.push(finalCallback);
         }
 
         this.assocTrigger();
         return () => {
-            const index = watchValueList.indexOf(callback);
+            const index = watchValueList.indexOf(finalCallback);
             watchValueList?.splice(index, 1);
             if(watchValueList.size === 1) {
                 this.$watchers.set(value, watchValueList[0]);
@@ -1426,36 +1431,29 @@ var NativeComponents = (function (exports) {
         setInterval(() => MemoryManager.cleanObservables(threshold), interval);
     };
 
-    ObservableItem.prototype.bindNdClass = function(element, className) {
-        element.classes.toggle(className, this.val());
-        this.subscribe(toggleElementClass.bind(null, element, className));
-    };
-
-    ObservableWhen.prototype.bindNdClass = function(element, className) {
-        element.classes.toggle(className, this.isMath());
-        this.subscribe(toggleElementClass.bind(null, element, className));
+    const handleElementAttributeClass = function(shouldAdd, _, __, context) {
+        context.element.classes.toggle(context.className, shouldAdd);
     };
-
-    function toggleElementClass(element, className, shouldAdd) {
-        element.classes.toggle(className, shouldAdd);
-    }
-
     /**
      *
      * @param {HTMLElement} element
      * @param {Object} data
      */
     function bindClassAttribute(element, data) {
-        for(let className in data) {
+        const classNames = Object.keys(data);
+
+        for(let i = 0, length = classNames.length; i < length; i++) {
+            const className = classNames[i];
             const value = data[className];
             if(value.__$isObservable) {
                 element.classes.toggle(className, value.val());
-                value.subscribe(toggleElementClass.bind(null, element, className));
+                value.subscribe(handleElementAttributeClass, { element, className });
+                // value.subscribe((shouldAdd) => element.classes.toggle(className, shouldAdd));
                 continue;
             }
             if(value.__$isObservableWhen) {
                 element.classes.toggle(className, value.isMath());
-                value.subscribe(toggleElementClass.bind(null, element, className));
+                value.subscribe(handleElementAttributeClass, { element, className });
                 continue;
             }
             if(value.$hydrate) {
@@ -1464,7 +1462,6 @@ var NativeComponents = (function (exports) {
             }
             element.classes.toggle(className, value);
         }
-        data = null;
     }
 
     /**
@@ -1473,7 +1470,9 @@ var NativeComponents = (function (exports) {
      * @param {Object} data
      */
     function bindStyleAttribute(element, data) {
-        for(let styleName in data) {
+        const keys = Object.keys(data);
+        for(let i = 0, length = keys.length; i < length; i++) {
+            const styleName = keys[i];
             const value = data[styleName];
             if(value.__$isObservable) {
                 element.style[styleName] = value.val();
@@ -1493,7 +1492,8 @@ var NativeComponents = (function (exports) {
     function bindBooleanAttribute(element, attributeName, value) {
         const isObservable = value.__$isObservable;
         const defaultValue = isObservable? value.val() : value;
-        if(Validator.isBoolean(defaultValue)) {
+        const isBoolValue = typeof defaultValue === "boolean";
+        if(isBoolValue) {
             element[attributeName] = defaultValue;
         }
         else {
@@ -1501,13 +1501,13 @@ var NativeComponents = (function (exports) {
         }
         if(isObservable) {
             if(attributeName === 'checked') {
-                if(typeof defaultValue === 'boolean') {
+                if(isBoolValue) {
                     element.addEventListener('input', () => value.set(element[attributeName]));
+                    value.subscribe((newValue) => element[attributeName] = newValue);
+                    return;
                 }
-                else {
-                    element.addEventListener('input', () => value.set(element.value));
-                }
-                value.subscribe((newValue) => element[attributeName] = newValue);
+                element.addEventListener('input', () => value.set(element.value));
+                value.subscribe((newValue) => element[attributeName] = (newValue === element.value));
                 return;
             }
             value.subscribe((newValue) => element[attributeName] = (newValue === element.value));
@@ -1522,14 +1522,14 @@ var NativeComponents = (function (exports) {
      * @param {Observable} value
      */
     function bindAttributeWithObservable(element, attributeName, value) {
-        const applyValue = attributeName === 'value' ? (newValue) => element.value = newValue : (newValue) => element.setAttribute(attributeName, newValue);
-        value.subscribe(applyValue);
-
         if(attributeName === 'value') {
+            value.subscribe((newValue) => element.value = newValue);
             element.value = value.val();
             element.addEventListener('input', () => value.set(element.value));
             return;
         }
+
+        value.subscribe((newValue) => element.setAttribute(attributeName, newValue));
         element.setAttribute(attributeName, value.val());
     }
 
@@ -1539,10 +1539,12 @@ var NativeComponents = (function (exports) {
      * @param {Object} attributes
      */
     function AttributesWrapper(element, attributes) {
+        const attributeNames = Object.keys(attributes);
 
-        for(let key in attributes) {
-            const attributeName = key.toLowerCase();
-            let value = attributes[attributeName];
+        for(let i = 0, length = attributeNames.length; i < length; i++) {
+            const originalAttributeName = attributeNames[i];
+            const attributeName = originalAttributeName.toLowerCase();
+            let value = attributes[originalAttributeName];
             if(value == null) {
                 continue;
             }
@@ -1565,6 +1567,10 @@ var NativeComponents = (function (exports) {
                 continue;
             }
 
+            if(attributeName === 'value') {
+                element.value = value;
+                continue;
+            }
             element.setAttribute(attributeName, value);
         }
         return element;

package/dist/native-document.dev.js

@@ -113,10 +113,10 @@ var NativeDocument = (function (exports) {
 
     ObservableChecker.prototype.__$isObservableChecker = true;
 
-    ObservableChecker.prototype.subscribe = function(callback) {
-        const unSubscribe = this.observable.subscribe((value) => {
-            callback && callback(this.checker(value));
-        });
+    ObservableChecker.prototype.subscribe = function(callback, context = null) {
+        const unSubscribe = this.observable.subscribe((value, _, __) => {
+            callback && callback(this.checker(value), _, __, context);
+        }, context);
         this.unSubscriptions.push(unSubscribe);
         return unSubscribe;
     };
@@ -228,8 +228,8 @@ var NativeDocument = (function (exports) {
 
     ObservableWhen.prototype.__$isObservableWhen = true;
 
-    ObservableWhen.prototype.subscribe = function(callback) {
-        return this.$observer.on(this.$target, callback);
+    ObservableWhen.prototype.subscribe = function(callback, context = null) {
+        return this.$observer.on(this.$target, callback, context);
     };
 
     ObservableWhen.prototype.val = function() {
@@ -365,7 +365,7 @@ var NativeDocument = (function (exports) {
     };
 
     ObservableItem.prototype.triggerFirstListener = function(operations) {
-        this.$firstListener(this.$currentValue, this.$previousValue, operations || {});
+        this.$firstListener.callback(this.$currentValue, this.$previousValue, operations || {}, this.$firstListener.context);
     };
 
     ObservableItem.prototype.triggerListeners = function(operations) {
@@ -375,14 +375,14 @@ var NativeDocument = (function (exports) {
 
         operations = operations || DEFAULT_OPERATIONS;
         for(let i = 0, length = $listeners.length; i < length; i++) {
-            $listeners[i];
-            $listeners[i]($currentValue, $previousValue, operations);
+            const listener = $listeners[i];
+            listener.callback($currentValue, $previousValue, operations, listener.context);
         }
     };
 
     const handleWatcherCallback = function(callbacks, value) {
-        if(typeof callbacks === "function") {
-            callbacks(value);
+        if(callbacks.callback) {
+            callbacks.callback(value, null, null, callbacks.context);
             return;
         }
         if (callbacks.set) {
@@ -390,7 +390,9 @@ var NativeDocument = (function (exports) {
             return;
         }
         callbacks.forEach(callback => {
-            callback.set ? callback.set(value) : callback(value);
+            callback.callback
+                ? callback.callback(value, null, null, callback.context)
+                : callback.set(value);
         });
     };
 
@@ -519,10 +521,11 @@ var NativeDocument = (function (exports) {
     /**
      *
      * @param {Function} callback
+     * @param {?Object} context
      * @param {any} target
      * @returns {(function(): void)}
      */
-    ObservableItem.prototype.subscribe = function(callback, target = null) {
+    ObservableItem.prototype.subscribe = function(callback, context = null, target = null) {
         this.$listeners = this.$listeners ?? [];
         if (this.$isCleanedUp) {
             DebugManager.warn('Observable subscription', '⚠️ Attempted to subscribe to a cleaned up observable.');
@@ -532,13 +535,15 @@ var NativeDocument = (function (exports) {
             throw new NativeDocumentError('Callback must be a function');
         }
 
-        this.$listeners.push(callback);
+
+        const finalCallback = { callback, context };
+        this.$listeners.push(finalCallback);
         this.assocTrigger();
         {
             PluginsManager.emit('ObservableSubscribe', this, target);
         }
         return () => {
-            this.unsubscribe(callback);
+            this.unsubscribe(finalCallback);
             this.assocTrigger();
             {
                 PluginsManager.emit('ObservableUnsubscribe', this);
@@ -546,24 +551,24 @@ var NativeDocument = (function (exports) {
         };
     };
 
-    ObservableItem.prototype.on = function(value, callback) {
+    ObservableItem.prototype.on = function(value, callback, context = null) {
         this.$watchers = this.$watchers ?? new Map();
 
         let watchValueList = this.$watchers.get(value);
+        const finalCallback = { callback, context };
 
         if(!watchValueList) {
-            this.$watchers.set(value, callback);
+            this.$watchers.set(value, finalCallback);
         } else if(!Validator.isArray(watchValueList)) {
-            watchValueList = [watchValueList];
+            watchValueList = [watchValueList, finalCallback];
             this.$watchers.set(value, watchValueList);
-            return;
         } else {
-            watchValueList.push(callback);
+            watchValueList.push(finalCallback);
         }
 
         this.assocTrigger();
         return () => {
-            const index = watchValueList.indexOf(callback);
+            const index = watchValueList.indexOf(finalCallback);
             watchValueList?.splice(index, 1);
             if(watchValueList.size === 1) {
                 this.$watchers.set(value, watchValueList[0]);
@@ -1349,40 +1354,29 @@ var NativeDocument = (function (exports) {
         setInterval(() => MemoryManager.cleanObservables(threshold), interval);
     };
 
-    ObservableItem.prototype.bindNdClass = function(element, className) {
-        element.classes.toggle(className, this.val());
-        this.subscribe(toggleElementClass.bind(null, element, className));
-    };
-
-    ObservableWhen.prototype.bindNdClass = function(element, className) {
-        element.classes.toggle(className, this.isMath());
-        this.subscribe(toggleElementClass.bind(null, element, className));
+    const handleElementAttributeClass = function(shouldAdd, _, __, context) {
+        context.element.classes.toggle(context.className, shouldAdd);
     };
-
-    TemplateBinding.prototype.bindNdClass = function(element, className) {
-        this.$hydrate(element, className);
-    };
-
-    function toggleElementClass(element, className, shouldAdd) {
-        element.classes.toggle(className, shouldAdd);
-    }
-
     /**
      *
      * @param {HTMLElement} element
      * @param {Object} data
      */
     function bindClassAttribute(element, data) {
-        for(let className in data) {
+        const classNames = Object.keys(data);
+
+        for(let i = 0, length = classNames.length; i < length; i++) {
+            const className = classNames[i];
             const value = data[className];
             if(value.__$isObservable) {
                 element.classes.toggle(className, value.val());
-                value.subscribe(toggleElementClass.bind(null, element, className));
+                value.subscribe(handleElementAttributeClass, { element, className });
+                // value.subscribe((shouldAdd) => element.classes.toggle(className, shouldAdd));
                 continue;
             }
             if(value.__$isObservableWhen) {
                 element.classes.toggle(className, value.isMath());
-                value.subscribe(toggleElementClass.bind(null, element, className));
+                value.subscribe(handleElementAttributeClass, { element, className });
                 continue;
             }
             if(value.$hydrate) {
@@ -1391,7 +1385,6 @@ var NativeDocument = (function (exports) {
             }
             element.classes.toggle(className, value);
         }
-        data = null;
     }
 
     /**
@@ -1400,7 +1393,9 @@ var NativeDocument = (function (exports) {
      * @param {Object} data
      */
     function bindStyleAttribute(element, data) {
-        for(let styleName in data) {
+        const keys = Object.keys(data);
+        for(let i = 0, length = keys.length; i < length; i++) {
+            const styleName = keys[i];
             const value = data[styleName];
             if(value.__$isObservable) {
                 element.style[styleName] = value.val();
@@ -1420,7 +1415,8 @@ var NativeDocument = (function (exports) {
     function bindBooleanAttribute(element, attributeName, value) {
         const isObservable = value.__$isObservable;
         const defaultValue = isObservable? value.val() : value;
-        if(Validator.isBoolean(defaultValue)) {
+        const isBoolValue = typeof defaultValue === "boolean";
+        if(isBoolValue) {
             element[attributeName] = defaultValue;
         }
         else {
@@ -1428,13 +1424,13 @@ var NativeDocument = (function (exports) {
         }
         if(isObservable) {
             if(attributeName === 'checked') {
-                if(typeof defaultValue === 'boolean') {
+                if(isBoolValue) {
                     element.addEventListener('input', () => value.set(element[attributeName]));
+                    value.subscribe((newValue) => element[attributeName] = newValue);
+                    return;
                 }
-                else {
-                    element.addEventListener('input', () => value.set(element.value));
-                }
-                value.subscribe((newValue) => element[attributeName] = newValue);
+                element.addEventListener('input', () => value.set(element.value));
+                value.subscribe((newValue) => element[attributeName] = (newValue === element.value));
                 return;
             }
             value.subscribe((newValue) => element[attributeName] = (newValue === element.value));
@@ -1449,14 +1445,14 @@ var NativeDocument = (function (exports) {
      * @param {Observable} value
      */
     function bindAttributeWithObservable(element, attributeName, value) {
-        const applyValue = attributeName === 'value' ? (newValue) => element.value = newValue : (newValue) => element.setAttribute(attributeName, newValue);
-        value.subscribe(applyValue);
-
         if(attributeName === 'value') {
+            value.subscribe((newValue) => element.value = newValue);
             element.value = value.val();
             element.addEventListener('input', () => value.set(element.value));
             return;
         }
+
+        value.subscribe((newValue) => element.setAttribute(attributeName, newValue));
         element.setAttribute(attributeName, value.val());
     }
 
@@ -1467,11 +1463,15 @@ var NativeDocument = (function (exports) {
      */
     function AttributesWrapper(element, attributes) {
 
-        Validator.validateAttributes(attributes);
+        {
+            Validator.validateAttributes(attributes);
+        }
+        const attributeNames = Object.keys(attributes);
 
-        for(let key in attributes) {
-            const attributeName = key.toLowerCase();
-            let value = attributes[attributeName];
+        for(let i = 0, length = attributeNames.length; i < length; i++) {
+            const originalAttributeName = attributeNames[i];
+            const attributeName = originalAttributeName.toLowerCase();
+            let value = attributes[originalAttributeName];
             if(value == null) {
                 continue;
             }
@@ -1494,6 +1494,10 @@ var NativeDocument = (function (exports) {
                 continue;
             }
 
+            if(attributeName === 'value') {
+                element.value = value;
+                continue;
+            }
             element.setAttribute(attributeName, value);
         }
         return element;