@pepperi-addons/ngx-lib 0.4.2-beta.32 → 0.4.2-beta.320

package/fesm2020/pepperi-addons-ngx-lib-remote-loader.mjs

@@ -20,8 +20,24 @@ class PepRemoteLoaderService {
         this.addonService = addonService;
         //
     }
+    getBlockLoaderDataUrl(options) {
+        const fileName = 'addon_blocks';
+        const pagesAddonUuid = this.addonService.getPagesAddonUUID();
+        let pagesBaseUrl;
+        // For devServer run server on localhost.
+        if (options.pagesDevServer?.length > 0) {
+            pagesBaseUrl = `${options.pagesDevServer}/${fileName}`;
+        }
+        else {
+            const baseUrl = this.sessionService.getPapiBaseUrl();
+            pagesBaseUrl = `${baseUrl}/addons/api/${pagesAddonUuid}/${fileName}`;
+        }
+        const url = `${pagesBaseUrl}/get_addon_block_loader_data?name=${options.name}&slugName=${options.slugName}&blockType=${options.blockType}&addonUUID=${options.addonUUID}`;
+        return url;
+    }
     getRemoteLoaderOptions(blockLoaderData, blockRemoteEntry = '', type = 'module') {
-        const exposedModule = blockLoaderData.relation.ElementsModule?.length > 0 ? blockLoaderData.relation.ElementsModule : blockLoaderData.relation.ModuleName;
+        const loadAsElement = blockLoaderData.relation.ElementName?.length > 0;
+        const exposedModule = loadAsElement ? (blockLoaderData.relation.ElementsModule || 'WebComponents') : blockLoaderData.relation.ModuleName;
         const res = {
             type: type,
             remoteEntry: blockRemoteEntry.length > 0 ? blockRemoteEntry : `${blockLoaderData.addonPublicBaseURL}${blockLoaderData.relation.AddonRelativeURL}.js`,
@@ -30,7 +46,7 @@ class PepRemoteLoaderService {
             addonId: blockLoaderData.relation.AddonUUID, // For local use (adding the relative path to the assets).
         };
         // If it's web components
-        if (blockLoaderData.relation.ElementsModule?.length > 0) {
+        if (loadAsElement) {
             res['elementName'] = blockLoaderData.relation.ElementName;
         }
         else { // For load the component from the module.
@@ -38,20 +54,14 @@ class PepRemoteLoaderService {
         }
         return res;
     }
-    getBlockLoaderDataUrl(options) {
-        const fileName = 'addon_blocks';
-        const pagesAddonUuid = this.addonService.getPagesAddonUUID();
-        let pagesBaseUrl;
-        // For devServer run server on localhost.
-        if (options.pagesDevServer?.length > 0) {
-            pagesBaseUrl = `${options.pagesDevServer}/${fileName}`;
-        }
-        else {
-            const baseUrl = this.sessionService.getPapiBaseUrl();
-            pagesBaseUrl = `${baseUrl}/addons/api/${pagesAddonUuid}/${fileName}`;
-        }
-        const url = `${pagesBaseUrl}/get_addon_block_loader_data?name=${options.name}&slugName=${options.slugName}&blockType=${options.blockType}&addonUUID=${options.addonUUID}`;
-        return url;
+    getBlockLoaderDataSuccess(data, options) {
+        const ngVersionNumber = coerceNumberProperty(data.relation?.SubType?.toLocaleLowerCase().replace('ng', ''), 14);
+        const type = ngVersionNumber >= 14 ? 'module' : 'script';
+        return this.getRemoteLoaderOptions(data, options.blockRemoteEntry, type);
+    }
+    getBlockLoaderDataError(options) {
+        const nameMsg = options.blockType === 'SettingsBlock' ? `slugName - ${options.slugName}` : `name - ${options.name}`;
+        return (`Block with ${nameMsg} is not found for type - ${options.blockType}`);
     }
     async getBlockRemoteLoaderOptions(options) {
         options.blockType = options.blockType ?? 'AddonBlock';
@@ -60,15 +70,28 @@ class PepRemoteLoaderService {
         options.addonUUID = options.addonUUID ?? '';
         return new Promise((resolve, reject) => {
             if (options.name?.length > 0 || (options.slugName?.length > 0 && options.blockType === 'SettingsBlock')) {
-                const blockLoaderDataUrl = this.getBlockLoaderDataUrl(options);
-                this.httpService.getHttpCall(blockLoaderDataUrl).toPromise().then((data) => {
-                    const ngVersionNumber = coerceNumberProperty(data.relation?.SubType?.toLocaleLowerCase().replace('ng', ''), 14);
-                    const type = ngVersionNumber >= 14 ? 'module' : 'script';
-                    resolve(this.getRemoteLoaderOptions(data, options.blockRemoteEntry, type));
-                }).catch(err => {
-                    const nameMsg = options.blockType === 'SettingsBlock' ? `slugName - ${options.slugName}` : `name - ${options.name}`;
-                    reject(`Block with ${nameMsg} is not found for type - ${options.blockType}`);
-                });
+                if (options.blockType === 'SettingsBlock' || options.blockType === 'LogicBlock' || options.pagesDevServer?.length > 0) {
+                    // Work online for settings blocks or logic blocks or debug only !!!
+                    const blockLoaderDataUrl = this.getBlockLoaderDataUrl(options);
+                    this.httpService.getHttpCall(blockLoaderDataUrl).toPromise().then((data) => {
+                        resolve(this.getBlockLoaderDataSuccess(data, options));
+                    }).catch(err => {
+                        reject(this.getBlockLoaderDataError(options));
+                    });
+                }
+                else {
+                    // Work offline !!!
+                    this.addonService.emitEvent("GetBlockLoaderData", {
+                        Name: options.name,
+                        // SlugName: options.slugName,
+                        BlockType: options.blockType,
+                        // AddonUUID: options.addonUUID
+                    }).then((res) => {
+                        resolve(this.getBlockLoaderDataSuccess(res, options));
+                    }).catch(err => {
+                        reject(this.getBlockLoaderDataError(options));
+                    });
+                }
             }
             else {
                 if (options.blockType === 'SettingsBlock') {
@@ -132,7 +155,6 @@ class PepRemoteLoaderComponent {
     }
     async loadModule() {
         try {
-            const t0 = performance.now();
             this.viewContainer?.clear();
             if (this.options.exposedModule?.length > 0) { // Load module
                 if (this.options?.addonId && (this.options.type === 'module' || this.options.type === 'script')) {
@@ -145,8 +167,6 @@ class PepRemoteLoaderComponent {
                 const module = await loadRemoteModule(this.options).then(m => m);
                 const moduleRef = createNgModuleRef(module[this.options.exposedModule.replace('./', '')], this.injector);
                 this.compRef = this.viewContainer.createComponent(module[this.options.componentName], { injector: this.injector, ngModuleRef: moduleRef });
-                const t1 = performance.now();
-                console.log('remote module load performance: ' + (t1 - t0) / 1000);
             }
             // Check if this is in use??? (comment out in Angular 14 version)
             // else { // Load Component
@@ -202,6 +222,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.2", ngImpor
             }] } });
 
 class PepRemoteLoaderElementComponent {
+    // // This is for debounce.
+    // private _getBlockRemoteLoaderOptionsSubject = new BehaviorSubject<BlockRemoteLoaderOptionsData>(null);
+    // get getBlockRemoteLoaderOptionsDebouncedSubject$(): Observable<BlockRemoteLoaderOptionsData> {
+    //     return this._getBlockRemoteLoaderOptionsSubject.asObservable().pipe(debounceTime(250));
+    // }
     constructor(renderer, el, pepAddonService, remoteLoaderService, route) {
         this.renderer = renderer;
         this.el = el;
@@ -211,6 +236,8 @@ class PepRemoteLoaderElementComponent {
         this.load = new EventEmitter();
         this.element = null;
         this._elementName = '';
+        this._blockType = '';
+        this._alreadyLoaded = false;
     }
     populateProps() {
         for (const prop in this.props) {
@@ -225,16 +252,16 @@ class PepRemoteLoaderElementComponent {
     async loadOptionsFromRoute() {
         const params = this.route?.snapshot.params;
         const data = this.route?.snapshot.data;
-        const blockType = data?.blockType || 'SettingsBlock';
+        this._blockType = data?.blockType || 'SettingsBlock';
         const slugName = params?.slugName || data?.slugName;
         const blockName = params?.blockName || data?.blockName;
-        if (blockName?.length > 0 || (slugName?.length > 0 && blockType === 'SettingsBlock')) {
+        if (blockName?.length > 0 || (slugName?.length > 0 && this._blockType === 'SettingsBlock')) {
             const addonUUID = params?.addonUUID || data?.addonUUID || '';
             const blockRemoteEntry = data?.blockRemoteEntry || '';
             this.options = await this.remoteLoaderService.getBlockRemoteLoaderOptions({
                 name: blockName,
                 slugName,
-                blockType,
+                blockType: this._blockType,
                 addonUUID,
                 blockRemoteEntry
             });
@@ -252,37 +279,151 @@ class PepRemoteLoaderElementComponent {
         this.populateProps();
     }
     ngOnDestroy() {
-        // 
-    }
-    async ngAfterContentInit() {
-        try {
-            const t0 = performance.now();
-            // If the options is not supplied then we need to get it from the route.
-            if (!this.options) {
-                await this.loadOptionsFromRoute();
+        if (this.element) {
+            try {
+                if (this.events) {
+                    for (const event in this.events) {
+                        try {
+                            this.element.removeEventListener(event, this.events[event]);
+                        }
+                        catch {
+                            // ignore
+                        }
+                    }
+                }
+                // ADO 1036660: Fix React teardown race in hosted web-components.
+                // The host (Angular) may destroy/remove the element subtree while the remote (React) is still
+                // unmounting, which can surface as `NotFoundError: Failed to execute 'removeChild' on 'Node'`.
+                // If the remote element exposes `pepperiUnmount()`, call it here to let it cleanup before DOM removal.
+                const elToUnmount = this.element;
+                let parkedContainer = null;
+                const cleanup = () => {
+                    try {
+                        if (parkedContainer?.parentNode) {
+                            parkedContainer.parentNode.removeChild(parkedContainer);
+                        }
+                    }
+                    catch {
+                        // ignore
+                    }
+                };
+                // Detach the remote element subtree so Angular destroying this host won't remove it while React is still unmounting.
+                try {
+                    if (typeof document !== 'undefined' && elToUnmount?.parentNode && document.body) {
+                        parkedContainer = document.createElement('div');
+                        parkedContainer.style.display = 'none';
+                        document.body.appendChild(parkedContainer);
+                        parkedContainer.appendChild(elToUnmount);
+                    }
+                }
+                catch {
+                    // ignore
+                }
+                const anyEl = elToUnmount;
+                const maybeUnmount = anyEl?.pepperiUnmount;
+                if (typeof maybeUnmount === 'function') {
+                    try {
+                        const res = maybeUnmount.call(anyEl);
+                        if (res && typeof res.then === 'function') {
+                            res.finally(() => cleanup());
+                        }
+                        else {
+                            cleanup();
+                        }
+                    }
+                    catch {
+                        // ignore
+                        cleanup();
+                    }
+                }
+                else {
+                    cleanup();
+                }
             }
-            if (!this.options) {
-                throw new Error('No options supplied to the component.');
+            catch {
+                // ignore
             }
-            else {
-                if (this.options?.addonId && (this.options.type === 'module' || this.options.type === 'script')) {
-                    const lastSlashIndex = this.options.remoteEntry?.lastIndexOf('/') || -1;
-                    if (lastSlashIndex > 0) {
-                        const publicPath = this.options.remoteEntry.substring(0, lastSlashIndex + 1);
-                        this.pepAddonService.setAddonStaticFolder(publicPath, this.options.addonId);
-                    }
+            this.element = null;
+        }
+    }
+    /**
+     * Loads the remote JS bundle as a script tag for web component remotes.
+     * If the script is already loaded, resolves immediately.
+     */
+    // private async loadRemoteScript(remoteEntryUrl: string): Promise<any> {
+    //     return new Promise<any>((resolve, reject) => {
+    //         if (document.querySelector(`script[src="${remoteEntryUrl}"]`)) {
+    //             // If script is already loaded, try to get the module
+    //             import(remoteEntryUrl).then(module => {
+    //                 if (module && module.init) {
+    //                     module.init();
+    //                 }
+    //                 resolve(module);
+    //             }).catch(err => reject(err));
+    //             return;
+    //         }
+    //         const script = document.createElement('script');
+    //         script.type = 'module';
+    //         script.src = remoteEntryUrl;
+    //         script.onload = () => {
+    //             // After script is loaded, dynamically import it to get the module
+    //             import(remoteEntryUrl).then(module => {
+    //                 if (module && module.init) {
+    //                     module.init();
+    //                 }
+    //                 resolve(module);
+    //             }).catch(err => reject(err));
+    //         };
+    //         script.onerror = (err) => reject(err);
+    //         document.body.appendChild(script);
+    //     });
+    // }
+    loadElementFromModule() {
+        if (!this.options) {
+            // throw new Error('No options supplied to the component.');
+            console.info('No options supplied to the component.');
+            return;
+        }
+        else {
+            if (this.options?.addonId && (this.options.type === 'module' || this.options.type === 'script')) {
+                const lastSlashIndex = this.options.remoteEntry?.lastIndexOf('/') || -1;
+                if (lastSlashIndex > 0) {
+                    const publicPath = this.options.remoteEntry.substring(0, lastSlashIndex + 1);
+                    this.pepAddonService.setAddonStaticFolder(publicPath, this.options.addonId);
                 }
-                await loadRemoteModule(this.options);
+            }
+            // debugger;
+            // this.loadRemoteScript(this.options['remoteEntry']).then(() => {
+            loadRemoteModule(this.options).then((m) => {
                 this._elementName = this.options.elementName;
                 this.element = this.renderer.createElement(this._elementName);
                 this.populateProps();
                 this.setupEvents();
                 this.renderer.appendChild(this.el.nativeElement, this.element);
-                const t1 = performance.now();
-                console.log('remote module wc load performance: ' + (t1 - t0) / 1000);
                 // Fix internal routing bug.
-                this.pepAddonService.connectInternalRouter(this._elementName);
+                if (this._blockType === 'SettingsBlock') {
+                    this.pepAddonService.connectInternalRouter(this._elementName);
+                }
                 this.load.emit();
+            }).catch((error) => {
+                throw error;
+            });
+        }
+    }
+    ngAfterContentInit() {
+        try {
+            // if (!this.element) { maybe the load of the element is too long so change to flag.
+            if (!this._alreadyLoaded) {
+                this._alreadyLoaded = true;
+                // If the options is not supplied then we need to get it from the route.
+                if (!this.options) {
+                    this.loadOptionsFromRoute().then(() => {
+                        this.loadElementFromModule();
+                    });
+                }
+                else {
+                    this.loadElementFromModule();
+                }
             }
         }
         catch (error) {
@@ -293,12 +434,12 @@ class PepRemoteLoaderElementComponent {
 PepRemoteLoaderElementComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.2", ngImport: i0, type: PepRemoteLoaderElementComponent, deps: [{ token: i0.Renderer2 }, { token: i0.ElementRef }, { token: i1.PepAddonService }, { token: PepRemoteLoaderService }, { token: i3.ActivatedRoute, optional: true }], target: i0.ɵɵFactoryTarget.Component });
 PepRemoteLoaderElementComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.0.2", type: PepRemoteLoaderElementComponent, selector: "pep-remote-loader-element", inputs: { options: "options", props: "props", events: "events" }, outputs: { load: "load" }, usesOnChanges: true, ngImport: i0, template: `
         <!--<div #vc style="height: inherit;"></div>-->
-    `, isInline: true, styles: [":host{width:100%;height:inherit}:host::ng-deep>*{height:inherit}\n"] });
+    `, isInline: true, styles: [":host{width:100%;height:inherit;overflow:inherit}:host::ng-deep>*{height:inherit}\n"] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.2", ngImport: i0, type: PepRemoteLoaderElementComponent, decorators: [{
             type: Component,
             args: [{ selector: 'pep-remote-loader-element', template: `
         <!--<div #vc style="height: inherit;"></div>-->
-    `, styles: [":host{width:100%;height:inherit}:host::ng-deep>*{height:inherit}\n"] }]
+    `, styles: [":host{width:100%;height:inherit;overflow:inherit}:host::ng-deep>*{height:inherit}\n"] }]
         }], ctorParameters: function () { return [{ type: i0.Renderer2 }, { type: i0.ElementRef }, { type: i1.PepAddonService }, { type: PepRemoteLoaderService }, { type: i3.ActivatedRoute, decorators: [{
                     type: Optional
                 }] }]; }, propDecorators: { options: [{
@@ -321,10 +462,10 @@ class PepAddonBlockLoaderComponent {
         this._name = '';
         this.hostObject = null;
         this._dialogRef = null;
+        this._remoteLoaderOptions = null;
         this.hostEvents = new EventEmitter();
         this.blockLoad = new EventEmitter();
         this.inDialog = false;
-        this.remotePathOptions = null;
         this.loadElement = false;
         this.onHostEventsCallback = (event) => {
             this.onHostEvents(event.detail);
@@ -349,24 +490,32 @@ class PepAddonBlockLoaderComponent {
     get dialogRef() {
         return this._dialogRef;
     }
+    set remoteLoaderOptions(value) {
+        this._remoteLoaderOptions = value;
+        this.loadElement = this.remoteLoaderOptions?.elementName?.length > 0;
+    }
+    get remoteLoaderOptions() {
+        return this._remoteLoaderOptions;
+    }
     ngOnInit() {
-        const options = {
-            name: this.name,
-            slugName: this.slugName,
-            blockType: this.blockType,
-            addonUUID: this.addonId,
-            blockRemoteEntry: this.remoteEntry
-        };
-        this.remoteLoaderService.getBlockRemoteLoaderOptions(options).then((options) => {
-            this.loadElement = options.elementName?.length > 0;
-            this.remotePathOptions = options;
-        });
+        if (this.remoteLoaderOptions === null) {
+            const rlpOptions = {
+                name: this.name,
+                slugName: this.slugName,
+                blockType: this.blockType,
+                addonUUID: this.addonId,
+                blockRemoteEntry: this.remoteEntry
+            };
+            this.remoteLoaderService.getBlockRemoteLoaderOptions(rlpOptions).then((options) => {
+                this.remoteLoaderOptions = options;
+            });
+        }
     }
     ngOnDestroy() {
         if (this.dialogRef) {
             this.dialogRef = null;
         }
-        this.remotePathOptions = null;
+        this.remoteLoaderOptions = null;
     }
     onBlockLoad() {
         this.blockLoad.emit();
@@ -379,10 +528,10 @@ class PepAddonBlockLoaderComponent {
     }
 }
 PepAddonBlockLoaderComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.0.2", ngImport: i0, type: PepAddonBlockLoaderComponent, deps: [{ token: PepRemoteLoaderService }], target: i0.ɵɵFactoryTarget.Component });
-PepAddonBlockLoaderComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.0.2", type: PepAddonBlockLoaderComponent, selector: "pep-addon-block-loader", inputs: { addonId: "addonId", remoteEntry: "remoteEntry", slugName: "slugName", blockType: "blockType", name: "name", hostObject: "hostObject", dialogRef: "dialogRef" }, outputs: { hostEvents: "hostEvents", blockLoad: "blockLoad" }, viewQueries: [{ propertyName: "dialogTemplate", first: true, predicate: ["dialogTemplate"], descendants: true, read: TemplateRef, static: true }], ngImport: i0, template: "<ng-container *ngIf=\"!inDialog\">\n    <ng-container *ngTemplateOutlet=\"remoteLoaderTemplate\"></ng-container>\n</ng-container>\n\n<ng-template #dialogTemplate let-data>\n    <pep-dialog [showClose]=\"data?.showClose\" [showHeader]=\"data?.showHeader\" [showFooter]=\"data?.showFooter\" [title]=\"data?.title\" (close)=\"closeDialog($event)\">\n        <ng-container pep-dialog-content>\n            <ng-container *ngTemplateOutlet=\"remoteLoaderTemplate\"></ng-container>\n        </ng-container>\n    </pep-dialog>\n</ng-template>\n\n<ng-template #remoteLoaderTemplate>\n    <pep-remote-loader *ngIf=\"remotePathOptions && !loadElement\"\n        [options]=\"remotePathOptions\"\n        [hostObject]=\"hostObject\"\n        (hostEvents)=\"onHostEvents($event);\"\n        (load)=\"onBlockLoad()\">\n    </pep-remote-loader>\n\n    <pep-remote-loader-element *ngIf=\"remotePathOptions && loadElement\" \n        [options]=\"remotePathOptions\"\n        [props]=\"{ hostObject: hostObject }\"\n        [events]=\"{ hostEvents: onHostEventsCallback }\"\n        (load)=\"onBlockLoad()\">\n    </pep-remote-loader-element>\n\n</ng-template>", styles: [""], dependencies: [{ kind: "directive", type: i2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i2.NgTemplateOutlet, selector: "[ngTemplateOutlet]", inputs: ["ngTemplateOutletContext", "ngTemplateOutlet", "ngTemplateOutletInjector"] }, { kind: "component", type: i1$1.PepDialogComponent, selector: "pep-dialog", inputs: ["title", "showClose", "showHeader", "showFooter"], outputs: ["close"] }, { kind: "component", type: PepRemoteLoaderComponent, selector: "pep-remote-loader", inputs: ["options", "hostObject"], outputs: ["hostEvents", "load"] }, { kind: "component", type: PepRemoteLoaderElementComponent, selector: "pep-remote-loader-element", inputs: ["options", "props", "events"], outputs: ["load"] }] });
+PepAddonBlockLoaderComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.0.2", type: PepAddonBlockLoaderComponent, selector: "pep-addon-block-loader", inputs: { addonId: "addonId", remoteEntry: "remoteEntry", slugName: "slugName", blockType: "blockType", name: "name", hostObject: "hostObject", dialogRef: "dialogRef", remoteLoaderOptions: "remoteLoaderOptions" }, outputs: { hostEvents: "hostEvents", blockLoad: "blockLoad" }, viewQueries: [{ propertyName: "dialogTemplate", first: true, predicate: ["dialogTemplate"], descendants: true, read: TemplateRef, static: true }], ngImport: i0, template: "<ng-container *ngIf=\"!inDialog\">\n    <ng-container *ngTemplateOutlet=\"remoteLoaderTemplate\"></ng-container>\n</ng-container>\n\n<ng-template #dialogTemplate let-data>\n    <pep-dialog [showClose]=\"data?.showClose\" [showHeader]=\"data?.showHeader\" [showFooter]=\"data?.showFooter\" [title]=\"data?.title\" (close)=\"closeDialog($event)\">\n        <ng-container pep-dialog-content>\n            <ng-container *ngTemplateOutlet=\"remoteLoaderTemplate\"></ng-container>\n        </ng-container>\n    </pep-dialog>\n</ng-template>\n\n<ng-template #remoteLoaderTemplate>\n    <pep-remote-loader class=\"remote-loader-element\" *ngIf=\"remoteLoaderOptions && !loadElement\"\n        [options]=\"remoteLoaderOptions\"\n        [hostObject]=\"hostObject\"\n        (hostEvents)=\"onHostEvents($event);\"\n        (load)=\"onBlockLoad()\">\n    </pep-remote-loader>\n\n    <pep-remote-loader-element class=\"remote-loader-element\" *ngIf=\"remoteLoaderOptions && loadElement\" \n        [options]=\"remoteLoaderOptions\"\n        [props]=\"{ hostObject: hostObject }\"\n        [events]=\"{ hostEvents: onHostEventsCallback }\"\n        (load)=\"onBlockLoad()\">\n    </pep-remote-loader-element>\n\n</ng-template>", styles: [".remote-loader-element{width:100%;height:100%;overflow:auto}\n"], dependencies: [{ kind: "directive", type: i2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i2.NgTemplateOutlet, selector: "[ngTemplateOutlet]", inputs: ["ngTemplateOutletContext", "ngTemplateOutlet", "ngTemplateOutletInjector"] }, { kind: "component", type: i1$1.PepDialogComponent, selector: "pep-dialog", inputs: ["title", "showClose", "showHeader", "showFooter"], outputs: ["close"] }, { kind: "component", type: PepRemoteLoaderComponent, selector: "pep-remote-loader", inputs: ["options", "hostObject"], outputs: ["hostEvents", "load"] }, { kind: "component", type: PepRemoteLoaderElementComponent, selector: "pep-remote-loader-element", inputs: ["options", "props", "events"], outputs: ["load"] }] });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.2", ngImport: i0, type: PepAddonBlockLoaderComponent, decorators: [{
             type: Component,
-            args: [{ selector: 'pep-addon-block-loader', template: "<ng-container *ngIf=\"!inDialog\">\n    <ng-container *ngTemplateOutlet=\"remoteLoaderTemplate\"></ng-container>\n</ng-container>\n\n<ng-template #dialogTemplate let-data>\n    <pep-dialog [showClose]=\"data?.showClose\" [showHeader]=\"data?.showHeader\" [showFooter]=\"data?.showFooter\" [title]=\"data?.title\" (close)=\"closeDialog($event)\">\n        <ng-container pep-dialog-content>\n            <ng-container *ngTemplateOutlet=\"remoteLoaderTemplate\"></ng-container>\n        </ng-container>\n    </pep-dialog>\n</ng-template>\n\n<ng-template #remoteLoaderTemplate>\n    <pep-remote-loader *ngIf=\"remotePathOptions && !loadElement\"\n        [options]=\"remotePathOptions\"\n        [hostObject]=\"hostObject\"\n        (hostEvents)=\"onHostEvents($event);\"\n        (load)=\"onBlockLoad()\">\n    </pep-remote-loader>\n\n    <pep-remote-loader-element *ngIf=\"remotePathOptions && loadElement\" \n        [options]=\"remotePathOptions\"\n        [props]=\"{ hostObject: hostObject }\"\n        [events]=\"{ hostEvents: onHostEventsCallback }\"\n        (load)=\"onBlockLoad()\">\n    </pep-remote-loader-element>\n\n</ng-template>" }]
+            args: [{ selector: 'pep-addon-block-loader', template: "<ng-container *ngIf=\"!inDialog\">\n    <ng-container *ngTemplateOutlet=\"remoteLoaderTemplate\"></ng-container>\n</ng-container>\n\n<ng-template #dialogTemplate let-data>\n    <pep-dialog [showClose]=\"data?.showClose\" [showHeader]=\"data?.showHeader\" [showFooter]=\"data?.showFooter\" [title]=\"data?.title\" (close)=\"closeDialog($event)\">\n        <ng-container pep-dialog-content>\n            <ng-container *ngTemplateOutlet=\"remoteLoaderTemplate\"></ng-container>\n        </ng-container>\n    </pep-dialog>\n</ng-template>\n\n<ng-template #remoteLoaderTemplate>\n    <pep-remote-loader class=\"remote-loader-element\" *ngIf=\"remoteLoaderOptions && !loadElement\"\n        [options]=\"remoteLoaderOptions\"\n        [hostObject]=\"hostObject\"\n        (hostEvents)=\"onHostEvents($event);\"\n        (load)=\"onBlockLoad()\">\n    </pep-remote-loader>\n\n    <pep-remote-loader-element class=\"remote-loader-element\" *ngIf=\"remoteLoaderOptions && loadElement\" \n        [options]=\"remoteLoaderOptions\"\n        [props]=\"{ hostObject: hostObject }\"\n        [events]=\"{ hostEvents: onHostEventsCallback }\"\n        (load)=\"onBlockLoad()\">\n    </pep-remote-loader-element>\n\n</ng-template>", styles: [".remote-loader-element{width:100%;height:100%;overflow:auto}\n"] }]
         }], ctorParameters: function () { return [{ type: PepRemoteLoaderService }]; }, propDecorators: { dialogTemplate: [{
                 type: ViewChild,
                 args: ['dialogTemplate', { static: true, read: TemplateRef }]
@@ -400,6 +549,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.0.2", ngImpor
                 type: Input
             }], dialogRef: [{
                 type: Input
+            }], remoteLoaderOptions: [{
+                type: Input
             }], hostEvents: [{
                 type: Output
             }], blockLoad: [{
@@ -421,6 +572,9 @@ class PepAddonBlockLoaderService {
             addonBlockInstance.addonId = options.addonUUID;
             addonBlockInstance.remoteEntry = options.blockRemoteEntry;
             addonBlockInstance.hostObject = options.hostObject;
+            if (options.remoteLoaderOptions) {
+                addonBlockInstance.remoteLoaderOptions = options.remoteLoaderOptions;
+            }
             addonBlockInstance.hostEvents.subscribe((event) => {
                 if (options.hostEventsCallback) {
                     options.hostEventsCallback(event);
@@ -440,7 +594,7 @@ class PepAddonBlockLoaderService {
         if (componentRef) {
             const addonBlockInstance = componentRef.instance;
             const pepConfig = this.dialogService.getDialogConfig({ disableClose: false, panelClass: 'remote-loader-dialog' }, options.size || 'full-screen');
-            const mergeConfig = { ...options.config, ...pepConfig };
+            const mergeConfig = { ...pepConfig, ...options.config };
             const data = options.data || null;
             addonBlockInstance.dialogRef = this.dialogService.openDialog(addonBlockInstance.dialogTemplate, data, mergeConfig);
             addonBlockInstance.dialogRef.afterClosed().subscribe(() => {