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;
|
color: white;
|
||||||
`;
|
`;
|
||||||
|
|
||||||
export type MenuItemProps = {
|
type MenuItemProps = {
|
||||||
isHovered?: boolean,
|
isHovered?: boolean,
|
||||||
isActive?: boolean,
|
isActive?: boolean,
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { useSelector, useDispatch } from "react-redux";
|
import { useSelector, useDispatch } from "react-redux";
|
||||||
|
import { Inline } from "@bedrock-layout/inline";
|
||||||
import { PadBox } from "@bedrock-layout/padbox";
|
import { PadBox } from "@bedrock-layout/padbox";
|
||||||
|
import { Stack } from "@bedrock-layout/stack";
|
||||||
|
|
||||||
import { overlayToolSelector } from "../../../features/overlayTool/overlayToolSelector";
|
import { overlayToolSelector } from "../../../features/overlayTool/overlayToolSelector";
|
||||||
import {
|
import {
|
||||||
@@ -10,6 +12,7 @@ import {
|
|||||||
} from "../../../features/overlayTool/overlayToolSlice";
|
} from "../../../features/overlayTool/overlayToolSlice";
|
||||||
|
|
||||||
import { Toggle } from "../../Common/Inputs/Toggle";
|
import { Toggle } from "../../Common/Inputs/Toggle";
|
||||||
|
import { MockupBlock } from "../../Common/MockupBlock.styled";
|
||||||
|
|
||||||
|
|
||||||
export function OverlayControl() {
|
export function OverlayControl() {
|
||||||
@@ -44,22 +47,24 @@ export function OverlayControl() {
|
|||||||
};
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<PadBox padding="sm">
|
<Stack gutter="sm">
|
||||||
<Toggle
|
<Inline gutter="sm" stretch="end">
|
||||||
label="Show Overlay"
|
<Toggle
|
||||||
toggled={visible}
|
label="Show Overlay"
|
||||||
onToggle={onToggle}
|
toggled={visible}
|
||||||
/>
|
onToggle={onToggle}
|
||||||
|
/>
|
||||||
{/* For prototyping use only */}
|
<PadBox padding="sm">
|
||||||
<br />
|
<MockupBlock color="green" height="1.5rem" width="100%">
|
||||||
<a
|
Slot selector
|
||||||
onClick={nextIdNum}
|
</MockupBlock>
|
||||||
>
|
</PadBox>
|
||||||
Id #{idNum}: "{overlayIds[idNum]}"
|
</Inline>
|
||||||
</a>
|
<PadBox padding="sm">
|
||||||
{/* For prototyping use only */}
|
<MockupBlock color="green" height="1.5rem" width="100%">
|
||||||
|
Opacity Slider
|
||||||
</PadBox>
|
</MockupBlock>
|
||||||
|
</PadBox>
|
||||||
|
</Stack>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import { Grid } from "@bedrock-layout/grid";
|
import { Grid } from "@bedrock-layout/grid";
|
||||||
|
import { PadBox } from "@bedrock-layout/padbox";
|
||||||
import { useDispatch, useSelector } from "react-redux";
|
import { useDispatch, useSelector } from "react-redux";
|
||||||
|
|
||||||
import { workspaceSelector } from "../../../features/workspace/workspaceSelector";
|
import { workspaceSelector } from "../../../features/workspace/workspaceSelector";
|
||||||
@@ -12,14 +13,18 @@ export const WorkspaceControls = () => {
|
|||||||
const { animatedBG } = useSelector(workspaceSelector);
|
const { animatedBG } = useSelector(workspaceSelector);
|
||||||
|
|
||||||
return(
|
return(
|
||||||
<Grid gutter="sm" minItemWidth="25rem">
|
<Grid gutter="sm" minItemWidth="100px">
|
||||||
<Toggle
|
<PadBox padding="sm">
|
||||||
label="Animate BG"
|
<Toggle
|
||||||
toggled={animatedBG}
|
label="Animate BG"
|
||||||
onToggle={(value: boolean) => {
|
toggled={animatedBG}
|
||||||
dispatch(setAnimatedBG(value));
|
onToggle={(value: boolean) => {
|
||||||
}} />
|
dispatch(setAnimatedBG(value));
|
||||||
<OverlayControl />
|
}} />
|
||||||
|
</PadBox>
|
||||||
|
<PadBox padding="sm">
|
||||||
|
<OverlayControl />
|
||||||
|
</PadBox>
|
||||||
</Grid>
|
</Grid>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
@@ -65,6 +65,10 @@ export const overlayToolSlice = createSlice({
|
|||||||
state.currentWorkspaceId = action.payload.workspaceId;
|
state.currentWorkspaceId = action.payload.workspaceId;
|
||||||
state.overlayIds = action.payload.overlayIds;
|
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,
|
setCurrentOverlayId,
|
||||||
setPosition,
|
setPosition,
|
||||||
newWorkspace,
|
newWorkspace,
|
||||||
|
setOpacity,
|
||||||
} = overlayToolSlice.actions;
|
} = overlayToolSlice.actions;
|
||||||
export default overlayToolSlice.reducer;
|
export default overlayToolSlice.reducer;
|
||||||
Reference in new issue
Block a user