@smartface/builder
Advanced tools
Comparing version 1.0.0-alpha.23 to 1.0.0-alpha.24
@@ -41,2 +41,8 @@ //------------------------------------------------------------------------------ | ||
export { getStyle }; | ||
const mergeStyle = (inputs: StyleProp<any>[]): Record<string, any> => { | ||
return inputs.reduce((acc, style) => { | ||
return Object.assign(acc, style); | ||
}, {}); | ||
}; | ||
export { getStyle, mergeStyle }; |
{ | ||
"name": "@smartface/builder", | ||
"version": "1.0.0-alpha.23", | ||
"version": "1.0.0-alpha.24", | ||
"description": "Smartface Builder", | ||
@@ -43,3 +43,3 @@ "bin": { | ||
}, | ||
"gitHead": "37486aa6e62ba841e0e3dec292913777daf647b9" | ||
"gitHead": "18774ecf2337bea3e0f441ed78435f9c947473f0" | ||
} |
@@ -55,3 +55,4 @@ const path = require('path'); | ||
defaultsTheme: 'defaultTheme', | ||
workspaceTheme: `${WORKSPACE_NAME}Theme` | ||
workspaceTheme: `${WORKSPACE_NAME}Theme`, | ||
headerBarChildVarName: "headerView" | ||
}; | ||
@@ -58,0 +59,0 @@ |
@@ -11,3 +11,3 @@ const dot = require('dot-object'); | ||
const util = require('../util'); | ||
const { DEFAULT_PATHS, getProjectType, PROJECT_TYPES } = require('../config'); | ||
const { DEFAULT_PATHS, getProjectType, PROJECT_TYPES, CONSTANTS } = require('../config'); | ||
const LIBRARY_PAGE_NAME = DEFAULT_PATHS.LIBRARY_PAGE_NAME; | ||
@@ -194,2 +194,9 @@ const MODULES_PAGE_NAME = DEFAULT_PATHS.MODULES_PAGE_NAME; | ||
//Fixed Name headerView | ||
if (footer.headerBar?.smfObjects?.[0]) { | ||
footer.headerBar.smfObjects[0].varName = CONSTANTS.headerBarChildVarName; | ||
footer.headerBar.smfObjects[0].name = CONSTANTS.headerBarChildVarName; | ||
footer.headerBar.smfObjects[0].oldName = undefined; | ||
} | ||
//_smfObjects.reverse(); | ||
@@ -196,0 +203,0 @@ return Object.assign( |
@@ -19,2 +19,3 @@ const fs = require('fs-extra'); | ||
const { capitalizeFirstLetter } = require('./util'); | ||
const { CONSTANTS } = require('./config'); | ||
@@ -179,3 +180,3 @@ const importExportRegex = /import|export/; | ||
); | ||
await moveHeaderBarOfPage(parsedObjectData.oldName, parsedObjectData.name); | ||
//await moveHeaderBarOfPage(parsedObjectData.oldName, parsedObjectData.name); | ||
util.removeFile(path.join(pagesFolder, parsedObjectData.oldName)); | ||
@@ -187,3 +188,6 @@ hasOldName = true; | ||
designFilePath: `@smartface-generated/pages/${parsedObjectData.name}`, | ||
coreLibPath: parsedObjectData.coreLibPath | ||
coreLibPath: parsedObjectData.coreLibPath, | ||
headerViewVarName: | ||
parsedObjectData.footer.headerBar.smfObjects?.[0].varName || | ||
CONSTANTS.headerBarChildVarName | ||
}); | ||
@@ -195,3 +199,3 @@ let listItemRes = await createUserListItemsOfPage( | ||
hasOldName = hasOldName || listItemRes.hasOldName; | ||
createHeaderBarOfPage( | ||
/* createHeaderBarOfPage( | ||
parsedObjectData.name, | ||
@@ -202,2 +206,3 @@ parsedObjectData.footer.headerBar, | ||
); | ||
*/ | ||
} | ||
@@ -287,3 +292,3 @@ emitGeneratedEvent(transpiler.generate(parsedObjectData), resFilePath, true); | ||
} | ||
/* | ||
async function createHeaderBarOfPage(pageName, headerBar, pgx, pgxFilePath) { | ||
@@ -303,3 +308,5 @@ const templateHeaderBar = templateEngine('headerBar'); | ||
} | ||
*/ | ||
/* | ||
async function moveHeaderBarOfPage(oldPageName, pageName) { | ||
@@ -326,2 +333,3 @@ let oldFilePath = path.join(pagesFolder, `${oldPageName}/${oldPageName}HeaderBar.tsx`); | ||
} | ||
*/ | ||
@@ -394,2 +402,6 @@ function createUserPageIfDoesNotExist(opt) { | ||
`${util.capitalizeFirstLetter(pageName)}Options` | ||
) | ||
.replaceAll( | ||
`${util.capitalizeFirstLetter(oldPageName)}HeaderView`, | ||
`${util.capitalizeFirstLetter(pageName)}HeaderView` | ||
); | ||
@@ -396,0 +408,0 @@ await fs.writeFile(newUserFilePath, content, 'utf-8'); |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
245004
5384