diff --git a/app/web/src/components/Customizer/Customizer.tsx b/app/web/src/components/Customizer/Customizer.tsx index c758e5b..597e3aa 100644 --- a/app/web/src/components/Customizer/Customizer.tsx +++ b/app/web/src/components/Customizer/Customizer.tsx @@ -14,7 +14,6 @@ const Customizer = () => { const handleRender2 = ()=>handleRender(getParams(ref.current)) React.useEffect(() => { - console.log({ jsCadCustomizerElement, customizerParams, lastParameters }) if (jsCadCustomizerElement && customizerParams) { genParams(customizerParams, jsCadCustomizerElement, lastParameters || {}, (values, source)=>{ if(source === 'group'){ diff --git a/app/web/src/helpers/cadPackages/jsCadController.ts b/app/web/src/helpers/cadPackages/jsCadController.ts index 4724d78..5be10d1 100644 --- a/app/web/src/helpers/cadPackages/jsCadController.ts +++ b/app/web/src/helpers/cadPackages/jsCadController.ts @@ -109,7 +109,6 @@ export const render: DefaultKernelExport['render'] = async ({ if (data.error) { response = createUnhealthyResponse(new Date(), data.error) } else { - console.log('lastParameters',lastParameters) response = createHealthyResponse({ type: 'geometry', data: [...data.entities.map(CSG2Object3D).filter((o) => o)], diff --git a/app/web/src/helpers/cadPackages/jscadParams.js b/app/web/src/helpers/cadPackages/jscadParams.js index c549bb2..bd1e23a 100644 --- a/app/web/src/helpers/cadPackages/jscadParams.js +++ b/app/web/src/helpers/cadPackages/jscadParams.js @@ -51,7 +51,7 @@ export function genParams(defs, target, storedParams={}, callback=undefined, but let ret = '
' for(let i =0; i${captions[i]}` } return ret +'
' @@ -182,7 +182,10 @@ export function getParams(target){ } if(numeric[elem.getAttribute('type')] || elem.getAttribute('numeric') == '1') value = parseFloat(value || 0) - params[name] = value + + 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 5ce9b7c..32304da 100644 --- a/app/web/src/helpers/hooks/useIdeState.ts +++ b/app/web/src/helpers/hooks/useIdeState.ts @@ -86,7 +86,7 @@ const getParameterDefinitions = ()=>{ { name: 'slider', type: 'slider', initial: 3, min: 1, max: 10, step: 1, caption: 'Slider:' }, { name: 'choice1', type: 'choice', caption: 'Dropdown Menu:', values: [0, 1, 2, 3], captions: ['No', 'Yes', 'Maybe', 'So so'], initial: 2 }, { name: 'choice3', type: 'choice', caption: 'Dropdown Menu:', values: ['No', 'Yes', 'Maybe', 'So so'], initial: 'No' }, - { name: 'choice2', type: 'radio', caption: 'Radio Buttons:', values:[0, 1, 2, 3], captions: ['No', 'Yes', 'Maybe', 'So so'], initial: 5 }, + { name: 'choice2', type: 'radio', caption: 'Radio Buttons:', values:[0, 1, 2, 3], captions: ['No', 'Yes', 'Maybe', 'So so'], initial: 2 }, { name: 'group3', type: 'group', initial: 'closed', caption: 'Group 3: Initially Closed Group' }, { name: 'checkbox2', type: 'checkbox', checked: true, initial: '20', caption: 'Optional Checkbox:' }, diff --git a/app/web/src/index.css b/app/web/src/index.css index 6b71da4..7d3b8c9 100644 --- a/app/web/src/index.css +++ b/app/web/src/index.css @@ -179,6 +179,10 @@ input.error, textarea.error { display: inline-block; margin-left: 10px; } +#jscad-customizer-block > .form-line[type="checkbox"] > label > input{ + position: absolute; + right: 14px; +} #jscad-customizer-block > .form-line > label i{ display: none;