'
+
+ for (let i = 0; i < values.length; i++) {
+ let checked = value == values[i] || value == captions[i] ? 'checked' : ''
+ ret += ``
}
-}
+ return ret + '
'
+ }
-export function genParams(defs, target, storedParams={}, callback=undefined, buttons=['reset','save','load','edit','link']){
+ function inputChoice({ name, type, captions, value, values }) {
+ if (!captions) captions = values
- let funcs = {
- group:function({name,type, caption, captions, value, min,max}){
- return ''
- },
- choice:inputChoice,
- radio:inputRadio,
- float: inputNumber,
- range: inputNumber,
- slider: inputNumber,
- int: inputNumber,
- text: inputNumber,
- url: inputNumber,
- email: inputNumber,
- date: inputNumber,
- password: inputNumber,
- color: inputNumber,
- // TODO radio similar options as choice
- checkbox :function({name,type, caption, captions, value, checked, min,max}){
- let checkedStr = (value === 'checked' || value === true) ? 'checked':''
- return ``
- },
- number: inputNumber,
- }
+ let ret = `'
+ }
- let ret = '
'
+ function inputNumber(def) {
+ let { name, type, value, min, max, step, placeholder, live } = def
+ if (value === null || value === undefined) value = numeric[type] ? 0 : ''
+ let inputType = type
+ if (type == 'int' || type == 'float') inputType = 'number'
+ if (type == 'range' || type == 'slider') inputType = 'range'
+ var str = `'
+ }
- for(let i =0; i${captions[i]}`
- }
- return ret +'
'
- }
-
- function inputChoice({name, type, captions, value, values}){
- if(!captions) captions = values
+ let html = ''
+ let closed = false
+ let missing = {}
- let ret = `'
- }
+ if (storedParams[name] !== undefined) {
+ def.value = storedParams[name]
+ } else {
+ def.value = def.initial || def['default'] || def.checked
+ }
- function inputNumber(def){
- let {name,type, value, min,max, step, placeholder, live} = def
- if(value === null || value === undefined) value = numeric[type] ? 0:'';
- let inputType = type
- if(type == 'int' || type=='float') inputType = 'number'
- if(type == 'range' || type=='slider') inputType = 'range'
- var str = `';
- }
+ if (type == 'group') {
+ closed = def.value == 'closed'
+ }
+ def.closed = closed
- let html = '';
- let closed = false
- let missing = {}
+ html += `
`
- defs.forEach(def=>{
- let {type, caption, name} = def
+ html += ``
+ if (type == 'checkbox') html += funcs[type](def)
+ html += `${caption}${def.value}`
- if(storedParams[name] !== undefined){
- def.value = storedParams[name];
- }else {
- def.value = def.initial || def['default'] || def.checked
- }
+ if (funcs[type] && type != 'checkbox') html += funcs[type](def)
- if(type == 'group'){
- closed = def.value == 'closed'
- }
- def.closed = closed
-
- html +=`
`
-
- html += ``
- if(type == 'checkbox') html += funcs[type](def)
- html += `${caption}${def.value}`
-
- if(funcs[type] && type != 'checkbox') html += funcs[type](def)
+ if (!funcs[type]) missing[type] = 1
- if(!funcs[type]) missing[type] = 1
-
- html +='
\n'
- })
+ html += '
\n'
+ })
- let missingKeys = Object.keys(missing)
- if(missingKeys.length) console.log('missing param impl',missingKeys);
+ let missingKeys = Object.keys(missing)
+ if (missingKeys.length) console.log('missing param impl', missingKeys)
- function _callback(source='change'){
- if(callback) callback(getParams(target), source)
- }
+ function _callback(source = 'change') {
+ if (callback) callback(getParams(target), source)
+ }
- html +='
'
- buttons.forEach(b=>{
- if(typeof b === 'string') b = {id:b, name:b}
- let {id,name} = b
- html += ``
- })
- html += '
'
+ html += '
'
+ buttons.forEach((b) => {
+ if (typeof b === 'string') b = { id: b, name: b }
+ let { id, name } = b
+ html += ``
+ })
+ html += '
'
- target.innerHTML = html
+ target.innerHTML = html
- forEachInput(target, inp=>{
- let type = inp.type
- inp.addEventListener('input', function(evt){
- applyRange(inp)
- if(inp.getAttribute('live') === '1') _callback('live');
- })
- if(inp.getAttribute('live') !== '1') inp.addEventListener('change', _callback)
-
- })
-
- function groupClick(evt){
- var groupDiv = evt.target
- if(groupDiv.tagName === 'LABEL') groupDiv = groupDiv.parentNode
- var closed = (groupDiv.getAttribute('closed') == '1') ? '0':'1'
- var name = evt.target.getAttribute('name')
- do{
- groupDiv.setAttribute('closed', closed)
- groupDiv = groupDiv.nextElementSibling
- }while(groupDiv && groupDiv.getAttribute('type') != 'group')
- _callback('group')
- }
-
- forEachGroup(target, div=>{
- div.onclick=groupClick
- })
-}
-
-export function getParams(target){
- let params = {}
- if(!target) return params
-
- forEachGroup(target,elem=>{
- let name = elem.getAttribute('name')
- params[name] = (elem.getAttribute('closed') == '1') ? 'closed':''
+ forEachInput(target, (inp) => {
+ let type = inp.type
+ inp.addEventListener('input', function (evt) {
+ applyRange(inp)
+ if (inp.getAttribute('live') === '1') _callback('live')
})
+ if (inp.getAttribute('live') !== '1')
+ inp.addEventListener('change', _callback)
+ })
- forEachInput(target,elem=>{
- let name = elem.name
- let value = elem.value
- if(elem.tagName == 'INPUT'){
- if(elem.type == 'checkbox') value = elem.checked
- if(elem.type == 'range' || elem.type == 'color') applyRange(elem)
- }
+ function groupClick(evt) {
+ var groupDiv = evt.target
+ if (groupDiv.tagName === 'LABEL') groupDiv = groupDiv.parentNode
+ var closed = groupDiv.getAttribute('closed') == '1' ? '0' : '1'
+ var name = evt.target.getAttribute('name')
+ do {
+ groupDiv.setAttribute('closed', closed)
+ groupDiv = groupDiv.nextElementSibling
+ } while (groupDiv && groupDiv.getAttribute('type') != 'group')
+ _callback('group')
+ }
- if(numeric[elem.getAttribute('type')] || elem.getAttribute('numeric') == '1') value = parseFloat(value || 0)
-
- if(elem.type == 'radio' && !elem.checked) return // skip if not checked radio button
-
- params[name] = value
- })
- return params;
+ forEachGroup(target, (div) => {
+ div.onclick = groupClick
+ })
}
+export function getParams(target) {
+ let params = {}
+ if (!target) return params
+
+ forEachGroup(target, (elem) => {
+ let name = elem.getAttribute('name')
+ params[name] = elem.getAttribute('closed') == '1' ? 'closed' : ''
+ })
+
+ forEachInput(target, (elem) => {
+ let name = elem.name
+ let value = elem.value
+ if (elem.tagName == 'INPUT') {
+ if (elem.type == 'checkbox') value = elem.checked
+ if (elem.type == 'range' || elem.type == 'color') applyRange(elem)
+ }
+
+ if (
+ numeric[elem.getAttribute('type')] ||
+ elem.getAttribute('numeric') == '1'
+ )
+ value = parseFloat(value || 0)
+
+ if (elem.type == 'radio' && !elem.checked) return // skip if not checked radio button
+
+ params[name] = value
+ })
+ return params
+}
diff --git a/app/web/src/helpers/hooks/useIdeState.ts b/app/web/src/helpers/hooks/useIdeState.ts
index d4f5200..2de05d4 100644
--- a/app/web/src/helpers/hooks/useIdeState.ts
+++ b/app/web/src/helpers/hooks/useIdeState.ts
@@ -180,7 +180,8 @@ export const useIdeState = (): [State, (actionOrThunk: any) => any] => {
...state.objectData,
type: payload.objectData?.type,
data: payload.objectData?.data,
- customizerParams: payload.customizerParams || state.objectData.customizerParams,
+ customizerParams:
+ payload.customizerParams || state.objectData.customizerParams,
lastParameters: payload.lastParameters,
},
consoleMessages: payload.message
@@ -246,7 +247,7 @@ export const useIdeState = (): [State, (actionOrThunk: any) => any] => {
interface RequestRenderArgs {
state: State
dispatch: any
- parameters: any,
+ parameters: any
code: State['code']
camera: State['camera']
viewerSize: State['viewerSize']
@@ -280,26 +281,28 @@ export const requestRender = ({
quality,
},
})
- .then(({ objectData, message, status, customizerParams, lastParameters }) => {
- if (status === 'error') {
- dispatch({
- type: 'errorRender',
- payload: { message },
- })
- } else {
- dispatch({
- type: 'healthyRender',
- payload: {
- objectData,
- message,
- lastRunCode: code,
- customizerParams,
- lastParameters,
- },
- })
- return objectData
+ .then(
+ ({ objectData, message, status, customizerParams, lastParameters }) => {
+ if (status === 'error') {
+ dispatch({
+ type: 'errorRender',
+ payload: { message },
+ })
+ } else {
+ dispatch({
+ type: 'healthyRender',
+ payload: {
+ objectData,
+ message,
+ lastRunCode: code,
+ customizerParams,
+ lastParameters,
+ },
+ })
+ return objectData
+ }
}
- })
+ )
.catch(() => dispatch({ type: 'resetLoading' })) // TODO should probably display something to the user here
}
}