Merge pull request #744 from contember/fix/entity-key-reset

fix: reset entity key context
contember · Jul 10, 2024 · 64771fc · 64771fc
2 parents fecc48b + 0722c9d
commit 64771fc
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/packages/react-binding/src/coreComponents/DataBindingProvider.tsx b/packages/react-binding/src/coreComponents/DataBindingProvider.tsx
@@ -1,6 +1,7 @@
 import { ComponentType, createElement, memo, ReactElement, ReactNode } from 'react'
 import { AccessorTree, AccessorTreeState, AccessorTreeStateOptions, useDataBinding } from '../accessorTree'
 import { TreeRootIdProvider } from '../accessorPropagation'
+import { EntityKeyContext } from '../accessorPropagation/EntityKeyContext'
 
 export type DataBindingProviderStateComponent<StateProps> = (
 	| {
@@ -53,9 +54,11 @@ export const DataBindingProvider = memo(function DataBindingProvider<StateProps
 			: props.children
 	return (
 		<TreeRootIdProvider treeRootId={undefined}>
-			<AccessorTree state={accessorTreeState}>
-				{children}
-			</AccessorTree>
+			<EntityKeyContext.Provider value={undefined}>
+				<AccessorTree state={accessorTreeState}>
+					{children}
+				</AccessorTree>
+			</EntityKeyContext.Provider>
 		</TreeRootIdProvider>
 	)
 }) as <StateProps>(props: DataBindingProviderProps<StateProps>) => ReactElement