@cloud-ru/ds-tree 1.0.25-preview-ac2c37a8.0 → 1.0.25

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 1.0.25 (2026-10-01)
+
+### Bug Fixes
+
+- **FF-8862:** innerRef components recognition ([fca7d68](https://github.com/cloud-ru-tech/snack-v2/commit/fca7d68600da3d349dca0d1d1d702fef286ad4dd))
+
 ## 1.0.24 (2026-10-01)
 
 **Note:** Version bump only for package @ds/tree

package/dist/cjs/helperComponents/TreeNode/TreeNode.js

@@ -109,7 +109,12 @@ exports.TreeNode = (0, react_1.forwardRef)(({ id, title, icon: iconProp, expande
             contentRef.current?.focus();
         }
     };
-    const handleBlurActions = () => {
+    const handleBlurActions = (event) => {
+        const nextTarget = event.relatedTarget;
+        // Фокус уходит на саму строку (возврат после закрытия дроплиста) — строку не блюрим.
+        if (nextTarget instanceof Node && contentRef.current?.contains(nextTarget)) {
+            return;
+        }
         if (isDroplistTriggerFocused && !isDroplistOpen) {
             setFocusDroplistTrigger(false);
             contentRef.current?.blur();

package/dist/cjs/helperComponents/TreeNode/components/TreeNodeActions.d.ts

@@ -1,5 +1,5 @@
 import { ItemProps } from '@cloud-ru/ds-list';
-import { Dispatch, SetStateAction } from 'react';
+import { Dispatch, FocusEvent, SetStateAction } from 'react';
 import { Size, TreeNodeProps } from '../../../types';
 type TreeNodeActionsProps = {
     isDroplistOpen: boolean;
@@ -8,7 +8,7 @@ type TreeNodeActionsProps = {
     node: Omit<TreeNodeProps, 'href'>;
     isDroplistTriggerFocused: boolean;
     focusNode(): void;
-    onBlurActions(): void;
+    onBlurActions(event: FocusEvent<HTMLElement>): void;
     size: Size;
 };
 export declare function TreeNodeActions({ getNodeActions, isDroplistTriggerFocused, focusNode, isDroplistOpen, setDroplistOpen, onBlurActions, node, size, }: TreeNodeActionsProps): import("react/jsx-runtime").JSX.Element | null;

package/dist/cjs/helperComponents/TreeNode/components/TreeNodeActions.js

@@ -15,11 +15,15 @@ const utils_1 = require("../utils");
 function TreeNodeActions({ getNodeActions, isDroplistTriggerFocused, focusNode, isDroplistOpen, setDroplistOpen, onBlurActions, node, size, }) {
     const droplistActions = getNodeActions(node);
     const localRef = (0, react_1.useRef)(null);
+    const returnFocusTimerRef = (0, react_1.useRef)();
     (0, react_1.useEffect)(() => {
         if (localRef.current && isDroplistTriggerFocused) {
             localRef.current.focus();
         }
     }, [isDroplistTriggerFocused, localRef]);
+    (0, react_1.useEffect)(() => () => {
+        clearTimeout(returnFocusTimerRef.current);
+    }, []);
     const handleKeyDown = e => {
         switch (e.key) {
             case 'Tab': {
@@ -50,6 +54,8 @@ function TreeNodeActions({ getNodeActions, isDroplistTriggerFocused, focusNode,
                 return;
             }
             case 'ArrowUp': {
+                // onOpenChange уже поставил возврат фокуса на строку — здесь фокус остаётся на kebab.
+                clearTimeout(returnFocusTimerRef.current);
                 setDroplistOpen(false);
                 localRef.current?.focus();
                 e.stopPropagation();
@@ -64,13 +70,14 @@ function TreeNodeActions({ getNodeActions, isDroplistTriggerFocused, focusNode,
     }
     return ((0, jsx_runtime_1.jsx)("div", { role: 'presentation', className: styles_module_scss_1.default.treeNodeActions, "data-focused": isDroplistTriggerFocused || undefined, onClick: utils_1.stopPropagationClick, onKeyDown: handleKeyDown, onFocus: utils_1.stopPropagationFocus, children: (0, jsx_runtime_1.jsx)(list_1.Droplist, { open: isDroplistOpen, onOpenChange: open => {
                 setDroplistOpen(open);
-                // Закрытие дроплиста (по клику в пункт, ESC, outside-click) должно
-                // вернуть фокус на строку и снять `isDroplistTriggerFocused` —
-                // иначе kebab остаётся в visible-hover-состоянии. Tab и ArrowLeft
-                // уже делают это сами; для пути через `closeDroplistOnItemClick`
-                // ресет навешиваем здесь.
-                if (!open) {
-                    focusNode();
+                if (open) {
+                    return;
                 }
+                // Droplist возвращает фокус на триггер после onOpenChange: синхронно
+                // при выборе пункта и через setTimeout(0) при Escape. Возврат на строку
+                // ставим следующим тиком, чтобы он шёл после обоих. Tab и ArrowLeft
+                // фокусируют строку сами и до onOpenChange не доходят.
+                clearTimeout(returnFocusTimerRef.current);
+                returnFocusTimerRef.current = setTimeout(focusNode);
             }, items: droplistActions, closeDroplistOnItemClick: true, placement: 'bottom-end', size: size, children: (0, jsx_runtime_1.jsx)(button_1.Button, { view: 'elevated', appearance: 'neutral', size: size, icon: (0, jsx_runtime_1.jsx)(system_1.KebabSVG, {}), onBlur: onBlurActions, tabIndex: -1, "data-test-id": constants_1.TEST_IDS.droplistTrigger, innerRef: localRef }) }) }));
 }

package/dist/esm/helperComponents/TreeNode/TreeNode.js

@@ -103,7 +103,12 @@ export const TreeNode = forwardRef(({ id, title, icon: iconProp, expandedIcon: e
             contentRef.current?.focus();
         }
     };
-    const handleBlurActions = () => {
+    const handleBlurActions = (event) => {
+        const nextTarget = event.relatedTarget;
+        // Фокус уходит на саму строку (возврат после закрытия дроплиста) — строку не блюрим.
+        if (nextTarget instanceof Node && contentRef.current?.contains(nextTarget)) {
+            return;
+        }
         if (isDroplistTriggerFocused && !isDroplistOpen) {
             setFocusDroplistTrigger(false);
             contentRef.current?.blur();

package/dist/esm/helperComponents/TreeNode/components/TreeNodeActions.d.ts

@@ -1,5 +1,5 @@
 import { ItemProps } from '@cloud-ru/ds-list';
-import { Dispatch, SetStateAction } from 'react';
+import { Dispatch, FocusEvent, SetStateAction } from 'react';
 import { Size, TreeNodeProps } from '../../../types.js';
 type TreeNodeActionsProps = {
     isDroplistOpen: boolean;
@@ -8,7 +8,7 @@ type TreeNodeActionsProps = {
     node: Omit<TreeNodeProps, 'href'>;
     isDroplistTriggerFocused: boolean;
     focusNode(): void;
-    onBlurActions(): void;
+    onBlurActions(event: FocusEvent<HTMLElement>): void;
     size: Size;
 };
 export declare function TreeNodeActions({ getNodeActions, isDroplistTriggerFocused, focusNode, isDroplistOpen, setDroplistOpen, onBlurActions, node, size, }: TreeNodeActionsProps): import("react/jsx-runtime").JSX.Element | null;

package/dist/esm/helperComponents/TreeNode/components/TreeNodeActions.js

@@ -9,11 +9,15 @@ import { stopPropagationClick, stopPropagationFocus } from '../utils.js';
 export function TreeNodeActions({ getNodeActions, isDroplistTriggerFocused, focusNode, isDroplistOpen, setDroplistOpen, onBlurActions, node, size, }) {
     const droplistActions = getNodeActions(node);
     const localRef = useRef(null);
+    const returnFocusTimerRef = useRef();
     useEffect(() => {
         if (localRef.current && isDroplistTriggerFocused) {
             localRef.current.focus();
         }
     }, [isDroplistTriggerFocused, localRef]);
+    useEffect(() => () => {
+        clearTimeout(returnFocusTimerRef.current);
+    }, []);
     const handleKeyDown = e => {
         switch (e.key) {
             case 'Tab': {
@@ -44,6 +48,8 @@ export function TreeNodeActions({ getNodeActions, isDroplistTriggerFocused, focu
                 return;
             }
             case 'ArrowUp': {
+                // onOpenChange уже поставил возврат фокуса на строку — здесь фокус остаётся на kebab.
+                clearTimeout(returnFocusTimerRef.current);
                 setDroplistOpen(false);
                 localRef.current?.focus();
                 e.stopPropagation();
@@ -58,13 +64,14 @@ export function TreeNodeActions({ getNodeActions, isDroplistTriggerFocused, focu
     }
     return (_jsx("div", { role: 'presentation', className: styles.treeNodeActions, "data-focused": isDroplistTriggerFocused || undefined, onClick: stopPropagationClick, onKeyDown: handleKeyDown, onFocus: stopPropagationFocus, children: _jsx(Droplist, { open: isDroplistOpen, onOpenChange: open => {
                 setDroplistOpen(open);
-                // Закрытие дроплиста (по клику в пункт, ESC, outside-click) должно
-                // вернуть фокус на строку и снять `isDroplistTriggerFocused` —
-                // иначе kebab остаётся в visible-hover-состоянии. Tab и ArrowLeft
-                // уже делают это сами; для пути через `closeDroplistOnItemClick`
-                // ресет навешиваем здесь.
-                if (!open) {
-                    focusNode();
+                if (open) {
+                    return;
                 }
+                // Droplist возвращает фокус на триггер после onOpenChange: синхронно
+                // при выборе пункта и через setTimeout(0) при Escape. Возврат на строку
+                // ставим следующим тиком, чтобы он шёл после обоих. Tab и ArrowLeft
+                // фокусируют строку сами и до onOpenChange не доходят.
+                clearTimeout(returnFocusTimerRef.current);
+                returnFocusTimerRef.current = setTimeout(focusNode);
             }, items: droplistActions, closeDroplistOnItemClick: true, placement: 'bottom-end', size: size, children: _jsx(Button, { view: 'elevated', appearance: 'neutral', size: size, icon: _jsx(KebabSVG, {}), onBlur: onBlurActions, tabIndex: -1, "data-test-id": TEST_IDS.droplistTrigger, innerRef: localRef }) }) }));
 }