native-document 1.0.73 → 1.0.76

package/src/core/wrappers/AttributesWrapper.js

@@ -4,32 +4,36 @@ import {BOOLEAN_ATTRIBUTES} from "./constants.js";
 import {Observable} from "../data/Observable";
 
 
-function toggleElementClass(element, className, shouldAdd) {
+export function toggleElementClass(element, className, shouldAdd) {
     element.classes.toggle(className, shouldAdd);
 }
-function toggleElementStyle(element, styleName, newValue) {
+
+export function toggleElementStyle(element, styleName, newValue) {
     element.style[styleName] = newValue;
 }
-function updateInputFromObserver(element, attributeName, newValue) {
+
+export function updateInputFromObserver(element, attributeName, newValue) {
     if(Validator.isBoolean(newValue)) {
         element[attributeName] = newValue;
         return;
     }
     element[attributeName] = newValue === element.value;
 }
-function updateObserverFromInput(element, attributeName, defaultValue, value) {
+
+export function updateObserverFromInput(element, attributeName, defaultValue, value) {
     if(Validator.isBoolean(defaultValue)) {
         value.set(element[attributeName]);
         return;
     }
     value.set(element.value);
 }
+
 /**
  *
  * @param {HTMLElement} element
  * @param {Object} data
  */
-function bindClassAttribute(element, data) {
+export function bindClassAttribute(element, data) {
     for(let className in data) {
         const value = data[className];
         if(Validator.isObservable(value)) {
@@ -56,7 +60,7 @@ function bindClassAttribute(element, data) {
  * @param {HTMLElement} element
  * @param {Object} data
  */
-function bindStyleAttribute(element, data) {
+export function bindStyleAttribute(element, data) {
     for(let styleName in data) {
         const value = data[styleName];
         if(Validator.isObservable(value)) {
@@ -74,7 +78,7 @@ function bindStyleAttribute(element, data) {
  * @param {string} attributeName
  * @param {boolean|number|Observable} value
  */
-function bindBooleanAttribute(element, attributeName, value) {
+export function bindBooleanAttribute(element, attributeName, value) {
     const defaultValue = Validator.isObservable(value) ? value.val() : value;
     if(Validator.isBoolean(defaultValue)) {
         element[attributeName] = defaultValue;
@@ -97,7 +101,7 @@ function bindBooleanAttribute(element, attributeName, value) {
  * @param {string} attributeName
  * @param {Observable} value
  */
-function bindAttributeWithObservable(element, attributeName, value) {
+export function bindAttributeWithObservable(element, attributeName, value) {
     const applyValue = (newValue) => {
         if(attributeName === 'value') {
             element.value = newValue;
@@ -132,16 +136,13 @@ export default function AttributesWrapper(element, attributes) {
         if(value === null || value === undefined) {
             continue;
         }
+        if(value.handleNdAttribute) {
+            value.handleNdAttribute(element, attributeName, value)
+            continue;
+        }
         if(Validator.isString(value)) {
-            value = value.resolveObservableTemplate ? value.resolveObservableTemplate() : value;
-            if(Validator.isString(value)) {
-                element.setAttribute(attributeName, value);
-                continue;
-            }
-            const observables = value.filter(item => Validator.isObservable(item));
-            value = Observable.computed(() => {
-                return value.map(item => Validator.isObservable(item) ? item.val() : item).join(' ') || ' ';
-            }, observables);
+            element.setAttribute(attributeName, value);
+            return;
         }
         if(attributeName === 'class' && Validator.isObject(value)) {
             bindClassAttribute(element, value);
@@ -163,6 +164,7 @@ export default function AttributesWrapper(element, attributes) {
             value.$hydrate(element, attributeName);
             continue;
         }
+
         element.setAttribute(attributeName, value);
 
     }

package/src/core/wrappers/ElementCreator.js

@@ -2,7 +2,8 @@ import Anchor from "../elements/anchor";
 import Validator from "../utils/validator";
 import AttributesWrapper from "./AttributesWrapper";
 import PluginsManager from "../utils/plugins-manager";
-import './prototype-extensions';
+import './prototypes/nd-element-extensions';
+import './prototypes/attributes-extensions';
 
 const $nodeCache = new Map();
 let $textNodeCache = null;
@@ -75,20 +76,10 @@ export const ElementCreator = {
     processChildren(children, parent) {
         if(children === null) return;
         PluginsManager.emit('BeforeProcessChildren', parent);
-        if(!Array.isArray(children)) {
-            let child = this.getChild(children);
-            if(child) {
-                parent.appendChild(child);
-            }
-        }
-        else {
-            for(let i = 0, length = children.length; i < length; i++) {
-                let child = this.getChild(children[i]);
-                if (child === null) continue;
-                parent.appendChild(child);
-            }
+        let child = this.getChild(children);
+        if(child) {
+            parent.appendChild(child);
         }
-
         PluginsManager.emit('AfterProcessChildren', parent);
     },
     getChild(child) {

package/src/core/wrappers/prototypes/attributes-extensions.js

@@ -0,0 +1,17 @@
+import { bindAttributeWithObservable } from "../AttributesWrapper";
+import ObservableItem from "../../data/ObservableItem";
+import TemplateBinding from "../TemplateBinding";
+
+
+
+String.prototype.handleNdAttribute = function(element, attributeName) {
+    element.setAttribute(attributeName, this);
+};
+
+ObservableItem.prototype.handleNdAttribute = function(element, attributeName) {
+    bindAttributeWithObservable(element, attributeName, this);
+};
+
+TemplateBinding.prototype.handleNdAttribute = function(element, attributeName) {
+    this.$hydrate(element, attributeName);
+};

package/src/core/wrappers/{prototype-extensions.js → prototypes/nd-element-extensions.js}

@@ -1,9 +1,9 @@
-import ObservableItem from "../data/ObservableItem";
-import {NDElement} from "./NDElement";
-import TemplateBinding from "./TemplateBinding";
-import {ElementCreator} from "./ElementCreator";
-import PluginsManager from "../utils/plugins-manager";
-import Validator from "../utils/validator";
+import ObservableItem from "../../data/ObservableItem";
+import {NDElement} from "../NDElement";
+import TemplateBinding from "../TemplateBinding";
+import {ElementCreator} from "../ElementCreator";
+import PluginsManager from "../../utils/plugins-manager";
+import Validator from "../../utils/validator";
 
 String.prototype.toNdElement = function () {
     const formattedChild = this.resolveObservableTemplate ? this.resolveObservableTemplate() : this;
@@ -40,7 +40,9 @@ NDElement.prototype.toNdElement = function () {
 Array.prototype.toNdElement = function () {
     const fragment = document.createDocumentFragment();
     for(let i = 0, length = this.length; i < length; i++) {
-        fragment.appendChild(ElementCreator.getChild(this[i]));
+        const child = ElementCreator.getChild(this[i]);
+        if(child === null) continue;
+        fragment.appendChild(child);
     }
     return fragment;
 };