@rws-framework/client 2.21.4 → 2.21.5

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@rws-framework/client",
     "private": false,
-    "version": "2.21.4",
+    "version": "2.21.5",
     "main": "src/index.ts",
     "scripts": {
         "docs": "typedoc --tsconfig ./tsconfig.json"

package/src/components/_component.ts

@@ -13,6 +13,7 @@ import TheRWSService from '../services/_service';
 import { handleExternalChange } from './_attrs/_external_handler';
 import { IFastDefinition, isDefined, defineComponent, getDefinition } from './_definitions';
 import { on, $emitDown, observe, sendEventToOutside } from './_event_handling';
+import { domEvents } from '../events';
 
 type ComposeMethodType<
     T extends FoundationElementDefinition,
@@ -262,47 +263,71 @@ abstract class RWSViewComponent extends FoundationElement implements IRWSViewCom
 
         let adoptedSheets: CSSStyleSheet[] = [];
 
+        let doneAdded = false;
+
         for (const styleLink of styleLinks) {
-            if (mode === 'legacy' || mode === 'both') {
-                const link = document.createElement('link');
-                link.rel = 'stylesheet';
-                link.href = styleLink;
-                this.getShadowRoot().appendChild(link);
-            }
+            const loadPromise = new Promise<void>(async (resolve, reject) => {
+                if (mode === 'legacy' || mode === 'both') {
+                    const link = document.createElement('link');
+                    link.rel = 'stylesheet';
+                    link.href = styleLink;
+                    this.getShadowRoot().appendChild(link);
+    
+                    link.onload = () => {
+                        doneAdded = true;
+
+                        if(mode === 'legacy'){
+                            resolve();
+                        }
+                    };
+                }
 
-            if (mode === 'adopted' || mode === 'both') {
-                const entry = await this.indexedDBService.getFromDB(db, storeName, styleLink);                
+                if (mode === 'adopted' || mode === 'both') {
+                    const entry = await this.indexedDBService.getFromDB(db, storeName, styleLink);
 
-                let cssText: string | null = null;
+                    let cssText: string | null = null;
 
-                if (entry && typeof entry === 'object' && 'css' in entry && 'timestamp' in entry) {
-                    const expired = Date.now() - entry.timestamp > maxAgeDays;
-                    if (!expired) {
-                        cssText = entry.css;
+                    if (entry && typeof entry === 'object' && 'css' in entry && 'timestamp' in entry) {
+                        const expired = Date.now() - entry.timestamp > maxAgeDays;
+                        if (!expired) {
+                            cssText = entry.css;
+                        }
                     }
-                }
 
-                if (!cssText) {
-                    cssText = await fetch(styleLink).then(res => res.text());
-                    await this.indexedDBService.saveToDB(db, storeName, styleLink, {
-                        css: cssText,
-                        timestamp: Date.now()
-                    });
-                    console.log(`System saved stylesheet: ${styleLink} to IndexedDB`)
-                }
+                    if (!cssText) {
+                        cssText = await fetch(styleLink).then(res => res.text());
+                        await this.indexedDBService.saveToDB(db, storeName, styleLink, {
+                            css: cssText,
+                            timestamp: Date.now()
+                        });
+                        console.log(`System saved stylesheet: ${styleLink} to IndexedDB`)
+                    }
 
-                const sheet = new CSSStyleSheet();
-                await sheet.replace(cssText);
+                    const sheet = new CSSStyleSheet();
+                    await sheet.replace(cssText);
 
-                adoptedSheets.push(sheet);                
-            }
+                    adoptedSheets.push(sheet);
+
+                    if(mode === 'adopted' || mode === 'both'){
+                        resolve();
+                    }
+                }
+            });
+
+            await loadPromise;
         }
 
-        if(adoptedSheets.length){
-            this.getShadowRoot().adoptedStyleSheets = [                
+        if (adoptedSheets.length) {
+            this.getShadowRoot().adoptedStyleSheets = [
                 ...adoptedSheets,
                 ...this.getShadowRoot().adoptedStyleSheets,
             ];
+
+            doneAdded = true;
+        }
+
+        if (doneAdded) {
+            this.$emit(domEvents.loadedLinkedStyles);
         }
     }
 }

package/src/events.ts

@@ -0,0 +1,3 @@
+export const domEvents = {
+    loadedLinkedStyles: 'loaded:linked'
+}

package/src/index.ts

@@ -24,12 +24,12 @@ import type { IRWSPlugin, IStaticRWSPlugin, IPluginSpawnOption } from './types/I
 import type IRWSUser from './types/IRWSUser';
 import type { IAssetShowOptions, IRWSViewComponent } from './components/_component';
 import type { RWSDecoratorOptions } from './components/_decorator';
-import type { IKDBTypeInfo, IKDBTypesResponse } from './types/IBackendCore';
 import type { DOMOutputType, TagsProcessorType } from './services/DOMService';
 import type { IBackendRoute, IHTTProute, IPrefixedHTTProutes } from './services/ApiService';
 import type IRWSConfig from './types/IRWSConfig';
 import type RWSNotify from './types/RWSNotify';
 import type { NotifyUiType, NotifyLogType }  from './types/RWSNotify';
+import * as RWSEvents from './events';
 
 export default RWSClient;
 
@@ -70,11 +70,12 @@ export {
     RWSService,
     RWSViewComponent,
 
-    RWSContainer
+    RWSContainer,
+
+    RWSEvents
 };
 
-export type {
-    IKDBTypeInfo, IKDBTypesResponse,
+export type {    
     NotifyUiType,
     NotifyLogType,
     IBackendRoute as IRWSBackendRoute,

package/src/services/ApiService.ts

@@ -1,4 +1,4 @@
-import { IKDBTypesResponse } from '../types/IBackendCore';
+import { IKDBTypesResponse } from '../../../components/src/types/IBackendCore';
 import TheService from './_service';
 
 //@4DI

package/src/services/DOMService.ts

@@ -83,7 +83,7 @@ class DOMService extends RWSService {
         sanitizeOptions: DOMPurify.Config = { })
     {
         const output: string = line.trim();
-        const sanitized = DOMPurify.sanitize(output, { USE_PROFILES: { html: true }, ...sanitizeOptions});
+        const sanitized = DOMPurify.sanitize(output, { USE_PROFILES: { html: true }, ...sanitizeOptions}) as string;
         return sanitized;
     }
 }

package/src/types/IBackendCore.ts

@@ -1,12 +0,0 @@
-export interface IKDBTypeInfo {
-    fieldName: string;
-    type: string;
-    boundModel?: string
-}
-
-export interface IKDBTypesResponse {
-    success: boolean;
-    data: {
-        types: IKDBTypeInfo[];
-    };
-}

package/src/types/IRWSResource.ts

@@ -1,5 +0,0 @@
-export interface IRWSResourceQuery {
-    fieldName: string,
-    type: String,
-    boundModel: string
-}

package/src/types/IReFormerField.ts

@@ -1,5 +0,0 @@
-export interface IReFormerField {
-    name: string,
-    defaultValue?: any,
-    setForm: (field: string, value: any) => Promise<void>   
-}