Merge branch 'main' into fix/tooltip-hidden-under-toolbar

Author: dpolevodin

package-lock.json

@@ -258,7 +258,7 @@
     "jsdom": "25.0.1",
     "lowlight": "3.0.0",
     "markdown-it-testgen": "^0.1.6",
-    "mermaid": "10.9.0",
+    "mermaid": "10.9.3",
     "npm-run-all": "^4.1.5",
     "postcss": "^8.4.27",
     "prettier": "3.1.1",

package.json

@@ -62,6 +62,7 @@ import {icons} from './icons';
 import {HeadingPreview} from './previews/HeadingPreview';
 
 export type {
+    MToolbarBaseProps,
     MToolbarData,
     MToolbarItemData,
     MToolbarSingleItemData,

src/bundle/config/markup.tsx

@@ -41,6 +41,7 @@ import {
 } from './w-heading-config';
 
 export type {
+    WToolbarBaseProps,
     WToolbarData,
     WToolbarItemData,
     WToolbarSingleItemData,

src/bundle/config/wysiwyg.ts

@@ -12,7 +12,7 @@ import {
 } from '@gravity-ui/uikit';
 
 import {cn} from '../../classname';
-import type {Action, ActionStorage} from '../../core';
+import type {Action} from '../../core';
 import {groupBy, isFunction} from '../../lodash';
 import {useBooleanState, useElementState} from '../../react-utils/hooks';
 import {type ToolbarBaseProps, type ToolbarIconData, ToolbarTooltipDelay} from '../../toolbar';
@@ -32,7 +32,7 @@ export type MenuItem = {
 };
 
 export type ToolbarButtonWithPopupMenuProps = Omit<
-    ToolbarBaseProps<ActionStorage> &
+    ToolbarBaseProps<never> &
         Pick<PopupProps, 'disablePortal'> & {
             icon: ToolbarIconData;
             iconClassName?: string;

src/bundle/toolbar/ToolbarButtonWithPopupMenu.tsx

@@ -8,16 +8,15 @@ import {
 } from '@gravity-ui/uikit';
 
 import {cn} from '../../classname';
-import type {ActionStorage} from '../../core';
 import {isFunction} from '../../lodash';
 
-import type {ToolbarBaseProps, WToolbarItemData} from './types';
+import type {WToolbarBaseProps, WToolbarItemData} from './types';
 
 import './ToolbarSelect.scss';
 
 const b = cn('toolbar-select');
 
-export type ToolbarSelectProps = ToolbarBaseProps<ActionStorage> &
+export type ToolbarSelectProps = WToolbarBaseProps &
     Pick<SelectProps, 'disablePortal'> & {
         items: WToolbarItemData[];
     };

src/bundle/toolbar/ToolbarSelect.tsx

@@ -1,9 +1,8 @@
 import {colorify} from '../../../markup/commands';
-import type {CodeEditor} from '../../../markup/editor';
 import {ToolbarColors} from '../custom/ToolbarColors';
-import type {ToolbarBaseProps} from '../types';
+import type {MToolbarBaseProps} from '../types';
 
-export type MToolbarColorsProps = ToolbarBaseProps<CodeEditor>;
+export type MToolbarColorsProps = MToolbarBaseProps;
 
 export const MToolbarColors: React.FC<MToolbarColorsProps> = ({
     className,

src/bundle/toolbar/markup/MToolbarColors.tsx

@@ -1,11 +1,10 @@
 import {type FileItem, insertFiles} from '../../../markup/commands';
-import type {CodeEditor} from '../../../markup/editor';
-import type {ToolbarBaseProps} from '../../../toolbar';
 import {ToolbarFilePopup, type ToolbarFilePopupProps} from '../custom/ToolbarFilePopup';
+import type {MToolbarBaseProps} from '../types';
 
 import {useMarkupToolbarContext} from './context';
 
-export type MToolbarFilePopupProps = ToolbarBaseProps<CodeEditor> &
+export type MToolbarFilePopupProps = MToolbarBaseProps &
     Pick<ToolbarFilePopupProps, 'anchorElement'> & {
         hide: () => void;
     };

src/bundle/toolbar/markup/MToolbarFilePopup.tsx

@@ -1,18 +1,17 @@
 import isNumber from 'is-number';
 
 import {IMG_MAX_HEIGHT, type ImageItem, getImageDimensions, insertImages} from '../../../markup';
-import type {CodeEditor} from '../../../markup/editor';
-import type {ToolbarBaseProps} from '../../../toolbar';
 import type {UploadSuccessItem} from '../../../utils';
 import {type ToolbarImagePopuProps, ToolbarImagePopup} from '../custom/ToolbarImagePopup';
+import type {MToolbarBaseProps} from '../types';
 
 import {useMarkupToolbarContext} from './context';
 
 const noop = (err: unknown) => {
     console.error(err);
 };
 
-export type MToolbarImagePopupProps = ToolbarBaseProps<CodeEditor> &
+export type MToolbarImagePopupProps = MToolbarBaseProps &
     Pick<ToolbarImagePopuProps, 'anchorElement'> & {
         hide: () => void;
     };

src/bundle/toolbar/markup/MToolbarImagePopup.tsx

@@ -2,6 +2,7 @@ import type {ActionStorage} from '../../core';
 import type {CodeEditor} from '../../markup';
 import type {ToolbarListButtonData} from '../../toolbar';
 import type {
+    ToolbarBaseProps,
     ToolbarButtonPopupData,
     ToolbarData,
     ToolbarGroupData,
@@ -15,6 +16,7 @@ import type {
 
 export * from '../../toolbar/types';
 
+export type WToolbarBaseProps = ToolbarBaseProps<ActionStorage>;
 export type WToolbarData = ToolbarData<ActionStorage>;
 export type WToolbarItemData = ToolbarItemData<ActionStorage>;
 export type WToolbarSingleItemData = ToolbarSingleItemData<ActionStorage>;
@@ -24,6 +26,7 @@ export type WToolbarListButtonData = ToolbarListButtonData<ActionStorage>;
 export type WToolbarListItemData = ToolbarListItemData<ActionStorage>;
 export type WToolbarListButtonItemData = ToolbarListButtonItemData<ActionStorage>;
 
+export type MToolbarBaseProps = ToolbarBaseProps<CodeEditor>;
 export type MToolbarData = ToolbarData<CodeEditor>;
 export type MToolbarItemData = ToolbarItemData<CodeEditor>;
 export type MToolbarSingleItemData = ToolbarSingleItemData<CodeEditor>;