🐛 fix: Fix extra network sidebar scroll

lobehub · May 16, 2024 · c729939 · c729939
1 parent b0ae238
commit c729939
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 27 deletions.
diff --git a/javascript/main.js b/javascript/main.js
diff --git a/src/features/ExtraNetworkSidebar/Inner.tsx b/src/features/ExtraNetworkSidebar/Inner.tsx
@@ -3,6 +3,7 @@ import { Skeleton, Slider } from 'antd';
 import isEqual from 'fast-deep-equal';
 import { ZoomIn, ZoomOut } from 'lucide-react';
 import { memo, useState } from 'react';
+import { Flexbox } from 'react-layout-kit';
 
 import { selectors, useAppStore } from '@/store';
 
@@ -25,17 +26,29 @@ const Inner = memo(() => {
   return (
     <>
       <DraggablePanelBody className={styles.body}>
-        {isLoading && <Skeleton active />}
+        {isLoading && (
+          <Flexbox padding={16} width={'100%'}>
+            <Skeleton active />
+          </Flexbox>
+        )}
         <div style={isLoading ? { display: 'none' } : {}}>
           <div
             id="txt2img-extra-network-sidebar"
             ref={txt2imgExtraNetworkSidebarReference}
-            style={currentTab === 'tab_img2img' ? { display: 'none' } : {}}
+            style={
+              currentTab === 'tab_img2img' ?
+                { display: 'none' } :
+                { height: '100%', overflow: 'hidden', position: 'relative' }
+            }
           />
           <div
             id="img2img-extra-network-sidebar"
             ref={img2imgExtraNetworkSidebarReference}
-            style={currentTab === 'tab_img2img' ? {} : { display: 'none' }}
+            style={
+              currentTab === 'tab_img2img' ?
+                { height: '100%' } :
+                { display: 'none', overflow: 'hidden', position: 'relative' }
+            }
           />
         </div>
       </DraggablePanelBody>

diff --git a/src/features/ExtraNetworkSidebar/style.ts b/src/features/ExtraNetworkSidebar/style.ts
@@ -3,6 +3,9 @@ import { createStyles } from 'antd-style';
 export const useStyles = createStyles(
   ({ css, token }, { headerHeight = 64, size = 86 }: { headerHeight?: number; size?: number }) => ({
     body: css`
+      height: 100%;
+      padding: 0;
+
       .hide {
         display: none;
       }
@@ -27,20 +30,26 @@ export const useStyles = createStyles(
         }
 
         .tabitem {
+          position: relative;
           padding: 0 !important;
           background: transparent;
         }
       }
 
+      .extra-network-pane {
+        resize: none;
+        height: 100%;
+      }
+
       .extra-network-cards {
-        overflow: unset;
+        overflow: hidden auto;
         display: grid;
         grid-template-columns: repeat(auto-fill, minmax(${size}px, 1fr));
         flex: none !important;
         gap: 8px;
 
-        height: unset;
-        min-height: unset;
+        max-height: 100%;
+        padding: 16px;
 
         border: unset !important;
 
@@ -62,7 +71,7 @@ export const useStyles = createStyles(
         display: flex;
         flex-wrap: wrap;
         gap: 6px;
-        margin-bottom: 12px;
+        padding-inline: 16px;
 
         > button.lg.secondary.gradio-button {
           padding: 4px 8px;
@@ -72,6 +81,11 @@ export const useStyles = createStyles(
       }
 
       .extra-networks {
+        position: relative;
+        display: flex;
+        flex-direction: column;
+        height: 100%;
+
         .pending {
           opacity: 1 !important;
         }
@@ -82,14 +96,12 @@ export const useStyles = createStyles(
 
         .tab-nav {
           align-items: center;
-
-          > * {
-            height: 40px !important;
-            margin: 0 !important;
-            font-size: var(--text-md) !important;
-          }
+          margin: 0;
+          padding: 16px;
 
           > button {
+            font-size: 14px !important;
+
             &:first-child {
               display: none;
             }

diff --git a/src/store/initialState.ts b/src/store/initialState.ts
@@ -48,7 +48,7 @@ export const DEFAULT_SETTING: WebuiSetting = {
   i18n: 'en_US',
   layoutHideFooter: false,
   layoutSplitPreview: false,
-  liteAnimation: false,
+  liteAnimation: true,
   logoCustomTitle: '',
   logoCustomUrl: '',
   logoType: 'lobe',