Skip to content

fix(Highlighter): auto toggle single item #693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Kurtil wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(Highlighter): auto toggle single item #693

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions packages/front/src/fragments/Highlighter/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,10 +282,6 @@ export class Highlighter

this.events[name].onBeforeHighlight.trigger(this.selection[name]);

if (removePrevious) {
await this.clear(name);
}

let map = OBC.ModelIdMapUtils.clone(modelIdMap);
const fragments = this.components.get(OBC.FragmentsManager);

Expand Down Expand Up @@ -314,8 +310,16 @@ export class Highlighter
OBC.ModelIdMapUtils.remove(map, exclude);
}

const autoTogglePicking = isPicking && this.autoToggle.has(name);
const toggleFullSelection = autoTogglePicking && OBC.ModelIdMapUtils.isEqual(this.selection[name], map);

// If the full selection is toggled on click (like a single item clicked twice), clear must be prevented to let the auto toggle picking logic handle this special use case
if (removePrevious && !toggleFullSelection) {
await this.clear(name);
}

// Apply autotoggle when picking with the mouse
if (isPicking && this.autoToggle.has(name)) {
if (autoTogglePicking) {
const clearedItems: { [key: string]: Set<number> } = {};
let clearedItemsFound = false;

Expand Down