bfg-common 1.5.2 → 1.5.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bfg-common",
   "private": false,
-  "version": "1.5.2",
+  "version": "1.5.4",
   "scripts": {
     "build": "nuxt build",
     "dev": "nuxt dev --port=3002",

package/plugins/recursion.ts

@@ -29,35 +29,37 @@ export default defineNuxtPlugin(() => {
       return result
     }
     self.findAndExpandPathToNode = function (
-      nodes: any[],
-      targetValue: any,
-      valueProp: string,
+      arr: any[],
+      values: any[],
+      valueProps: string[],
       itemsProp: string,
+      expandProp: string = 'nodesShow',
       path: any[] = []
     ): any[] | null {
-      for (const node of nodes) {
+      for (const node of arr) {
         const newPath = [...path, node]
 
-        // Раскрываем узел
-        node.nodesShow = true
-
-        if (node[valueProp] === targetValue) {
+        const isMatch = values.every(
+          (val, index) => node[valueProps[index]] === val
+        )
+        if (isMatch) {
           return newPath
         }
 
         if (node[itemsProp]?.length) {
           const found = self.findAndExpandPathToNode(
             node[itemsProp],
-            targetValue,
-            valueProp,
+            values,
+            valueProps,
             itemsProp,
+            expandProp,
             newPath
           )
-          if (found) return found
+          if (found) {
+            node[expandProp] = true // раскрываем только тех, кто участвует в пути
+            return found
+          }
         }
-
-        // Если не найден — скрываем обратно
-        node.nodesShow = false
       }
       return null
     }