tycho-components 0.28.3 → 0.28.5

package/dist/features/TreeView/cytoscape/CytoscapeTreeConverter.d.ts

@@ -21,6 +21,7 @@ export default class CytoscapeTreeConverter {
     private findParent;
     private findContainingChunks;
     private findTightestContainingChunk;
+    private isXpScaffoldChunk;
     private tightestChunk;
     private initTree;
     private sortChunks;

package/dist/features/TreeView/cytoscape/CytoscapeTreeConverter.js

@@ -179,6 +179,10 @@ export default class CytoscapeTreeConverter {
             return (dominator !== null &&
                 this.generateChunkId(dominator) === this.generateChunkId(chunk));
         }
+        const tightestDominator = this.findTightestContainingChunk(struct, token.p, token.p);
+        if (tightestDominator !== null) {
+            return (this.generateChunkId(tightestDominator) === this.generateChunkId(chunk));
+        }
         if (token.l !== chunk.l)
             return false;
         const dominator = this.tightestChunk(this.findContainingChunks(struct, chunk.l, token.p, token.p));
@@ -241,7 +245,13 @@ export default class CytoscapeTreeConverter {
         return struct.chunks.filter((c) => c.l === level && i >= c.i && f <= c.f);
     }
     findTightestContainingChunk(struct, i, f, minLevel = 1) {
-        return this.tightestChunk(struct.chunks.filter((c) => c.l >= minLevel && i >= c.i && f <= c.f));
+        return this.tightestChunk(struct.chunks.filter((c) => c.l >= minLevel &&
+            i >= c.i &&
+            f <= c.f &&
+            !this.isXpScaffoldChunk(c)));
+    }
+    isXpScaffoldChunk(chunk) {
+        return chunk.t === '*XP*';
     }
     tightestChunk(chunks) {
         if (chunks.length === 0)
@@ -253,6 +263,13 @@ export default class CytoscapeTreeConverter {
                 return c;
             if (span > bestSpan)
                 return best;
+            if (c.l != null && best.l != null && c.l !== best.l) {
+                return c.l > best.l ? c : best;
+            }
+            if (this.isXpScaffoldChunk(c) && !this.isXpScaffoldChunk(best))
+                return best;
+            if (!this.isXpScaffoldChunk(c) && this.isXpScaffoldChunk(best))
+                return c;
             return c.i > best.i ? c : best;
         });
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tycho-components",
   "private": false,
-  "version": "0.28.3",
+  "version": "0.28.5",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {