h3n3/cadhub
1
0
Fork 0
Code Issues 35 Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'kurt/customizer-start-320' of https://github.com/Irev-Dev/cadhub into kurt/customizer-start-320

Browse Source
This commit is contained in:
Davor Hrg
2021-08-04 23:59:42 +02:00
parent 00c0ae801a 9dca2eb1c1
commit 80b12a6e3a
3 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/web/src/helpers/cadPackages/jsCadController.ts
View File

@@ -103,8 +103,7 @@ export const render: DefaultKernelExport['render'] = async ({
let parameterDefinitions = []
scriptWorker.addEventListener('message', (e) => {
const data = e.data
if (data.action == 'parameterDefinitions') {
console.log('message',data)
if (data.action == 'parameterDefinitions') {
parameterDefinitions = data.data
} else if (data.action == 'entities') {
if (data.error) {
@@ -123,7 +122,7 @@ export const render: DefaultKernelExport['render'] = async ({
callResolve()
}
})
callResolve()
response = null
scriptWorker.postMessage({ action: 'init', baseURI, alias: [] })

2
app/web/src/helpers/hooks/useIdeState.ts
View File

@@ -180,7 +180,7 @@ export const useIdeState = (): [State, (actionOrThunk: any) => any] => {
...state.objectData,
type: payload.objectData?.type,
data: payload.objectData?.data,
customizerParams: payload.customizerParams,
customizerParams: payload.customizerParams || state.objectData.customizerParams,
lastParameters: payload.lastParameters,
},
consoleMessages: payload.message