From 97c5752102cc69c8f5ae6c7fed96e75c8ce35c2e Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Tue, 18 Jan 2022 14:53:52 -0500 Subject: [PATCH] ISSUE-021 - Progress commit. Have a rough version of ProgressSlider component done. Still needs some work. --- .../Inputs/ProgressSlider/ProgressSlider.tsx | 53 +++++++++++++++++++ .../Common/Inputs/ProgressSlider/index.ts | 1 + .../Common/Inputs/ProgressSlider/styles.ts | 53 +++++++++++++++++++ .../OverlayControl/OverlayControl.tsx | 22 ++++++-- .../OverlayDisplay/OverlayDisplay.tsx | 4 +- .../OverlayTool/OverlayDisplay/styles.ts | 11 +++- 6 files changed, 136 insertions(+), 8 deletions(-) create mode 100644 src/components/Common/Inputs/ProgressSlider/ProgressSlider.tsx create mode 100644 src/components/Common/Inputs/ProgressSlider/index.ts create mode 100644 src/components/Common/Inputs/ProgressSlider/styles.ts diff --git a/src/components/Common/Inputs/ProgressSlider/ProgressSlider.tsx b/src/components/Common/Inputs/ProgressSlider/ProgressSlider.tsx new file mode 100644 index 0000000..65ab607 --- /dev/null +++ b/src/components/Common/Inputs/ProgressSlider/ProgressSlider.tsx @@ -0,0 +1,53 @@ +import { animated, useSpring } from "@react-spring/web"; +import { useDrag } from "@use-gesture/react"; +import useMeasure from "react-use-measure"; +import { clamp } from "lodash"; + +import { ProgressSliderBar, ProgressSliderBarHandle, ProgressSliderBarHandleContainer, ProgressSliderBody } from "./styles"; + +const MARGIN_WIDTH = 30; + +type ProgressSliderProps = { + value: number, // Fraction of 1 (0.0 to 1.0) + onChange: (value: number) => void, + formatter?: (value: number) => string, +}; +export function ProgressSlider({ + value, + onChange, + formatter = (x) => x.toString(), +}: ProgressSliderProps) { + const [bodyRef, { + width: bodyWidth, + }] = useMeasure(); + const barPos = useSpring({ x: (bodyWidth - 2 * MARGIN_WIDTH) * value }); + const bindBarPos = useDrag((params) => { + const newPos = clamp(barPos.x.get() + params.delta[0], MARGIN_WIDTH, bodyWidth - MARGIN_WIDTH); + const newValue = newPos / (bodyWidth - MARGIN_WIDTH); + + barPos.x.set(newPos); + onChange(newValue); + + console.log("drag", newPos, newValue); + }); + + // const + // console.log("main", bodyWidth, barPos.x.get()); + console.log("main",barPos.x.get()); + + return ( + + {/* */} + + + {/* */} + + + + {/* */} + + {/* */} + + + ); +} diff --git a/src/components/Common/Inputs/ProgressSlider/index.ts b/src/components/Common/Inputs/ProgressSlider/index.ts new file mode 100644 index 0000000..0dbb390 --- /dev/null +++ b/src/components/Common/Inputs/ProgressSlider/index.ts @@ -0,0 +1 @@ +export * from "./ProgressSlider"; diff --git a/src/components/Common/Inputs/ProgressSlider/styles.ts b/src/components/Common/Inputs/ProgressSlider/styles.ts new file mode 100644 index 0000000..dcf57cb --- /dev/null +++ b/src/components/Common/Inputs/ProgressSlider/styles.ts @@ -0,0 +1,53 @@ +import { animated } from "@react-spring/web"; +import styled from "styled-components"; + +export const ProgressSliderBody = styled.div` + position: relative; + height: 1.5em; + width: auto; + + border-radius: 0.6em; + background-color: white; + box-shadow: inset 0 0 50px -50px ${p => p.theme.colors.darkGrey}; + border: 1px solid ${p => p.theme.colors.darkGrey}; + + cursor: pointer; + + overflow: hidden; +`; + +type ProgressSliderBarProps = { + color?: string, +}; +export const ProgressSliderBar = styled.div` + position: absolute; + height: 100%; + width: 100%; + background-color: ${({ color }) => (color ?? (p => p.theme.colors.activeGreen))}; +`; +ProgressSliderBar.displayName = "ProgressSliderBar"; + + +export const ProgressSliderBarHandleContainer = styled(animated.div)` + width: 100%; + height: 100%; + position: absolute; +`; +ProgressSliderBarHandleContainer.displayName = "ProgressSliderBarHandleContainer"; + +export const ProgressSliderBarHandle = styled.div` + position: relative; + width: 1ch; + height: 1.2em; + background-color: white; + /* margin: 2px; */ + margin-top: 1px; + border-radius: 3px; + opacity: 0.5; + cursor: pointer; + + &:hover { + opacity: 0.9; + } +`; +ProgressSliderBarHandle.displayName = "ProgressSliderBarHandle"; diff --git a/src/components/OverlayTool/OverlayControl/OverlayControl.tsx b/src/components/OverlayTool/OverlayControl/OverlayControl.tsx index ccb977b..c9141da 100644 --- a/src/components/OverlayTool/OverlayControl/OverlayControl.tsx +++ b/src/components/OverlayTool/OverlayControl/OverlayControl.tsx @@ -7,19 +7,22 @@ import { overlayToolSelector } from "../../../features/overlayTool/overlayToolSe import { initNewOverlayItem, setCurrentOverlayId, + setOpacity, setVisibility, } 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() { const dispatch = useDispatch(); const { overlayIds, visible, currentOverlayItem } = useSelector(overlayToolSelector); - const onToggle = (value: boolean) => { + const onToggleVisibility = (value: boolean) => { if (currentOverlayItem == null) { dispatch(initNewOverlayItem({ overlayId: overlayIds[0], @@ -31,13 +34,21 @@ export function OverlayControl() { } }; + const onChangeOpacity = (value: number) => { + dispatch(setOpacity(value)); + }; + + /* TEMP */ + const [barValue, setBarValue] = useState(0.3); + /* TEMP */ + return ( value.replace(/(\.png)|(\.jpg)$/, "")} /> - - Opacity Slider - + ); } diff --git a/src/components/OverlayTool/OverlayDisplay/OverlayDisplay.tsx b/src/components/OverlayTool/OverlayDisplay/OverlayDisplay.tsx index 4fca404..516ce92 100644 --- a/src/components/OverlayTool/OverlayDisplay/OverlayDisplay.tsx +++ b/src/components/OverlayTool/OverlayDisplay/OverlayDisplay.tsx @@ -53,7 +53,7 @@ export function OverlayDisplay({ from: { top: 50, opacity: 0 }, enter: { top: 0, - opacity: currentOverlayItem?.opacity ?? 1, + opacity: 1, }, leave: { top: 50, opacity: 0 }, }); @@ -77,7 +77,7 @@ export function OverlayDisplay({ }} > - + (({ `; OverlayImage.displayName = "OverlayImage"; -export const OverlayImageContainer = styled.div` +type OverlayImageContainerProps = { + opacity: number, +}; +export const OverlayImageContainer = styled.div.attrs(({ + opacity, +}) => ({ + style: { + opacity, + }, +}))` display: flex; `; OverlayImageContainer.displayName = "OverlayImageContainer";