@lenne.tech/ng-base 0.3.4 → 0.3.8

package/fesm2015/lenne.tech-ng-base-src-lib-base.js

@@ -722,12 +722,9 @@ class ImageService {
      */
     preLoadImages(options) {
         // Init configuration
-        const config = Object.assign({ doneFunnction: undefined, elements: document, regExp: undefined, timeout: undefined }, options);
+        const config = Object.assign({ doneFunnction: undefined, elements: document, regExp: undefined }, options);
         return new Promise((resolve) => {
             var _a;
-            // Init variables
-            let resolved = false;
-            let timeoutId;
             // Convert element(s) into array
             if (!Array.isArray(config.elements)) {
                 // NodeList or HTMLCollection
@@ -747,48 +744,33 @@ class ImageService {
                 images = images.concat(Array.from(element.getElementsByTagName('img')));
             });
             // Prepare images
-            for (const image of images) {
+            for (let image of images) {
                 const src = image.getAttribute('src');
                 // Check if changes are necessary and possible
                 if ((image.complete && image.naturalHeight !== 0) || // already laoded
-                    image.getAttribute('loading') !== 'lazy' || // loading attribute !== lazy
                     !src || // Image has no src
                     ((_a = config.regExp) === null || _a === void 0 ? void 0 : _a.test(src)) // Test if src matches regular expression
                 ) {
                     continue;
                 }
                 // Replace lazy loading image with immediately loading image
-                const newImage = document.createElement('img');
-                Array.from(image.attributes).forEach((attr) => {
-                    if (attr.name !== 'loading' && attr.name !== 'src') {
-                        newImage.setAttribute(attr.name, attr.value);
-                    }
-                });
-                image.replaceWith(newImage);
+                if (image.getAttribute('loading') === 'lazy') {
+                    const newImage = document.createElement('img');
+                    Array.from(image.attributes).forEach((attr) => {
+                        if (attr.name !== 'loading' && attr.name !== 'src') {
+                            newImage.setAttribute(attr.name, attr.value);
+                        }
+                    });
+                    image.replaceWith(newImage);
+                    image = newImage;
+                }
                 // Wait for laoding
-                promises.push(this.loadImage(newImage, src));
-            }
-            if (config.timeout) {
-                timeoutId = setTimeout(() => __awaiter(this, void 0, void 0, function* () {
-                    resolved = true;
-                    if (config.doneFunnction) {
-                        yield config.doneFunction();
-                    }
-                    resolve(undefined);
-                }));
+                promises.push(this.loadImage(image, src));
             }
             // Wait until all images loaded
             Promise.all(promises)
                 .catch((e) => console.error('Error during image loading', e))
                 .finally(() => __awaiter(this, void 0, void 0, function* () {
-                // Check if already resolved
-                if (resolved) {
-                    return;
-                }
-                // Stop timeout
-                if (timeoutId) {
-                    clearTimeout(timeoutId);
-                }
                 // Return result
                 let result;
                 if (config.doneFunnction) {
@@ -831,28 +813,16 @@ class MatchHeightDirective {
         this.el = el;
         this.imageService = imageService;
         // Replace lazy loading images with immediate loading images
-        this.loadLazyImages = true;
+        this.loadImages = true;
         this.isBrowser = isPlatformBrowser(platformId);
     }
     onResize() {
         this.matchHeight(this.el.nativeElement, this.ltMatchHeight);
     }
-    ngAfterViewChecked() {
+    ngOnInit() {
         this.matchHeight(this.el.nativeElement, this.ltMatchHeight);
     }
     matchHeight(parent, target) {
-        if (this.isBrowser) {
-            // Timeout is set to force Angular to wait for all actions and only continue once the process has run through.
-            // Otherwise, an infinite loop will occur.
-            setTimeout(() => {
-                this.matchHeightHelper(parent, target);
-            }, 1);
-        }
-        else {
-            this.matchHeightHelper(parent, target);
-        }
-    }
-    matchHeightHelper(parent, target) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!parent) {
                 return;
@@ -871,7 +841,7 @@ class MatchHeightDirective {
                     continue;
                 }
                 // Load images of children
-                if (this.loadLazyImages) {
+                if (this.loadImages) {
                     yield this.imageService.preLoadImages({ elements: children });
                 }
                 // reset all children height
@@ -905,7 +875,7 @@ MatchHeightDirective.ctorParameters = () => [
 ];
 MatchHeightDirective.propDecorators = {
     ltMatchHeight: [{ type: Input }],
-    loadLazyImages: [{ type: Input }],
+    loadImages: [{ type: Input }],
     onResize: [{ type: HostListener, args: ['window:resize',] }]
 };
 
@@ -1730,7 +1700,7 @@ class GraphQLService {
                         .filter((field) => !argsData.usedArgs.includes(field));
                     console.log({ argsData, filtered, unused });
                 }
-                const args = argsData.argsString || '';
+                const args = (argsData === null || argsData === void 0 ? void 0 : argsData.argsString) || '';
                 // Log
                 if (config.log) {
                     console.log({ graphQL: graphql, args, fields, type: config.type });
@@ -1876,7 +1846,7 @@ class GraphQLService {
                     continue;
                 }
                 // Skip value if not exists
-                if (value === undefined && value === null) {
+                if (value === undefined || value === null) {
                     continue;
                 }
                 // Add current key to metadata
@@ -2191,7 +2161,7 @@ class ScrollService {
     scrollTo(id, options = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             // Prepare config
-            const config = Object.assign({ checkUrl: true, loadImagesBefore: true, resetStyles: false, setOverflow: true, stopPropagation: true }, options);
+            const config = Object.assign({ checkUrl: false, loadImagesBefore: true, resetStyles: false, setOverflow: true, stopPropagation: true }, options);
             // Check current URL
             if (config.checkUrl && this.router.url !== '/' && !this.router.url.startsWith('/#')) {
                 yield this.router.navigate(['/'], { fragment: id });
@@ -2269,37 +2239,16 @@ class ScrollService {
      * Scroll done promise
      */
     scrollDone(options = {}) {
-        // Init configuration
-        const config = Object.assign({ doneFunction: undefined, timeout: undefined }, options);
-        // Return promise for scroll done
-        return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-            // Init variables
-            let rejected = false;
-            let timeoutId;
-            // Set timeout handling if necessary
-            if (config.timeout) {
-                timeoutId = window.setTimeout(() => {
-                    rejected = true;
-                    reject(new Error('Timeout for scrollDone after:' + config.timeout));
-                }, config.timeout);
-            }
+        return __awaiter(this, void 0, void 0, function* () {
+            // Init configuration
+            const config = Object.assign({ doneFunction: undefined }, options);
             // Wait for scroll done
             yield this.scrollDoneDetection();
-            // Resolve promise if not already rejected
-            if (!rejected) {
-                // Stop timeout if set
-                if (timeoutId) {
-                    window.clearTimeout(timeoutId);
-                }
-                // Get result (if doneFunction is set)
-                let result;
-                if (config.doneFunction) {
-                    result = yield config.doneFunction();
-                }
-                // Scroll done
-                resolve(result);
+            // Get result
+            if (config.doneFunction) {
+                return config.doneFunction();
             }
-        }));
+        });
     }
     /**
      * Scroll done detecton