Merge branch 'fix/no-infinite-tree-when-tree-tree' into alpha

gisce · Nov 1, 2024 · e1296aa · e1296aa
2 parents cd6a85d + a15e850
commit e1296aa
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@gisce/react-ooui",
-  "version": "2.29.0-alpha.4",
+  "version": "2.29.0",
   "engines": {
     "node": "20.5.0"
   },
@@ -35,7 +35,7 @@
   "dependencies": {
     "@ant-design/plots": "^1.0.9",
     "@gisce/fiber-diagram": "2.1.1",
-    "@gisce/ooui": "2.14.0-alpha.3",
+    "@gisce/ooui": "2.14.0",
     "@gisce/react-formiga-components": "1.8.0",
     "@gisce/react-formiga-table": "1.8.3",
     "@monaco-editor/react": "^4.4.5",

diff --git a/src/views/actionViews/TreeActionView.tsx b/src/views/actionViews/TreeActionView.tsx
@@ -45,10 +45,10 @@ export const TreeActionView = (props: TreeActionViewProps) => {
   } = props;
 
   const isInfiniteTree = useMemo(() => {
-    if (!treeView?.arch) {
+    if (!treeView?.arch || treeView.isExpandable) {
       return false;
     }
-    const tagValue = extractTreeXmlAttribute(treeView?.arch, "infinite");
+    const tagValue = extractTreeXmlAttribute(treeView.arch, "infinite");
     return tagValue === "1";
   }, [treeView]);