Skip to content
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

Jump to bottom

Range input #6739 #7052

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+171 −5
Open

Range input #6739 #7052

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a222de
fix opacity not honoured for 8-hex+alpha for range input component tr…
sulaymon-tajudeen-hpe Dec 12, 2023
bedeb6a
add snapshot test, remove redundant || undefined
sulaymon-tajudeen-hpe Jan 3, 2024
b41ba00
remove redundant || 1 from lines 82 and 120 from getRGBA function
sulaymon-tajudeen-hpe Jan 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/js/components/RangeInput/StyledRangeInput.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const trackColorStyle = (props) => {
else {
defaultTrackColor = getRGBA(
normalizeColor(props.theme.rangeInput.track.color, props.theme),
props.theme.rangeInput.track.opacity || 1,
props.theme.rangeInput.track.opacity,
);
}

Expand All @@ -79,7 +79,7 @@ const trackColorStyle = (props) => {
? getBoundColor(props, 'lower')
: getRGBA(
normalizeColor(props.theme.global.colors.control, props.theme),
props.theme.rangeInput.track.opacity || 1,
props.theme.rangeInput.track.opacity,
);

if (
Expand All @@ -105,19 +105,19 @@ const trackColorStyle = (props) => {
const { value, color, opacity } = arrayOfTrackColors[index];
result += `${getRGBA(
normalizeColor(color, props.theme),
opacity || 1,
opacity,
)} ${valuePercentage}%,`;

if (props.value >= value) {
valuePercentage = ((value - min) / (max - min)) * 100;
result += `${getRGBA(
normalizeColor(color, props.theme),
opacity || 1,
opacity,
)} ${valuePercentage}%,`;
} else {
result += `${getRGBA(
normalizeColor(color, props.theme),
opacity || 1,
opacity,
)} ${thumbPosition},`;
result += `${upperTrackColor} ${thumbPosition}, ${upperTrackColor})`;
break;
Expand Down
20 changes: 20 additions & 0 deletions src/js/components/RangeInput/__tests__/RangeInput-test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,4 +138,24 @@ describe('RangeInput', () => {

expect(container.firstChild).toMatchSnapshot();
});

test('with 8-digit HEX color', () => {
const { container } = render(
<Grommet>
<RangeInput
color={[
{ value: 3, color: '#FF0000', opacity: 0.5 },
{ value: 4, color: '#FFFF00' },
{ value: 6, color: '#00FF004A' },
]}
min={1}
max={10}
step={1}
value={5}
/>
</Grommet>,
);

expect(container.firstChild).toMatchSnapshot();
});
});
146 changes: 146 additions & 0 deletions src/js/components/RangeInput/__tests__/__snapshots__/RangeInput-test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1070,6 +1070,152 @@ exports[`RangeInput track themed with color and opacity 1`] = `
</div>
`;

exports[`RangeInput with 8-digit HEX color 1`] = `
.c0 {
font-size: 18px;
line-height: 24px;
box-sizing: border-box;
-webkit-text-size-adjust: 100%;
-ms-text-size-adjust: 100%;
-moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased;
}

.c1 {
box-sizing: border-box;
position: relative;
-webkit-appearance: none;
border-color: transparent;
height: 24px;
width: 100%;
padding: 0px;
cursor: pointer;
background: transparent;
margin: 0px;
}

.c1::-moz-focus-inner {
border: none;
}

.c1::-moz-focus-outer {
border: none;
}

.c1::-webkit-slider-runnable-track {
box-sizing: border-box;
width: 100%;
height: 4px;
background: linear-gradient(to right,rgba(255,0,0,0.5) 0%,rgba(255,0,0,0.5) 22.22222222222222%,rgba(255,255,0,1) 22.22222222222222%,rgba(255,255,0,1) 33.33333333333333%,rgba(0,255,0,0.2901960784313726) 33.33333333333333%,rgba(0,255,0,0.2901960784313726) 44.44444444444444%,rgba(0,0,0,0.2) 44.44444444444444%,rgba(0,0,0,0.2));
}

.c1::-webkit-slider-thumb {
margin-top: -10px;
box-sizing: border-box;
position: relative;
border-radius: 24px;
height: 24px;
width: 24px;
overflow: visible;
background: #7D4CDB;
-webkit-appearance: none;
cursor: pointer;
}

.c1::-webkit-slider-thumb:hover {
box-shadow: 0px 0px 0px 2px #7D4CDB;
}

.c1::-moz-range-track {
box-sizing: border-box;
width: 100%;
height: 4px;
background: linear-gradient(to right,rgba(255,0,0,0.5) 0%,rgba(255,0,0,0.5) 22.22222222222222%,rgba(255,255,0,1) 22.22222222222222%,rgba(255,255,0,1) 33.33333333333333%,rgba(0,255,0,0.2901960784313726) 33.33333333333333%,rgba(0,255,0,0.2901960784313726) 44.44444444444444%,rgba(0,0,0,0.2) 44.44444444444444%,rgba(0,0,0,0.2));
}

.c1::-moz-range-thumb {
box-sizing: border-box;
position: relative;
border-radius: 24px;
height: 24px;
width: 24px;
overflow: visible;
background: #7D4CDB;
-webkit-appearance: none;
cursor: pointer;
margin-top: 0px;
height: 24px;
width: 24px;
}

.c1::-ms-thumb {
box-sizing: border-box;
position: relative;
border-radius: 24px;
height: 24px;
width: 24px;
overflow: visible;
background: #7D4CDB;
-webkit-appearance: none;
cursor: pointer;
margin-top: 0px;
height: 24px;
width: 24px;
}

.c1:hover::-moz-range-thumb {
box-shadow: 0px 0px 0px 2px #7D4CDB;
}

.c1:hover::-ms-thumb {
box-shadow: 0px 0px 0px 2px #7D4CDB;
}

.c1::-ms-track {
box-sizing: border-box;
width: 100%;
height: 4px;
background: linear-gradient(to right,rgba(255,0,0,0.5) 0%,rgba(255,0,0,0.5) 22.22222222222222%,rgba(255,255,0,1) 22.22222222222222%,rgba(255,255,0,1) 33.33333333333333%,rgba(0,255,0,0.2901960784313726) 33.33333333333333%,rgba(0,255,0,0.2901960784313726) 44.44444444444444%,rgba(0,0,0,0.2) 44.44444444444444%,rgba(0,0,0,0.2));
border-color: transparent;
color: transparent;
}

.c1::-ms-fill-lower {
background: linear-gradient(to right,rgba(255,0,0,0.5) 0%,rgba(255,0,0,0.5) 22.22222222222222%,rgba(255,255,0,1) 22.22222222222222%,rgba(255,255,0,1) 33.33333333333333%,rgba(0,255,0,0.2901960784313726) 33.33333333333333%,rgba(0,255,0,0.2901960784313726) 44.44444444444444%,rgba(0,0,0,0.2) 44.44444444444444%,rgba(0,0,0,0.2));
border-color: transparent;
}

.c1::-ms-fill-upper {
background: linear-gradient(to right,rgba(255,0,0,0.5) 0%,rgba(255,0,0,0.5) 22.22222222222222%,rgba(255,255,0,1) 22.22222222222222%,rgba(255,255,0,1) 33.33333333333333%,rgba(0,255,0,0.2901960784313726) 33.33333333333333%,rgba(0,255,0,0.2901960784313726) 44.44444444444444%,rgba(0,0,0,0.2) 44.44444444444444%,rgba(0,0,0,0.2));
border-color: transparent;
}

.c1:focus-visible {
outline: 0;
}

.c1:focus {
outline: none;
}

<div
class="c0"
>
<input
aria-valuemax="10"
aria-valuemin="1"
aria-valuenow="5"
class="c1"
color="[object Object],[object Object],[object Object]"
max="10"
min="1"
step="1"
type="range"
value="5"
/>
</div>
`;

exports[`RangeInput with min and max offset 1`] = `
.c0 {
font-size: 18px;
Expand Down