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

Fixes for adding padding on element or parent #39

Merged
merged 4 commits into from
Aug 3, 2022
Merged

Fixes for adding padding on element or parent #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c97094c
Fixes for adding padding on element or parent
ponnexcodev Aug 3, 2022
bd83330
Formatting fixes
ponnexcodev Aug 3, 2022
29f1435
Label offset fixes
ponnexcodev Aug 3, 2022
1f710d8
remove log
ponnexcodev Aug 3, 2022
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
53 changes: 19 additions & 34 deletions src/elements/toniq-slider/toniq-slider.element.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ export const ToniqSlider = defineToniqElement({
border-radius: 4px;
margin: 0;
margin-bottom: 48px;
position: relative;
${applyBackgroundAndForeground(toniqColors.accentSecondary)};
}

Expand Down Expand Up @@ -301,17 +302,13 @@ export const ToniqSlider = defineToniqElement({
* location is by getting the progress bar right location minus half of the label
* value width. Then set label value left to that computed value.
*/
const labelOffset =
progress.getBoundingClientRect().left +
progressCalculatedWidth -
label.offsetWidth / 2;

const labelOffset = progressCalculatedWidth - label.offsetWidth / 2;
setProps({
labelStyle: {
innerText: `${props.value} ${props.suffix}`,
left: `${
labelOffset < slider.getBoundingClientRect().left
? slider.getBoundingClientRect().left
labelOffset < 0
? 0
: labelOffset + label.clientWidth >
slider.getBoundingClientRect().right
? slider.getBoundingClientRect().right - label.clientWidth
Expand All @@ -334,21 +331,15 @@ export const ToniqSlider = defineToniqElement({
const lowerSliderWidth = lowerSliderElement.clientWidth;
const upperSliderWidth = upperSliderElement.clientWidth;

/** Get offset from range 24 to 8 as input ranges from min to max. */
const lowerSliderOffset = mapRange(props.value.min, props.min, props.max, 24, 8);
const upperSliderOffset = mapRange(props.value.max, props.min, props.max, 24, 8);

const lowerSliderLeft =
(lowerSliderWidth *
mapRange(props.value.min, props.min, props.max, 0, props.max)) /
props.max +
lowerSliderOffset;
props.max;

const upperSliderLeft =
(upperSliderWidth *
mapRange(props.value.max, props.min, props.max, 0, props.max)) /
props.max +
upperSliderOffset;
props.max;

setProps({
progressStyle: {
Expand All @@ -366,12 +357,9 @@ export const ToniqSlider = defineToniqElement({

const lowerLabelOffset = lowerSliderLeft - lowerLabelElement.offsetWidth / 2;
const upperLabelOffset =
progress.getBoundingClientRect().right - upperLabelElement.offsetWidth / 2;
progress.offsetLeft + progress.offsetWidth - upperLabelElement.offsetWidth / 2;

const lowerLabelCalculatedLeft = Math.max(
lowerLabelOffset,
lowerSliderElement.getBoundingClientRect().left,
);
const lowerLabelCalculatedLeft = Math.max(lowerLabelOffset, 0);
const upperLabelCalculatedLeft =
upperLabelOffset + upperLabelElement.clientWidth >
upperSliderElement.getBoundingClientRect().right
Expand All @@ -397,25 +385,22 @@ export const ToniqSlider = defineToniqElement({
upperLabelCalculatedLeft <=
lowerLabelCalculatedLeft + lowerLabelElement.offsetWidth
) {
const lowerLabelOffset =
progress.getBoundingClientRect().left -
lowerLabelElement.getBoundingClientRect().width;
const upperLabelOffset = progress.getBoundingClientRect().right;
const lowerLabelMin = lowerSliderElement.getBoundingClientRect().left;
const lowerLabelOffset = progress.offsetLeft - lowerLabelElement.offsetWidth;
const upperLabelOffset = progress.offsetLeft + progress.offsetWidth;
const lowerLabelMin = 0;

const lowerLabelMax =
lowerSliderElement.getBoundingClientRect().right -
upperLabelElement.getBoundingClientRect().width -
lowerLabelElement.getBoundingClientRect().width -
lowerSliderElement.offsetLeft +
lowerSliderElement.offsetWidth -
upperLabelElement.offsetWidth -
lowerLabelElement.offsetWidth -
labelsOffset;

const upperLabelMin =
upperSliderElement.getBoundingClientRect().left +
lowerLabelElement.getBoundingClientRect().width +
labelsOffset;
const upperLabelMin = lowerLabelElement.offsetWidth + labelsOffset;
const upperLabelMax =
upperSliderElement.getBoundingClientRect().right -
upperLabelElement.getBoundingClientRect().width;
upperSliderElement.offsetLeft +
upperSliderElement.offsetWidth -
upperLabelElement.offsetWidth;

setProps({
lowerLabelStyle: {
Expand Down
30 changes: 30 additions & 0 deletions src/elements/toniq-slider/toniq-slider.story.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,36 @@ export const mainStory = (controls: Record<keyof typeof sliderStoryControls, any
double
onValueChange={handleEventAsAction}
/>

<h3
style={{
...cssToReactStyleObject(toniqFontStyles.h3Font),
}}
>
With Padding
</h3>

<div style={{padding: '16px'}}>
<ToniqSlider
value={controls.value}
min={controls.min}
max={controls.max}
suffix={controls.suffix}
onValueChange={handleEventAsAction}
style={{padding: '16px'}}
/>
</div>
<div style={{padding: '16px'}}>
<ToniqSlider
min={0}
max={500}
value={{min: 120, max: 250}}
suffix={controls.suffix}
double
onValueChange={handleEventAsAction}
style={{padding: '16px'}}
/>
</div>
</article>
);
mainStory.storyName = 'Toniq Slider';