@wavemaker/rn-codegen 11.6.1-rc.5499 → 11.7.0-dev.2

{rn-codegen → package}/src/theme/theme.service.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ThemeService = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
+const path_1 = __importDefault(require("path"));
 const clean_css_1 = __importDefault(require("clean-css"));
 const rimraf_1 = __importDefault(require("rimraf"));
 const adm_zip_1 = __importDefault(require("adm-zip"));
@@ -148,7 +149,7 @@ class ThemeService {
                 fs_extra_1.default.copySync(`${osBuild}/wavemaker/assets`, `${osDist}/assets`);
                 fs_extra_1.default.copySync(`${osBuild}/custom/assets`, `${osDist}/assets`);
             })
-                .then(() => {
+                .then(async () => {
                 const platformFontConfigJson = require(`${themeProjectPath}/wavemaker/assets/fonts/font.config.json`);
                 const themeFontConfigJsonPath = `${osBuild}/custom/assets/fonts/font.config.json`;
                 let themeFontConfigJson = null;
@@ -158,9 +159,17 @@ class ThemeService {
                 const fontConfigTemplate = (0, utils_1.loadTemplate)(`${themeProjectPath}/wavemaker/assets/fonts/font.config.js.hbs`);
                 fs_extra_1.default.removeSync(`${osDist}/assets/fonts/font.config.js.hbs`);
                 fs_extra_1.default.removeSync(`${osDist}/assets/fonts/font.config.json`);
+                const fonts = [...platformFontConfigJson.fonts, ...((themeFontConfigJson === null || themeFontConfigJson === void 0 ? void 0 : themeFontConfigJson.fonts) || [])];
+                const fontGenPromise = Promise.all(fonts.map(f => {
+                    if (f.csspath) {
+                        f.stylePath = f.csspath.replace('.css', '.js');
+                        return this.getIconFontScripts(path_1.default.normalize(`${osDist}/assets/fonts/${f.csspath}`));
+                    }
+                    return Promise.resolve();
+                }));
                 (0, utils_1.writeFile)(`${osDist}/assets/fonts/font.config.js`, fontConfigTemplate({
                     baseFont: (themeFontConfigJson === null || themeFontConfigJson === void 0 ? void 0 : themeFontConfigJson.baseFont) || platformFontConfigJson.baseFont,
-                    fonts: [...platformFontConfigJson.fonts, ...((themeFontConfigJson === null || themeFontConfigJson === void 0 ? void 0 : themeFontConfigJson.fonts) || [])]
+                    fonts: fonts
                 }));
                 let content = fs_extra_1.default.readFileSync(`${osDist}/variables.js`, 'utf8');
                 content = content.replace(/;/g, ',');
@@ -170,6 +179,7 @@ class ThemeService {
                     '  fontConfig: fontConfig,' +
                     content.substring(content.indexOf('{') + 1);
                 fs_extra_1.default.writeFileSync(`${osDist}/variables.js`, content);
+                return fontGenPromise;
             });
         }
         else {
@@ -227,8 +237,17 @@ class ThemeService {
         (0, utils_1.writeFile)(`${path}/wavemaker/styles.less`, style);
     }
     generateVariables(path) {
-        (0, utils_1.writeFile)(`${path}/wavemaker/variables.less`, VARIABLE__TEMPLATE({ variables: variables_1.default }));
-        const mVariables = {};
+        let mVariables = {};
+        Object.keys(variables_1.default).forEach(k => {
+            const v = (0, lodash_1.cloneDeep)((variables_1.default[k]));
+            if (v && (0, lodash_1.isString)(v.md)) {
+                v.md = v.md.replace('--', '@--');
+                v.mdValue = v.mdValue.replace('--', '@--');
+            }
+            mVariables[k] = v;
+        });
+        (0, utils_1.writeFile)(`${path}/wavemaker/variables.less`, VARIABLE__TEMPLATE({ variables: mVariables }));
+        mVariables = {};
         Object.keys(variables_1.default).map(k => {
             const v = (variables_1.default[k]).dValue;
             if ((0, lodash_1.isString)(v)) {
@@ -253,6 +272,17 @@ class ThemeService {
         (0, utils_1.writeFile)(`${themePath}/.wmproject.properties`, WM_PROPERTIES_TEMPLATE({ theme: themeName }));
         return Promise.resolve();
     }
+    getIconFontScripts(csspath) {
+        const cssPathSplits = csspath.split(path_1.default.sep);
+        const fileName = cssPathSplits[cssPathSplits.length - 1].replace('.css', '');
+        cssPathSplits.splice(cssPathSplits.length - 1, 1);
+        const dest = cssPathSplits.join(path_1.default.sep);
+        return this.minifyCSS(`${dest}/${fileName}.css`, `${dest}/font-styles.min.css`).then(() => {
+            let rawStyle = fs_extra_1.default.readFileSync(`${dest}/font-styles.min.css`, 'utf8');
+            fs_extra_1.default.writeFileSync(`${dest}/${fileName}.js`, 'export default ' + this.generateFontReactNativeStyles(rawStyle) + ';');
+            fs_extra_1.default.removeSync(`${dest}/font-styles.min.css`);
+        });
+    }
 }
 exports.ThemeService = ThemeService;
 //# sourceMappingURL=theme.service.js.map

package/src/theme/theme.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"theme.service.js","sourceRoot":"","sources":["../../../src/theme/theme.service.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA0B;AAC1B,gDAAwB;AACxB,0DAAiC;AACjC,oDAA4B;AAC5B,sDAA6B;AAC7B,0DAAkC;AAClC,sFAA0E;AAC1E,mCAA6C;AAC7C,4DAAoC;AACpC,gDAAwB;AACxB,oCAA8E;AAC9E,yEAAoE;AACpE,6EAAsE;AAEtE,MAAM,mBAAmB,GAAG,SAAS,GAAI,qBAAqB,CAAC;AAC/D,MAAM,eAAe,GAAG,IAAA,oBAAY,EAAC,SAAS,GAAG,oDAAoD,CAAC,CAAC;AACvG,MAAM,kBAAkB,GAAG,IAAA,oBAAY,EAAC,SAAS,GAAG,uDAAuD,CAAC,CAAC;AAC7G,MAAM,0BAA0B,GAAG,IAAA,oBAAY,EAAC,SAAS,GAAG,0DAA0D,CAAC,CAAC;AACxH,MAAM,iCAAiC,GAAG,IAAA,oBAAY,EAAC,SAAS,GAAG,4CAA4C,CAAC,CAAC;AACjH,MAAM,sBAAsB,GAAG,IAAA,oBAAY,EAAC,SAAS,GAAG,mDAAmD,CAAC,CAAC;AAE7G,MAAa,YAAY;IAAzB;QAEY,2BAAsB,GAAG,IAAI,iDAAsB,EAAE,CAAC;QACtD,6BAAwB,GAAE,IAAI,qDAAwB,EAAE,CAAC;IAkRrE,CAAC;IAhRW,QAAQ,CAAC,IAAY;QACzB,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACzC,IAAA,gBAAM,EAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YACT,kBAAE,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,eAAe,CAAC,GAAW,EAAE,EAAU,EAAE,IAAY;QACzD,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YACtC,kBAAE,CAAC,QAAQ,CAAC,GAAG,GAAG,YAAY,EAAE,GAAG,IAAI,YAAY,CAAC,CAAC;YACrD,kBAAE,CAAC,QAAQ,CAAC,GAAG,GAAG,aAAa,EAAE,GAAG,IAAI,SAAS,CAAC,CAAC;YACnD,kBAAE,CAAC,QAAQ,CAAC,GAAG,GAAG,QAAQ,EAAE,EAAE,EAAE,GAAG,IAAI,YAAY,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;IACP,CAAC;IAEM,SAAS,CAAC,GAAW,EAAE,IAAI,GAAG,GAAG;QACpC,MAAM,IAAI,GAAG,kBAAE,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC1C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3B,IAAI,mBAAQ,CAAC;gBACT,MAAM,EAAE;oBACJ,0BAA0B,EAAE,IAAI;iBACnC;aACJ,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE;gBACrC,kBAAE,CAAC,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACxC,OAAO,EAAE,CAAC;YACd,CAAC,CAAC,CAAA;QAAA,CAAC,CAAC,CAAC;IACT,CAAC;IAEO,WAAW,CAAC,GAAW,EAAE,GAAW,EAAE,IAAI,GAAG,GAAG;QACpD,MAAM,OAAO,GAAG,kBAAE,CAAC,YAAY,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC7C,OAAO,cAAI,CAAC,MAAM,CAAC,OAAO,EAAE;YACpB,KAAK,EAAE,CAAC,GAAG,CAAC;SACf,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE;YACb,IAAI,MAAM,EAAE;gBACR,kBAAE,CAAC,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;aACtC;QACL,CAAC,CAAC,CAAC;IACX,CAAC;IAEO,cAAc,CAAC,MAAc;QACjC,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;IACnF,CAAC;IAED,MAAM,CAAC,SAAiB;QACpB,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACzC,IAAI,kBAAE,CAAC,UAAU,CAAC,GAAG,SAAS,YAAY,CAAC,EAAE;gBACzC,IAAA,gBAAM,EAAC,GAAG,SAAS,YAAY,EAAE,CAAC,CAAC,EAAE,EAAE;oBACnC,IAAI,CAAC,EAAE;wBACH,MAAM,CAAC,CAAC,CAAC,CAAC;qBACb;yBAAM;wBACH,OAAO,EAAE,CAAC;qBACb;gBACL,CAAC,CAAC,CAAC;aACN;QACL,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YACT,kBAAE,CAAC,QAAQ,CAAC,GAAG,mBAAmB,YAAY,EAAE,GAAG,SAAS,YAAY,EAAE;gBACtE,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC;aAC9C,CAAC,CAAA;YACF,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;YAC9B,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;IACP,CAAC;IAED,oBAAoB,CAAC,SAAiB;QAClC,OAAO,IAAI,CAAC,sBAAsB,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;IACjE,CAAC;IAED,yBAAyB,CAAC,SAAiB;QACvC,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,sBAAsB,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC/F,CAAC;IAED,6BAA6B,CAAC,SAAiB;QAC3C,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,wBAAwB,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;aACvF,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,gBAAwB;QAC1C,MAAM,IAAI,GAAG,GAAG,gBAAgB,OAAO,CAAC;QACxC,IAAI,OAAO,GAAsB,IAAW,CAAC;QAC7C,IAAI;YACA,OAAO,GAAG,MAAM,mBAAS,CAAC,MAAM,EAAE,CAAC;YACnC,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;YACrC,MAAM,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,aAAa,CAAC,CAAC;YAC7C,MAAM,IAAI,CAAC,WAAW,CAAC,EAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAC,CAAC,CAAC;YAClD,MAAM,IAAI,CAAC,UAAU,CAAC;gBAClB,IAAI,EAAE,GAAG,gBAAgB,YAAY;gBACrC,IAAI,EAAE;oBACF,CAAC,EAAE,CAAC;oBACJ,CAAC,EAAE,CAAC;oBACJ,KAAK,EAAE,GAAG;oBACV,MAAM,EAAE,GAAG;iBACd;aACJ,CAAC,CAAC;SACN;QAAC,OAAM,CAAC,EAAE;YACP,OAAO,CAAC,GAAG,CAAC,+FAA+F,CAAC,CAAC;YAC7G,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SACpB;gBAAS;YACN,OAAO,IAAI,OAAO,CAAC,KAAK,EAAE,CAAC;SAC9B;IACL,CAAC;IAED,OAAO,CAAC,gBAAwB,EAAE,QAAQ,GAAG,gBAAgB,EAAE,EAAW;QACtE,IAAI,CAAC,kBAAE,CAAC,UAAU,CAAC,GAAG,gBAAgB,EAAE,CAAC,EAAE;YACvC,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;SAC5B;QACD,IAAI,EAAE,EAAE;YACJ,MAAM,OAAO,GAAG,GAAG,QAAQ,UAAU,EAAE,EAAE,CAAC;YAC1C,MAAM,MAAM,GAAG,GAAG,QAAQ,SAAS,EAAE,EAAE,CAAC;YACxC,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;iBAC5B,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;iBACjC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,gBAAgB,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;iBAC/D,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,WAAW,CACxB,GAAG,OAAO,wBAAwB,EAClC,GAAG,OAAO,YAAY,EACtB,GAAG,MAAM,iBAAiB,CAC7B,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,MAAM,iBAAiB,EAAE,GAAG,MAAM,qBAAqB,CAAC,CAAC;iBACxF,IAAI,CAAC,GAAG,EAAE;gBACP,MAAM,QAAQ,GAAG,kBAAE,CAAC,YAAY,CAAC,GAAG,MAAM,qBAAqB,EAAE,OAAO,CAAC,CAAC;gBAC1E,kBAAE,CAAC,aAAa,CAAC,GAAG,MAAM,YAAY,EAAE,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC;gBAC7E,kBAAE,CAAC,aAAa,CAAC,GAAG,MAAM,WAAW,EAAE,iBAAiB,GAAG,IAAI,CAAC,yBAAyB,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC,CAAC;gBAC3G,kBAAE,CAAC,UAAU,CAAC,GAAG,MAAM,iBAAiB,CAAC,CAAC;gBAC1C,kBAAE,CAAC,UAAU,CAAC,GAAG,MAAM,qBAAqB,CAAC,CAAC;YAClD,CAAC,CAAC;iBACD,IAAI,CAAC,GAAG,EAAE;gBACP,OAAO,IAAI,CAAC,WAAW,CACnB,GAAG,OAAO,8BAA8B,EACxC,GAAG,OAAO,YAAY,EACtB,GAAG,MAAM,eAAe,CAC3B,CAAC;YACN,CAAC,CAAC;iBACD,IAAI,CAAC,GAAG,EAAE;gBACP,kBAAE,CAAC,QAAQ,CAAC,GAAG,OAAO,mBAAmB,EAAE,GAAG,MAAM,SAAS,CAAC,CAAC;gBAC/D,kBAAE,CAAC,QAAQ,CAAC,GAAG,OAAO,gBAAgB,EAAE,GAAG,MAAM,SAAS,CAAC,CAAC;YAChE,CAAC,CAAC;iBACD,IAAI,CAAC,KAAK,IAAI,EAAE;gBACb,MAAM,sBAAsB,GAAG,OAAO,CAAC,GAAG,gBAAgB,0CAA0C,CAAC,CAAC;gBACtG,MAAM,uBAAuB,GAAG,GAAG,OAAO,uCAAuC,CAAC;gBAClF,IAAI,mBAAmB,GAAI,IAAW,CAAC;gBACvC,IAAI,kBAAE,CAAC,UAAU,CAAC,uBAAuB,CAAC,EAAE;oBACxC,mBAAmB,GAAG,OAAO,CAAC,GAAG,OAAO,uCAAuC,CAAC,CAAC;iBACpF;gBACD,MAAM,kBAAkB,GAAG,IAAA,oBAAY,EAAC,GAAG,gBAAgB,4CAA4C,CAAC,CAAC;gBACzG,kBAAE,CAAC,UAAU,CAAC,GAAG,MAAM,kCAAkC,CAAC,CAAC;gBAC3D,kBAAE,CAAC,UAAU,CAAC,GAAG,MAAM,gCAAgC,CAAC,CAAC;gBACzD,MAAM,KAAK,GAAG,CAAC,GAAG,sBAAsB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,KAAK,KAAI,EAAE,CAAC,CAAC,CAAC;gBACvF,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;oBAC7C,IAAI,CAAC,CAAC,OAAO,EAAE;wBACX,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;wBAC/C,OAAO,IAAI,CAAC,kBAAkB,CAAC,cAAI,CAAC,SAAS,CAAC,GAAG,MAAM,iBAAiB,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;qBACzF;oBACD,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;gBAC7B,CAAC,CAAC,CAAC,CAAC;gBACJ,IAAA,iBAAS,EAAC,GAAG,MAAM,8BAA8B,EAAE,kBAAkB,CAAC;oBAClE,QAAQ,EAAE,CAAA,mBAAmB,aAAnB,mBAAmB,uBAAnB,mBAAmB,CAAE,QAAQ,KAAI,sBAAsB,CAAC,QAAQ;oBAC1E,KAAK,EAAE,KAAK;iBACf,CAAC,CAAC,CAAC;gBACJ,IAAI,OAAO,GAAG,kBAAE,CAAC,YAAY,CAAC,GAAG,MAAM,eAAe,EAAE,MAAM,CAAC,CAAC;gBAChE,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBACrC,OAAO,GAAG,wDAAwD;oBAC1D,oBAAoB;oBACpB,oCAAoC;oBACpC,2BAA2B;oBAC3B,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;gBACpD,kBAAE,CAAC,aAAa,CAAC,GAAG,MAAM,eAAe,EAAE,OAAO,CAAC,CAAC;gBACpD,OAAO,cAAc,CAAC;YAC1B,CAAC,CAAC,CAAC;SACN;aAAM;YACH,IAAI,kBAAE,CAAC,UAAU,CAAC,GAAG,gBAAgB,OAAO,CAAC,EAAE;gBAC3C,kBAAE,CAAC,UAAU,CAAC,GAAG,gBAAgB,OAAO,CAAC,CAAA;aAC5C;YACD,OAAO,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,QAAQ,EAAE,SAAS,CAAC;iBACrD,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;iBAC3D,IAAI,CAAC,GAAG,EAAE;gBACP,kBAAE,CAAC,YAAY,CAAC,GAAG,SAAS,gCAAgC,EAAE,GAAG,QAAQ,kBAAkB,CAAC,CAAC;gBAC7F,MAAM,UAAU,GAAG,kBAAE,CAAC,YAAY,CAAC,GAAG,QAAQ,2CAA2C,EAAE;oBACvF,QAAQ,EAAE,OAAO;iBACpB,CAAC,CAAC;gBACH,MAAM,QAAQ,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC,mBAAmB,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;gBAClE,MAAM,QAAQ,GAAG,yBAAyB;sBACpC,CAAC,UAAU,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC,aAAa,GAAC,QAAQ,GAAC,iDAAiD,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;gBACxH,OAAO,IAAA,iCAAyB,EAAC,GAAG,QAAQ,kBAAkB,EAAE,CAAC,OAAO,EAAE,EAAE;oBACxE,OAAO,OAAO,CAAC,OAAO,CAAC,2BAA2B,EAAE,QAAQ,CAAC;yBACxD,OAAO,CAAC,+BAA+B,EAAE,QAAQ,CAAC;yBAClD,OAAO,CAAC,0BAA0B,EAAE,QAAQ,CAAC;yBAC7C,OAAO,CAAC,8BAA8B,EAAE,QAAQ,CAAC,CAAA;gBAC1D,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;gBACT,kBAAE,CAAC,YAAY,CAAC,GAAG,gBAAgB,wBAAwB,EAAE,GAAG,QAAQ,6BAA6B,CAAC,CAAC;gBACvG,OAAO,IAAI,CAAC,eAAe,CAAC,gBAAgB,CAAC,CAAC;YAClD,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;gBACT,kBAAE,CAAC,YAAY,CAAC,GAAG,gBAAgB,YAAY,EAAE,GAAG,QAAQ,iBAAiB,CAAC,CAAC;YACnF,CAAC,CAAC,CAAC;SACV;IACL,CAAC;IAEM,QAAQ,CAAC,gBAAwB;QACpC,MAAM,OAAO,GAAG,GAAG,gBAAgB,iBAAiB,CAAC;QACrD,OAAO,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC3C,MAAM,GAAG,GAAG,IAAI,iBAAM,EAAE,CAAC;YACzB,GAAG,CAAC,cAAc,CAAC,GAAG,gBAAgB,OAAO,CAAC,CAAC;YAC/C,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;gBAC5B,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC7C,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC;IAEO,aAAa,CAAC,IAAY;QAC9B,MAAM,UAAU,GAAG,EAAc,CAAC;QAClC,4CAAgB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;YACpC,MAAM,MAAM,GAAG,iCAAiC,CAAC;gBAC7C,SAAS,EAAE,IAAI;gBACf,IAAI,EAAE,cAAc,IAAI,OAAO;gBAC/B,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;aACrD,CAAC,CAAC;YACH,IAAA,iBAAS,EAAC,GAAG,IAAI,yBAAyB,IAAI,OAAO,EAAE,MAAM,CAAC,CAAC;YAC/D,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC1B,CAAC,CAAC,CAAC;QACH,MAAM,KAAK,GAAG,eAAe,CAAC;YAC1B,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC;SAC5D,CAAC,CAAC;QACH,IAAA,iBAAS,EAAC,GAAG,IAAI,wBAAwB,EAAE,KAAK,CAAC,CAAC;IACtD,CAAC;IAEO,iBAAiB,CAAC,IAAY;QAClC,IAAI,UAAU,GAAG,EAAS,CAAC;QAC3B,MAAM,CAAC,IAAI,CAAC,mBAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YAC/B,MAAM,CAAC,GAAG,IAAA,kBAAS,EAAC,CAAE,mBAAiB,CAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAC9C,IAAI,CAAC,IAAI,IAAA,iBAAQ,EAAC,CAAC,CAAC,EAAE,CAAC,EAAE;gBACrB,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACjC,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;aAC9C;YACD,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACtB,CAAC,CAAC,CAAC;QACH,IAAA,iBAAS,EAAC,GAAG,IAAI,2BAA2B,EAAE,kBAAkB,CAAC,EAAC,SAAS,EAAE,UAAU,EAAC,CAAC,CAAC,CAAC;QAC3F,UAAU,GAAG,EAAS,CAAC;QACvB,MAAM,CAAC,IAAI,CAAC,mBAAS,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YAC3B,MAAM,CAAC,GAAG,CAAE,mBAAiB,CAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;YAC1C,IAAI,IAAA,iBAAQ,EAAC,CAAC,CAAC,EAAE;gBACb,UAAU,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC;aAC/B;iBAAM;gBACH,UAAU,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;aAC3B;QACL,CAAC,CAAC,CAAC;QACH,IAAA,iBAAS,EAAC,GAAG,IAAI,8BAA8B,EAAE,0BAA0B,CAAC,EAAC,SAAS,EAAE,UAAU,EAAC,CAAC,CAAC,CAAC;IAC1G,CAAC;IAED,QAAQ,CAAC,SAAiB,EAAE,IAAY,EAAE,KAAK,GAAG,KAAK;QACnD,MAAM,SAAS,GAAG,GAAG,IAAI,IAAI,SAAS,EAAE,CAAC;QACzC,IAAI,kBAAE,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE;YAC1B,OAAO,OAAO,CAAC,MAAM,CAAC,GAAG,SAAS,SAAS,CAAC,CAAC;SAChD;QACD,kBAAE,CAAC,QAAQ,CAAC,mBAAmB,EAAE,SAAS,EAAE;YACxC,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC;SAC9C,CAAC,CAAC;QACH,IAAI,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAC9B,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QAClC,IAAA,iBAAS,EAAC,GAAG,SAAS,wBAAwB,EAAE,sBAAsB,CAAC,EAAC,KAAK,EAAE,SAAS,EAAC,CAAC,CAAC,CAAC;QAC5F,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IAED,kBAAkB,CAAC,OAAe;QAC9B,MAAM,aAAa,GAAG,OAAO,CAAC,KAAK,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC;QAC9C,MAAM,QAAQ,GAAG,aAAa,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QAC7E,aAAa,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,GAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAChD,MAAM,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,cAAI,CAAC,GAAG,CAAC,CAAC;QAC1C,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,IAAI,IAAI,QAAQ,MAAM,EAAE,GAAG,IAAI,sBAAsB,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YACtF,IAAI,QAAQ,GAAG,kBAAE,CAAC,YAAY,CAAC,GAAG,IAAI,sBAAsB,EAAE,MAAM,CAAC,CAAC;YACtE,kBAAE,CAAC,aAAa,CAAC,GAAG,IAAI,IAAI,QAAQ,KAAK,EAAE,iBAAiB,GAAG,IAAI,CAAC,6BAA6B,CAAC,QAAQ,CAAC,GAAG,GAAG,CAAC,CAAC;YACnH,kBAAE,CAAC,UAAU,CAAC,GAAG,IAAI,sBAAsB,CAAC,CAAC;QACjD,CAAC,CAAC,CAAA;IACN,CAAC;CACJ;AArRD,oCAqRC"}

{rn-codegen → package}/src/theme/variables.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 class ColorProp {
-    constructor(dValue, md) {
+    constructor(dValue, md, mdValue) {
         this.dValue = dValue;
         this.md = md;
+        this.mdValue = mdValue;
+        this.mdValue = this.mdValue || this.md;
     }
 }
 const variables = new Map();
@@ -52,6 +54,8 @@ variables.set('heading6FontSize', new ColorProp(12));
 variables.set('transparent', new ColorProp('transparent'));
 variables.set('badgeColor', new ColorProp('#6c757d', '--md-ref-palette-error40'));
 variables.set('badgeContrastColor', new ColorProp('#ffffff'));
+//rippleColor
+variables.set('rippleColor', new ColorProp('fade(@primaryColor, 70%)', '--md-ref-palette-primary40', 'fade(--md-ref-palette-primary40, 70%)'));
 // Page
 variables.set('pageContentBgColor', new ColorProp('@defaultColorE', '--md-ref-palette-neutral80'));
 // Common Widget Colors
@@ -61,6 +65,9 @@ variables.set('widgetActiveHeaderBgColor', new ColorProp('@primaryColor', '--md-
 variables.set('widgetActiveHeaderTextColor', new ColorProp('@primaryContrastColor', '--md-ref-palette-neutral10'));
 variables.set('widgetBorderColor', new ColorProp('@defaultColorC', '--md-ref-palette-neutral-variant90'));
 variables.set('widgetBgColor', new ColorProp('@defaultColorF'));
+//App Navbar
+variables.set('titleBadgeTextColor', new ColorProp('#151420', '--md-ref-palette-neutral-variant30'));
+variables.set('titleBadgeBackgroundColor', new ColorProp('fade(@titleBadgeTextColor, 20%)'));
 // Navbar variables
 variables.set('navbarBackgroundColor', new ColorProp('@defaultColorF', '--md-ref-palette-neutral98'));
 variables.set('navbarBorderColor', new ColorProp('@widgetBorderColor', '--md-ref-palette-neutral-variant50'));
@@ -100,6 +107,13 @@ variables.set('spinnerIconColor', new ColorProp('@primaryColor', '--md-ref-palet
 variables.set('tabbarBackgroundColor', new ColorProp('@primaryContrastColor', '--md-ref-palette-neutral98'));
 variables.set('tabbarTextColor', new ColorProp('@primaryColor', '--md-ref-palette-neutral-variant30'));
 variables.set('tabbarIconColor', new ColorProp('@primaryColor', '--md-ref-palette-neutral-variant30'));
+variables.set('tabShadowColor', new ColorProp('@defaultColor', '--md-ref-palette-nuetral10'));
+variables.set('tabActiveBackgroundColor', new ColorProp('@secondaryColor', '--md-ref-palette-secondary90'));
+variables.set('tabActiveIconColor', new ColorProp('@secondaryColor', '--md-ref-palette-secondary10'));
+variables.set('tabLabelTextColor', new ColorProp('@primaryColor', '--md-ref-palette-neutral-variant30'));
+variables.set('centerHubItemColor', new ColorProp('@primaryColor', '--md-ref-palette-primary40'));
+variables.set('centerHubIconColor', new ColorProp('@defaultColorF', '--md-ref-palette-neutral100'));
+variables.set('centerHubLabelColor', new ColorProp('@defaultColorF', '--md-ref-palette-neutral100'));
 // Tab variables
 variables.set('tabHeaderBgColor', new ColorProp('@widgetBgColor', '--md-ref-palette-neutral98'));
 variables.set('tabHeaderTextColor', new ColorProp('@defaultColorA', '--md-ref-palette-neutral-variant30'));
@@ -166,17 +180,20 @@ variables.set('buttonDarkTextColor', new ColorProp('@lightColor'));
 variables.set('buttonLightColor', new ColorProp('@lightColor'));
 variables.set('buttonLightTextColor', new ColorProp('@darkColor'));
 variables.set('buttonGrpBorderColor', new ColorProp('@widgetBorderColor', '--md-ref-palette-neutral-variant50'));
-variables.set('buttonGrpBgColor', new ColorProp('@defaultColorF'));
+variables.set('buttonGrpBgColor', new ColorProp('@defaultColorF', '--md-ref-palette-neutral98'));
 // Picture Variables
 variables.set('pictureThumbBgColor', new ColorProp('@defaultColorF'));
 variables.set('pictureThumbBorderColor', new ColorProp('@defaultColorD'));
 // Input Variables
 variables.set('inputTextColor', new ColorProp('@defaultTextColor'));
 variables.set('inputBorderColor', new ColorProp('@defaultColorD'));
-variables.set('inputBackgroundColor', new ColorProp('@defaultColorF', '--md-ref-palette-neutral95'));
+variables.set('inputBackgroundColor', new ColorProp('@defaultColorF', '--md-ref-palette-neutral98'));
 variables.set('inputFocusBorderColor', new ColorProp('@primaryColor'));
 variables.set('inputInvalidBorderColor', new ColorProp('@dangerColor'));
-variables.set('inputPlaceholderColor', new ColorProp('@defaultColorB'));
+variables.set('inputPlaceholderColor', new ColorProp('@defaultColorB', '--md-ref-palette-neutral10'));
+//floating label
+variables.set('floatingLabelColor', new ColorProp('@inputPlaceholderColor'));
+variables.set('activeFloatingLabelColor', new ColorProp('@primaryColor'));
 // Slider Variables
 variables.set('minimumTrackTintColor', new ColorProp('@primaryColor', '--md-ref-palette-primary40'));
 variables.set('maximumTrackTintColor', new ColorProp('@widgetHeaderBgColor', '--md-ref-palette-neutral90'));
@@ -194,6 +211,13 @@ variables.set('toggleOffBorderColor', new ColorProp('@defaultColorB', '--md-ref-
 variables.set('groupHeadingBgColor', new ColorProp('@transparent'));
 variables.set('checkedColor', new ColorProp('@primaryColor', '--md-ref-palette-primary40'));
 variables.set('checkedDisabledColor', new ColorProp('@defaultColorA', '--md-ref-palette-neutral-variant30'));
+variables.set('checkedEnabledColor', new ColorProp('@defaultColorF'));
+variables.set('checkboxBorderColor', new ColorProp('@defaultColor9'));
+variables.set('checkedBgColor', new ColorProp('@checkedColor'));
+variables.set('uncheckedBgColor', new ColorProp('@transparent'));
+variables.set('checkedIconColor', new ColorProp('@defaultColorF'));
+variables.set('checkedBorderColor', new ColorProp('@primaryColor'));
+variables.set('uncheckedBorderColor', new ColorProp('@defaultColor9'));
 // Form
 variables.set('formBorderColor', new ColorProp('@widgetBorderColor'));
 variables.set('formTitleColor', new ColorProp('@defaultTextColor'));
@@ -216,7 +240,7 @@ variables.set('popoverTitleColor', new ColorProp('@defaultColor1'));
 // Menu
 variables.set('menuIconColor', new ColorProp('@defaultColor6', '--md-ref-palette-neutral-variant30'));
 variables.set('menuTextColor', new ColorProp('@defaultColor6', '--md-ref-palette-neutral10'));
-variables.set('menuBackgroundColor', new ColorProp('@popoverBackgroundColor', '--md-ref-palette-neutral94'));
+variables.set('menuBackgroundColor', new ColorProp('@popoverBackgroundColor', '--md-ref-palette-neutral98'));
 variables.set('menuItemBorderColor', new ColorProp('@widgetBorderColor', '--md-ref-palette-neutral-variant90'));
 variables.set('menuItemIconColor', new ColorProp('@defaultColor6', '--md-ref-palette-neutral-variant30'));
 variables.set('menuItemTextColor', new ColorProp('@defaultColor6', '--md-ref-palette-neutral10'));
@@ -242,10 +266,10 @@ variables.set('messageWarningColor', new ColorProp('@warningColor'));
 variables.set('messageInfoColor', new ColorProp('@infoColor'));
 variables.set('messageLoadingColor', new ColorProp('@infoColor'));
 // Panel
-variables.set('panelBgColor', new ColorProp('@widgetBgColor'));
-variables.set('panelHeaderBgColor', new ColorProp('@widgetHeaderBgColor', '--md-ref-palette-neutral98'));
+variables.set('panelBgColor', new ColorProp('@widgetBgColor', '--md-ref-palette-neutral98'));
+variables.set('panelHeaderBgColor', new ColorProp('@widgetHeaderBgColor', '--md-ref-palette-secondary90'));
 variables.set('panelHeaderTextColor', new ColorProp('@widgetHeaderTextColor'));
-variables.set('panelFooterColor', new ColorProp('@defaultColorD'));
+variables.set('panelFooterColor', new ColorProp('@defaultColorD', '--md-ref-palette-secondary90'));
 variables.set('panelBorderColor', new ColorProp('@widgetBorderColor'));
 variables.set('panelDangerColor', new ColorProp('@dangerColor'));
 variables.set('panelDefaultColor', new ColorProp('@defaultColor'));
@@ -320,15 +344,15 @@ variables.set('calendarEventDay3Color', new ColorProp('@primaryColor3'));
 variables.set('datepickerBgColor', new ColorProp('@defaultColorF'));
 // Wizard
 variables.set('wizardBackgroundColor', new ColorProp('@widgetBgColor'));
-variables.set('wizardStepActiveColor', new ColorProp('@primaryColor', '--md-ref-palette-neutral98'));
-variables.set('wizardStepDoneColor', new ColorProp('@successColor', '--md-ref-palette-neutral98'));
+variables.set('wizardStepActiveColor', new ColorProp('@primaryColor', '--md-ref-palette-secondary90'));
+variables.set('wizardStepDoneColor', new ColorProp('@successColor', '--md-ref-palette-secondary90'));
 variables.set('wizardStepIconColor', new ColorProp('@defaultColor9', '--md-ref-palette-neutral-variant30'));
 variables.set('wizardStepColor', new ColorProp('@defaultColor9', '--md-ref-palette-neutral-variant30'));
 variables.set('wizardActiveStepColor', new ColorProp('@defaultColorF', '--md-ref-palette-neutral10'));
 variables.set('wizardDoneStepColor', new ColorProp('@defaultColorF', '--md-ref-palette-neutral-variant30'));
 variables.set('wizardStepTitleColor', new ColorProp('@defaultColorA', '--md-ref-palette-neutral-variant30'));
-variables.set('wizardNextBtnColor', new ColorProp('@primaryColor', '--md-ref-palette-neutral98'));
-variables.set('wizardDoneBtnColor', new ColorProp('@successColor', '--md-ref-palette-neutral98'));
+variables.set('wizardNextBtnColor', new ColorProp('@primaryColor', '--md-ref-palette-secondary90'));
+variables.set('wizardDoneBtnColor', new ColorProp('@successColor', '--md-ref-palette-secondary90'));
 variables.set('wizardStepConnectorColor', new ColorProp('@defaultColorE'));
 variables.set('wizardStepCounerColor', new ColorProp('@defaultColor9'));
 variables.set('wizardBorderColor', new ColorProp('@widgetBorderColor'));
@@ -340,7 +364,7 @@ variables.set('searchItemBorderColor', new ColorProp('@defaultColorD'));
 variables.set('searchItemTextColor', new ColorProp('@defaultColor6'));
 variables.set('searchDropdownBackgroundColor', new ColorProp('@defaultColorF'));
 variables.set('searchDataCompleteItemBgColor', new ColorProp('@defaultColorE'));
-variables.set('searchBgContainerColor', new ColorProp('@defaultColorD', '--md-ref-palette-neutral80'));
+variables.set('searchBgContainerColor', new ColorProp('@defaultColorD', '--md-ref-palette-neutral98'));
 // Chip
 variables.set('chipIconColor', new ColorProp('@primaryColor', '--md-ref-palette-secondary10'));
 variables.set('chipActiveTextColor', new ColorProp('@defaultColorF', '--md-ref-palette-secondary10'));
@@ -362,7 +386,7 @@ variables.set('barcodeScannerBgColor', new ColorProp('@defaultColorF', '--md-ref
 variables.set('barcodeScannerBorderColor', new ColorProp('@widgetBorderColor'));
 variables.set('barcodeScannerTextColor', new ColorProp('@defaultTextColor', '--md-ref-palette-neutral10'));
 // File Upload
-variables.set('fileuploadBgColor', new ColorProp('@defaultColorF'));
+variables.set('fileuploadBgColor', new ColorProp('@defaultColorF', '--md-ref-palette-neutral98'));
 variables.set('fileuploadBorderColor', new ColorProp('@widgetBorderColor'));
 variables.set('fileuploadTextColor', new ColorProp('@defaultTextColor'));
 // Charts

package/src/theme/variables.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"variables.js","sourceRoot":"","sources":["../../../src/theme/variables.ts"],"names":[],"mappings":"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"}

{rn-codegen → package}/src/transpile/components/basic/buttongroup.transformer.js

@@ -8,13 +8,16 @@ exports.imports = [
 ];
 exports.default = {
     pre: (element, context) => {
+        let lastBtn = null;
         (0, utils_1.findElement)(element, 'WM-BUTTON', (n, i) => {
-            let mClass = (n.attrs['class'] || '') + ' btn-group-child';
+            lastBtn = n;
+            let mClass = (n.attrs['class'] || '') + ' btn-group-child ';
             if (i === 0) {
-                mClass += ' btn-group-first-child';
+                mClass += 'btn-group-first-child ';
             }
             n.setAttribute('class', mClass);
         });
+        lastBtn ? lastBtn.setAttribute('class', (lastBtn.attrs['class'] || '') + ' btn-group-last-child') : null;
         return `<WmButtongroup ${(0, transpile_1.transformAttrs)(element, context)}>`;
     },
     post: (element, context) => '</WmButtongroup>',

package/src/transpile/components/basic/buttongroup.transformer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"buttongroup.transformer.js","sourceRoot":"","sources":["../../../../../src/transpile/components/basic/buttongroup.transformer.ts"],"names":[],"mappings":";;;AAEA,+CAA4F;AAC5F,oCAAuC;AAE1B,QAAA,OAAO,GAAa;IAC/B,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,8EAA8E,EAAC;CAC/G,CAAC;AAEF,kBAAe;IACb,GAAG,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE;QAC3D,IAAI,OAAO,GAAgB,IAAW,CAAC;QACvC,IAAA,mBAAW,EAAC,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YACzC,OAAO,GAAG,CAAC,CAAC;YACZ,IAAI,MAAM,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,mBAAmB,CAAC;YAC5D,IAAI,CAAC,KAAK,CAAC,EAAE;gBACX,MAAM,IAAI,wBAAwB,CAAC;aACpC;YACD,CAAC,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QAClC,CAAC,CAAC,CAAA;QACF,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,GAAG,uBAAuB,CAAC,CAAA,CAAC,CAAC,IAAI,CAAC;QACxG,OAAO,kBAAkB,IAAA,0BAAc,EAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC;IAC/D,CAAC;IACD,IAAI,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE,CAAC,kBAAkB;IACjF,OAAO,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE,CAAC,eAAO;CAC3D,CAAC"}

{rn-codegen → package}/src/transpile/components/basic/search.transformer.js

@@ -51,6 +51,7 @@ exports.default = {
         const onQuerySearch = getSearchSubmitExpr(element);
         const isUpdateRequired = getUpdateRequiredExpr(element);
         return `<WmSearch ${(0, transpile_1.transformAttrs)(element, context)}
+      ${(0, utils_1.getRenderItemPartial)()}
       ${onQuerySearch ? `onQuerySearch={${onQuerySearch}}` : ''}
       ${isUpdateRequired ? `isUpdateRequired={${isUpdateRequired}}` : ''}
       ${getDisplayExpression ? `getDisplayExpression=${getDisplayExpression} ` : ''}

{rn-codegen → package}/src/transpile/components/basic/search.transformer.js.map

@@ -1 +1 @@
-{"version":3,"file":"search.transformer.js","sourceRoot":"","sources":["../../../../../src/transpile/components/basic/search.transformer.ts"],"names":[],"mappings":";;;AAEA,+CAA8G;AAC9G,oCAAwD;AAE3C,QAAA,OAAO,GAAa;IAC/B,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,oEAAoE,EAAC;CAChG,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,OAAoB,EAAE,EAAE;IAClD,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;IAChD,IAAI,OAAO,EAAE;QACX,MAAM,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACrE,IAAI,WAAW,IAAI,WAAW,CAAC,MAAM,EAAE;YACtC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC;SACtB;KACF;AACH,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,CAAC,OAAoB,EAAE,EAAE;IACrD,IAAI,QAAQ,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAC3C,IAAI,QAAQ,EAAE;QACZ,OAAO,SAAS,QAAQ,OAAO,QAAQ,yCAAyC,CAAC;KAClF;AACH,CAAC,CAAA;AAED,MAAM,mBAAmB,GAAG,CAAC,OAAoB,EAAE,EAAE;IACnD,IAAI,QAAQ,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAC3C,IAAI,QAAQ,EAAE;QACV,OAAO;UACH,QAAQ,OAAO,QAAQ;iBAChB,QAAQ;QACjB,CAAC;KACJ;AACL,CAAC,CAAA;AAED,kBAAe;IACb,GAAG,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE;QAC3D,IAAI,oBAAoB,GAAG,IAAA,4BAAgB,EAAC,OAAO,EAAE,mBAAmB,CAAC,IAAI,IAAA,4BAAgB,EAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QACvH,IAAI,oBAAoB,EAAE;YACxB,OAAO,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC;YAC7C,OAAO,CAAC,eAAe,CAAC,cAAc,CAAC,CAAC;SACzC;QACD,IAAI,eAAe,GAAG,OAAO,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC;QAC9D,IAAI,kBAAkB,GAAG,IAAI,CAAC;QAC9B,IAAI,eAAe,IAAI,eAAe,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE;YAC5G,kBAAkB,GAAG,IAAA,4BAAgB,EAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;YAClE,OAAO,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAC;SAC5C;QACD,IAAI,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,KAAK,cAAc,EAAE;YACnD,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YACtD,OAAO,CAAC,YAAY,CAAC,OAAO,EAAE,oBAAoB,SAAS,EAAE,CAAC,CAAC;SAChE;QACD,MAAM,QAAQ,GAAG,IAAA,oCAA4B,EAAC,OAAO,EAAE,WAAW,CAAC,CAAC;QACpE,MAAM,aAAa,GAAG,mBAAmB,CAAC,OAAO,CAAC,CAAC;QACnD,MAAM,gBAAgB,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;QACxD,OAAO,aAAa,IAAA,0BAAc,EAAC,OAAO,EAAE,OAAO,CAAC;QAChD,aAAa,CAAC,CAAC,CAAC,kBAAkB,aAAa,GAAG,CAAC,CAAC,CAAC,EAAE;QACvD,gBAAgB,CAAC,CAAC,CAAC,qBAAqB,gBAAgB,GAAG,CAAC,CAAC,CAAC,EAAE;QAChE,oBAAoB,CAAC,CAAC,CAAC,wBAAwB,oBAAoB,GAAG,CAAC,CAAC,CAAC,EAAE;QAC3E,kBAAkB,CAAC,CAAC,CAAC,mBAAmB,kBAAkB,GAAG,CAAA,CAAC,CAAC,EAAE,IAAI,QAAQ,CAAC,CAAC,CAAC,aAAa,QAAQ,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC;IACvH,CAAC;IACD,IAAI,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE,CAAC,aAAa;IAC5E,OAAO,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE,CAAC,eAAO;CAC3D,CAAC"}
+{"version":3,"file":"search.transformer.js","sourceRoot":"","sources":["../../../../../src/transpile/components/basic/search.transformer.ts"],"names":[],"mappings":"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"}

{rn-codegen → package}/src/transpile/components/container/wizard/wizardstep.transformer.js

@@ -10,15 +10,21 @@ const getOnNext = (element) => {
     const onNext = element.getAttribute('on-next');
     return onNext ? `(widget, currentStep, stepIndex) =>{return ${onNext}}` : '';
 };
+const getOnPrev = (element) => {
+    const onPrev = element.getAttribute('on-prev');
+    return onPrev ? `(widget, currentStep, stepIndex) =>{return ${onPrev}}` : '';
+};
 exports.default = {
     pre: (element, context) => {
         const onNext = getOnNext(element);
+        const onPrev = getOnPrev(element);
         element.removeAttribute('on-next');
+        element.removeAttribute('on-prev');
         const paneContent = (0, node_html_parser_1.parse)(`<wm-panecontent name="${element.getAttribute("name")}Content"></wm-panecontent>`).firstChild;
         paneContent.childNodes = element.childNodes;
         element.childNodes = [paneContent];
         return `<WmWizardstep ${(0, transpile_1.transformAttrs)(element, context)}
-    ${onNext ? `onNext={${onNext}}` : ''}>`;
+    ${onNext ? `onNext={${onNext}}` : ''} ${onPrev ? `onPrev={${onPrev}}` : ''}>`;
     },
     post: (element, context) => '</WmWizardstep>',
     imports: (element, context) => exports.imports

package/src/transpile/components/container/wizard/wizardstep.transformer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wizardstep.transformer.js","sourceRoot":"","sources":["../../../../../../src/transpile/components/container/wizard/wizardstep.transformer.ts"],"names":[],"mappings":";;;AAAA,uDAAsD;AAEtD,kDAA+F;AAElF,QAAA,OAAO,GAAa;IAC/B,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,uFAAuF,EAAC;CACvH,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,OAAoB,EAAE,EAAE;IACzC,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;IAC/C,OAAO,MAAM,CAAC,CAAC,CAAC,8CAA8C,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;AAC/E,CAAC,CAAA;AAED,MAAM,SAAS,GAAG,CAAC,OAAoB,EAAE,EAAE;IACzC,MAAM,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;IAC/C,OAAO,MAAM,CAAC,CAAC,CAAC,8CAA8C,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;AAC/E,CAAC,CAAA;AAED,kBAAe;IACb,GAAG,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE;QAC3D,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;QAClC,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;QAClC,OAAO,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QACnC,OAAO,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QACnC,MAAM,WAAW,GAAG,IAAA,wBAAK,EAAC,yBAAyB,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,4BAA4B,CAAC,CAAC,UAAyB,CAAC;QACvI,WAAW,CAAC,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;QAC5C,OAAO,CAAC,UAAU,GAAG,CAAC,WAAW,CAAC,CAAC;QACnC,OAAO,iBAAiB,IAAA,0BAAc,EAAC,OAAO,EAAE,OAAO,CAAC;MACtD,MAAM,CAAC,CAAC,CAAC,WAAW,MAAM,GAAG,CAAA,CAAC,CAAC,EAAE,IAAI,MAAM,CAAC,CAAC,CAAC,WAAW,MAAM,GAAG,CAAA,CAAC,CAAC,EAAE,GAAG,CAAC;IAC9E,CAAC;IACD,IAAI,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE,CAAC,iBAAiB;IAChF,OAAO,EAAE,CAAC,OAAoB,EAAE,OAA6B,EAAE,EAAE,CAAC,eAAO;CAC3D,CAAC"}

{rn-codegen → package}/src/transpile/components/data/form/form-action.transformer.js

@@ -25,22 +25,22 @@ exports.default = {
         let btnClass = 'btn-default';
         if (actionType === 'submit') {
             btnClass = 'btn-primary';
-            action = listName ? action = `Widgets.${listName}.itemWidgets[$index].${formName}.submit();` + (action || '') : `Widgets.${formName}.submit();` + (action || '');
+            action = listName ? action = `list.itemWidgets[$index].${formName}.submit();` + (action || '') : `Widgets.${formName}.submit();` + (action || '');
         }
         if (actionType === 'reset') {
-            action = listName ? `Widgets.${listName}.itemWidgets[$index].${formName}.formreset()` + (action || '') : `Widgets.${formName}.formreset();` + (action || '');
+            action = listName ? `list.itemWidgets[$index].${formName}.formreset()` + (action || '') : `Widgets.${formName}.formreset();` + (action || '');
         }
         if (action) {
             action = action.endsWith(';') ? action.substring(0, action.length - 1) : action;
             action = action.split(';').map(s => {
                 if (s === 'reset()') {
-                    return listName ? `fragment.Widgets.${listName}.itemWidgets[$index].${formName}.formreset()` : `fragment.Widgets.${formName}.formreset()`;
+                    return listName ? `list.itemWidgets[$index].${formName}.formreset()` : `fragment.Widgets.${formName}.formreset()`;
                 }
                 else if (s === 'edit()' || s === 'new()' || s === 'cancel()' || s === 'delete()') {
-                    return listName ? `fragment.Widgets.${listName}.itemWidgets[$index].${formName}.` + s : `fragment.Widgets.${formName}.` + s;
+                    return listName ? `list.itemWidgets[$index].${formName}.` + s : `fragment.Widgets.${formName}.` + s;
                 }
                 else {
-                    return 'fragment.' + s;
+                    return listName ? s : 'fragment.' + s;
                 }
             }).join(';');
             element.setAttribute('action', `()=> ${action}`);

package/src/transpile/components/data/form/form-action.transformer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"form-action.transformer.js","sourceRoot":"","sources":["../../../../../../src/transpile/components/data/form/form-action.transformer.ts"],"names":[],"mappings":"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"}

{rn-codegen → package}/src/transpile/components/data/form/form-field.transformer.js

@@ -10,16 +10,26 @@ const getAttribute = (element, attrName) => {
     const value = element.getAttribute(attrName);
     return value === null || value === void 0 ? void 0 : value.replace(/"/g, '"');
 };
+const getStyleProps = (element) => {
+    const attributes = ['fontsize', 'fontweight', 'color', 'textalign', 'fontfamily', 'textdecoration', 'fontstyle'];
+    return attributes.reduce((propsString, attr) => {
+        const value = getAttribute(element, attr);
+        if (value !== undefined) {
+            propsString += `${attr}=${value} `;
+        }
+        return propsString;
+    }, '');
+};
 const extractField = (element, context, formElement) => {
     const widgetType = getAttribute(element, 'widget') || 'text';
-    const widgetName = getAttribute(element, 'key') || 'text' + '_formWidget';
+    const widgetName = getAttribute(element, 'key') || getAttribute(element, 'name') || 'text' + '_formWidget';
     return getFormWidgetTemplate(widgetType, widgetName, element, getAttribute(formElement, 'formdata'));
 };
 const getFormWidgetTemplate = (widgetType, widgetName, element, formDataVariable) => {
     widgetName = widgetName.replace('.', '_');
     var labelMarkup = getAttribute(element, 'displayname') ? `<wm-label 
     caption="bind:$formField.displayname"
-    class="form-label"
+    class="form-label ${widgetName}_formLabel"
     memoize="false"
     required="bind:$formField.required"
     name="${widgetName}_formLabel"></wm-label>` : '';
@@ -35,19 +45,23 @@ const getFormWidgetTemplate = (widgetType, widgetName, element, formDataVariable
     if (onTap) {
         element.removeAttribute('on-tap');
     }
+    const placeholder = getAttribute(element, 'placeholder');
+    if (placeholder) {
+        element.removeAttribute('placeholder');
+    }
     const formfieldName = getAttribute(element, 'name');
     var commonFields = `name="${widgetName}"
                       formfieldname="${formfieldName}"
                       formfield="true"
                       memoize="false"
-                      placeholder="bind:$formField.placeholder"
                       required="bind:$formField.required"
                       regexp="bind:$formField.regexp"
                       validationmessage="bind:$formField.validationmessage"
                       datavalue="bind:$formField.defaultvalue"
                       disabled="bind:$formField.disabled"
                       readonly="bind:$formField.readonly"
-                      class="form-input form-${widgetType}"
+                      class="form-input form-${widgetType} form-${widgetName}-input"
+                      ${placeholder ? 'placeholder="' + placeholder + '"' : ''}
                       ${onFocus ? 'on-focus=' + onFocus : ''}
                       ${onBlur ? 'on-blur=' + onBlur : ''}
                       ${onTap ? 'on-tap=' + onTap : ''}`;
@@ -66,12 +80,14 @@ const getWidgetMarkup = (widgetType, widgetName, commonFields, element) => {
             tmpl = `<wm-text ${inputtype} ${commonFields} 
                 updateon="bind:$formField.updateon || 'blur'"
                 maxchars="bind:$formField.maxchars"
+                ${getStyleProps(element)}
                 ></wm-text>`;
             break;
         case 'textarea':
             tmpl = `<wm-textarea ${commonFields}
                 updateon="bind:$formField.updateon || 'blur'"
                 maxchars="bind:$formField.maxchars">
+                ${getStyleProps(element)}
               </wm-textarea>`;
             break;
         case 'number':
@@ -79,6 +95,7 @@ const getWidgetMarkup = (widgetType, widgetName, commonFields, element) => {
                 updateon="bind:$formField.updateon || 'blur'"
                 minvalue="bind:$formField.minvalue"
                 maxvalue="bind:$formField.maxvalue">
+                ${getStyleProps(element)}
               </wm-number>`;
             break;
         case 'currency':
@@ -86,6 +103,7 @@ const getWidgetMarkup = (widgetType, widgetName, commonFields, element) => {
                   updateon="bind:$formField.updateon || 'blur'"
                   minvalue="bind:$formField.minvalue"
                   maxvalue="bind:$formField.maxvalue">
+                  ${getStyleProps(element)}
                 </wm-currency>`;
             break;
         case 'select':
@@ -94,6 +112,7 @@ const getWidgetMarkup = (widgetType, widgetName, commonFields, element) => {
                 displayfield="bind:$formField.displayfield"
                 datafield="bind:$formField.datafield"
                 class="form-widget-select"
+                ${getStyleProps(element)}
               ></wm-select>`;
             break;
         case 'autocomplete':
@@ -106,6 +125,7 @@ const getWidgetMarkup = (widgetType, widgetName, commonFields, element) => {
                 dataset="bind:$formField.dataset"
                 displayfield="bind:$formField.displaylabel"
                 datafield="bind:$formField.datafield"
+                ${getStyleProps(element)}
                 ></wm-search>`;
             break;
         case 'chips':
@@ -203,13 +223,21 @@ exports.default = {
         const listName = context.data.listname;
         let currentNode = element.parentNode;
         while (currentNode) {
-            if (currentNode.rawTagName === 'wm-form' || currentNode.rawTagName === 'wm-liveform') {
+            if (currentNode.rawTagName === 'wm-form' || currentNode.rawTagName === 'wm-liveform' || currentNode.getAttribute('type') === "dynamic") {
                 break;
             }
             currentNode = currentNode.parentNode;
         }
+        let formName, formScope;
+        if (currentNode.getAttribute('type') === "dynamic") {
+            formName = currentNode.getAttribute('dynamicForm');
+            formScope = `formScope={() => fragment.Widgets.${formName}}`;
+        }
+        else {
+            formName = currentNode.getAttribute('name');
+        }
         // @ts-ignore
-        element.setAttribute('formRef', currentNode.getAttribute('name'));
+        element.setAttribute('formRef', formName);
         element.setAttribute('primaryKey', element.attrs['primary-key']);
         element.removeAttribute('primary-key');
         element.setAttribute('isRelated', element.attrs['is-related']);
@@ -219,7 +247,7 @@ exports.default = {
         }
         const validate = `widget.validateFormField.call(widget);`;
         let onChange = element.getAttribute('on-change') || '';
-        onChange = listName ? `fragment.Widgets.${listName}.itemWidgets[$index].${currentNode.getAttribute('name')} && fragment.Widgets.${listName}.itemWidgets[$index].${currentNode.getAttribute('name')}.props.onChange && fragment.Widgets.${listName}.itemWidgets[$index].${currentNode.getAttribute('name')}.props.onChange($event, widget, newVal, oldVal);` + onChange
+        onChange = listName ? `list.itemWidgets[$index].${currentNode.getAttribute('name')} && list.itemWidgets[$index].${currentNode.getAttribute('name')}.props.onChange && list.itemWidgets[$index].${currentNode.getAttribute('name')}.props.onChange($event, widget, newVal, oldVal);` + onChange
             : `fragment.Widgets.${currentNode.getAttribute('name')} && fragment.Widgets.${currentNode.getAttribute('name')}.props.onChange && fragment.Widgets.${currentNode.getAttribute('name')}.props.onChange($event, widget, newVal, oldVal);` + onChange;
         element.setAttribute('on-change', onChange);
         const formField = extractField(element, context, currentNode);
@@ -238,7 +266,7 @@ exports.default = {
             element.setAttribute('formKey', element.attrs['key'] || element.attrs['name']);
         }
         element.removeAttribute('key');
-        return `<WmFormField ${(0, transpile_1.transformAttrs)(element, context)} renderFormFields={($formField) => (<>`;
+        return `<WmFormField ${formScope || ''} ${(0, transpile_1.transformAttrs)(element, context)} renderFormFields={($formField) => (<>`;
     },
     post: (element, context) => '</>)}></WmFormField>',
     imports: (element, context) => exports.imports,

package/src/transpile/components/data/form/form-field.transformer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"form-field.transformer.js","sourceRoot":"","sources":["../../../../../../src/transpile/components/data/form/form-field.transformer.ts"],"names":[],"mappings":"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"}