diff --git a/src/components/Common/Inputs/ProgressSlider/ProgressSlider.tsx b/src/components/Common/Inputs/ProgressSlider/ProgressSlider.tsx
new file mode 100644
index 0000000..47881b2
--- /dev/null
+++ b/src/components/Common/Inputs/ProgressSlider/ProgressSlider.tsx
@@ -0,0 +1,89 @@
+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,
+ ProgressSliderBarIndicator,
+ ProgressSliderBody,
+} from "./styles";
+
+/**
+ * This component isn't 100% amazing. Consider that the number indicator
+ * component may be bugged when loading with a value that isn't 1.
+ */
+
+const MARGIN_WIDTH = 15;
+const percentage = (value: number) => `${Math.floor(value * 100)}%`;
+
+type ProgressSliderProps = {
+ value: number, // Fraction of 1 (0.0 to 1.0)
+ onChange: (value: number) => void,
+ disabled?: boolean,
+ formatter?: (value: number) => string,
+ barColor?: string,
+ labelColor?: string,
+ handleColor?: string,
+};
+export function ProgressSlider({
+ value,
+ onChange,
+ disabled = false,
+ formatter = percentage,
+ barColor,
+ labelColor,
+ handleColor,
+}: ProgressSliderProps) {
+ const [bodyRef, {
+ width: bodyWidth,
+ }] = useMeasure();
+ const [labelRef, {
+ width: labelWidth,
+ }] = useMeasure();
+ const barPos = useSpring({ x: ((bodyWidth - 2 * MARGIN_WIDTH) * value) + MARGIN_WIDTH });
+ const bindBarPos = useDrag((params) => {
+ const newPos = clamp(
+ barPos.x.get() + params.delta[0],
+ MARGIN_WIDTH,
+ bodyWidth - MARGIN_WIDTH,
+ );
+ const newValue = (newPos - MARGIN_WIDTH) / (bodyWidth - 2 * MARGIN_WIDTH);
+
+ barPos.x.set(newPos);
+ onChange(newValue);
+ }, { enabled: !disabled });
+
+ console.log(bodyWidth, labelWidth, value, barPos.x.get());
+
+ const AnimatedProgressSliderBar = animated(ProgressSliderBar);
+
+ return (
+
+
+
+ labelWidth * 1.5
+ || barPos.x.get() < 0
+ || value === 1
+ ) ? -1 : value > 0.1 ? 4 : 3 // Tuned fitting considerations.
+ }
+ disabled={disabled}
+ onBarColor={labelColor}
+ >
+ {formatter(value)}
+
+
+
+ );
+}
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..1b1df95
--- /dev/null
+++ b/src/components/Common/Inputs/ProgressSlider/styles.ts
@@ -0,0 +1,89 @@
+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 = {
+ bodyWidth: number,
+ disabled: boolean,
+ color?: string,
+};
+export const ProgressSliderBar = styled.div`
+ position: absolute;
+ left: ${({ bodyWidth }) => `${-bodyWidth}px`};
+ height: 100%;
+ width: 100%;
+ background-color: ${({ color, disabled }) => (
+ disabled ? (p => p.theme.colors.lightGrey) :
+ color ?? (p => p.theme.colors.activeGreen)
+ )};
+ transition: background-color 0.2s ease;
+`;
+ProgressSliderBar.displayName = "ProgressSliderBar";
+
+type ProgressSliderBarHandleProps = {
+ color?: string,
+};
+export const ProgressSliderBarHandle = styled.div`
+ position: relative;
+ float: right;
+
+ width: 0.8ch;
+ right: 0.5ch;
+
+ height: 70%;
+ top: 15%;
+
+ border-radius: 2px;
+
+ opacity: 0.5;
+ background-color: ${({ color = "white" }) => color};
+ transition: background-color 0.2s ease;
+ cursor: pointer;
+
+ &:hover {
+ opacity: 0.8;
+ }
+`;
+ProgressSliderBarHandle.displayName = "ProgressSliderBarHandle";
+
+type ProgressSliderBarIndicatorProps = {
+ left: number,
+ disabled: boolean,
+ onBarColor?: string,
+};
+export const ProgressSliderBarIndicator = styled.span`
+ display: block;
+ position: relative;
+ float: right;
+ left: ${({ left }) => left}ch;
+
+ font-family: ${p => p.theme.fonts.f1Regular};
+ font-size: 0.9em;
+ color: ${({ onBarColor, left, disabled }) => (
+ left < 0
+ ? disabled
+ ? (p => p.theme.colors.darkGrey)
+ : onBarColor ?? "white"
+ : (p => p.theme.colors.darkGrey)
+ )};
+
+ transition-property: left, color;
+ transition-timing-function: ease;
+ transition-duration: 0.2s;
+
+ user-select: none;
+`;
+ProgressSliderBarIndicator.displayName = "ProgressSliderBarIndicator";
diff --git a/src/components/OverlayTool/OverlayControl/OverlayControl.tsx b/src/components/OverlayTool/OverlayControl/OverlayControl.tsx
index ccb977b..261dd2d 100644
--- a/src/components/OverlayTool/OverlayControl/OverlayControl.tsx
+++ b/src/components/OverlayTool/OverlayControl/OverlayControl.tsx
@@ -7,19 +7,20 @@ 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";
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 +32,17 @@ export function OverlayControl() {
}
};
+ const onChangeOpacity = (value: number) => {
+ dispatch(setOpacity(value));
+ };
+
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";