From 2de7beefa212acfacc317cb744f71b92557bea0d Mon Sep 17 00:00:00 2001 From: Tatiana Lopaeva Date: Thu, 22 Aug 2024 19:46:11 +0300 Subject: [PATCH] Refactoring. --- .../src/components/panels/StyledPanels.js | 35 ------------------- .../shared/components/aside/Aside.types.ts | 2 +- .../ContextMenuButton.styled.ts | 16 ++++----- .../context-menu-button/ContextMenuButton.tsx | 9 +++-- 4 files changed, 13 insertions(+), 49 deletions(-) diff --git a/packages/client/src/components/panels/StyledPanels.js b/packages/client/src/components/panels/StyledPanels.js index e1a9f2c587..7599b7a77c 100644 --- a/packages/client/src/components/panels/StyledPanels.js +++ b/packages/client/src/components/panels/StyledPanels.js @@ -256,40 +256,6 @@ const StyledContent = styled.div` StyledContent.defaultProps = { theme: Base }; -const StyledHeaderContent = styled.div` - display: flex; - align-items: center; - - ${(props) => - props.theme.interfaceDirection === "rtl" - ? css` - padding-right: 16px; - padding-left: 37px; - ` - : css` - padding-left: 16px; - padding-right: 37px; - `} - - border-bottom: ${(props) => props.theme.filesPanels.sharing.borderBottom}; - - .files-operations-header, - .sharing_panel-header { - font-weight: 700; - margin: 14px 0; - } - - @media ${desktop} { - .files-operations-header, - .sharing_panel-header { - margin: 12px 0; - font-size: 18px; - } - } -`; - -StyledHeaderContent.defaultProps = { theme: Base }; - const StyledBody = styled.div` &.files-operations-body { ${(props) => @@ -726,7 +692,6 @@ export { StyledEmbeddingPanel, StyledVersionHistoryPanel, StyledContent, - StyledHeaderContent, StyledBody, StyledFooter, StyledLinkRow, diff --git a/packages/shared/components/aside/Aside.types.ts b/packages/shared/components/aside/Aside.types.ts index 05d29f8afe..dc5619b220 100644 --- a/packages/shared/components/aside/Aside.types.ts +++ b/packages/shared/components/aside/Aside.types.ts @@ -43,7 +43,7 @@ export interface AsideProps { onCloseClick?: AsideHeaderProps["onCloseClick"]; } export interface AsideHeaderProps { - header: string; + header: string | React.ReactNode; className?: string; id?: string; isBackButton?: boolean; diff --git a/packages/shared/components/context-menu-button/ContextMenuButton.styled.ts b/packages/shared/components/context-menu-button/ContextMenuButton.styled.ts index 4599e616a8..923816e8e1 100644 --- a/packages/shared/components/context-menu-button/ContextMenuButton.styled.ts +++ b/packages/shared/components/context-menu-button/ContextMenuButton.styled.ts @@ -73,13 +73,13 @@ const StyledContent = styled.div` `; StyledContent.defaultProps = { theme: Base }; -const StyledHeaderContent = styled.div` - display: flex; - align-items: center; - border-bottom: ${(props) => - props.theme.contextMenuButton.headerContent.borderBottom}; -`; -StyledHeaderContent.defaultProps = { theme: Base }; +// const StyledHeaderContent = styled.div` +// display: flex; +// align-items: center; +// border-bottom: ${(props) => +// props.theme.contextMenuButton.headerContent.borderBottom}; +// `; +// StyledHeaderContent.defaultProps = { theme: Base }; const StyledBodyContent = styled.div` position: relative; @@ -101,4 +101,4 @@ const StyledBodyContent = styled.div` `; StyledBodyContent.defaultProps = { theme: Base }; -export { StyledBodyContent, StyledHeaderContent, StyledContent, StyledOuter }; +export { StyledBodyContent, StyledContent, StyledOuter }; diff --git a/packages/shared/components/context-menu-button/ContextMenuButton.tsx b/packages/shared/components/context-menu-button/ContextMenuButton.tsx index a304537ab0..72b356a2c0 100644 --- a/packages/shared/components/context-menu-button/ContextMenuButton.tsx +++ b/packages/shared/components/context-menu-button/ContextMenuButton.tsx @@ -38,13 +38,11 @@ import { DropDown } from "../drop-down"; import { IconButton } from "../icon-button"; import { Backdrop } from "../backdrop"; import { Aside } from "../aside"; -import { Heading, HeadingLevel, HeadingSize } from "../heading"; import { Link } from "../link"; import { ContextMenuModel } from "../context-menu"; import { StyledBodyContent, - StyledHeaderContent, StyledContent, StyledOuter, } from "./ContextMenuButton.styled"; @@ -225,7 +223,7 @@ const ContextMenuButtonPure = ({ }; const iconButtonName = state.isOpen && iconOpenName ? iconOpenName : iconName; - + console.log("displayType", displayType); return ( - + {/* {asideHeader} - + */} {state.data.map( (item: ContextMenuModel, index: number) =>