Multimaterial: trim strings, skip empties

openscad · Dec 31, 2024 · 6a9529a · 6a9529a
1 parent 5e48ffb
commit 6a9529a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/components/MultimaterialColorsDialog.tsx b/src/components/MultimaterialColorsDialog.tsx
@@ -40,11 +40,11 @@ export default function MultimaterialColorsDialog() {
                     <Button 
                     label={state.view.extruderPickerVisibility == 'exporting' ? "Export" : "Save"}
                     icon="pi pi-check"
-                    disabled={!tempExtruderColors.every(c => chroma.valid(c))}
+                    disabled={!tempExtruderColors.every(c => chroma.valid(c) || c.trim() === '')}
                     autoFocus
                     onClick={e => {
                         model!.mutate(s => {
-                            s.params.extruderColors = tempExtruderColors;
+                            s.params.extruderColors = tempExtruderColors.filter(c => c.trim() !== '');
                             s.view.extruderPickerVisibility = undefined;
                         });
                         if (state.view.extruderPickerVisibility === 'exporting') {
@@ -84,9 +84,9 @@ export default function MultimaterialColorsDialog() {
                                         }
                                     }}
                                     onChange={(e) => {
-                                        let color = e.target.value;
+                                        let color = e.target.value.trim();
                                         try {
-                                            color = chroma(e.target.value).name();
+                                            color = chroma(color).name();
                                             console.log(`color: ${e.target.value} -> ${color}`);
                                         } catch (e) {
                                             // ignore