Refactoring.

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;

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,

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"];
-}

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}