Cleaning up document layout

seed-hypermedia · Jul 26, 2024 · 3ae852c · 3ae852c
1 parent 46fbf2c
commit 3ae852c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 17 deletions.
diff --git a/frontend/apps/desktop/src/components/accessory-sidebar.tsx b/frontend/apps/desktop/src/components/accessory-sidebar.tsx
@@ -83,12 +83,8 @@ export function AccessoryLayout<
   return (
     <XStack f={1}>
       <PanelGroup direction="horizontal">
-        <Panel minSize={50}>
-          <XStack>
-            <YStack f={1}>{children}</YStack>
-          </XStack>
-        </Panel>
-        <PanelResizeHandle style={{width: 4}} />
+        <Panel minSize={50}>{children}</Panel>
+        <PanelResizeHandle />
         <Panel
           hidden={accessoryKey === undefined}
           maxSize={50}

diff --git a/frontend/apps/desktop/src/pages/document.tsx b/frontend/apps/desktop/src/pages/document.tsx
@@ -10,7 +10,6 @@ import Footer from '@/components/footer'
 import {FormInput} from '@/components/form-input'
 import {FormField} from '@/components/forms'
 import {ListItem} from '@/components/list-item'
-import {MainWrapperNoScroll} from '@/components/main-wrapper'
 import {useMyAccountIds} from '@/models/daemon'
 import {useEntity} from '@/models/entities'
 import {getFileUrl} from '@/utils/account-url'
@@ -154,9 +153,7 @@ export default function DocumentPage() {
         }}
         accessoryOptions={accessoryOptions}
       >
-        <MainWrapperNoScroll>
-          <MainDocumentPage />
-        </MainWrapperNoScroll>
+        <MainDocumentPage />
       </AccessoryLayout>
       <Footer></Footer>
     </>

diff --git a/frontend/packages/ui/src/layout.tsx b/frontend/packages/ui/src/layout.tsx
@@ -1,18 +1,17 @@
-import {forwardRef} from 'react'
-import {ScrollView, YStack, YStackProps} from 'tamagui'
+import {forwardRef} from "react";
+import {ScrollView, YStack, YStackProps} from "tamagui";
 
 export const MainWrapper = forwardRef(function MainWrapper(
   {
     children,
     noScroll = false,
     ...props
   }: YStackProps & {
-    noScroll?: boolean
+    noScroll?: boolean;
   },
-  ref,
+  ref
 ) {
   return (
-    // @ts-expect-error
     <YStack flex={1} className="content-wrapper" {...props} ref={ref}>
       {noScroll ? (
         children
@@ -21,5 +20,5 @@ export const MainWrapper = forwardRef(function MainWrapper(
         <ScrollView id="scroll-page-wrapper">{children}</ScrollView>
       )}
     </YStack>
-  )
-})
+  );
+});