diff --git a/package.json b/package.json index 2006d4d..42e370b 100644 --- a/package.json +++ b/package.json @@ -29,6 +29,7 @@ "@types/react-dom": "^17.0.9", "@types/react-redux": "^7.1.21", "@types/styled-components": "^5.1.18", + "@types/webpack-env": "^1.16.3", "@use-gesture/react": "^10.2.4", "d3": "^7.2.1", "history": "5", diff --git a/src/components/OverlayTool/OverlayControl/OverlayControl.tsx b/src/components/OverlayTool/OverlayControl/OverlayControl.tsx index 35c17bc..72df498 100644 --- a/src/components/OverlayTool/OverlayControl/OverlayControl.tsx +++ b/src/components/OverlayTool/OverlayControl/OverlayControl.tsx @@ -6,7 +6,6 @@ import { overlayToolSelector } from "../../../features/overlayTool/overlayToolSe import { initNewOverlayItem, setCurrentOverlayId, - setPosition, setVisibility, } from "../../../features/overlayTool/overlayToolSlice"; @@ -36,7 +35,7 @@ export function OverlayControl() { if (currentOverlayItem == null) { dispatch(initNewOverlayItem({ overlayId: overlayIds[idNum], - initialPosition: { x: 400, y: 300 }, + initialPosition: { x: 0, y: 0 }, setVisible: true, })); } else { diff --git a/src/components/OverlayTool/OverlayDisplay/OverlayDisplay.tsx b/src/components/OverlayTool/OverlayDisplay/OverlayDisplay.tsx index 6f19e0f..5c2cb46 100644 --- a/src/components/OverlayTool/OverlayDisplay/OverlayDisplay.tsx +++ b/src/components/OverlayTool/OverlayDisplay/OverlayDisplay.tsx @@ -5,8 +5,9 @@ import { useDrag } from "@use-gesture/react"; import { useDimensions } from "../../../utils/hooks"; import { overlayToolSelector } from "../../../features/overlayTool/overlayToolSelector"; import { setPosition } from "../../../features/overlayTool/overlayToolSlice"; +import { OverlayImage, OverlayImageContainer, OverlayImageSubContainer } from "./styles"; -import { OverlayItemContainer } from "./styles"; +const overlayImages = require.context("../../../public/images/overlays", true); type OverlayDisplayProps = { containerDimensions: { @@ -27,10 +28,11 @@ export function OverlayDisplay({ } = useSelector(overlayToolSelector); // Monitor element dimensions to calculate min/max drag coordinates. - const [overlayItemRef, { + const [overlayItemImageRef, { width: overlayItemWidth, height: overlayItemHeight, - }] = useDimensions(); + }] = useDimensions(); + console.log(overlayItemWidth, overlayItemHeight); const minX = -bleedover, minY = -bleedover, @@ -62,7 +64,6 @@ export function OverlayDisplay({ return null; } - const { position } = currentOverlayItem; return transition((style, visible) => visible ? ( @@ -77,15 +78,14 @@ export function OverlayDisplay({ }} > - - {currentOverlayId} -
- (x:{Math.floor(position.x)}px, y:{Math.floor(position.y)}px) -
+ + + + +
) : null, diff --git a/src/components/OverlayTool/OverlayDisplay/styles.ts b/src/components/OverlayTool/OverlayDisplay/styles.ts index 39eae1d..999f0ff 100644 --- a/src/components/OverlayTool/OverlayDisplay/styles.ts +++ b/src/components/OverlayTool/OverlayDisplay/styles.ts @@ -1,22 +1,28 @@ import styled from "styled-components"; -export type OverlayItemContainerProps = { - visible: boolean, - tempColor: string, +/** + * scale is a percentage (0-100%) + * */ +type OverlayImageProps = { + src: string, + scale?: number, }; -export const OverlayItemContainer = styled.div.attrs(({ - visible, +export const OverlayImage = styled.img.attrs(({ + src, }) => ({ - style: { - display: visible ? undefined : "none", - }, -}))` - /* Temporary. Overlay will be transparent and based on an image. */ - /* width: ${({ tempColor }) => tempColor == "red" ? "150px" : "100px"}; */ - width: 150px; - height: 150px; - background-color: ${({ tempColor }) => tempColor}; - box-shadow: 0px 7px 11px 1px black; + draggable: false, + src, +}))` + width: ${({ scale = 100 }) => `${scale}%`}; `; -OverlayItemContainer.displayName = "OverlayItemContainer"; +OverlayImage.displayName = "OverlayImage"; +export const OverlayImageContainer = styled.div` + display: flex; +`; +OverlayImageContainer.displayName = "OverlayImageContainer"; + +export const OverlayImageSubContainer = styled.div` + flex-shrink: 0; +`; +OverlayImageSubContainer.displayName = "OverlayImageSubContainer"; diff --git a/src/components/Workspaces/Workspace/Workspace.tsx b/src/components/Workspaces/Workspace/Workspace.tsx index e42f9f6..7a79ae0 100644 --- a/src/components/Workspaces/Workspace/Workspace.tsx +++ b/src/components/Workspaces/Workspace/Workspace.tsx @@ -16,9 +16,6 @@ import { OverlayDisplay } from "../../OverlayTool"; import { workspaceObject } from "../workspaces"; -const PREVIEW_WINDOW_HEIGHT = 600; -const PREVIEW_WINDOW_WIDTH = 800; - export const Workspace = () => { const dispatch = useDispatch(); const { workspaceId } = useParams(); @@ -40,6 +37,9 @@ export const Workspace = () => { } }, [workspaceId]); + if (workspaceId == null) return null; + const workspace = workspaceObject[workspaceId]; + return ( { maxWidth="80%" centerChildren > -

{workspaceId ? workspaceObject[workspaceId].name : "Unknown"}

+

{workspaceId ? workspace.name : "Unknown"}

Preview Item diff --git a/src/components/Workspaces/Workspace/styles.ts b/src/components/Workspaces/Workspace/styles.ts index 9544e0a..8d689ed 100644 --- a/src/components/Workspaces/Workspace/styles.ts +++ b/src/components/Workspaces/Workspace/styles.ts @@ -2,6 +2,7 @@ import styled, { css, keyframes } from "styled-components"; import { PadBox } from "@bedrock-layout/padbox"; import bg from "../../../public/images/misc/checker-40x40.png"; +import { Dimensions } from "../../../types/state"; const scrollAnimation = keyframes` from { background-position: 0 0; } @@ -9,8 +10,7 @@ const scrollAnimation = keyframes` `; export type PreviewWindowProps = { - height: number, - width: number, + dimensions: Dimensions, animatedBG?: boolean, }; export const PreviewWindow = styled(PadBox).attrs(() => ({ @@ -21,8 +21,8 @@ export const PreviewWindow = styled(PadBox).attrs(() => ({ justify-content: center; align-items: center; - height: ${({ height }) => height}px; - width: ${({ width }) => width}px; + height: ${({ dimensions }) => dimensions.height}px; + width: ${({ dimensions }) => dimensions.width}px; border-radius: 1em; diff --git a/src/components/Workspaces/workspaces.ts b/src/components/Workspaces/workspaces.ts index fa2c6b6..db93ab1 100644 --- a/src/components/Workspaces/workspaces.ts +++ b/src/components/Workspaces/workspaces.ts @@ -1,57 +1,24 @@ -import { OverlayIds } from "../../types/state"; +import { Dimensions, OverlayIds } from "../../types/state"; export type WorkspaceObject = { [id: string]: { name: string, overlayIds: OverlayIds, + previewWindowDimensions: Dimensions, }, }; export const workspaceObject: WorkspaceObject = { - workspace1: { - name: "Workspace 1", - overlayIds: ["red", "blue", "white"], + chyronSimple: { + name: "Chyron Simple", + overlayIds: [ + "chyron-simple-full.png", + "chyron-simple-opening-1.png", + "chyron-simple-opening-2.png", + ], + previewWindowDimensions: { + width: 650, + height: 200, + }, }, - workspace2: { - name: "Workspace 2", - overlayIds: ["green"], - }, - workspace3: { - name: "Workspace 3", - overlayIds: ["green"], - }, - workspace4: { - name: "Workspace 4 has a longer name than the rest", - overlayIds: ["green"], - }, - blah0: { name: "blah", overlayIds: ["green"] }, - blah1: { name: "blah", overlayIds: ["green"] }, - blah2: { name: "blah", overlayIds: ["green"] }, - blah3: { name: "blah", overlayIds: ["green"] }, - blah4: { name: "blah", overlayIds: ["green"] }, - blah5: { name: "blah", overlayIds: ["green"] }, - blah6: { name: "blah", overlayIds: ["green"] }, - blah7: { name: "blah", overlayIds: ["green"] }, - blah8: { name: "blah", overlayIds: ["green"] }, - blah9: { name: "blah", overlayIds: ["green"] }, - blah10: { name: "blah", overlayIds: ["green"] }, - blah11: { name: "blah", overlayIds: ["green"] }, - blah12: { name: "blah", overlayIds: ["green"] }, - blah13: { name: "blah", overlayIds: ["green"] }, - blah14: { name: "blah", overlayIds: ["green"] }, - blah15: { name: "blah", overlayIds: ["green"] }, - blah16: { name: "blah", overlayIds: ["green"] }, - blah17: { name: "blah", overlayIds: ["green"] }, - blah18: { name: "blah", overlayIds: ["green"] }, - blah19: { name: "blah", overlayIds: ["green"] }, - blah20: { name: "blah", overlayIds: ["green"] }, - blah21: { name: "blah", overlayIds: ["green"] }, - blah22: { name: "blah", overlayIds: ["green"] }, - blah23: { name: "blah", overlayIds: ["green"] }, - blah24: { name: "blah", overlayIds: ["green"] }, - blah25: { name: "blah", overlayIds: ["green"] }, - blah26: { name: "blah", overlayIds: ["green"] }, - blah27: { name: "blah", overlayIds: ["green"] }, - blah28: { name: "blah", overlayIds: ["green"] }, - blah29: { name: "blah", overlayIds: ["green"] }, }; diff --git a/src/public/images/overlays/chyron-simple-full.png b/src/public/images/overlays/chyron-simple-full.png new file mode 100644 index 0000000..2e28040 Binary files /dev/null and b/src/public/images/overlays/chyron-simple-full.png differ diff --git a/src/public/images/overlays/chyron-simple-opening-1.png b/src/public/images/overlays/chyron-simple-opening-1.png new file mode 100644 index 0000000..6a526bd Binary files /dev/null and b/src/public/images/overlays/chyron-simple-opening-1.png differ diff --git a/src/public/images/overlays/chyron-simple-opening-2.png b/src/public/images/overlays/chyron-simple-opening-2.png new file mode 100644 index 0000000..10792ba Binary files /dev/null and b/src/public/images/overlays/chyron-simple-opening-2.png differ diff --git a/tsconfig.json b/tsconfig.json index 06df788..7735bf2 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -22,6 +22,9 @@ "jsx": "react-jsx", "noUnusedLocals": false, "noUnusedParameters": false, + "types": [ + "webpack-env" + ] }, "include": [ "src", diff --git a/yarn.lock b/yarn.lock index 3b5d83c..6f7f759 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2238,6 +2238,11 @@ resolved "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.2.tgz" integrity sha512-F5DIZ36YVLE+PN+Zwws4kJogq47hNgX3Nx6WyDJ3kcplxyke3XIzB8uK5n/Lpm1HBsbGzd6nmGehL8cPekP+Tg== +"@types/webpack-env@^1.16.3": + version "1.16.3" + resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.16.3.tgz#b776327a73e561b71e7881d0cd6d34a1424db86a" + integrity sha512-9gtOPPkfyNoEqCQgx4qJKkuNm/x0R2hKR7fdl7zvTJyHnIisuE/LfvXOsYWL0o3qq6uiBnKZNNNzi3l0y/X+xw== + "@types/yargs-parser@*": version "20.2.1" resolved "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz"