@rws-framework/client 2.10.0 → 2.10.2

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@rws-framework/client",
     "private": false,
-    "version": "2.10.0",
+    "version": "2.10.2",
     "main": "src/index.ts",
     "scripts": {
         "docs": "typedoc --tsconfig ./tsconfig.json"
@@ -106,4 +106,4 @@
     "overrides": {
         "lodash": "^4.17.21"
     }
-}
+}

package/rws.webpack.config.js

@@ -32,7 +32,9 @@ const RWSWebpackWrapper = async (config) => {
 
   const executionDir = rwsPath.relativize(BuildConfigurator.get('executionDir') || config.executionDir || process.cwd(), config.packageDir);
 
-  const isDev = BuildConfigurator.get('dev', config.dev);
+  const isWatcher = process.argv.includes('--watch') || false;  
+
+  const isDev = isWatcher ? true : (BuildConfigurator.get('dev', config.dev) || false);
   const isHotReload = BuildConfigurator.get('hot', config.hot);
   const isReport = BuildConfigurator.get('report', config.report);
   const isParted = BuildConfigurator.get('parted', config.parted || false);
@@ -235,9 +237,6 @@ const RWSWebpackWrapper = async (config) => {
     WEBPACK_PLUGINS.push(new RWSAfterPlugin({ actions: WEBPACK_AFTER_ACTIONS, dev: isDev }));
   }
 
-  console.log('Webpack building with entrypoints:', Object.keys(automatedChunks));
-
-
   let cfgExport = {  
     context: executionDir,  
     entry: {      

package/src/client/components.ts

@@ -13,13 +13,9 @@ async function loadPartedComponents(this: RWSClientInstance): Promise<RWSInfoTyp
         const loadedComponents = [];
 
         document.addEventListener(RWSViewComponent._EVENTS.component_define, (event: Event) => {
-            const customEvent = event as CustomEvent<string>;
+            const customEvent = event as CustomEvent<string>;            
 
-            console.log('defined', customEvent.detail);
-
-            loadedComponents.push(customEvent.detail);
-
-            console.log(loadedComponents.length, componentParts.components.length);
+            loadedComponents.push(customEvent.detail);                           
         });
 
         let compList = '';

package/src/components/uploader/component.ts

@@ -3,19 +3,23 @@ import { RWSView, RWSViewComponent, observable, attr } from '../../index';
 @RWSView('rws-uploader')
 class RWSUploader extends RWSViewComponent {
 
-  @observable uploadProgress: number = 0;
+  @observable uploadProgress: number;
 
   @observable uploadedFile: File;
   @observable chosenFile: File;
   @observable uploadParams: any;
 
   @attr onFinish: (uploadResponse: any) => void;
-  @attr onStart: (chosenFile: File, context: any) => void = (chosenFile: File) => null;
+  @attr onStart: (chosenFile: File, context: any) => Promise<unknown> = async (chosenFile: File) => chosenFile;
   @attr onProgress: (progress: number) => void = (progress: number) => null;
 
 
   async onUploadStart(): Promise<void>
   {    
+        if(!this.uploadProgress){
+            this.uploadProgress = 0;
+        }
+
       const response = await this.onStart(this.chosenFile, this);
    
       if(response === null){
@@ -71,7 +75,7 @@ class RWSUploader extends RWSViewComponent {
 
   uploadProgressChanged(oldV: any, newV: any)
   {
-    console.log('chng', this.uploadProgress);
+    
   }
 }
 

package/src/components/uploader/styles/layout.scss

@@ -1,8 +1,33 @@
 @import "@rws-mixins";
 
+//vars
+$upl_secondary: var(--rws-uploader-secondary, #CCC);
+$upl_bg: var(--rws-uploader-bg, #424242);
+$upl_border: var(--rws-uploader-border, #FFF);
+
+$upl_primary: var(--rws-uploader-primary, #EE2375);
+
+$upl_text: var(--rws-uploader-text, #000);
+
+$upl_btn_text: var(--rws-uploader-btn-text, #000);
+$upl_btn_bg: var(--rws-uploader-btn-bg, #CCC);
+$upl_btn_border: var(--rws-uploader-btn-border, #000);
+
+rws-progress {
+    --accent-foreground-rest: $upl_primary;
+}
+
+//styles
 .upload_area {    
+
+    color: $upl_text;
+
     padding: 25px;
 
+    
+    *{
+        box-sizing: border-box;
+    }
 
     section{
         &::after{
@@ -14,7 +39,7 @@
         display: block;
         contain: content;
         box-sizing: border-box;
-        background: #424242;
+        background: $upl_bg;
         border-radius: 10px;
         box-shadow: 0 0 5px rgba(0, 0, 0, 0.7);
 
@@ -22,7 +47,7 @@
             @include grid-container();
             @include grid-flex-align-items(center, center);
             
-            border: 4px dashed #FFF; // Adjust color as needed
+            border: 4px dashed $upl_border; // Adjust color as needed
             width: 100%; // Adjust width as needed
             height: 100%; // Adjust height as needed
             padding: 30px;
@@ -33,14 +58,14 @@
             cursor: pointer;
 
             .file-block {
-                border: 1px solid #FFF;
+                border: 1px solid $upl_border;
 
                 font-size: 10px;
                 padding: 15px;
                 border-radius: 15px;
 
                 .close-btn {
-                    border: 1px solid #FFF;
+                    border: 1px solid $upl_border;
                     padding: 5px;
                     font-weight: bold;
                     margin-left: 10px;
@@ -53,7 +78,7 @@
 
                 &:before{
                     content: '';
-                    background: #CCC;
+                    background: $upl_secondary;
                     opacity: 0.4;
 
                     position: absolute;
@@ -70,6 +95,7 @@
 
         h3{
             padding: 0 15px;
+            color: $upl_text;
         }
 
         article {
@@ -78,14 +104,14 @@
         
 
         button {
-            background: var(--accent-fill-rest);
-            color: var(--foreground-on-accent-rest);
+            background: $upl_btn_bg;
+            color: $upl_btn_text;
             font-size: 14px;
             padding: 10px;        
             box-shadow: none;
             border-radius: 5px;
             border-style: solid;
-            border-color: var(--accent-fill-rest);
+            border-color: $upl_btn_border;
             border-width: 1px;
 
             fill: currentcolor;
@@ -97,6 +123,8 @@
 
             &.next{
                 float: right;
+                margin-right: 10px;
+                margin-bottom: 10px;
             }            
         }
     }    

package/src/components/uploader/template.html

@@ -1,7 +1,7 @@
 <div class="upload_area">
     <section>
         <h3>Upload file</h3>
-        <rws-progress value="${x => x.uploadProgress}" min="1" max="100"></rws-progress>
+        <rws-progress :value="${x => x.uploadProgress}" min="1" max="100"></rws-progress>
         <article>
             <div class="drag-and-drop"> 
                 <div @click="${x => !x.chosenFile ? x.onChoose() : (() => {})()}" class="upl-background"></div>

package/src/services/ConfigService.ts

@@ -92,10 +92,7 @@ class ConfigService extends TheService {
 
         return new Promise((resolve) => {
             const tick = () => {
-                if(ConfigService.isLoaded){
-                   
-
-                    // console.log('resolved', tagName);
+                if(ConfigService.isLoaded){                                    
                     clearTimeout(t);    
                     resolve(true);
                     return;

package/webpack/scss/_import.js

@@ -114,8 +114,6 @@ function extractScssUses(fileContent) {
         }
     }
 
-    // console.log(uses);
-
     return [uses];
 }