diff --git a/src/components/Common/MenuItem.styled.ts b/src/components/Common/MenuItem.styled.ts index eb73e53..cc7bad7 100644 --- a/src/components/Common/MenuItem.styled.ts +++ b/src/components/Common/MenuItem.styled.ts @@ -6,7 +6,7 @@ const hoverRules = css` color: white; `; -export type MenuItemProps = { +type MenuItemProps = { isHovered?: boolean, isActive?: boolean, }; diff --git a/src/components/OverlayTool/OverlayControl/OverlayControl.tsx b/src/components/OverlayTool/OverlayControl/OverlayControl.tsx index 72df498..e23c8da 100644 --- a/src/components/OverlayTool/OverlayControl/OverlayControl.tsx +++ b/src/components/OverlayTool/OverlayControl/OverlayControl.tsx @@ -1,6 +1,8 @@ import { useState } from "react"; import { useSelector, useDispatch } from "react-redux"; +import { Inline } from "@bedrock-layout/inline"; import { PadBox } from "@bedrock-layout/padbox"; +import { Stack } from "@bedrock-layout/stack"; import { overlayToolSelector } from "../../../features/overlayTool/overlayToolSelector"; import { @@ -10,6 +12,7 @@ import { } from "../../../features/overlayTool/overlayToolSlice"; import { Toggle } from "../../Common/Inputs/Toggle"; +import { MockupBlock } from "../../Common/MockupBlock.styled"; export function OverlayControl() { @@ -44,22 +47,24 @@ export function OverlayControl() { }; return ( - - - - {/* For prototyping use only */} -
- - Id #{idNum}: "{overlayIds[idNum]}" - - {/* For prototyping use only */} - -
+ + + + + + Slot selector + + + + + + Opacity Slider + + + ); } diff --git a/src/components/Workspaces/Workspace/WorkspaceControls.tsx b/src/components/Workspaces/Workspace/WorkspaceControls.tsx index c0b53f3..70069a9 100644 --- a/src/components/Workspaces/Workspace/WorkspaceControls.tsx +++ b/src/components/Workspaces/Workspace/WorkspaceControls.tsx @@ -1,4 +1,5 @@ import { Grid } from "@bedrock-layout/grid"; +import { PadBox } from "@bedrock-layout/padbox"; import { useDispatch, useSelector } from "react-redux"; import { workspaceSelector } from "../../../features/workspace/workspaceSelector"; @@ -12,14 +13,18 @@ export const WorkspaceControls = () => { const { animatedBG } = useSelector(workspaceSelector); return( - - { - dispatch(setAnimatedBG(value)); - }} /> - + + + { + dispatch(setAnimatedBG(value)); + }} /> + + + + ); }; diff --git a/src/features/overlayTool/overlayToolSlice.ts b/src/features/overlayTool/overlayToolSlice.ts index 966dafc..e66140d 100644 --- a/src/features/overlayTool/overlayToolSlice.ts +++ b/src/features/overlayTool/overlayToolSlice.ts @@ -65,6 +65,10 @@ export const overlayToolSlice = createSlice({ state.currentWorkspaceId = action.payload.workspaceId; state.overlayIds = action.payload.overlayIds; }, + setOpacity: (state, action: PayloadAction) => { + if (state.currentOverlayItem == null) return; + state.currentOverlayItem.opacity = action.payload; + }, }, }); @@ -74,5 +78,6 @@ export const { setCurrentOverlayId, setPosition, newWorkspace, + setOpacity, } = overlayToolSlice.actions; export default overlayToolSlice.reducer;