From 30701247c6ef2b3c3954e85f9da482bc7680739d Mon Sep 17 00:00:00 2001
From: Tatiana Lopaeva <tatiana.lopaeva@onlyoffice.com>
Date: Fri, 23 Aug 2024 20:21:35 +0300
Subject: [PATCH] Refactoring.

---
 packages/shared/components/aside/Aside.types.ts        | 10 ++--------
 packages/shared/components/aside/AsideHeader.tsx       |  1 +
 .../components/modal-dialog/ModalDialog.types.ts       |  9 ++-------
 .../components/selector/sub-components/Header.tsx      |  1 -
 4 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/packages/shared/components/aside/Aside.types.ts b/packages/shared/components/aside/Aside.types.ts
index 8ff857f92b..7ab6e26acf 100644
--- a/packages/shared/components/aside/Aside.types.ts
+++ b/packages/shared/components/aside/Aside.types.ts
@@ -24,7 +24,7 @@
 // content are licensed under the terms of the Creative Commons Attribution-ShareAlike 4.0
 // International. See the License terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
 
-export interface AsideProps {
+export type AsideProps = AsideHeaderProps & {
   visible: boolean;
   scale?: boolean;
   className?: string;
@@ -35,13 +35,7 @@ export interface AsideProps {
   onClose: () => void;
 
   withoutHeader: boolean;
-  header: AsideHeaderProps["header"];
-  isBackButton?: AsideHeaderProps["isBackButton"];
-  isCloseable?: AsideHeaderProps["isCloseable"];
-  headerIcons?: AsideHeaderProps["headerIcons"];
-  onBackClick?: AsideHeaderProps["onBackClick"];
-  onCloseClick?: AsideHeaderProps["onCloseClick"];
-}
+};
 export interface AsideHeaderProps {
   header: string | React.ReactNode;
   className?: string;
diff --git a/packages/shared/components/aside/AsideHeader.tsx b/packages/shared/components/aside/AsideHeader.tsx
index d6daa0e013..8394ba8eb7 100644
--- a/packages/shared/components/aside/AsideHeader.tsx
+++ b/packages/shared/components/aside/AsideHeader.tsx
@@ -33,6 +33,7 @@ import { AsideHeaderProps } from "./Aside.types";
 import { StyledHeaderContainer } from "./Aside.styled";
 import { RectangleSkeleton } from "../../skeletons/rectangle";
 import { Heading, HeadingSize } from "../heading";
+
 const AsideHeader = (props: AsideHeaderProps) => {
   const {
     isBackButton = false,
diff --git a/packages/shared/components/modal-dialog/ModalDialog.types.ts b/packages/shared/components/modal-dialog/ModalDialog.types.ts
index 070503cf73..df6afebc19 100644
--- a/packages/shared/components/modal-dialog/ModalDialog.types.ts
+++ b/packages/shared/components/modal-dialog/ModalDialog.types.ts
@@ -135,7 +135,7 @@ export interface ModalDialogBackdropProps {
   modalSwipeOffset?: number;
 }
 
-export interface ModalSubComponentsProps {
+export type ModalSubComponentsProps = AsideHeaderProps & {
   id?: string;
   style?: React.CSSProperties;
   className?: string;
@@ -161,9 +161,4 @@ export interface ModalSubComponentsProps {
   embedded?: boolean;
   withForm?: boolean;
   blur?: number;
-
-  isBackButton?: AsideHeaderProps["isBackButton"];
-  headerIcons?: AsideHeaderProps["headerIcons"];
-  onBackClick?: AsideHeaderProps["onBackClick"];
-  onCloseClick?: AsideHeaderProps["onCloseClick"];
-}
+};
diff --git a/packages/shared/components/selector/sub-components/Header.tsx b/packages/shared/components/selector/sub-components/Header.tsx
index 5a1f75d6bc..47fc3518bf 100644
--- a/packages/shared/components/selector/sub-components/Header.tsx
+++ b/packages/shared/components/selector/sub-components/Header.tsx
@@ -38,7 +38,6 @@ const Header = React.memo(
     withoutBorder,
     isCloseable,
   }: HeaderProps) => {
-    console.log("isCloseable", isCloseable);
     return (
       <AsideHeader
         header={headerLabel}