From b3720a63612cc898870472086382e65019b7c68d Mon Sep 17 00:00:00 2001 From: dominik-zeglen Date: Wed, 21 Aug 2019 14:44:29 +0200 Subject: [PATCH] Fix dialog windows rendering --- src/categories/views/CategoryDetails.tsx | 16 ++++++++++++---- src/categories/views/CategoryList.tsx | 6 ++++-- src/collections/views/CollectionDetails.tsx | 5 ++++- src/collections/views/CollectionList.tsx | 21 ++++++++++++++++++--- 4 files changed, 38 insertions(+), 10 deletions(-) diff --git a/src/categories/views/CategoryDetails.tsx b/src/categories/views/CategoryDetails.tsx index 650c5c313..cdbba49f9 100644 --- a/src/categories/views/CategoryDetails.tsx +++ b/src/categories/views/CategoryDetails.tsx @@ -383,9 +383,13 @@ export const CategoryDetails: React.StatelessComponent< }?" id="categoryDetailsDeleteCategoriesDialogContent" values={{ - counter: params.ids.length, + counter: maybe( + () => params.ids.length + ), displayQuantity: ( - {params.ids.length} + + {maybe(() => params.ids.length)} + ) }} /> @@ -425,9 +429,13 @@ export const CategoryDetails: React.StatelessComponent< }?" id="categoryDetailsDeleteProductsDialogContent" values={{ - counter: params.ids.length, + counter: maybe( + () => params.ids.length + ), displayQuantity: ( - {params.ids.length} + + {maybe(() => params.ids.length)} + ) }} /> diff --git a/src/categories/views/CategoryList.tsx b/src/categories/views/CategoryList.tsx index 1a7b0d1a9..e1fb56332 100644 --- a/src/categories/views/CategoryList.tsx +++ b/src/categories/views/CategoryList.tsx @@ -140,8 +140,10 @@ export const CategoryList: React.StatelessComponent = ({ }?" id="categoryListDeleteCategoriesDialogContent" values={{ - counter: params.ids.length, - displayQuantity: {params.ids.length} + counter: maybe(() => params.ids.length), + displayQuantity: ( + {maybe(() => params.ids.length)} + ) }} /> diff --git a/src/collections/views/CollectionDetails.tsx b/src/collections/views/CollectionDetails.tsx index 1f1523de8..fde363504 100644 --- a/src/collections/views/CollectionDetails.tsx +++ b/src/collections/views/CollectionDetails.tsx @@ -361,7 +361,10 @@ export const CollectionDetails: React.StatelessComponent< }?" id="collectionDetailsUnassignProductsDialogContent" values={{ - number: {params.ids.length} + counter: maybe(() => params.ids.length), + displayQuantity: ( + {maybe(() => params.ids.length)} + ) }} /> diff --git a/src/collections/views/CollectionList.tsx b/src/collections/views/CollectionList.tsx index acc735f9b..5a751cd86 100644 --- a/src/collections/views/CollectionList.tsx +++ b/src/collections/views/CollectionList.tsx @@ -208,7 +208,12 @@ export const CollectionList: React.StatelessComponent = ({ }?" id="collectionListPublishCollectionsDialogContent" values={{ - number: params.ids.length + counter: maybe(() => params.ids.length), + displayQuantity: ( + + {maybe(() => params.ids.length)} + + ) }} /> @@ -243,7 +248,12 @@ export const CollectionList: React.StatelessComponent = ({ }?" id="collectionListUnpublishCollectionsDialogContent" values={{ - number: params.ids.length + counter: maybe(() => params.ids.length), + displayQuantity: ( + + {maybe(() => params.ids.length)} + + ) }} /> @@ -277,7 +287,12 @@ export const CollectionList: React.StatelessComponent = ({ }?" id="collectionListDeleteCollectionsDialogContent" values={{ - number: params.ids.length + counter: maybe(() => params.ids.length), + displayQuantity: ( + + {maybe(() => params.ids.length)} + + ) }} />