fix:scrollbar disappearing (#539)

* fix:scrollbar disappearing * style: 💄 fix scrollbar disappearing
equinor · Nov 22, 2023 · 891819f · 891819f
1 parent e75f4ba
commit 891819f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 19 deletions.
diff --git a/packages/workspace-fusion/package.json b/packages/workspace-fusion/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@equinor/workspace-fusion",
-  "version": "6.0.13",
+  "version": "6.0.14",
   "type": "module",
   "sideEffects": false,
   "license": "MIT",

diff --git a/packages/workspace-react/package.json b/packages/workspace-react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@equinor/workspace-react",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "type": "module",
   "sideEffects": false,
   "license": "MIT",

diff --git a/packages/workspace-react/src/lib/components/Workspace.tsx b/packages/workspace-react/src/lib/components/Workspace.tsx
@@ -38,15 +38,13 @@ export function Workspace({ tabs, defaultTab, Sidesheet = () => <></>, providers
         <TabsProvider.Provider value={tabs}>
           <EventHandler {...events}>
             <ContextProviders providers={providers}>
-              <StyledSidesheetWrapper>
-                <StyledLayoutWrapper>
-                  <WorkspaceHeader />
-                  <WorkspaceBody />
-                  <StyledSurroundingSidesheet id="sidesheet-workspace-wrapper">
-                    <Sidesheet />
-                  </StyledSurroundingSidesheet>
-                </StyledLayoutWrapper>
-              </StyledSidesheetWrapper>
+              <StyledLayoutWrapper>
+                <WorkspaceHeader />
+                <WorkspaceBody />
+                <StyledSidesheetWrapper id="sidesheet-workspace-wrapper">
+                  <Sidesheet />
+                </StyledSidesheetWrapper>
+              </StyledLayoutWrapper>
             </ContextProviders>
           </EventHandler>
         </TabsProvider.Provider>
@@ -55,7 +53,7 @@ export function Workspace({ tabs, defaultTab, Sidesheet = () => <></>, providers
   );
 }
 
-const StyledSurroundingSidesheet = styled.div`
+const StyledSidesheetWrapper = styled.div`
   grid-area: 1 / 2 / span 2;
   background: white;
   z-index: 2;
@@ -69,13 +67,6 @@ const StyledLayoutWrapper = styled.div`
   width: 100%;
 `;
 
-const StyledSidesheetWrapper = styled.div`
-  height: 100%;
-  width: 100%;
-  display: grid;
-  grid-template-columns: minmax(0px, 1fr) auto; /* set two equal-width columns */
-`;
-
 const EventHandler = (props: PropsWithChildren<WorkspaceEvents>) => {
   const { activeTab, setActiveTab } = useTabContext((s) => s);
   const tabs = useContext(TabsProvider);