SemianiakaVY/openpencil
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Fix override resolution for sibling instances of the same component

Browse source 
findNodeByComponentId used root-matching which returned the first
child when multiple siblings shared the same component root. This
caused all symbolOverride guidPaths targeting different siblings
(e.g., 3 _stepper instances inside a Stepper component) to resolve
to the first sibling.

Fix: separate into 3 passes — exact componentId match first, then
unambiguous root match (only when exactly one child shares the root),
then deep recursion.
This commit is contained in:
Danila Poyarkov 2026-03-04 23:48:52 +03:00
parent 829bafa698
commit 02b12224cc
1 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
packages/core/src/kiwi/instance-overrides.ts
View file

@ -143,15 +143,35 @@ export function populateAndApplyOverrides(
}
function findNodeByComponentId(parentId: string, componentId: string): string | null {
const targetRoot = preComputedRoot.get(componentId) ?? getComponentRoot(componentId)
const parent = graph.getNode(parentId)
if (!parent) return null
// Pass 1: exact componentId match on direct children
for (const childId of parent.childIds) {
const child = graph.getNode(childId)
if (!child) continue
if (child.componentId === componentId) return childId
const childRoot = preComputedRoot.get(childId) ?? (child.componentId ? getComponentRoot(child.componentId) : null)
if (childRoot && childRoot === targetRoot) return childId
if (child?.componentId === componentId) return childId
}
// Pass 2: root match — but only if exactly one child shares the root
// (multiple siblings with the same root are ambiguous)
const targetRoot = preComputedRoot.get(componentId) ?? getComponentRoot(componentId)
if (targetRoot) {
let rootMatch: string | null = null
let ambiguous = false
for (const childId of parent.childIds) {
const child = graph.getNode(childId)
if (!child?.componentId) continue
const childRoot = preComputedRoot.get(childId) ?? getComponentRoot(child.componentId)
if (childRoot === targetRoot) {
if (rootMatch) { ambiguous = true; break }
rootMatch = childId
}
}
if (rootMatch && !ambiguous) return rootMatch
}
// Pass 3: recurse into children
for (const childId of parent.childIds) {
const deep = findNodeByComponentId(childId, componentId)
if (deep) return deep
}
@ -474,6 +494,7 @@ export function populateAndApplyOverrides(
if (!guids?.length) continue
const targetId = resolveOverrideTarget(nodeId, guids)
if (!targetId) continue
overriddenNodes.add(targetId)