From a2b8bbc19aea283dc6ff2107d73dadbed9e5de99 Mon Sep 17 00:00:00 2001 From: febbraiod Date: Tue, 28 Nov 2023 07:14:08 -0500 Subject: [PATCH] Multifield renderer always lets the supplied value render attempt to transform value --- cmp/grid/renderers/MultiFieldRenderer.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cmp/grid/renderers/MultiFieldRenderer.ts b/cmp/grid/renderers/MultiFieldRenderer.ts index b580608832..d19083bc52 100644 --- a/cmp/grid/renderers/MultiFieldRenderer.ts +++ b/cmp/grid/renderers/MultiFieldRenderer.ts @@ -107,9 +107,10 @@ function renderSubField({colId, label}, context) { if (label && !isString(label)) label = headerName; - const renderedVal = renderValue(value, renderer, column, context); + const renderedVal = renderValue(value, renderer, column, context), + renderedValIsEmpty = renderedVal === '' || isNil(renderedVal); - return isNil(renderedVal) + return renderedValIsEmpty ? null : div({ className: 'xh-multifield-renderer-field', @@ -118,8 +119,8 @@ function renderSubField({colId, label}, context) { } function renderValue(value, renderer, column, context) { - if (isNil(value)) return null; - return renderer ? renderer(value, {...context, column}) : value; + const ret = renderer ? renderer(value, {...context, column}) : value; + return isNil(ret) ? null : ret; } function renderDelimiter(delimiter) {