@magic-xpa/angular 4.801.0-dev481.321 → 4.801.0-dev481.322

package/fesm2020/magic-xpa-angular.mjs

@@ -2239,6 +2239,10 @@ let COLOR_FILE_NAME = new InjectionToken('colorFile', {
 });
 const MAGIC_FG_COLOR = 1;
 const MAGIC_BG_COLOR = 2;
+const SYSTEM_FG = 2;
+const SYSTEM_BG = 4;
+const SYSTEM_FG_AND_SYSTEM_BG = 6;
+const TRANSPERENT_BG = 1;
 class MagicColorService {
     constructor(http, colorFile1 = 'clr_rnt.eng') {
         this.http = http;
@@ -2284,27 +2288,26 @@ class MagicColorService {
             this.getColorData();
         if (this.colorsData) {
             if (this.colorsData[colorIndex - 1]) {
-                let hex = '';
                 const grayHashCode = '00808080';
+                let hex = grayHashCode;
                 let color = this.colorsData[colorIndex - 1].split(',');
-                if (+color[3] || 1 == +color[3]) {
-                    isTransperent = true;
-                }
-                if (+color[3] <= 1) {
-                    switch (colorType) {
-                        case MAGIC_FG_COLOR:
+                let colorAtrributes = +color[3];
+                switch (colorType) {
+                    case MAGIC_FG_COLOR:
+                        if (colorAtrributes != SYSTEM_FG && colorAtrributes != SYSTEM_FG_AND_SYSTEM_BG)
                             hex = (color[1]);
-                            break;
-                        case MAGIC_BG_COLOR:
+                        break;
+                    case MAGIC_BG_COLOR:
+                        if (colorAtrributes != SYSTEM_BG && colorAtrributes != SYSTEM_FG_AND_SYSTEM_BG) {
+                            if (colorAtrributes == TRANSPERENT_BG)
+                                isTransperent = true;
                             hex = (color[2]);
-                            break;
-                        default:
-                            console.log('Please enter valid color type : 1-FG, 2-BG ' + colorIndex);
-                            return '';
-                    }
+                        }
+                        break;
+                    default:
+                        console.log('Please enter valid color type : 1-FG, 2-BG ' + colorIndex);
+                        return '';
                 }
-                else
-                    hex = grayHashCode;
                 return this.hexToRgba('#' + hex, isTransperent);
             }
             else