fix the rtl test

elastic · May 28, 2024 · e2dce2e · e2dce2e
1 parent ec3a272
commit e2dce2e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 21 deletions.
diff --git a/packages/charts/src/components/legend/legend_item.tsx b/packages/charts/src/components/legend/legend_item.tsx
@@ -15,7 +15,7 @@ import { SharedLegendItemProps } from './types';
 import { getExtra } from './utils';
 import { LegendItem, LegendItemExtraValues, LegendValue } from '../../common/legend';
 import { SeriesIdentifier } from '../../common/series_id';
-import { LayoutDirection, isDefined } from '../../utils/common';
+import { LayoutDirection } from '../../utils/common';
 
 /** @internal */
 export const LEGEND_HIERARCHY_MARGIN = 10;
@@ -32,14 +32,12 @@ export const prepareLegendValues = (
   totalItems: number,
   extraValues: Map<string, LegendItemExtraValues>,
 ) => {
-  return legendValues
-    .map((legendValue) => {
-      if (legendValue === LegendValue.Value || legendValue === LegendValue.CurrentAndLastValue) {
-        return getExtra(extraValues, item, totalItems);
-      }
-      return item.values.find(({ type }) => type === legendValue);
-    })
-    .filter(isDefined);
+  return legendValues.map((legendValue) => {
+    if (legendValue === LegendValue.Value || legendValue === LegendValue.CurrentAndLastValue) {
+      return getExtra(extraValues, item, totalItems);
+    }
+    return item.values.find(({ type }) => type === legendValue);
+  });
 };
 
 /** @internal */
@@ -116,12 +114,9 @@ export const LegendListItem: React.FC<LegendItemProps> = (props) => {
           totalSeriesCount={totalItems}
           hiddenSeriesCount={hiddenItems}
         />
-        {!isSeriesHidden &&
-          legendValueItems.map((legendValueItem) => (
-            <div key={legendValueItem.label} className="echLegendItem__legendValue">
-              {legendValueItem.label}
-            </div>
-          ))}
+        {!isSeriesHidden && legendValueItems[0] && legendValueItems[0].label !== '' && (
+          <div className="echLegendItem__legendValue">{legendValueItems[0].label}</div>
+        )}
         {Action && (
           <div className="echLegendItem__action">
             <Action series={seriesIdentifiers} color={color} label={label} />

diff --git a/packages/charts/src/components/legend/legend_table/legend_table_item.tsx b/packages/charts/src/components/legend/legend_table/legend_table_item.tsx
@@ -91,12 +91,8 @@ export const LegendListItem: React.FC<LegendItemProps> = (props) => {
           />
         </LegendTableCell>
 
-        {legendValueItems?.map((l, i) => {
-          return (
-            <LegendTableCell key={l?.type || i}>
-              <LegendValueComponent {...l} />
-            </LegendTableCell>
-          );
+        {legendValueItems.map((l, i) => {
+          return <LegendTableCell key={l?.type || i}>{l && <LegendValueComponent {...l} />}</LegendTableCell>;
         })}
         {ActionComponent && (
           <LegendTableCell>