fix: navigation import and types (#76)

Juli Ovechkina · web-flow · commit 53ea8d4bb122 · 2022-12-07T11:20:21.000+03:00
* fix: navigation import and types
diff --git a/src/components/index.ts b/src/components/index.ts
@@ -33,7 +33,5 @@ export {default as OverflowScroller} from './OverflowScroller/OverflowScroller';
 export {default as Author} from './Author/Author';
 export {default as RouterLink} from './RouterLink/RouterLink';
 export {default as HTML} from './HTML/HTML';
-export {default as Header} from './navigation/components/Header/Header';
-export * as Navigation from './navigation/components/index';
 
 export type {RouterLinkProps} from './RouterLink/RouterLink';
diff --git a/src/components/navigation/components/index.ts b/src/components/navigation/components/index.ts
diff --git a/src/containers/PageConstructor/PageConstructor.tsx b/src/containers/PageConstructor/PageConstructor.tsx
@@ -28,7 +28,7 @@ import {ConstructorRow} from './components/ConstructorRow';
 import {ConstructorFootnotes} from './components/ConstructorFootnotes';
 import {ConstructorHeader} from './components/ConstructorItem';
 import {ConstructorBlocks} from './components/ConstructorBlocks';
-import Layout from '../../components/navigation/containers/Layout/Layout';
+import Layout from '../../navigation/containers/Layout/Layout';
 
 import './PageConstructor.scss';
 
diff --git a/src/models/navigation.ts b/src/models/navigation.ts
@@ -37,7 +37,10 @@ export interface NavigationSocialItem extends Omit<NavigationItemBase, 'text'> {
     url: string;
 }
 
-export type NavigationItem = NavigationLinkItem | NavigationButtonItem | NavigationDropdownItem;
+export type NavigationItemModel =
+    | NavigationLinkItem
+    | NavigationButtonItem
+    | NavigationDropdownItem;
 
 export type NavigationItemData =
     | NavigationLinkItem
@@ -47,24 +50,24 @@ export type NavigationItemData =
 
 export type DropdownItemData = Omit<NavigationDropdownItem, 'items'>;
 
-export interface NavigationLogo {
+export interface NavigationLogoData {
     icon: ImageProps;
     text?: string;
     url?: string;
 }
 
 export interface HeaderData {
-    leftItems: NavigationItem[];
-    rightItems?: NavigationItem[];
+    leftItems: NavigationItemModel[];
+    rightItems?: NavigationItemModel[];
 }
 
 export interface FooterColumn {
     title: string;
-    links: NavigationItem[];
+    links: NavigationItemModel[];
 }
 
 export interface FooterUnderline {
-    links?: NavigationItem[];
+    links?: NavigationItemModel[];
     copyright?: string;
 }
 
@@ -75,7 +78,7 @@ export interface FooterData {
 }
 
 export interface NavigationData {
-    logo: NavigationLogo;
+    logo: NavigationLogoData;
     header: HeaderData;
     footer?: FooterData;
 }
diff --git a/src/navigation/components/Header/Header.scss b/src/navigation/components/Header/Header.scss
@@ -1,5 +1,5 @@
-@import '../../../../../styles/variables.scss';
-@import '../../../../../styles/mixins.scss';
+@import '../../../../styles/variables';
+@import '../../../../styles/mixins';
 
 $block: '.#{$ns}header';
 
diff --git a/src/navigation/components/Header/Header.tsx b/src/navigation/components/Header/Header.tsx
@@ -1,16 +1,16 @@
 import React, {MouseEvent, useCallback, useState} from 'react';
 
-import {block} from '../../../../utils';
-import {HeaderData, NavigationLogo} from '../../../../models';
-import {Col, Grid, Row} from '../../../../grid';
-import OutsideClick from '../../../OutsideClick/OutsideClick';
-import Control from '../../../Control/Control';
+import {block} from '../../../utils';
+import {HeaderData, NavigationLogoData} from '../../../models';
+import {Col, Grid, Row} from '../../../grid';
+import OutsideClick from '../../../components/OutsideClick/OutsideClick';
+import Control from '../../../components/Control/Control';
 import Navigation from '../Navigation/Navigation';
 import MobileNavigation from '../MobileNavigation/MobileNavigation';
 import NavigationItem from '../NavigationItem/NavigationItem';
 import Logo from '../Logo/Logo';
 
-import {NavigationClose, NavigationOpen} from '../../../../icons';
+import {NavigationClose, NavigationOpen} from '../../../icons';
 
 import './Header.scss';
 
@@ -19,7 +19,7 @@ const b = block('header');
 const ICON_SIZE = 36;
 
 export interface HeaderProps {
-    logo: NavigationLogo;
+    logo: NavigationLogoData;
     data: HeaderData;
 }
 
diff --git a/src/navigation/components/Logo/Logo.scss b/src/navigation/components/Logo/Logo.scss
@@ -1,5 +1,5 @@
-@import '../../../../../styles/variables.scss';
-@import '../../../../../styles/mixins.scss';
+@import '../../../../styles/variables';
+@import '../../../../styles/mixins';
 
 $block: '.#{$ns}logo';
 
diff --git a/src/navigation/components/Logo/Logo.tsx b/src/navigation/components/Logo/Logo.tsx
@@ -1,16 +1,16 @@
 import React from 'react';
 
-import {block} from '../../../../utils';
-import {NavigationLogo} from '../../../../models';
-import RouterLink from '../../../RouterLink/RouterLink';
-import {getMediaImage} from '../../../Media/Image/utils';
-import {Image} from '../../../index';
+import {block} from '../../../utils';
+import {NavigationLogoData} from '../../../models';
+import RouterLink from '../../../components/RouterLink/RouterLink';
+import {getMediaImage} from '../../../components/Media/Image/utils';
+import {Image} from '../../../components';
 
 import './Logo.scss';
 
 const b = block('logo');
 
-export interface LogoProps extends NavigationLogo {
+export interface LogoProps extends NavigationLogoData {
     className?: string;
 }
 
diff --git a/src/navigation/components/MobileNavigation/MobileNavigation.scss b/src/navigation/components/MobileNavigation/MobileNavigation.scss
@@ -1,5 +1,5 @@
-@import '../../../../../styles/variables.scss';
-@import '../../../../../styles/mixins.scss';
+@import '../../../../styles/variables';
+@import '../../../../styles/mixins';
 
 $block: '.#{$ns}mobile-navigation';
 
diff --git a/src/navigation/components/MobileNavigation/MobileNavigation.tsx b/src/navigation/components/MobileNavigation/MobileNavigation.tsx
@@ -1,13 +1,9 @@
 import React, {MouseEventHandler, useRef, useCallback} from 'react';
 import {Popup, Portal} from '@gravity-ui/uikit';
 
-import {block} from '../../../../utils';
-import Foldable from '../../../Foldable/Foldable';
-import {
-    NavigationItem as NavigationItemModel,
-    NavigationDropdownItem,
-    NavigationItemType,
-} from '../../../../models/navigation';
+import {block} from '../../../utils';
+import Foldable from '../../../components/Foldable/Foldable';
+import {NavigationItemModel, NavigationDropdownItem, NavigationItemType} from '../../../models';
 import NavigationItem from '../NavigationItem/NavigationItem';
 
 import './MobileNavigation.scss';
diff --git a/src/navigation/components/Navigation/Navigation.scss b/src/navigation/components/Navigation/Navigation.scss
@@ -1,5 +1,5 @@
-@import '../../../../../styles/variables.scss';
-@import '../../../../../styles/mixins.scss';
+@import '../../../../styles/variables';
+@import '../../../../styles/mixins';
 
 $block: '.#{$ns}navigation';
 
diff --git a/src/navigation/components/Navigation/Navigation.tsx b/src/navigation/components/Navigation/Navigation.tsx
@@ -9,16 +9,16 @@ import React, {
     useRef,
 } from 'react';
 
-import {block} from '../../../../utils';
-import OverflowScroller from '../../../OverflowScroller/OverflowScroller';
+import {block} from '../../../utils';
+import OverflowScroller from '../../../components/OverflowScroller/OverflowScroller';
 import {
     NavigationDropdownItem,
-    NavigationItem as NavigationItemModel,
+    NavigationItemModel,
     NavigationItemType,
-} from '../../../../models/navigation';
+} from '../../../models/navigation';
 import NavigationPopup from '../NavigationPopup/NavigationPopup';
 import NavigationItem from '../NavigationItem/NavigationItem';
-import {LocationContext} from '../../../../context/locationContext';
+import {LocationContext} from '../../../context/locationContext';
 
 import './Navigation.scss';
 
diff --git a/src/navigation/components/NavigationItem/NavigationItem.scss b/src/navigation/components/NavigationItem/NavigationItem.scss
@@ -1,5 +1,5 @@
-@import '../../../../../styles/variables.scss';
-@import '../../../../../styles/mixins.scss';
+@import '../../../../styles/variables';
+@import '../../../../styles/mixins';
 
 $block: '.#{$ns}navigation-item';
 
diff --git a/src/navigation/components/NavigationItem/NavigationItem.tsx b/src/navigation/components/NavigationItem/NavigationItem.tsx
@@ -1,19 +1,19 @@
 import React, {Fragment, MouseEventHandler, useContext, useMemo} from 'react';
 
-import {block, getLinkProps} from '../../../../utils';
-import {RouterLink, ToggleArrow, Button, Image} from '../../../index';
-import {LocationContext} from '../../../../context/locationContext';
+import {block, getLinkProps} from '../../../utils';
+import {RouterLink, ToggleArrow, Button, Image} from '../../../components';
+import {LocationContext} from '../../../context/locationContext';
 import {
     NavigationItemType,
     NavigationLinkItem,
     ImageProps,
     ButtonProps,
     NavigationItemData,
     DropdownItemData,
-} from '../../../../models';
-import {NavigationArrow} from '../../../../icons';
+} from '../../../models';
+import {NavigationArrow} from '../../../icons';
 import SocialIcon from '../SocialIcon/SocialIcon';
-import {getMediaImage} from '../../../Media/Image/utils';
+import {getMediaImage} from '../../../components/Media/Image/utils';
 
 import './NavigationItem.scss';
 
diff --git a/src/navigation/components/NavigationPopup/NavigationPopup.scss b/src/navigation/components/NavigationPopup/NavigationPopup.scss
@@ -1,5 +1,5 @@
-@import '../../../../../styles/variables.scss';
-@import '../../../../../styles/mixins.scss';
+@import '../../../../styles/variables';
+@import '../../../../styles/mixins';
 
 $block: '.#{$ns}navigation-popup';
 
diff --git a/src/navigation/components/NavigationPopup/NavigationPopup.tsx b/src/navigation/components/NavigationPopup/NavigationPopup.tsx
@@ -2,9 +2,9 @@ import _ from 'lodash';
 import React, {useRef, useState, useEffect, useCallback} from 'react';
 import {Portal} from '@gravity-ui/uikit';
 
-import {block} from '../../../../utils';
-import {OutsideClick} from '../../../index';
-import {NavigationLinkItem} from '../../../../models';
+import {block} from '../../../utils';
+import {OutsideClick} from '../../../components';
+import {NavigationLinkItem} from '../../../models';
 import NavigationItem from '../NavigationItem/NavigationItem';
 
 import './NavigationPopup.scss';
diff --git a/src/navigation/components/SocialIcon/SocialIcon.scss b/src/navigation/components/SocialIcon/SocialIcon.scss
@@ -1,5 +1,5 @@
-@import '../../../../../styles/variables.scss';
-@import '../../../../../styles/mixins.scss';
+@import '../../../../styles/variables';
+@import '../../../../styles/mixins';
 
 $block: '.#{$ns}social-icon';
 
diff --git a/src/navigation/components/SocialIcon/SocialIcon.tsx b/src/navigation/components/SocialIcon/SocialIcon.tsx
@@ -1,19 +1,19 @@
 import React from 'react';
 
-import {block} from '../../../../utils';
-import {NavigationSocialItem} from '../../../../models';
-import {Image} from '../../../index';
-import {getMediaImage} from '../../../Media/Image/utils';
+import {block} from '../../../utils';
+import {NavigationSocialItem} from '../../../models';
+import {Image} from '../../../components';
+import {getMediaImage} from '../../../components/Media/Image/utils';
 
 import './SocialIcon.scss';
 
 const b = block('social-icon');
 
-export interface NavigationSocialItemProps extends NavigationSocialItem {
+export interface NavigationSocialItemOwnProps extends NavigationSocialItem {
     className?: string;
 }
 
-const SocialIcon: React.FC<NavigationSocialItemProps> = ({icon, url, className}) => {
+const SocialIcon: React.FC<NavigationSocialItemOwnProps> = ({icon, url, className}) => {
     const iconData = getMediaImage(icon);
 
     return (
diff --git a/src/navigation/containers/Layout/Layout.scss b/src/navigation/containers/Layout/Layout.scss
diff --git a/src/navigation/containers/Layout/Layout.tsx b/src/navigation/containers/Layout/Layout.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 
-import {block} from '../../../../utils';
-import {NavigationData} from '../../../../models';
+import {block} from '../../../utils';
+import {NavigationData} from '../../../models';
 import Header from '../../components/Header/Header';
 
 import './Layout.scss';
