Skip to content

fix(ui5-color-picker): ensure RGB and HSL values are within limits #11915

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Aug 4, 2025
Merged

fix(ui5-color-picker): ensure RGB and HSL values are within limits #11915

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2ec5176
fix(ui5-color-palette): ensure RGB and HSL values are within limits
hinzzx Jul 15, 2025
e653e5e
Merge branch 'main' into cp-hsl-rgb-value-normalization
GDamyanov Jul 15, 2025
42afd2f
fix: address comments
hinzzx Jul 15, 2025
884cdd0
fix: address comments
hinzzx Jul 17, 2025
773b566
chore: move logic to utility file
hinzzx Jul 17, 2025
1db07be
fix: apply single responsibility principle, separate normalise and va…
hinzzx Jul 17, 2025
bfff0d6
fix: remove deafult value switch
hinzzx Jul 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 30 additions & 1 deletion packages/main/src/ColorPicker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ type ColorChannelInput = {
showPercentSymbol?: boolean,
}

type MinMaxValues = {
min: number,
max: number,
}

type HSLandRGBValueLimits = Record<string, MinMaxValues>;

/**
* @class
*
Expand Down Expand Up @@ -355,9 +362,31 @@ class ColorPicker extends UI5Element implements IFormInputElement {
this._displayHSL = !this._displayHSL;
}

_normalizeInputValue(stringValue: string, inputId: string): number {
const value = Number(stringValue);

const limits: HSLandRGBValueLimits = {
red: { min: 0, max: 255 },
green: { min: 0, max: 255 },
blue: { min: 0, max: 255 },
hue: { min: 0, max: 360 },
saturation: { min: 0, max: 100 },
light: { min: 0, max: 100 },
};

const limit = limits[inputId];
if (!limit) {
return value || 0;
}

// Return the value normalized to the limits
return Math.max(limit.min, Math.min(limit.max, value));
}

_handleColorInputChange(e: Event) {
const target = e.target as Input;
const targetValue = parseInt(target.value) || 0;
const targetValue = this._normalizeInputValue(target.value, target.id);
target.value = String(targetValue);

switch (target.id) {
case "red":
Expand Down
Loading