@snack-uikit/tree 0.8.14 → 0.8.16

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 0.8.16 (2024-12-27)
+
+
+### Bug Fixes
+
+* **PDS-1315:** tree radio selected element parents ([fae6416](https://github.com/cloud-ru-tech/snack-uikit/commit/fae64165834b2eaa32c66eccad01178ab321436e))
+
+
+
+
+
+## 0.8.15 (2024-12-26)
+
+
+### Bug Fixes
+
+* **FF-5734:** eslint fixes ([5ce6f1f](https://github.com/cloud-ru-tech/snack-uikit/commit/5ce6f1f22d3ac3dd367cbdd184e5873e67837c8b))
+
+
+
+
+
 ## 0.8.14 (2024-12-25)
 
 ### Only dependencies have been changed

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

@@ -191,7 +191,7 @@ function TreeNode(_a) {
         return;
     }
   };
-  const getNodeActions = Boolean(nested) ? parentActions : nodeActions;
+  const getNodeActions = nested ? parentActions : nodeActions;
   return (0, jsx_runtime_1.jsxs)("div", Object.assign({
     role: 'presentation',
     className: (0, classnames_1.default)(styles_module_scss_1.default.treeNode, className)
@@ -202,7 +202,7 @@ function TreeNode(_a) {
       horizontal: true,
       visible: showLines,
       "data-test-id": constants_1.TEST_IDS.line
-    }), !parentNode && !Boolean(nested) && (0, jsx_runtime_1.jsx)(TreeLine_1.TreeLine, {
+    }), !parentNode && !nested && (0, jsx_runtime_1.jsx)(TreeLine_1.TreeLine, {
       visible: false
     }), isExpandable && (0, jsx_runtime_1.jsx)(button_1.ButtonFunction, {
       size: 'xs',
@@ -216,7 +216,7 @@ function TreeNode(_a) {
     }), (0, jsx_runtime_1.jsxs)("div", {
       role: 'treeitem',
       "aria-expanded": isExpanded,
-      "aria-selected": isSelectable ? isSelected : undefined,
+      "aria-selected": isSelectable ? isSelected || (nestedNodesSelection === null || nestedNodesSelection === void 0 ? void 0 : nestedNodesSelection.someSelected) && !isExpanded && !isMultiSelect : undefined,
       "aria-disabled": disabled,
       "data-multiselect": isMultiSelect || undefined,
       "data-droplist-active": isDroplistOpen || isDroplistTriggerFocused || undefined,
@@ -242,7 +242,7 @@ function TreeNode(_a) {
         }), showToggle && (0, jsx_runtime_1.jsx)(toggles_1.Radio, {
           size: 's',
           checked: isSelected,
-          disabled: disabled || !isSelected && (nestedNodesSelection === null || nestedNodesSelection === void 0 ? void 0 : nestedNodesSelection.someSelected),
+          disabled: disabled,
           "data-test-id": constants_1.TEST_IDS.radio,
           tabIndex: -1
         })]

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

@@ -138,8 +138,8 @@ export function TreeNode(_a) {
                 return;
         }
     };
-    const getNodeActions = Boolean(nested) ? parentActions : nodeActions;
-    return (_jsxs("div", Object.assign({ role: 'presentation', className: cn(styles.treeNode, className) }, extractSupportProps(rest), { "data-node-id": id, children: [parentNode && (_jsx(TreeLine, { halfWidth: Boolean(nested), horizontal: true, visible: showLines, "data-test-id": TEST_IDS.line })), !parentNode && !Boolean(nested) && _jsx(TreeLine, { visible: false }), isExpandable && (_jsx(ButtonFunction, { size: 'xs', icon: _jsx(ChevronRightSVG, {}), loading: isLoading, onClick: onChevronClick, "data-expanded": isExpanded || undefined, className: styles.treeNodeExpandButton, tabIndex: -1, "data-test-id": TEST_IDS.chevron })), _jsxs("div", { role: 'treeitem', "aria-expanded": isExpanded, "aria-selected": isSelectable ? isSelected : undefined, "aria-disabled": disabled, "data-multiselect": isMultiSelect || undefined, "data-droplist-active": isDroplistOpen || isDroplistTriggerFocused || undefined, onClick: handleClick, onKeyDown: handleKeyDown, onFocus: handleFocus, onBlur: resetFocusPosition, tabIndex: tabIndexAvailable ? 0 : -1, className: styles.treeNodeContent, "data-test-id": TEST_IDS.item, ref: ref, children: [(isMultiSelect || showToggle) && (_jsxs("div", { className: styles.treeNodeCheckboxWrap, children: [isMultiSelect && (_jsx(Checkbox, { size: 's', disabled: disabled, checked: isSelected, indeterminate: !isSelected && (nestedNodesSelection === null || nestedNodesSelection === void 0 ? void 0 : nestedNodesSelection.someSelected), onChange: handleSelect, onClick: stopPropagationClick, "data-test-id": TEST_IDS.checkbox, tabIndex: -1 })), showToggle && (_jsx(Radio, { size: 's', checked: isSelected, disabled: disabled || (!isSelected && (nestedNodesSelection === null || nestedNodesSelection === void 0 ? void 0 : nestedNodesSelection.someSelected)), "data-test-id": TEST_IDS.radio, tabIndex: -1 }))] })), treeNodeIcon && (_jsx("div", { className: styles.treeNodeIcon, "data-test-id": TEST_IDS.icon, children: treeNodeIcon })), _jsxs(Typography.SansBodyM, { tag: 'div', className: styles.treeNodeTitle, children: [typeof title === 'string' && _jsx(TruncateString, { text: title, "data-test-id": TEST_IDS.title }), typeof title !== 'string' && title({ id, disabled, nested })] }), getNodeActions && (_jsx(TreeNodeActions, { getNodeActions: getNodeActions, node: {
+    const getNodeActions = nested ? parentActions : nodeActions;
+    return (_jsxs("div", Object.assign({ role: 'presentation', className: cn(styles.treeNode, className) }, extractSupportProps(rest), { "data-node-id": id, children: [parentNode && (_jsx(TreeLine, { halfWidth: Boolean(nested), horizontal: true, visible: showLines, "data-test-id": TEST_IDS.line })), !parentNode && !nested && _jsx(TreeLine, { visible: false }), isExpandable && (_jsx(ButtonFunction, { size: 'xs', icon: _jsx(ChevronRightSVG, {}), loading: isLoading, onClick: onChevronClick, "data-expanded": isExpanded || undefined, className: styles.treeNodeExpandButton, tabIndex: -1, "data-test-id": TEST_IDS.chevron })), _jsxs("div", { role: 'treeitem', "aria-expanded": isExpanded, "aria-selected": isSelectable ? isSelected || ((nestedNodesSelection === null || nestedNodesSelection === void 0 ? void 0 : nestedNodesSelection.someSelected) && !isExpanded && !isMultiSelect) : undefined, "aria-disabled": disabled, "data-multiselect": isMultiSelect || undefined, "data-droplist-active": isDroplistOpen || isDroplistTriggerFocused || undefined, onClick: handleClick, onKeyDown: handleKeyDown, onFocus: handleFocus, onBlur: resetFocusPosition, tabIndex: tabIndexAvailable ? 0 : -1, className: styles.treeNodeContent, "data-test-id": TEST_IDS.item, ref: ref, children: [(isMultiSelect || showToggle) && (_jsxs("div", { className: styles.treeNodeCheckboxWrap, children: [isMultiSelect && (_jsx(Checkbox, { size: 's', disabled: disabled, checked: isSelected, indeterminate: !isSelected && (nestedNodesSelection === null || nestedNodesSelection === void 0 ? void 0 : nestedNodesSelection.someSelected), onChange: handleSelect, onClick: stopPropagationClick, "data-test-id": TEST_IDS.checkbox, tabIndex: -1 })), showToggle && (_jsx(Radio, { size: 's', checked: isSelected, disabled: disabled, "data-test-id": TEST_IDS.radio, tabIndex: -1 }))] })), treeNodeIcon && (_jsx("div", { className: styles.treeNodeIcon, "data-test-id": TEST_IDS.icon, children: treeNodeIcon })), _jsxs(Typography.SansBodyM, { tag: 'div', className: styles.treeNodeTitle, children: [typeof title === 'string' && _jsx(TruncateString, { text: title, "data-test-id": TEST_IDS.title }), typeof title !== 'string' && title({ id, disabled, nested })] }), getNodeActions && (_jsx(TreeNodeActions, { getNodeActions: getNodeActions, node: {
                             id,
                             title,
                             disabled,

package/package.json

@@ -4,7 +4,7 @@
     "access": "public"
   },
   "title": "Tree",
-  "version": "0.8.14",
+  "version": "0.8.16",
   "sideEffects": [
     "*.css",
     "*.woff",
@@ -38,14 +38,14 @@
   "dependencies": {
     "@snack-uikit/button": "0.19.5",
     "@snack-uikit/icons": "0.24.1",
-    "@snack-uikit/list": "0.22.1",
-    "@snack-uikit/toggles": "0.13.2",
-    "@snack-uikit/truncate-string": "0.6.3",
+    "@snack-uikit/list": "0.22.2",
+    "@snack-uikit/toggles": "0.13.3",
+    "@snack-uikit/truncate-string": "0.6.4",
     "@snack-uikit/typography": "0.8.3",
     "@snack-uikit/utils": "3.6.0",
     "classnames": "2.5.1",
     "react-transition-state": "2.1.1",
     "uncontrollable": "8.0.4"
   },
-  "gitHead": "5f981cd3d7c5169db2bff1d58db36b6c83da6861"
+  "gitHead": "9e7b0296b1a89a61bedfd095f7e40159c6b5f53a"
 }

package/src/helperComponents/TreeNode/TreeNode.tsx

@@ -203,7 +203,7 @@ export function TreeNode({
     }
   };
 
-  const getNodeActions = Boolean(nested) ? parentActions : nodeActions;
+  const getNodeActions = nested ? parentActions : nodeActions;
 
   return (
     <div
@@ -216,7 +216,7 @@ export function TreeNode({
         <TreeLine halfWidth={Boolean(nested)} horizontal visible={showLines} data-test-id={TEST_IDS.line} />
       )}
 
-      {!parentNode && !Boolean(nested) && <TreeLine visible={false} />}
+      {!parentNode && !nested && <TreeLine visible={false} />}
 
       {isExpandable && (
         <ButtonFunction
@@ -234,7 +234,9 @@ export function TreeNode({
       <div
         role='treeitem'
         aria-expanded={isExpanded}
-        aria-selected={isSelectable ? isSelected : undefined}
+        aria-selected={
+          isSelectable ? isSelected || (nestedNodesSelection?.someSelected && !isExpanded && !isMultiSelect) : undefined
+        }
         aria-disabled={disabled}
         data-multiselect={isMultiSelect || undefined}
         data-droplist-active={isDroplistOpen || isDroplistTriggerFocused || undefined}
@@ -262,13 +264,7 @@ export function TreeNode({
               />
             )}
             {showToggle && (
-              <Radio
-                size='s'
-                checked={isSelected}
-                disabled={disabled || (!isSelected && nestedNodesSelection?.someSelected)}
-                data-test-id={TEST_IDS.radio}
-                tabIndex={-1}
-              />
+              <Radio size='s' checked={isSelected} disabled={disabled} data-test-id={TEST_IDS.radio} tabIndex={-1} />
             )}
           </div>
         )}