diff --git a/src/renderer/components/+extensions/install.module.css b/src/renderer/components/+extensions/install.module.css index 3ccef6d2a0..1cb5b5175a 100644 --- a/src/renderer/components/+extensions/install.module.css +++ b/src/renderer/components/+extensions/install.module.css @@ -1,5 +1,5 @@ .icon { - @apply h-5 w-5 cursor-pointer; + @apply h-5 w-5 mr-3 cursor-pointer; } .icon:hover { diff --git a/src/renderer/components/+extensions/installed-extensions.module.css b/src/renderer/components/+extensions/installed-extensions.module.css index e0d344ca6d..15624e4a08 100644 --- a/src/renderer/components/+extensions/installed-extensions.module.css +++ b/src/renderer/components/+extensions/installed-extensions.module.css @@ -12,5 +12,5 @@ } .title { - margin-bottom: 6px!important; + margin-bottom: 0!important; } \ No newline at end of file diff --git a/src/renderer/components/+extensions/installed-extensions.tsx b/src/renderer/components/+extensions/installed-extensions.tsx index 0ecd19c2c3..fc427051b7 100644 --- a/src/renderer/components/+extensions/installed-extensions.tsx +++ b/src/renderer/components/+extensions/installed-extensions.tsx @@ -116,9 +116,8 @@ export function InstalledExtensions({ extensions, uninstall }: Props) { return (
-

Installed

Installed} columns={columns} data={data} items={extensions} diff --git a/src/renderer/components/list/list.tsx b/src/renderer/components/list/list.tsx index 1b01a60707..a11a002c4d 100644 --- a/src/renderer/components/list/list.tsx +++ b/src/renderer/components/list/list.tsx @@ -9,7 +9,7 @@ export type SearchFilter = (item: object) => string | number; interface Props extends UseTableOptions { items: object[]; filters: SearchFilter[]; - title?: string; + title?: React.ReactNode; } export function List({ columns, data, title, items, filters, }: Props) { diff --git a/src/renderer/components/table/react-table.module.css b/src/renderer/components/table/react-table.module.css index 4a8281045e..e6cd2639ce 100644 --- a/src/renderer/components/table/react-table.module.css +++ b/src/renderer/components/table/react-table.module.css @@ -12,11 +12,11 @@ } .thead .tr { - margin: 0; + margin: 0 var(--margin); } .tr { - margin: var(--margin) 0; + margin: calc(var(--margin) * 1.6) var(--margin); } .th { @@ -30,7 +30,7 @@ } .disabledArrow { - color: #909ba666; + opacity: 0.3; } .td { diff --git a/src/renderer/components/table/react-table.tsx b/src/renderer/components/table/react-table.tsx index b22d59456c..de40fa7819 100644 --- a/src/renderer/components/table/react-table.tsx +++ b/src/renderer/components/table/react-table.tsx @@ -2,16 +2,14 @@ import styles from "./react-table.module.css"; import React from "react"; import { useCallback, useMemo } from "react"; import { useFlexLayout, useSortBy, useTable, UseTableOptions } from "react-table"; -import { FixedSizeList } from "react-window"; import { Icon } from "../icon"; import { cssNames } from "../../utils"; interface Props extends UseTableOptions { - virtual?: boolean; headless?: boolean; } -export function Table({ columns, data, virtual, headless }: Props) { +export function Table({ columns, data, headless }: Props) { const defaultColumn = useMemo( () => ({ minWidth: 20, @@ -20,15 +18,11 @@ export function Table({ columns, data, virtual, headless }: Props) { [] ); - // const scrollBarSize = React.useMemo(() => scrollbarWidth(), []) - const scrollBarSize = 10; - const { getTableProps, getTableBodyProps, headerGroups, rows, - totalColumnsWidth, prepareRow, } = useTable( { @@ -87,16 +81,7 @@ export function Table({ columns, data, virtual, headless }: Props) { }
- {virtual ? ( - - {RenderRow} - - ) : rows.map((row, index) => RenderRow({index}))} + {rows.map((row, index) => RenderRow({index}))}
);