ISSUE-020 - Mocked up new slot selector and (since it'll happen later) opacity controls.
This commit is contained in:
1 parent
82c0d65187
commit
1ca2137a5b
4 files changed
+41
-26
No files matched your search
@@ -6,7 +6,7 @@ const hoverRules = css`
|
||||
color: white;
|
||||
`;
|
||||
|
||||
export type MenuItemProps = {
|
||||
type MenuItemProps = {
|
||||
isHovered?: boolean,
|
||||
isActive?: boolean,
|
||||
};
|
||||
|
||||
@@ -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 (
|
||||
<PadBox padding="sm">
|
||||
<Toggle
|
||||
label="Show Overlay"
|
||||
toggled={visible}
|
||||
onToggle={onToggle}
|
||||
/>
|
||||
|
||||
{/* For prototyping use only */}
|
||||
<br />
|
||||
<a
|
||||
onClick={nextIdNum}
|
||||
>
|
||||
Id #{idNum}: "{overlayIds[idNum]}"
|
||||
</a>
|
||||
{/* For prototyping use only */}
|
||||
|
||||
</PadBox>
|
||||
<Stack gutter="sm">
|
||||
<Inline gutter="sm" stretch="end">
|
||||
<Toggle
|
||||
label="Show Overlay"
|
||||
toggled={visible}
|
||||
onToggle={onToggle}
|
||||
/>
|
||||
<PadBox padding="sm">
|
||||
<MockupBlock color="green" height="1.5rem" width="100%">
|
||||
Slot selector
|
||||
</MockupBlock>
|
||||
</PadBox>
|
||||
</Inline>
|
||||
<PadBox padding="sm">
|
||||
<MockupBlock color="green" height="1.5rem" width="100%">
|
||||
Opacity Slider
|
||||
</MockupBlock>
|
||||
</PadBox>
|
||||
</Stack>
|
||||
);
|
||||
}
|
||||
@@ -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(
|
||||
<Grid gutter="sm" minItemWidth="25rem">
|
||||
<Toggle
|
||||
label="Animate BG"
|
||||
toggled={animatedBG}
|
||||
onToggle={(value: boolean) => {
|
||||
dispatch(setAnimatedBG(value));
|
||||
}} />
|
||||
<OverlayControl />
|
||||
<Grid gutter="sm" minItemWidth="100px">
|
||||
<PadBox padding="sm">
|
||||
<Toggle
|
||||
label="Animate BG"
|
||||
toggled={animatedBG}
|
||||
onToggle={(value: boolean) => {
|
||||
dispatch(setAnimatedBG(value));
|
||||
}} />
|
||||
</PadBox>
|
||||
<PadBox padding="sm">
|
||||
<OverlayControl />
|
||||
</PadBox>
|
||||
</Grid>
|
||||
);
|
||||
};
|
||||
@@ -65,6 +65,10 @@ export const overlayToolSlice = createSlice({
|
||||
state.currentWorkspaceId = action.payload.workspaceId;
|
||||
state.overlayIds = action.payload.overlayIds;
|
||||
},
|
||||
setOpacity: (state, action: PayloadAction<number>) => {
|
||||
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;
|
||||
Reference in new issue
Block a user