From cd050a59f9a3d231ca14ce383a7daf9a765d1cd7 Mon Sep 17 00:00:00 2001
From: 1ilit <lilitmousheghyan@gmail.com>
Date: Fri, 17 May 2024 03:45:42 +0300
Subject: [PATCH] Fix styling for overflowing elements

---
 src/components/EditorHeader/Modal/Modal.jsx   |  1 +
 src/components/EditorHeader/Modal/New.jsx     |  2 +-
 .../EditorSidePanel/AreasTab/AreasTab.jsx     | 14 +++---
 .../EditorSidePanel/NotesTab/NotesTab.jsx     | 28 ++++++-----
 .../EditorSidePanel/TablesTab/TableInfo.jsx   | 20 +++-----
 .../EditorSidePanel/TablesTab/TablesTab.jsx   | 14 +++---
 .../EditorSidePanel/TypesTab/TypesTab.jsx     | 46 +++++++++----------
 7 files changed, 55 insertions(+), 70 deletions(-)

diff --git a/src/components/EditorHeader/Modal/Modal.jsx b/src/components/EditorHeader/Modal/Modal.jsx
index 409f017..d92ed19 100644
--- a/src/components/EditorHeader/Modal/Modal.jsx
+++ b/src/components/EditorHeader/Modal/Modal.jsx
@@ -333,6 +333,7 @@ export default function Modal({
       }}
       cancelText={t("cancel")}
       width={modal === MODAL.NEW ? 740 : 600}
+      bodyStyle={{ maxHeight: window.innerHeight - 280, overflow: "auto" }}
     >
       {getModalBody()}
     </SemiUIModal>
