Skip to content

#701 word forms change in collect element issue #710

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

Merged
klues merged 4 commits into from
Feb 9, 2026
Merged

#701 word forms change in collect element issue #710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
199b9a1
Update actionService.js
alexangelov14 Dec 17, 2025
98e2eee
Update to how it works
alexangelov14 Dec 17, 2025
a5d13ea
Code changes requested
alexangelov14 Jan 8, 2026
87ac275
Requested change regarding element collection
alexangelov14 Jan 23, 2026
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
4 changes: 2 additions & 2 deletions src/js/service/actionService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,12 +182,12 @@ async function doAction(gridElement, action, options = {}) {
stateService.addWordFormTags(action.tags, action.toggle);
break;
case GridActionWordForm.WORDFORM_MODE_CHANGE_BAR:
collectElementService.addWordFormTagsToLast(action.tags);
collectElementService.addWordFormTagsToLast(action.tags, action.toggle, gridElement.id);
break;
case GridActionWordForm.WORDFORM_MODE_CHANGE_EVERYWHERE:
stateService.resetWordFormIds(gridElement);
stateService.addWordFormTags(action.tags, action.toggle);
collectElementService.addWordFormTagsToLast(action.tags);
collectElementService.addWordFormTagsToLast(action.tags, action.toggle);
break;
case GridActionWordForm.WORDFORM_MODE_NEXT_FORM:
let currentId = stateService.nextWordForm(gridElement.id);
Expand Down
32 changes: 23 additions & 9 deletions src/js/service/collectElementService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,16 +235,30 @@ collectElementService.doCollectElementActions = async function (action, gridElem
predictionService.predict(getPredictText(), dictionaryKey);
};

collectElementService.addWordFormTagsToLast = function (tags, toggle) {
let lastElement = collectedElements[collectedElements.length - 1];
if (lastElement && !lastElement.wordFormFixated) {
let lastElementCopy = JSON.parse(JSON.stringify(lastElement));
lastElementCopy.wordFormTags = lastElementCopy.wordFormTags || [];
let currentLabel = getPrintTextOfElement(lastElementCopy);
lastElementCopy.wordFormTags = stateService.mergeTags(lastElementCopy.wordFormTags, tags, toggle);
let newLabel = stateService.getWordForm(lastElementCopy, {searchTags: lastElementCopy.wordFormTags, searchSubTags: true});
collectElementService.addWordFormTagsToLast = function (tags, toggle, skipElementId) {
// Find the last element that doesn't have skipElementId
// This is more robust than skipLast because it doesn't depend on execution order
let targetIndex = -1;
for (let i = collectedElements.length - 1; i >= 0; i--) {
if (!skipElementId || collectedElements[i].id !== skipElementId) {
targetIndex = i;
break;
}
}

if (targetIndex < 0) {
return;
}

let targetElement = collectedElements[targetIndex];
if (targetElement && !targetElement.wordFormFixated) {
let elementCopy = JSON.parse(JSON.stringify(targetElement));
elementCopy.wordFormTags = elementCopy.wordFormTags || [];
let currentLabel = getPrintTextOfElement(elementCopy);
elementCopy.wordFormTags = stateService.mergeTags(elementCopy.wordFormTags, tags, toggle);
let newLabel = stateService.getWordForm(elementCopy, {searchTags: elementCopy.wordFormTags, searchSubTags: true});
if (newLabel && newLabel !== currentLabel) {
collectedElements[collectedElements.length - 1] = lastElementCopy;
collectedElements[targetIndex] = elementCopy;
updateCollectElements();
}
}
Expand Down