native-document 1.0.80 → 1.0.81

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

@@ -548,6 +548,7 @@ var NativeComponents = (function (exports) {
         this.$currentValue = value;
         this.$isCleanedUp = false;
 
+        this.$firstListener = null;
         this.$listeners = null;
         this.$watchers = null;
 
@@ -583,7 +584,7 @@ var NativeComponents = (function (exports) {
     };
 
     ObservableItem.prototype.triggerFirstListener = function(operations) {
-        this.$listeners[0](this.$currentValue, this.$previousValue, operations || {});
+        this.$firstListener(this.$currentValue, this.$previousValue, operations || {});
     };
 
     ObservableItem.prototype.triggerListeners = function(operations) {
@@ -632,22 +633,29 @@ var NativeComponents = (function (exports) {
     };
 
     ObservableItem.prototype.triggerAll = function(operations) {
-        this.triggerListeners(operations);
         this.triggerWatchers();
+        this.triggerListeners(operations);
     };
 
     ObservableItem.prototype.triggerWatchersAndFirstListener = function(operations) {
-        this.triggerListeners(operations);
         this.triggerWatchers();
+        this.triggerListeners(operations);
     };
 
     ObservableItem.prototype.assocTrigger = function() {
+        this.$firstListener = null;
         if(this.$watchers?.size && this.$listeners?.length) {
             this.trigger = (this.$listeners.length === 1) ? this.triggerWatchersAndFirstListener : this.triggerAll;
             return;
         }
         if(this.$listeners?.length) {
-            this.trigger = (this.$listeners.length === 1) ? this.triggerFirstListener : this.triggerListeners;
+            if(this.$listeners.length === 1) {
+                this.$firstListener = this.$listeners[0];
+                this.trigger = this.triggerFirstListener;
+            }
+            else {
+                this.trigger = this.triggerListeners;
+            }
             return;
         }
         if(this.$watchers?.size) {
@@ -2300,7 +2308,7 @@ var NativeComponents = (function (exports) {
 
     mutationMethods.forEach((method) => {
         ObservableArray.prototype[method] = function(...values) {
-            const result = this.$currentValue[method](...values);
+            const result = this.$currentValue[method].apply(this.$currentValue, values);
             this.trigger({ action: method, args: values, result });
             return result;
         };
@@ -2308,7 +2316,7 @@ var NativeComponents = (function (exports) {
 
     noMutationMethods.forEach((method) => {
         ObservableArray.prototype[method] = function(...values) {
-            return this.$currentValue[method](...values);
+            return this.$currentValue[method].apply(this.$currentValue, values);
         };
     });
 
@@ -2326,7 +2334,7 @@ var NativeComponents = (function (exports) {
     };
 
     ObservableArray.prototype.merge = function(values) {
-        this.$currentValue.push(...values);
+        this.$currentValue.push.apply(this.$currentValue, values);
         this.trigger({ action: 'merge',  args: values });
     };
 
@@ -2402,7 +2410,7 @@ var NativeComponents = (function (exports) {
                     const deps = Array.isArray(predicate.dependencies)
                         ? predicate.dependencies
                         : [predicate.dependencies];
-                    observableDependencies.push(...deps);
+                    observableDependencies.push.apply(observableDependencies, deps);
                 }
             } else if(typeof predicate === 'function') {
                 filterCallbacks[key] = predicate;

package/dist/native-document.dev.js

@@ -322,6 +322,7 @@ var NativeDocument = (function (exports) {
         this.$currentValue = value;
         this.$isCleanedUp = false;
 
+        this.$firstListener = null;
         this.$listeners = null;
         this.$watchers = null;
 
@@ -357,7 +358,7 @@ var NativeDocument = (function (exports) {
     };
 
     ObservableItem.prototype.triggerFirstListener = function(operations) {
-        this.$listeners[0](this.$currentValue, this.$previousValue, operations || {});
+        this.$firstListener(this.$currentValue, this.$previousValue, operations || {});
     };
 
     ObservableItem.prototype.triggerListeners = function(operations) {
@@ -406,22 +407,29 @@ var NativeDocument = (function (exports) {
     };
 
     ObservableItem.prototype.triggerAll = function(operations) {
-        this.triggerListeners(operations);
         this.triggerWatchers();
+        this.triggerListeners(operations);
     };
 
     ObservableItem.prototype.triggerWatchersAndFirstListener = function(operations) {
-        this.triggerListeners(operations);
         this.triggerWatchers();
+        this.triggerListeners(operations);
     };
 
     ObservableItem.prototype.assocTrigger = function() {
+        this.$firstListener = null;
         if(this.$watchers?.size && this.$listeners?.length) {
             this.trigger = (this.$listeners.length === 1) ? this.triggerWatchersAndFirstListener : this.triggerAll;
             return;
         }
         if(this.$listeners?.length) {
-            this.trigger = (this.$listeners.length === 1) ? this.triggerFirstListener : this.triggerListeners;
+            if(this.$listeners.length === 1) {
+                this.$firstListener = this.$listeners[0];
+                this.trigger = this.triggerFirstListener;
+            }
+            else {
+                this.trigger = this.triggerListeners;
+            }
             return;
         }
         if(this.$watchers?.size) {
@@ -2147,14 +2155,6 @@ var NativeDocument = (function (exports) {
         return null;
     };
 
-    const findByPath = (root, path) => {
-        let target = root;
-        for (let i = 0, len = path.length; i < len; i++) {
-            target = target.childNodes[path[i]];
-        }
-        return target;
-    };
-
     const $hydrateFn = function(hydrateFunction, targetType, element, property) {
         if(!cloneBindingsDataCache.has(element)) {
             // { classes, styles, attributes, value, attach }
@@ -2180,27 +2180,43 @@ var NativeDocument = (function (exports) {
         }
     };
 
+
+    const applyBindingTreePath = (root, target, data, path) => {
+        let newTarget = null;
+        if(path.fn) {
+            newTarget = path.fn(data, target, root);
+        }
+        if(path.children) {
+            for(let i = 0, length = path.children.length; i < length; i++) {
+                const currentPath = path.children[i];
+                const pathTargetNode = target.childNodes[currentPath.index];
+                applyBindingTreePath(root, pathTargetNode, data, currentPath);
+            }
+        }
+        return newTarget;
+    };
+
     function TemplateCloner($fn) {
         let $node = null;
         let $hasBindingData = false;
 
-        const $bindingPaths = [];
+        const $bindingTreePath = {
+            fn: null,
+            children: [],
+        };
 
-        const clone = (node, data, path) => {
+        const clone = (node, data, currentPath) => {
             const bindDingData = cloneBindingsDataCache.get(node);
             if(node.nodeType === 3) {
                 if(bindDingData && bindDingData.value) {
-                    $bindingPaths.push({
-                        path: [...path],
-                        fn: (data, targetNode, currentRoot) => {
-                            const newNode = bindDingData.value(data);
-                            targetNode.replaceWith(newNode);
-                            if (targetNode === currentRoot) {
-                                return newNode;
-                            }
-                            return null;
+                    currentPath.fn = (data, targetNode, currentRoot) => {
+                        const newNode = bindDingData.value(data);
+                        if (targetNode === currentRoot) {
+                            return newNode;
                         }
-                    });
+                        targetNode.replaceWith(newNode);
+                        return null;
+                    };
                     return bindDingData.value(data);
                 }
                 return node.cloneNode(true);
@@ -2212,35 +2228,35 @@ var NativeDocument = (function (exports) {
             if(bindDingData) {
                 bindAttributes(nodeCloned, bindDingData, data);
                 bindAttachMethods(nodeCloned, bindDingData, data);
-                $bindingPaths.push({
-                    path: [...path],
-                    fn: (data, targetNode) => {
-                        bindAttributes(targetNode, bindDingData, data);
-                        bindAttachMethods(targetNode, bindDingData, data);
-                    }
-                });
+                currentPath.fn = (data, targetNode) => {
+                    bindAttributes(targetNode, bindDingData, data);
+                    bindAttachMethods(targetNode, bindDingData, data);
+                };
             }
             const childNodes = node.childNodes;
+            const bindingPathChildren = [];
             for(let i = 0, length = childNodes.length; i < length; i++) {
                 const childNode = childNodes[i];
-                path.push(i);
+                const path = { index: i, fn: null };
                 const childNodeCloned = clone(childNode, data, path);
-                path.pop();
+                if(path.children || path.fn) {
+                    bindingPathChildren.push(path);
+                }
                 nodeCloned.appendChild(childNodeCloned);
             }
+            if(bindingPathChildren.length) {
+                currentPath.children = currentPath.children || [];
+                currentPath.children = bindingPathChildren;
+            }
             return nodeCloned;
         };
 
         const cloneWithBindingPaths = (data) => {
             let root = $node.cloneNode(true);
 
-            for (let i = 0, len = $bindingPaths.length; i < len; i++) {
-                const binding = $bindingPaths[i];
-                const target = findByPath(root, binding.path);
-                const newRoot = binding.fn(data, target, root);
-                if(newRoot) {
-                    root = newRoot;
-                }
+            const newRoot = applyBindingTreePath(root, root, data, $bindingTreePath);
+            if(newRoot) {
+                root = newRoot;
             }
 
             return root;
@@ -2253,7 +2269,7 @@ var NativeDocument = (function (exports) {
                 return $node.cloneNode(true);
             }
 
-            const firstClone = clone($node, data, []);
+            const firstClone = clone($node, data, $bindingTreePath);
             this.clone = cloneWithBindingPaths;
             return firstClone;
         };
@@ -2897,7 +2913,7 @@ var NativeDocument = (function (exports) {
 
     mutationMethods.forEach((method) => {
         ObservableArray.prototype[method] = function(...values) {
-            const result = this.$currentValue[method](...values);
+            const result = this.$currentValue[method].apply(this.$currentValue, values);
             this.trigger({ action: method, args: values, result });
             return result;
         };
@@ -2905,7 +2921,7 @@ var NativeDocument = (function (exports) {
 
     noMutationMethods.forEach((method) => {
         ObservableArray.prototype[method] = function(...values) {
-            return this.$currentValue[method](...values);
+            return this.$currentValue[method].apply(this.$currentValue, values);
         };
     });
 
@@ -2923,7 +2939,7 @@ var NativeDocument = (function (exports) {
     };
 
     ObservableArray.prototype.merge = function(values) {
-        this.$currentValue.push(...values);
+        this.$currentValue.push.apply(this.$currentValue, values);
         this.trigger({ action: 'merge',  args: values });
     };
 
@@ -2999,7 +3015,7 @@ var NativeDocument = (function (exports) {
                     const deps = Array.isArray(predicate.dependencies)
                         ? predicate.dependencies
                         : [predicate.dependencies];
-                    observableDependencies.push(...deps);
+                    observableDependencies.push.apply(observableDependencies, deps);
                 }
             } else if(typeof predicate === 'function') {
                 filterCallbacks[key] = predicate;