diff --git a/src/components/EditorHeader/Modal/New.jsx b/src/components/EditorHeader/Modal/New.jsx
index 48151fb..81ffcdb 100644
--- a/src/components/EditorHeader/Modal/New.jsx
+++ b/src/components/EditorHeader/Modal/New.jsx
@@ -10,7 +10,7 @@ export default function New({ selectedTemplateId, setSelectedTemplateId }) {
   const templates = useLiveQuery(() => db.templates.toArray());
 
   return (
-    <div className="h-[360px] grid grid-cols-3 gap-2 overflow-auto px-1">
+    <div className="grid grid-cols-3 gap-2 overflow-auto px-1">
       <div onClick={() => setSelectedTemplateId(0)}>
         <div
           className={`rounded-md h-[180px] border-2 hover:border-dashed ${
diff --git a/src/components/EditorSidePanel/AreasTab/AreasTab.jsx b/src/components/EditorSidePanel/AreasTab/AreasTab.jsx
index 12bb340..0801a9e 100644
--- a/src/components/EditorSidePanel/AreasTab/AreasTab.jsx
+++ b/src/components/EditorSidePanel/AreasTab/AreasTab.jsx
@@ -1,4 +1,4 @@
-import { Row, Col, Button } from "@douyinfe/semi-ui";
+import { Button } from "@douyinfe/semi-ui";
 import { IconPlus } from "@douyinfe/semi-icons";
 import Empty from "../Empty";
 import { useAreas } from "../../../hooks";
@@ -12,16 +12,14 @@ export default function AreasTab() {
 
   return (
     <div>
-      <Row gutter={6}>
-        <Col span={16}>
-          <SearchBar />
-        </Col>
-        <Col span={8}>
+      <div className="flex gap-2">
+        <SearchBar />
+        <div>
           <Button icon={<IconPlus />} block onClick={addArea}>
             {t("add_area")}
           </Button>
-        </Col>
-      </Row>
+        </div>
+      </div>
       {areas.length <= 0 ? (
         <Empty
           title={t("no_subject_areas")}
diff --git a/src/components/EditorSidePanel/NotesTab/NotesTab.jsx b/src/components/EditorSidePanel/NotesTab/NotesTab.jsx
index 6bf4488..1473d26 100644
--- a/src/components/EditorSidePanel/NotesTab/NotesTab.jsx
+++ b/src/components/EditorSidePanel/NotesTab/NotesTab.jsx
@@ -1,4 +1,4 @@
-import { Row, Col, Button, Collapse } from "@douyinfe/semi-ui";
+import { Button, Collapse } from "@douyinfe/semi-ui";
 import { IconPlus } from "@douyinfe/semi-icons";
 import { useNotes, useSelect } from "../../../hooks";
 import Empty from "../Empty";
@@ -13,23 +13,21 @@ export default function NotesTab() {
 
   return (
     <>
-      <Row gutter={6}>
-        <Col span={16}>
-          <SearchBar
-            setActiveKey={(activeKey) =>
-              setSelectedElement((prev) => ({
-                ...prev,
-                id: parseInt(activeKey),
-              }))
-            }
-          />
-        </Col>
-        <Col span={8}>
+      <div className="flex gap-2">
+        <SearchBar
+          setActiveKey={(activeKey) =>
+            setSelectedElement((prev) => ({
+              ...prev,
+              id: parseInt(activeKey),
+            }))
+          }
+        />
+        <div>
           <Button icon={<IconPlus />} block onClick={() => addNote()}>
             {t("add_note")}
           </Button>
-        </Col>
-      </Row>
+        </div>
+      </div>
       {notes.length <= 0 ? (
         <Empty title={t("no_notes")} text={t("no_notes_text")} />
       ) : (
diff --git a/src/components/EditorSidePanel/TablesTab/TableInfo.jsx b/src/components/EditorSidePanel/TablesTab/TableInfo.jsx
index b23a16e..63bf392 100644
--- a/src/components/EditorSidePanel/TablesTab/TableInfo.jsx
+++ b/src/components/EditorSidePanel/TablesTab/TableInfo.jsx
@@ -1,8 +1,6 @@
 import { useState } from "react";
 import {
   Collapse,
-  Row,
-  Col,
   Input,
   TextArea,
   Button,
@@ -210,8 +208,8 @@ export default function TableInfo({ data }) {
           </Collapse.Panel>
         </Collapse>
       </Card>
-      <Row gutter={6} className="mt-2">
-        <Col span={8}>
+      <div className="flex justify-between items-center gap-1 mb-2">
+        <div>
           <Popover
             content={
               <div className="popover-theme">
@@ -263,12 +261,12 @@ export default function TableInfo({ data }) {
             showArrow
           >
             <div
-              className="h-[32px] w-[32px] rounded mb-2"
+              className="h-[32px] w-[32px] rounded"
               style={{ backgroundColor: data.color }}
             />
           </Popover>
-        </Col>
-        <Col span={7}>
+        </div>
+        <div className="flex gap-1">
           <Button
             block
             onClick={() => {
@@ -302,8 +300,6 @@ export default function TableInfo({ data }) {
           >
             {t("add_index")}
           </Button>
-        </Col>
-        <Col span={6}>
           <Button
             onClick={() => {
               setUndoStack((prev) => [
@@ -342,15 +338,13 @@ export default function TableInfo({ data }) {
           >
             {t("add_field")}
           </Button>
-        </Col>
-        <Col span={3}>
           <Button
             icon={<IconDeleteStroked />}
             type="danger"
             onClick={() => deleteTable(data.id)}
           />
-        </Col>
-      </Row>
+        </div>
+      </div>
     </div>
   );
 }
diff --git a/src/components/EditorSidePanel/TablesTab/TablesTab.jsx b/src/components/EditorSidePanel/TablesTab/TablesTab.jsx
index 113c35d..47e99cd 100644
--- a/src/components/EditorSidePanel/TablesTab/TablesTab.jsx
+++ b/src/components/EditorSidePanel/TablesTab/TablesTab.jsx
@@ -1,4 +1,4 @@
-import { Collapse, Row, Col, Button } from "@douyinfe/semi-ui";
+import { Collapse, Button } from "@douyinfe/semi-ui";
 import { IconPlus } from "@douyinfe/semi-icons";
 import { useSelect, useTables } from "../../../hooks";
 import { ObjectType } from "../../../data/constants";
@@ -14,16 +14,14 @@ export default function TablesTab() {
 
   return (
     <>
-      <Row gutter={6}>
-        <Col span={16}>
-          <SearchBar tables={tables} />
-        </Col>
-        <Col span={8}>
+      <div className="flex gap-2">
+        <SearchBar tables={tables} />
+        <div>
           <Button icon={<IconPlus />} block onClick={() => addTable()}>
             {t("add_table")}
           </Button>
-        </Col>
-      </Row>
+        </div>
+      </div>
       {tables.length === 0 ? (
         <Empty title={t("no_tables")} text={t("no_tables_text")} />
       ) : (
diff --git a/src/components/EditorSidePanel/TypesTab/TypesTab.jsx b/src/components/EditorSidePanel/TypesTab/TypesTab.jsx
index aee15b2..aec0701 100644
--- a/src/components/EditorSidePanel/TypesTab/TypesTab.jsx
+++ b/src/components/EditorSidePanel/TypesTab/TypesTab.jsx
@@ -1,4 +1,4 @@
-import { Collapse, Row, Col, Button, Popover } from "@douyinfe/semi-ui";
+import { Collapse, Button, Popover } from "@douyinfe/semi-ui";
 import { IconPlus, IconInfoCircle } from "@douyinfe/semi-icons";
 import { useSelect, useTypes } from "../../../hooks";
 import { ObjectType } from "../../../data/constants";
@@ -14,33 +14,29 @@ export default function TypesTab() {
 
   return (
     <>
-      <Row gutter={6}>
-        <Col span={13}>
-          <Searchbar />
-        </Col>
-        <Col span={8}>
+      <div className="flex gap-2">
+        <Searchbar />
+        <div>
           <Button icon={<IconPlus />} block onClick={() => addType()}>
             {t("add_type")}
           </Button>
-        </Col>
-        <Col span={3}>
-          <Popover
-            content={
-              <div className="w-[240px] text-sm space-y-2 popover-theme">
-                {t("types_info")
-                  .split("\n")
-                  .map((line, index) => (
-                    <div key={index}>{line}</div>
-                  ))}
-              </div>
-            }
-            showArrow
-            position="rightTop"
-          >
-            <Button theme="borderless" icon={<IconInfoCircle />} />
-          </Popover>
-        </Col>
-      </Row>
+        </div>
+        <Popover
+          content={
+            <div className="w-[240px] text-sm space-y-2 popover-theme">
+              {t("types_info")
+                .split("\n")
+                .map((line, index) => (
+                  <div key={index}>{line}</div>
+                ))}
+            </div>
+          }
+          showArrow
+          position="rightTop"
+        >
+          <Button theme="borderless" icon={<IconInfoCircle />} />
+        </Popover>
+      </div>
       {types.length <= 0 ? (
         <Empty title={t("no_types")} text={t("no_types_text")} />
       ) : (