From d15d37b4855fece145de7a2c038edda67b7a531b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20G=C5=82ownia?= Date: Thu, 15 Sep 2022 11:03:02 +0200 Subject: [PATCH] chore: derivedDataProvider fixes --- libs/react-helpers/src/lib/generic-data-provider.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libs/react-helpers/src/lib/generic-data-provider.ts b/libs/react-helpers/src/lib/generic-data-provider.ts index b3448fb2c..6fd5c3aff 100644 --- a/libs/react-helpers/src/lib/generic-data-provider.ts +++ b/libs/react-helpers/src/lib/generic-data-provider.ts @@ -531,9 +531,13 @@ function makeDerivedDataProviderInternal( newLoading = newLoading || !part || part.loading; newLoaded = newLoaded && part && part.loaded; }); - const dataParts = dependencies.map((dependency, i) => parts[i].data); - const newData = newLoaded ? combineData(dataParts, variables) : data; - if (updatedPartIndex !== undefined) { + const newData = newLoaded + ? combineData( + parts.map((part) => part.data), + variables + ) + : data; + if (newLoaded && updatedPartIndex !== undefined) { const updatedPart = parts[updatedPartIndex]; if (updatedPart.isUpdate && updatedPart.delta && combineDelta) { delta = combineDelta(parts, variables);