Skip to content

🧹 simplify deeply nested shape reordering logic in PresentationEngine #56

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
MarsLuay merged 2 commits into from
Aug 25, 2026
Merged

🧹 simplify deeply nested shape reordering logic in PresentationEngine #56

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9f4a0e
🧹 simplify deeply nested shape reordering logic in PresentationEngine
MarsLuay Aug 25, 2026
9cd428b
Merge main into code-health-presentation-engine-reorder-shapes-638760…
MarsLuay Aug 25, 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
35 changes: 25 additions & 10 deletions src/PresentationEngine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,25 @@
'tint',
]);

function shiftShapeAdjacent(
shapeTree: Element,
element: Element,
selected: Set<Element>,
direction: 1 | -1,
intersectingOnly: boolean
): boolean {
const target = intersectingOnly
? adjacentIntersectingUnselectedShape(element, selected, direction)
: adjacentUnselectedShape(element, selected, direction);
if (!target) return false;

if (direction === 1) {
shapeTree.insertBefore(element, target.nextSibling);
} else {
shapeTree.insertBefore(element, target);
}
return true;

function getRunFontSizePt(run: Element): number | null {
const runProperties = getElementChildren(run)
.find((element) => element.localName === 'rPr' && element.namespaceURI === DRAWINGML_NAMESPACE) ?? null;
Expand Down Expand Up @@ -2746,19 +2765,15 @@
for (let index = ordered.length - 1; index >= 0; index--) {
const element = ordered[index];
if (!element) continue;
const next = options.intersectingOnly
? adjacentIntersectingUnselectedShape(element, selected, 1)
: adjacentUnselectedShape(element, selected, 1);
if (options.intersectingOnly && next) intersectionTargetCount += 1;
if (next) shapeTree.insertBefore(element, next.nextSibling);
if (shiftShapeAdjacent(shapeTree, element, selected, 1, Boolean(options.intersectingOnly)) && options.intersectingOnly) {
intersectionTargetCount += 1;
}
}
} else {
for (const element of ordered) {
const previous = options.intersectingOnly
? adjacentIntersectingUnselectedShape(element, selected, -1)
: adjacentUnselectedShape(element, selected, -1);
if (options.intersectingOnly && previous) intersectionTargetCount += 1;
if (previous) shapeTree.insertBefore(element, previous);
if (shiftShapeAdjacent(shapeTree, element, selected, -1, Boolean(options.intersectingOnly)) && options.intersectingOnly) {
intersectionTargetCount += 1;
}
}
}

Expand Down Expand Up @@ -3942,3 +3957,3 @@
return `${slideIndex}:${shapeIndex}`;
}
}
Loading