From 7c2654ba51ae0507a81d8a527e5e7a1c8534444e Mon Sep 17 00:00:00 2001 From: Kyle Geib Date: Fri, 7 Jan 2022 19:00:16 -0500 Subject: [PATCH] ISSUE-005 - Added a scrolling effect to the PreviewWindow. Added scroll functionality to overflow-y for the WorkspaceList box. --- .../Workspaces/Workspace/Workspace.tsx | 4 +-- src/components/Workspaces/Workspace/styles.ts | 17 ++++++++-- .../WorkspaceList/WorkspaceList.tsx | 7 ++-- .../Workspaces/WorkspaceList/styles.ts | 9 ++++-- src/components/Workspaces/WorkspacesRoute.tsx | 4 +-- src/components/Workspaces/workspaces.ts | 32 +++++++++++++++++-- 6 files changed, 61 insertions(+), 12 deletions(-) diff --git a/src/components/Workspaces/Workspace/Workspace.tsx b/src/components/Workspaces/Workspace/Workspace.tsx index ff1a249..3362b8c 100644 --- a/src/components/Workspaces/Workspace/Workspace.tsx +++ b/src/components/Workspaces/Workspace/Workspace.tsx @@ -18,8 +18,8 @@ export const Workspace = () => { maxWidth="80%" centerChildren > -

{workspaceId ? workspaceObject[workspaceId] : ""}

- +

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

+ ({ padding: "lg", @@ -17,8 +23,15 @@ export const PreviewWindow = styled(PadBox).attrs(() => ({ height: ${({ height }) => height}px; width: ${({ width }) => width}px; - border-radius: 2em; + border-radius: 1em; + background-image: url("${bg}"); + background-position: 0px 0px; + background-repeat: repeat; + + ${({ animatedBG }) => animatedBG && css` + animation: ${scrollAnimation} 5s linear infinite; + `} `; export const H2 = styled.h2` diff --git a/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx b/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx index b620190..1c805d2 100644 --- a/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx +++ b/src/components/Workspaces/WorkspaceList/WorkspaceList.tsx @@ -4,8 +4,11 @@ import { NavLink } from "react-router-dom"; import { MenuItem } from "../../Common/MenuItem.styled"; import { workspaceList } from "../workspaces"; -export const WorkspaceList = () => ( - +type WorkspaceListProps = { + headerOffset?: number, +}; +export const WorkspaceList = ({ headerOffset }: WorkspaceListProps) => ( + {workspaceList.map((workspace, i) => ( diff --git a/src/components/Workspaces/WorkspaceList/styles.ts b/src/components/Workspaces/WorkspaceList/styles.ts index b35772c..9e1f838 100644 --- a/src/components/Workspaces/WorkspaceList/styles.ts +++ b/src/components/Workspaces/WorkspaceList/styles.ts @@ -1,11 +1,16 @@ import styled from "styled-components"; import { PadBox } from "@bedrock-layout/padbox"; +type WorkspaceListBoxProps = { + headerOffset?: number, +}; export const WorkspaceListBox = styled(PadBox).attrs(() => ({ padding: ["lg", "md"], -}))` - height: 100%; +}))` + height: calc(100vh - ${({ headerOffset = 0 }) => `${headerOffset}px`}); width: 100%; background-image: linear-gradient(to bottom, #f0f0f0, #fff); border-right: 1px solid ${p => p.theme.colors.darkGrey}; + overflow-y: scroll; `; +WorkspaceListBox.displayName = "WorkspaceListBox"; diff --git a/src/components/Workspaces/WorkspacesRoute.tsx b/src/components/Workspaces/WorkspacesRoute.tsx index 6ae8376..0a5de85 100644 --- a/src/components/Workspaces/WorkspacesRoute.tsx +++ b/src/components/Workspaces/WorkspacesRoute.tsx @@ -12,9 +12,9 @@ export default function Workspaces() { return ( - + - + diff --git a/src/components/Workspaces/workspaces.ts b/src/components/Workspaces/workspaces.ts index 4189823..d10fb05 100644 --- a/src/components/Workspaces/workspaces.ts +++ b/src/components/Workspaces/workspaces.ts @@ -15,6 +15,36 @@ export const workspaceList = [ name: "Workspace 4 has a longer name than the rest", id: "workspace4", }, + { name: "blah", id: "blah0" }, + { name: "blah", id: "blah1" }, + { name: "blah", id: "blah2" }, + { name: "blah", id: "blah3" }, + { name: "blah", id: "blah4" }, + { name: "blah", id: "blah5" }, + { name: "blah", id: "blah6" }, + { name: "blah", id: "blah7" }, + { name: "blah", id: "blah8" }, + { name: "blah", id: "blah9" }, + { name: "blah", id: "blah10" }, + { name: "blah", id: "blah11" }, + { name: "blah", id: "blah12" }, + { name: "blah", id: "blah13" }, + { name: "blah", id: "blah14" }, + { name: "blah", id: "blah15" }, + { name: "blah", id: "blah16" }, + { name: "blah", id: "blah17" }, + { name: "blah", id: "blah18" }, + { name: "blah", id: "blah19" }, + { name: "blah", id: "blah20" }, + { name: "blah", id: "blah21" }, + { name: "blah", id: "blah22" }, + { name: "blah", id: "blah23" }, + { name: "blah", id: "blah24" }, + { name: "blah", id: "blah25" }, + { name: "blah", id: "blah26" }, + { name: "blah", id: "blah27" }, + { name: "blah", id: "blah28" }, + { name: "blah", id: "blah29" }, ]; export const workspaceObject = ((list: typeof workspaceList) => { @@ -22,7 +52,5 @@ export const workspaceObject = ((list: typeof workspaceList) => { list.forEach(item => { obj[item.id] = item.name; }); - console.log("workspaceObject", obj); return obj; })(workspaceList); -console.log(workspaceObject);