From ed134103d7cae1f49df313118f024a88fefbd9fd Mon Sep 17 00:00:00 2001
From: Wroud <wrouds@gmail.com>
Date: Mon, 4 May 2020 11:46:37 +0300
Subject: [PATCH] fix: styles & circular dependency

---
 webapp/packages/core/src/blocks/ItemList/ItemListSearch.tsx    | 2 +-
 webapp/packages/core/src/blocks/ItemList/ListItem.tsx          | 2 +-
 .../core/src/blocks/PropertiesTable/PropertiesTable.tsx        | 2 +-
 .../packages/core/src/blocks/PropertiesTable/PropertyItem.tsx  | 3 ++-
 .../TableFooter/TableFooterMenu/TableFooterMenuItem.tsx        | 1 +
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/webapp/packages/core/src/blocks/ItemList/ItemListSearch.tsx b/webapp/packages/core/src/blocks/ItemList/ItemListSearch.tsx
index 6c6b08f358..96d53d755f 100644
--- a/webapp/packages/core/src/blocks/ItemList/ItemListSearch.tsx
+++ b/webapp/packages/core/src/blocks/ItemList/ItemListSearch.tsx
@@ -11,10 +11,10 @@ import {
 } from 'react';
 import styled, { use } from 'reshadow';
 
-import { StaticImage } from '@dbeaver/core/blocks';
 import { useTranslate } from '@dbeaver/core/localization';
 import { useStyles } from '@dbeaver/core/theming';
 
+import { StaticImage } from '../StaticImage';
 import { Styles } from './styles';
 
 type ItemListProps = React.PropsWithChildren<{
diff --git a/webapp/packages/core/src/blocks/ItemList/ListItem.tsx b/webapp/packages/core/src/blocks/ItemList/ListItem.tsx
index 25c7a1a22a..6ed37cb58b 100644
--- a/webapp/packages/core/src/blocks/ItemList/ListItem.tsx
+++ b/webapp/packages/core/src/blocks/ItemList/ListItem.tsx
@@ -9,9 +9,9 @@
 import { useContext } from 'react';
 import styled from 'reshadow';
 
-import { StaticImage } from '@dbeaver/core/blocks';
 import { useStyles } from '@dbeaver/core/theming';
 
+import { StaticImage } from '../StaticImage';
 import { Styles } from './styles';
 
 type ListItemProps = {
diff --git a/webapp/packages/core/src/blocks/PropertiesTable/PropertiesTable.tsx b/webapp/packages/core/src/blocks/PropertiesTable/PropertiesTable.tsx
index c9e6e4468c..6bdd784005 100644
--- a/webapp/packages/core/src/blocks/PropertiesTable/PropertiesTable.tsx
+++ b/webapp/packages/core/src/blocks/PropertiesTable/PropertiesTable.tsx
@@ -10,10 +10,10 @@ import { observer, useLocalStore } from 'mobx-react';
 import { useCallback } from 'react';
 import styled from 'reshadow';
 
-import { Button } from '@dbeaver/core/blocks';
 import { useTranslate } from '@dbeaver/core/localization';
 import { useStyles } from '@dbeaver/core/theming';
 
+import { Button } from '../Button';
 import { IProperty } from './IProperty';
 import { PropertyItem } from './PropertyItem';
 import { PROPERTIES_TABLE_STYLES } from './styles';
diff --git a/webapp/packages/core/src/blocks/PropertiesTable/PropertyItem.tsx b/webapp/packages/core/src/blocks/PropertiesTable/PropertyItem.tsx
index b2f68a2bc0..9b317dc4ed 100644
--- a/webapp/packages/core/src/blocks/PropertiesTable/PropertyItem.tsx
+++ b/webapp/packages/core/src/blocks/PropertiesTable/PropertyItem.tsx
@@ -12,9 +12,10 @@ import {
 } from 'react';
 import styled, { css, use } from 'reshadow';
 
-import { ShadowInput, Icon } from '@dbeaver/core/blocks';
 import { composes, useStyles } from '@dbeaver/core/theming';
 
+import { Icon } from '../Icons';
+import { ShadowInput } from '../ShadowInput';
 import { DriverPropertyValueSelector } from './DriverPropertyValueSelector';
 import { IProperty } from './IProperty';
 
diff --git a/webapp/packages/data-viewer-plugin/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenuItem.tsx b/webapp/packages/data-viewer-plugin/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenuItem.tsx
index 49d439a556..779dc7965e 100644
--- a/webapp/packages/data-viewer-plugin/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenuItem.tsx
+++ b/webapp/packages/data-viewer-plugin/src/TableViewer/TableFooter/TableFooterMenu/TableFooterMenuItem.tsx
@@ -42,6 +42,7 @@ export const tableFooterMenuStyles = composes(
       cursor: pointer;
     }
     Button {
+      background: transparent;
       outline: none;
     }
     menu-trigger-icon IconOrImage {