fix(front): make highlightByID toggle only when picking

ThatOpen · Aug 7, 2024 · e5b8790 · e5b8790
1 parent f726fc3
commit e5b8790
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@thatopen/components",
   "description": "Collection of core functionalities to author BIM apps.",
-  "version": "2.1.20",
+  "version": "2.1.21",
   "author": "That Open Company",
   "contributors": [
     "Antonio Gonzalez Viegas (https://github.com/agviegas)",

diff --git a/packages/core/src/core/Components/index.ts b/packages/core/src/core/Components/index.ts
@@ -14,7 +14,7 @@ export class Components implements Disposable {
   /**
    * The version of the @thatopen/components library.
    */
-  static readonly release = "2.1.20";
+  static readonly release = "2.1.21";
 
   /** {@link Disposable.onDisposed} */
   readonly onDisposed = new Event<void>();

diff --git a/packages/front/package.json b/packages/front/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@thatopen/components-front",
   "description": "Collection of frontend tools to author BIM apps.",
-  "version": "2.1.18",
+  "version": "2.1.19",
   "author": "That Open Company",
   "contributors": [
     "Antonio Gonzalez Viegas (https://github.com/agviegas)",

diff --git a/packages/front/src/fragments/Highlighter/index.ts b/packages/front/src/fragments/Highlighter/index.ts
@@ -253,6 +253,7 @@ export class Highlighter
           zoomToSelection,
           exclude,
           mesh,
+          true,
         );
 
         const fragID = Object.keys(itemFoundInFillMesh)[0];
@@ -286,11 +287,15 @@ export class Highlighter
       removePrevious,
       zoomToSelection,
       exclude,
+      undefined,
+      true,
     );
 
     return { id: itemID, fragments: found };
   }
 
+  // TODO: Make parameters an object?
+
   /**
    * Highlights a fragment based on a given fragment ID map.
    *
@@ -300,6 +305,7 @@ export class Highlighter
    * @param zoomToSelection - Whether to zoom to the highlighted selection.
    * @param exclude - Fragments to exclude from the highlight.
    * @param fillMesh - The fill mesh to also highlight, if any.
+   * @param isPicking - Whether this function is called when picking with the mouse.
    *
    * @returns Promise that resolves when the highlighting is complete.
    *
@@ -315,6 +321,7 @@ export class Highlighter
     zoomToSelection = this.zoomToSelection,
     exclude: FragmentIdMap = {},
     fillMesh: THREE.Mesh | undefined = undefined,
+    isPicking = false,
   ) {
     if (!this.enabled) return;
 
@@ -356,7 +363,8 @@ export class Highlighter
 
       for (const itemID of itemIDs) {
         const set = this.selection[name][fragID];
-        if (this.autoToggle.has(name) && set.has(itemID)) {
+        // Only apply autotoggle when picking with the mouse
+        if (isPicking && this.autoToggle.has(name) && set.has(itemID)) {
           deselectedIDs.add(itemID);
           set.delete(itemID);
         } else {