native-document 1.0.88 → 1.0.89

package/src/core/data/ObservableWhen.js

@@ -6,8 +6,8 @@ export const ObservableWhen = function(observer, value) {
 
 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() {

package/src/core/utils/callback-handler.js

@@ -0,0 +1,21 @@
+
+
+export function CallbackHandler(callback) {
+
+    if(!(this instanceof CallbackHandler)) {
+        return new CallbackHandler(callback);
+    }
+
+    const $contextSore = new WeakMap();
+
+    this.set = (target, context) => {
+        $contextSore.set(target, context);
+    };
+
+    this.callback = function() {
+        const context = $contextSore.get(this);
+        if(context) {
+            callback(context, ...arguments);
+        }
+    };
+}

package/src/core/wrappers/AttributesWrapper.js

@@ -1,30 +1,30 @@
 import Validator from "../utils/validator";
-import NativeDocumentError from "../errors/NativeDocumentError";
 import {BOOLEAN_ATTRIBUTES} from "./constants.js";
 import {Observable} from "../data/Observable";
-import './prototypes/bind-class-extensions';
-
-
-export function toggleElementClass(element, className, shouldAdd) {
-    element.classes.toggle(className, shouldAdd);
-}
 
+export const handleElementAttributeClass = function(shouldAdd, _, __, context) {
+    context.element.classes.toggle(context.className, shouldAdd);
+};
 /**
  *
  * @param {HTMLElement} element
  * @param {Object} data
  */
 export 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) {
@@ -33,7 +33,6 @@ export function bindClassAttribute(element, data) {
         }
         element.classes.toggle(className, value)
     }
-    data = null;
 }
 
 /**
@@ -42,7 +41,9 @@ export function bindClassAttribute(element, data) {
  * @param {Object} data
  */
 export 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();
@@ -62,7 +63,8 @@ export function bindStyleAttribute(element, data) {
 export 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 {
@@ -70,13 +72,13 @@ export function bindBooleanAttribute(element, attributeName, value) {
     }
     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));
@@ -91,14 +93,14 @@ export function bindBooleanAttribute(element, attributeName, value) {
  * @param {Observable} value
  */
 export 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());
 }
 
@@ -109,11 +111,15 @@ export function bindAttributeWithObservable(element, attributeName, value) {
  */
 export default function AttributesWrapper(element, attributes) {
 
-    Validator.validateAttributes(attributes);
+    if(process.env.NODE_ENV === 'development') {
+        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;
         }
@@ -136,6 +142,10 @@ export default function AttributesWrapper(element, attributes) {
             continue;
         }
 
+        if(attributeName === 'value') {
+            element.value = value;
+            continue;
+        }
         element.setAttribute(attributeName, value);
     }
     return element;

package/src/core/wrappers/prototypes/bind-class-extensions.js

@@ -1,16 +1,20 @@
 import ObservableItem from "../../../core/data/ObservableItem";
-import {toggleElementClass} from "../AttributesWrapper";
 import {ObservableWhen} from "../../data/ObservableWhen";
 import TemplateBinding from "../../../core/wrappers/TemplateBinding";
 
+
+export const handleElementAttributeClass = function(shouldAdd, _, __, context) {
+    context.element.classes.toggle(context.className, shouldAdd);
+};
+
 ObservableItem.prototype.bindNdClass = function(element, className) {
     element.classes.toggle(className, this.val());
-    this.subscribe(toggleElementClass.bind(null, element, className));
+    this.subscribe(handleElementAttributeClass, { element, className });
 };
 
 ObservableWhen.prototype.bindNdClass = function(element, className) {
     element.classes.toggle(className, this.isMath());
-    this.subscribe(toggleElementClass.bind(null, element, className));
+    this.subscribe(handleElementAttributeClass, { element, className });
 };
 
 TemplateBinding.prototype.bindNdClass = function(element, className) {