Rename types, move types to popover-item folder

src/components/utils/popover/components/popover-item/index.ts

@@ -2,6 +2,7 @@ import { PopoverItemDefault } from './popover-item-default/popover-item-default'
 import { PopoverItemDelimiter } from './popover-item-delimiter/popover-item-delimiter';
 
 export * from './popover-item-default/popover-item-default.const';
+export * from './popover-item.types';
 
 /**
  * Commoon type for popover items

src/components/utils/popover/components/popover-item/popover-item-default/popover-item-default.ts

@@ -1,6 +1,9 @@
 import Dom from '../../../../../dom';
 import { IconDotCircle, IconChevronRight } from '@codexteam/icons';
-import { PopoverItemDefault as PopoverItemDefaultParams, PopoverItem as PopoverItemParams } from '../popover-item.types';
+import {
+  PopoverItemDefaultParams as PopoverItemDefaultParams,
+  PopoverItemParams as PopoverItemParams
+} from '../popover-item.types';
 import { css } from './popover-item-default.const';
 
 /**

types/configs/popover.d.ts → src/components/utils/popover/components/popover-item/popover-item.types.ts

@@ -2,7 +2,7 @@
 /**
  * Represents popover item delimiter
  */
-export interface PopoverItemDelimiter {
+export interface PopoverItemDelimiterParams {
   /**
    * Item type
    */
@@ -12,7 +12,7 @@ export interface PopoverItemDelimiter {
 /**
  * Common parameters for both types of popover items: with or without confirmation
  */
-interface PopoverItemBase {
+interface PopoverItemBaseParams {
   /**
    * Item type
    */
@@ -55,8 +55,8 @@ interface PopoverItemBase {
   name?: string;
 
   /**
-   * Defines whether item should toggle on click. 
-   * Can be represented as boolean value or a string key. 
+   * Defines whether item should toggle on click.
+   * Can be represented as boolean value or a string key.
    * In case of string, works like radio buttons group and highlights as inactive any other item that has same toggle key value.
    */
   toggle?: boolean | string;
@@ -65,20 +65,20 @@ interface PopoverItemBase {
 /**
  * Represents popover item with confirmation state configuration
  */
-export interface PopoverItemWithConfirmation extends PopoverItemBase {
+export interface PopoverItemWithConfirmationParams extends PopoverItemBaseParams {
   /**
    * Popover item parameters that should be applied on item activation.
    * May be used to ask user for confirmation before executing popover item activation handler.
    */
-  confirmation: PopoverItemDefault;
+  confirmation: PopoverItemDefaultParams;
 
   onActivate?: never;
 }
 
 /**
  * Represents popover item without confirmation state configuration
  */
-export interface PopoverItemWithoutConfirmation extends PopoverItemBase {
+export interface PopoverItemWithoutConfirmationParams extends PopoverItemBaseParams {
   confirmation?: never;
 
   /**
@@ -87,36 +87,36 @@ export interface PopoverItemWithoutConfirmation extends PopoverItemBase {
    * @param item - activated item
    * @param event - event that initiated item activation
    */
-  onActivate: (item: PopoverItem, event?: PointerEvent) => void;
+  onActivate: (item: PopoverItemParams, event?: PointerEvent) => void;
 
 }
 
 
 /**
  * Represents popover item with children (nested popover items)
  */
-export interface PopoverItemWithChildren extends PopoverItemBase {
+export interface PopoverItemWithChildrenParams extends PopoverItemBaseParams {
   confirmation?: never;
   onActivate?: never;
 
   /**
    * Items of nested popover that should be open on the current item hover/click (depending on platform)
    */
   children?: {
-    items: PopoverItem[]
+    items: PopoverItemParams[]
   }
 }
 
 /**
  * Default, non-delimiter popover item type
  */
-export type PopoverItemDefault = 
-  PopoverItemWithConfirmation | 
-  PopoverItemWithoutConfirmation | 
-  PopoverItemWithChildren;
+export type PopoverItemDefaultParams =
+  PopoverItemWithConfirmationParams |
+  PopoverItemWithoutConfirmationParams |
+  PopoverItemWithChildrenParams;
 
 /**
  * Represents single popover item
  */
-export type PopoverItem = PopoverItemDefault |  PopoverItemDelimiter;
+export type PopoverItemParams = PopoverItemDefaultParams |  PopoverItemDelimiterParams;
 

src/components/utils/popover/popover-abstract.ts

@@ -5,7 +5,7 @@ import EventsDispatcher from '../events';
 import Listeners from '../listeners';
 import { PopoverEventMap, PopoverMessages, PopoverParams, PopoverEvent, PopoverNodes } from './popover.types';
 import { css } from './popover.const';
-import { PopoverItem as PopoverItemParams } from '../../../../types';
+import { PopoverItemParams } from './components/popover-item';
 
 /**
  * Class responsible for rendering popover and handling its behaviour

src/components/utils/popover/popover-mobile.ts

@@ -3,8 +3,7 @@ import ScrollLocker from '../scroll-locker';
 import { PopoverHeader } from './components/popover-header';
 import { PopoverStatesHistory } from './utils/popover-states-history';
 import { PopoverMobileNodes, PopoverParams } from './popover.types';
-import { PopoverItemDefault } from './components/popover-item';
-import { PopoverItem as PopoverItemParams } from '../../../../types';
+import { PopoverItemDefault, PopoverItemParams } from './components/popover-item';
 import { css } from './popover.const';
 import Dom from '../../dom';
 

types/configs/index.d.ts

@@ -5,4 +5,4 @@ export * from './conversion-config';
 export * from './log-levels';
 export * from './i18n-config';
 export * from './i18n-dictionary';
-export * from './popover'
+export * from '../../src/components/utils/popover/components/popover-item/popover-item.types';

types/index.d.ts

@@ -77,10 +77,15 @@ export {
   Dictionary,
   DictValue,
   I18nConfig,
-  PopoverItem,
-  PopoverItemWithConfirmation,
-  PopoverItemWithoutConfirmation
 } from './configs';
+
+export {
+  PopoverItemParams,
+  PopoverItemDefaultParams,
+  PopoverItemWithConfirmationParams,
+  PopoverItemWithoutConfirmationParams
+} from '../src/components/utils/popover/components/popover-item';
+
 export { OutputData, OutputBlockData} from './data-formats/output-data';
 export { BlockId } from './data-formats/block-id';
 export { BlockAPI } from './api'

types/tools/tool-settings.d.ts

@@ -1,6 +1,6 @@
 import { ToolConfig } from './tool-config';
 import { ToolConstructable, BlockToolData } from './index';
-import { PopoverItem } from '../configs';
+import { PopoverItemParams } from '../configs';
 
 /**
  * Tool may specify its toolbox configuration
@@ -32,7 +32,7 @@ export interface ToolboxConfigEntry {
 /**
  * Represents single Tunes Menu item
  */
-export type TunesMenuConfigItem = PopoverItem & {
+export type TunesMenuConfigItem = PopoverItemParams & {
   /**
    * Tune displayed text.
    */