Merge branch 'main' of https://github.com/Protofy-xyz/Protofy

Protofy-xyz · Jul 5, 2024 · a85967c · a85967c
2 parents 4d9a702 + c73c170
commit a85967c
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 46 deletions.
diff --git a/packages/protolib/components/Monaco.tsx b/packages/protolib/components/Monaco.tsx
@@ -3,7 +3,8 @@ import Editor, { EditorProps, useMonaco, loader } from '@monaco-editor/react';
 import useKeypress from 'react-use-keypress';
 import { useThemeSetting } from '@tamagui/next-theme';
 import { useTheme } from '@my/ui';
-import { Tinted, useTint } from 'protolib'
+import { useTint } from 'protolib/lib/Tints'
+import { Tinted } from 'protolib/components/Tinted'
 
 type Props = {
     sourceCode: string,

diff --git a/packages/protolib/components/layout/DefaultLayout.tsx b/packages/protolib/components/layout/DefaultLayout.tsx
@@ -1,4 +1,4 @@
-import { AppBar, Tinted } from 'protolib'
+import { Tinted } from 'protolib/components/Tinted'
 import { ToastProvider, ToastViewport } from '@tamagui/toast'
 import { NextSeo } from 'next-seo'
 import React from 'react'

diff --git a/packages/protolib/components/layout/HeaderContents.tsx b/packages/protolib/components/layout/HeaderContents.tsx
@@ -1,4 +1,6 @@
-import { ThemeToggle, GithubIcon, HeaderLink, NextLink, ColorToggleButton, LogoIcon, Session} from 'protolib'
+import { ThemeToggle} from 'protolib/components/ThemeToggle'
+import { NextLink} from 'protolib/components/NextLink'
+import { ColorToggleButton} from 'protolib/components/ColorToggleButton'
 import * as React from 'react'
 import {
   TooltipGroup,

diff --git a/packages/protolib/components/layout/PanelLayout.tsx b/packages/protolib/components/layout/PanelLayout.tsx
@@ -1,49 +1,49 @@
 import { YStack, ScrollView, XStack, getTokens } from 'tamagui'
-import {AppBar} from 'protolib'
+import { AppBar } from 'protolib/components/AppBar'
 
-export const PanelLayout = ({panelBgColor=undefined, menuContent, children, SideMenu, Layout, headerContents, HeaderMenu}) => {
-    const appBarHeight = 55
-    const bgPanels = '$bgPanel'
-    const _panelBgColor = '$bgContent'
+export const PanelLayout = ({ panelBgColor = undefined, menuContent, children, SideMenu, Layout, headerContents, HeaderMenu }) => {
+  const appBarHeight = 55
+  const bgPanels = '$bgPanel'
+  const _panelBgColor = '$bgContent'
 
-    return (
-      <Layout
-        header={
-          <AppBar 
-            height={appBarHeight} 
-            fullscreen={true} 
-            dettached={false} 
-            translucid={false} 
-            position="top"
-            backgroundColor={bgPanels}
-
-          >
-            <XStack ml={"$5"} justifyContent="space-between" f={1}>{headerContents}</XStack>
-          </AppBar>
-        } 
-        sideMenu={<SideMenu mt={appBarHeight} sideBarColor={bgPanels}>{menuContent}</SideMenu>}
-        footer={
-          null
-          // <AppBar dettached={false} translucid={false} position="bottom">
-          //   <HeaderContents menuPlacement={"top"} />
-          // </AppBar>
-        }>
-        {/* <Theme name={tint as any}> */}
-        <XStack f={1} p="$3" pl={0} bc={bgPanels}>
-          <XStack bc={bgPanels} elevation={3} br={"$6"} mt={appBarHeight} f={1} height={'calc(100vh - '+(appBarHeight+30)+'px)'}>
-            <ScrollView $sm={{br:"$0"}} height={'calc(100vh - '+(appBarHeight+30)+'px)'}>
-              {/* <Tinted> */}
-                <YStack br={"$6"} bc={panelBgColor ?? _panelBgColor} f={1} minHeight={'calc(100vh - '+(appBarHeight+30)+'px)'} flex={1}>
-                  {/* <Theme reset> */}
-                    {children}
-                  {/* </Theme> */}
+  return (
+    <Layout
+      header={
+        <AppBar
+          height={appBarHeight}
+          fullscreen={true}
+          dettached={false}
+          translucid={false}
+          position="top"
+          backgroundColor={bgPanels}
 
-                </YStack>
-              {/* </Tinted> */}
-            </ScrollView>
-          </XStack>
-        {/* </Theme> */}
+        >
+          <XStack ml={"$5"} justifyContent="space-between" f={1}>{headerContents}</XStack>
+        </AppBar>
+      }
+      sideMenu={<SideMenu mt={appBarHeight} sideBarColor={bgPanels}>{menuContent}</SideMenu>}
+      footer={
+        null
+        // <AppBar dettached={false} translucid={false} position="bottom">
+        //   <HeaderContents menuPlacement={"top"} />
+        // </AppBar>
+      }>
+      {/* <Theme name={tint as any}> */}
+      <XStack f={1} p="$3" pl={0} bc={bgPanels}>
+        <XStack bc={bgPanels} elevation={3} br={"$6"} mt={appBarHeight} f={1} height={'calc(100vh - ' + (appBarHeight + 30) + 'px)'}>
+          <ScrollView $sm={{ br: "$0" }} height={'calc(100vh - ' + (appBarHeight + 30) + 'px)'}>
+            {/* <Tinted> */}
+            <YStack br={"$6"} bc={panelBgColor ?? _panelBgColor} f={1} minHeight={'calc(100vh - ' + (appBarHeight + 30) + 'px)'} flex={1}>
+              {/* <Theme reset> */}
+              {children}
+              {/* </Theme> */}
+
+            </YStack>
+            {/* </Tinted> */}
+          </ScrollView>
         </XStack>
-      </Layout>
-    )
+        {/* </Theme> */}
+      </XStack>
+    </Layout>
+  )
 }