Fix associating context objects with extended contexts

lehni · lehni · commit 6937df97fbaa · 2024-10-10T20:11:06.000+02:00
diff --git a/packages/admin/src/DitoContext.js b/packages/admin/src/DitoContext.js
@@ -32,10 +32,10 @@ function toObject(context) {
     if (object) break
     raw = Object.getPrototypeOf(raw)
   } while (raw)
-  if (raw !== rawStart) {
+  if (object && raw !== rawStart) {
     // Assign the passed context with the original object as well, so we don't
     // have to search for it again:
-    contexts.set(rawStart, object)
+    contexts.set(raw, object)
   }
   return object
 }

Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,10 @@ function toObject(context) {`
`32`	`32`	`if (object) break`
`33`	`33`	`raw = Object.getPrototypeOf(raw)`
`34`	`34`	`} while (raw)`
`35`		`- if (raw !== rawStart) {`
	`35`	`+ if (object && raw !== rawStart) {`
`36`	`36`	`// Assign the passed context with the original object as well, so we don't`
`37`	`37`	`// have to search for it again:`
`38`		`- contexts.set(rawStart, object)`
	`38`	`+ contexts.set(raw, object)`
`39`	`39`	`}`
`40`	`40`	`return object`
`41`	`41`	`}`