Merge branch 'main' into feat-aside-header-top-block

.storybook/focus-addon/register.tsx

@@ -0,0 +1,11 @@
+import {addons, } from '@storybook/addons';
+
+addons.register('initialFocus', () => {
+    addons.getChannel().on('currentStoryWasSet', () => focusIframe());
+})
+
+const focusIframe = () => {
+    const previewIframe: HTMLInputElement | null = document.querySelector('#storybook-preview-iframe');
+
+    previewIframe?.focus?.();
+  }

.storybook/main.ts

@@ -8,7 +8,8 @@ const config: StorybookConfig = {
         '@storybook/addon-interactions',
         '@storybook/preset-scss',
         'storybook-preset-inline-svg',
-        './theme-addon/register.tsx'
+        './theme-addon/register.tsx',
+        './focus-addon/register.tsx'
     ],
     framework: {
         name: '@storybook/react-webpack5',

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [0.22.1](https://github.com/gravity-ui/navigation/compare/v0.22.0...v0.22.1) (2023-10-02)
+
+
+### Bug Fixes
+
+* **AsideHeader:** return export AsideHeaderProps ([#119](https://github.com/gravity-ui/navigation/issues/119)) ([1ba6f85](https://github.com/gravity-ui/navigation/commit/1ba6f856479d22cb4330341a7164dee3e432e0cb))
+* **CompositeBar:** fix stucking multipleTooltip ([#117](https://github.com/gravity-ui/navigation/issues/117)) ([be6534e](https://github.com/gravity-ui/navigation/commit/be6534e1a6f49dd8ce1e1dde1aba837b661baf19))
+
 ## [0.22.0](https://github.com/gravity-ui/navigation/compare/v0.21.1...v0.22.0) (2023-09-29)
 
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/navigation",
-  "version": "0.22.0",
+  "version": "0.22.1",
   "description": "Gravity UI Navigation components",
   "license": "MIT",
   "repository": {

src/components/CompositeBar/CompositeBar.tsx

@@ -112,7 +112,7 @@ const CompositeBarView: FC<CompositeBarViewProps> = ({
 
     const onMouseEnterByIndex = useCallback(
         (itemIndex) => () => {
-            if (multipleTooltip) {
+            if (multipleTooltip && document.hasFocus()) {
                 let multipleTooltipActiveValue = multipleTooltipActive;
                 if (!multipleTooltipActive && itemIndex !== lastClickedItemIndex) {
                     multipleTooltipActiveValue = true;
@@ -139,7 +139,7 @@ const CompositeBarView: FC<CompositeBarViewProps> = ({
     );
 
     const onMouseLeave = useCallback(() => {
-        if (compact) {
+        if (compact && document.hasFocus()) {
             ref.current?.activateItem(undefined as unknown as number);
             if (
                 multipleTooltip &&
@@ -220,9 +220,9 @@ const CompositeBarView: FC<CompositeBarViewProps> = ({
                     }}
                 />
             </div>
-            {type === 'menu' && (
+            {type === 'menu' && multipleTooltip && (
                 <MultipleTooltip
-                    open={compact && multipleTooltip && multipleTooltipActive}
+                    open={compact && multipleTooltipActive}
                     anchorRef={tooltipRef}
                     placement={['right-start']}
                     items={items}

src/components/index.ts

@@ -1,4 +1,5 @@
 export {AsideHeader} from './AsideHeader/AsideHeader';
+export type {AsideHeaderProps} from './AsideHeader/types';
 export {AsideHeaderContextProvider, useAsideHeaderContext} from './AsideHeader/AsideHeaderContext';
 export {Drawer, DrawerProps, DrawerItemProps, DrawerItem} from './Drawer/Drawer';
 export {FooterItem, FooterItemProps} from './FooterItem/FooterItem';