|
286 | 286 | const colorToEmit = color || new Color({ h: hue, s: saturation, v: value, a: alpha }); |
287 | 287 |
|
288 | 288 | const stop = gradientSpectrumInputWidget && activeIndex !== undefined && gradient?.atIndex(activeIndex); |
289 | | - if (stop && gradientSpectrumInputWidget instanceof SpectrumInput) { |
290 | | - stop.color = colorToEmit; |
291 | | - } |
| 289 | + if (stop) stop.color = colorToEmit; |
292 | 290 |
|
293 | 291 | dispatch("colorOrGradient", gradient || colorToEmit); |
294 | 292 | } |
|
347 | 345 |
|
348 | 346 | function setColorPreset(preset: PresetColors) { |
349 | 347 | dispatch("startHistoryTransaction"); |
| 348 | +
|
350 | 349 | if (preset === "none") { |
351 | 350 | setNewHSVA(0, 0, 0, 1, true); |
352 | 351 | setColor(new Color("none")); |
353 | | - return; |
354 | | - } |
355 | | -
|
356 | | - const presetColor = new Color(...PURE_COLORS[preset], 1); |
357 | | - const hsva = presetColor.toHSVA() || { h: 0, s: 0, v: 0, a: 0 }; |
| 352 | + } else { |
| 353 | + const presetColor = new Color(...PURE_COLORS[preset], 1); |
| 354 | + const hsva = presetColor.toHSVA() || { h: 0, s: 0, v: 0, a: 0 }; |
358 | 355 |
|
359 | | - setNewHSVA(hsva.h, hsva.s, hsva.v, hsva.a, false); |
360 | | - setColor(presetColor); |
| 356 | + setNewHSVA(hsva.h, hsva.s, hsva.v, hsva.a, false); |
| 357 | + setColor(presetColor); |
| 358 | + } |
361 | 359 | } |
362 | 360 |
|
363 | 361 | function setNewHSVA(h: number, s: number, v: number, a: number, none: boolean) { |
|
479 | 477 | <SpectrumInput |
480 | 478 | {gradient} |
481 | 479 | {disabled} |
482 | | - on:gradient={() => { |
483 | | - if (gradient) dispatch("colorOrGradient", gradient); |
484 | | - }} |
| 480 | + on:gradient={() => dispatch("colorOrGradient", gradient)} |
485 | 481 | on:activeMarkerIndexChange={gradientActiveMarkerIndexChange} |
486 | 482 | activeMarkerIndex={activeIndex} |
487 | 483 | on:dragging={({ detail }) => (gradientSpectrumDragging = detail)} |
|
0 commit comments