diff --git a/src/components/Common/Inputs/ProgressSlider/ProgressSlider.tsx b/src/components/Common/Inputs/ProgressSlider/ProgressSlider.tsx index 81543c2..6d398ae 100644 --- a/src/components/Common/Inputs/ProgressSlider/ProgressSlider.tsx +++ b/src/components/Common/Inputs/ProgressSlider/ProgressSlider.tsx @@ -3,7 +3,7 @@ import { useDrag } from "@use-gesture/react"; import useMeasure from "react-use-measure"; import { clamp } from "lodash"; -import { ProgressSliderBar, ProgressSliderBarHandle, ProgressSliderBarHandleContainer, ProgressSliderBody } from "./styles"; +import { ProgressSliderBar, ProgressSliderBarHandle, ProgressSliderBody } from "./styles"; const MARGIN_WIDTH = 15; @@ -20,7 +20,7 @@ export function ProgressSlider({ const [bodyRef, { width: bodyWidth, }] = useMeasure(); - const barPos = useSpring({ x: (bodyWidth - MARGIN_WIDTH) * value }); + const barPos = useSpring({ x: ((bodyWidth - 2 * MARGIN_WIDTH) * value) + MARGIN_WIDTH }); const bindBarPos = useDrag((params) => { const newPos = clamp( barPos.x.get() + params.delta[0], @@ -37,14 +37,16 @@ export function ProgressSlider({ const AnimatedProgressSliderBar = animated(ProgressSliderBar); - const AnimatedProgressSliderBarHandleContainer = animated(ProgressSliderBarHandleContainer); return ( - - + - + ); } diff --git a/src/components/Common/Inputs/ProgressSlider/styles.ts b/src/components/Common/Inputs/ProgressSlider/styles.ts index 706322a..98f4e11 100644 --- a/src/components/Common/Inputs/ProgressSlider/styles.ts +++ b/src/components/Common/Inputs/ProgressSlider/styles.ts @@ -28,31 +28,20 @@ export const ProgressSliderBar = styled.div` `; ProgressSliderBar.displayName = "ProgressSliderBar"; - -export const ProgressSliderBarHandleContainer = styled.div` - position: relative; - left: -50%; - - display: flex; - align-items: center; - justify-content: center; - width: 100%; - height: 100%; - - - background-color: rgba(200, 200, 0, 0.3); -`; -ProgressSliderBarHandleContainer.displayName = "ProgressSliderBarHandleContainer"; - export const ProgressSliderBarHandle = styled.div` position: relative; - width: 1ch; - height: 80%; + float: right; + + width: 0.8ch; + right: 0.5ch; + + height: 70%; + top: 15%; + border-radius: 2px; opacity: 0.5; background-color: white; - cursor: pointer; &:hover { diff --git a/src/components/OverlayTool/OverlayControl/OverlayControl.tsx b/src/components/OverlayTool/OverlayControl/OverlayControl.tsx index c9141da..f95aa24 100644 --- a/src/components/OverlayTool/OverlayControl/OverlayControl.tsx +++ b/src/components/OverlayTool/OverlayControl/OverlayControl.tsx @@ -12,10 +12,8 @@ import { } from "../../../features/overlayTool/overlayToolSlice"; import { Toggle } from "../../Common/Inputs/Toggle"; -import { MockupBlock } from "../../Common/MockupBlock.styled"; import { SlotSelector } from "../../Common/Inputs/SlotSelector"; import { ProgressSlider } from "../../Common/Inputs/ProgressSlider"; -import { useState } from "react"; export function OverlayControl() { @@ -38,10 +36,6 @@ export function OverlayControl() { dispatch(setOpacity(value)); }; - /* TEMP */ - const [barValue, setBarValue] = useState(0.3); - /* TEMP */ - return (