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

Fix override resolution for nested instance targets

Browse source 
When an override targets an instance node directly (not a descendant),
the node's componentId matches the remapped target. Check the current
node itself before searching descendants. Also prefer exact componentId
match over root-chain match for more precise resolution.
This commit is contained in:
Danila Poyarkov 2026-03-04 17:04:49 +03:00
parent 24207932f2
commit efdb09852f
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -70,15 +70,19 @@ export function populateAndApplyOverrides(
return root
}
function findDescendantByComponentId(parentId: string, componentId: string): string | null {
function findNodeByComponentId(parentId: string, componentId: string): string | null {
const targetRoot = getComponentRoot(componentId)
const parent = graph.getNode(parentId)
if (!parent) return null
// Check direct children first, then recurse
for (const childId of parent.childIds) {
const child = graph.getNode(childId)
if (!child) continue
if (child.componentId === componentId) return childId
if (child.componentId && getComponentRoot(child.componentId) === targetRoot) return childId
const deep = findDescendantByComponentId(childId, componentId)
}
for (const childId of parent.childIds) {
const deep = findNodeByComponentId(childId, componentId)
if (deep) return deep
}
return null
@ -91,7 +95,15 @@ export function populateAndApplyOverrides(
const figmaGuid = overrideKeyToGuid.get(key) ?? key
const remapped = guidToNodeId.get(figmaGuid)
if (!remapped) return null
const found = findDescendantByComponentId(currentId, remapped)
// The override may target the current node itself (when it's an instance
// cloned from the component the override points to)
const current = graph.getNode(currentId)
if (current?.componentId === remapped) {
continue
}
const found = findNodeByComponentId(currentId, remapped)
if (!found) return null
currentId = found
}