fix: take empty field into account (#1250)

* fix: take empty field into account * test: add unit test
qlik-oss · May 2, 2023 · b11e9c9 · b11e9c9
1 parent 63c4196
commit b11e9c9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/apis/nucleus/src/components/listbox/ListBox.jsx b/apis/nucleus/src/components/listbox/ListBox.jsx
@@ -103,11 +103,13 @@ export default function ListBox({
       selectDisabled,
       layout,
     });
+  }
 
-    if (itemsLoader.pages.length && !awaitingFrequencyMax) {
-      // All necessary data fetching done - signal rendering done!
-      renderedCallback?.();
-    }
+  const cardinal = layout?.qListObject.qDimensionInfo.qCardinal;
+
+  if ((itemsLoader?.pages.length && !awaitingFrequencyMax) || cardinal === 0) {
+    // All necessary data fetching done - signal rendering done!
+    renderedCallback?.();
   }
 
   const isItemLoaded = useCallback(
@@ -307,7 +309,7 @@ export default function ListBox({
   return (
     <StyledWrapper>
       <ScreenReaderForSelections className="screenReaderOnly" layout={layout} />
-      {!listCount && <ListBoxDisclaimer width={width} text="Listbox.NoMatchesForYourTerms" />}
+      {!listCount && cardinal > 0 && <ListBoxDisclaimer width={width} text="Listbox.NoMatchesForYourTerms" />}
       <InfiniteLoader
         isItemLoaded={isItemLoaded}
         itemCount={listCount || 1} // must be more than 0 or loadMoreItems will never be called again

diff --git a/apis/nucleus/src/components/listbox/__tests__/list-box.test.jsx b/apis/nucleus/src/components/listbox/__tests__/list-box.test.jsx
@@ -278,11 +278,20 @@ describe('<Listbox />', () => {
 
     test('should render a disclaimer when list count is 0 but should still render a list component', async () => {
       layout.qListObject.qSize.qcy = 0;
+      layout.qListObject.qDimensionInfo.qCardinal = 1;
       await render();
       const disclaimers = renderer.root.findAllByType(ListBoxDisclaimer);
       expect(disclaimers).toHaveLength(1);
       const listRows = renderer.root.findAllByProps({ className: 'a-value-row' });
       expect(listRows).toHaveLength(1);
     });
+
+    test('should not render a disclaimer when list count is 0 and qCardinal is 0', async () => {
+      layout.qListObject.qSize.qcy = 0;
+      layout.qListObject.qDimensionInfo.qCardinal = 0;
+      await render();
+      const disclaimers = renderer.root.findAllByType(ListBoxDisclaimer);
+      expect(disclaimers).toHaveLength(0);
+    });
   });
 });