@splunk/visualizations 27.0.0 → 27.2.0

package/Map.js

@@ -59,7 +59,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/Map/Map.tsx
+// src/Map/index.ts
 var Map_exports = {};
 __export(Map_exports, {
   PureMap: () => PureMap_default,
@@ -488,6 +488,13 @@ var sanitizeValues = (values) => {
   }
   return values.map((arr) => sanitizeValues(arr));
 };
+var sortByValuesField = (bubbleLayer) => {
+  const { bubbleSizeFields, dataValuesField } = bubbleLayer;
+  const index = bubbleSizeFields.indexOf(dataValuesField);
+  if (index === -1) return bubbleLayer;
+  bubbleLayer.bubbleSizeFields.unshift(bubbleLayer.bubbleSizeFields.splice(index, 1)[0]);
+  bubbleLayer.bubbleSize.unshift(bubbleLayer.bubbleSize.splice(index, 1)[0]);
+};
 var bakeBubbleData = (layer) => {
   var _a;
   if (!layer || !((_a = layer.bubbleSize) == null ? void 0 : _a.length) || !layer.geobin || !layer.geobin.length || !layer.latitude || !layer.latitude.length || !layer.longitude || !layer.longitude.length) {
@@ -502,6 +509,9 @@ var bakeBubbleData = (layer) => {
     transposedSanitizedBubbleSize = transposeArray(sanitizedBubbleSize);
     if (layer.bubbleSize.length > 1) {
       isPie = true;
+      if (layer.dataValuesField && !!layer.dataColors) {
+        sortByValuesField(layer);
+      }
     }
   } else {
     transposedBubbleSize = layer.bubbleSize.map((n) => [n]);
@@ -537,10 +547,10 @@ var isValidLatLon = (latlon) => {
     return false;
   }
   const [lat, lon] = latlon;
-  if (!(0, types_exports.isNumber)(lat) || !(lat >= MIN_LATITUDE && lat <= MAX_LATITUDE)) {
+  if (!(0, types_exports.isNumber)(lat) || !(Number(lat) >= MIN_LATITUDE && Number(lat) <= MAX_LATITUDE)) {
     return false;
   }
-  if (!(0, types_exports.isNumber)(lon) || !(lon >= MIN_LONGITUDE && lon <= MAX_LONGITUDE)) {
+  if (!(0, types_exports.isNumber)(lon) || !(Number(lon) >= MIN_LONGITUDE && Number(lon) <= MAX_LONGITUDE)) {
     return false;
   }
   return true;
@@ -1875,41 +1885,50 @@ PureMap.defaultProps = {
 };
 var PureMap_default = PureMap;
 
+// esm-externals:@splunk/themes
+var themes_exports = {};
+__export(themes_exports, {
+  default: () => themes_default
+});
+var defaultImport23 = __toESM(require("@splunk/themes"));
+__reExport(themes_exports, require("@splunk/themes"));
+var themes_default = "default" in defaultImport23 ? defaultImport23.default : defaultImport23;
+
+// esm-externals:@splunk/visualization-color-palettes/editors/PresetPalettes
+var PresetPalettes_exports = {};
+__export(PresetPalettes_exports, {
+  default: () => PresetPalettes_default
+});
+var defaultImport24 = __toESM(require("@splunk/visualization-color-palettes/editors/PresetPalettes"));
+__reExport(PresetPalettes_exports, require("@splunk/visualization-color-palettes/editors/PresetPalettes"));
+var PresetPalettes_default = "default" in defaultImport24 ? defaultImport24.default : defaultImport24;
+
 // esm-externals:@splunk/visualization-icons
 var visualization_icons_exports = {};
 __export(visualization_icons_exports, {
   default: () => visualization_icons_default
 });
-var defaultImport23 = __toESM(require("@splunk/visualization-icons"));
+var defaultImport25 = __toESM(require("@splunk/visualization-icons"));
 __reExport(visualization_icons_exports, require("@splunk/visualization-icons"));
-var visualization_icons_default = "default" in defaultImport23 ? defaultImport23.default : defaultImport23;
+var visualization_icons_default = "default" in defaultImport25 ? defaultImport25.default : defaultImport25;
 
 // esm-externals:@splunk/visualization-icons/placeholders
 var placeholders_exports = {};
 __export(placeholders_exports, {
   default: () => placeholders_default
 });
-var defaultImport24 = __toESM(require("@splunk/visualization-icons/placeholders"));
+var defaultImport26 = __toESM(require("@splunk/visualization-icons/placeholders"));
 __reExport(placeholders_exports, require("@splunk/visualization-icons/placeholders"));
-var placeholders_default = "default" in defaultImport24 ? defaultImport24.default : defaultImport24;
-
-// esm-externals:@splunk/themes
-var themes_exports = {};
-__export(themes_exports, {
-  default: () => themes_default
-});
-var defaultImport25 = __toESM(require("@splunk/themes"));
-__reExport(themes_exports, require("@splunk/themes"));
-var themes_default = "default" in defaultImport25 ? defaultImport25.default : defaultImport25;
+var placeholders_default = "default" in defaultImport26 ? defaultImport26.default : defaultImport26;
 
 // esm-externals:@splunk/visualizations-shared/configUtils
 var configUtils_exports = {};
 __export(configUtils_exports, {
   default: () => configUtils_default
 });
-var defaultImport26 = __toESM(require("@splunk/visualizations-shared/configUtils"));
+var defaultImport27 = __toESM(require("@splunk/visualizations-shared/configUtils"));
 __reExport(configUtils_exports, require("@splunk/visualizations-shared/configUtils"));
-var configUtils_default = "default" in defaultImport26 ? defaultImport26.default : defaultImport26;
+var configUtils_default = "default" in defaultImport27 ? defaultImport27.default : defaultImport27;
 
 // src/common/utils/configUtils.ts
 function enhanceConfig(vizConfig) {
@@ -1948,7 +1967,8 @@ var defaultContext = {
     { from: 40, to: 60, value: "#CBA700" },
     { from: 60, to: 80, value: "#669922" },
     { from: 80, value: "#118832" }
-  ]
+  ],
+  colorMatchConfig: [{ match: "", value: "#5C33FF" }]
 };
 var dataContract = {
   requiredDataSources: [],
@@ -2006,8 +2026,11 @@ var themes = {
     }
   })(props)
 };
-var checkTypeIsChoropleth = (options) => options.layers && options.layers.length && options.layers[0].type === visualization_schemas_exports.LAYER_TYPE.Choropleth;
-var checkTypeIsLocalChoropleth = (options) => options.layers && options.layers.length && options.layers[0].type === visualization_schemas_exports.LAYER_TYPE.Choropleth && (options.layers[0].source === "geo://default/us" || options.layers[0].source === "geo://default/world");
+var isChoroplethLayer = (options) => {
+  var _a, _b;
+  return ((_b = (_a = options.layers) == null ? void 0 : _a[0]) == null ? void 0 : _b.type) === visualization_schemas_exports.LAYER_TYPE.Choropleth;
+};
+var isLocalChoroplethLayer = (options) => isChoroplethLayer(options) && (options.layers[0].source === "geo://default/us" || options.layers[0].source === "geo://default/world");
 var EDITOR_LABEL_WIDTH = 140;
 var editorConfig = [
   {
@@ -2032,7 +2055,7 @@ var editorConfig = [
           label: (0, i18n_exports._)("Area IDs"),
           option: "layers[0].areaIds",
           editor: "editor.columnSelector",
-          showEditor: ({ options }) => checkTypeIsChoropleth(options),
+          showEditor: ({ options }) => isChoroplethLayer(options),
           editorProps: {
             dataSourceKey: "primary",
             shouldShowInternalFields: false,
@@ -2045,7 +2068,7 @@ var editorConfig = [
           label: (0, i18n_exports._)("Area values"),
           option: "layers[0].areaValues",
           editor: "editor.columnSelector",
-          showEditor: ({ options }) => checkTypeIsChoropleth(options),
+          showEditor: ({ options }) => isChoroplethLayer(options),
           editorProps: {
             dataSourceKey: "primary",
             shouldShowInternalFields: false,
@@ -2058,7 +2081,7 @@ var editorConfig = [
           label: (0, i18n_exports._)("Latitude"),
           option: "layers[0].latitude",
           editor: "editor.columnSelector",
-          showEditor: ({ options }) => !(options.layers && options.layers.length && options.layers[0].type === "choropleth"),
+          showEditor: ({ options }) => !isChoroplethLayer(options),
           editorProps: {
             dataSourceKey: "primary",
             shouldShowInternalFields: false
@@ -2070,7 +2093,7 @@ var editorConfig = [
           label: (0, i18n_exports._)("Longitude"),
           option: "layers[0].longitude",
           editor: "editor.columnSelector",
-          showEditor: ({ options }) => !(options.layers && options.layers.length && options.layers[0].type === "choropleth"),
+          showEditor: ({ options }) => !isChoroplethLayer(options),
           editorProps: {
             dataSourceKey: "primary",
             shouldShowInternalFields: false
@@ -2102,7 +2125,7 @@ var editorConfig = [
           label: (0, i18n_exports._)("Result limit"),
           option: "layers[0].resultLimit",
           editor: "editor.number",
-          showEditor: ({ options }) => !checkTypeIsLocalChoropleth(options),
+          showEditor: ({ options }) => !isLocalChoroplethLayer(options),
           editorProps: {
             themes,
             labelPosition: "top",
@@ -2194,46 +2217,75 @@ var editorConfig = [
   {
     label: (0, i18n_exports._)("Color and style"),
     layout: [
-      // TODO: add support for color mode option and its corresponding editor
-      // [
-      //     {
-      //         label: _('Color mode'),
-      //         option: 'colorMode',
-      //         editor: 'editor.radioBar',
-      //         editorProps: {
-      //             values: [
-      //                 { label: _('Static'), value: 'static' },
-      //                 { label: _('Dynamic'), value: 'dynamic' },
-      //             ],
-      //         },
-      //     },
-      // ],
+      [
+        {
+          label: (0, i18n_exports._)("Data colors"),
+          option: "layers[0].dataColors",
+          context: "colorRangeConfig",
+          editor: "editor.dynamicColorWithPrecedence",
+          editorProps: {
+            labelPosition: "top",
+            flyoutTitle: (0, i18n_exports._)("Dynamic coloring: value"),
+            formatters: [
+              {
+                label: (0, i18n_exports._)("Ranges"),
+                value: "rangeValue",
+                isDefault: true,
+                defaults: {
+                  dataValues: defaultContext.colorRangeConfig
+                }
+              },
+              {
+                label: (0, i18n_exports._)("Matches"),
+                value: "matchValue",
+                defaults: {
+                  dataValues: defaultContext.colorMatchConfig
+                }
+              }
+            ],
+            dataSelectors: [
+              {
+                label: (0, i18n_exports._)("Data values"),
+                value: "dataValues"
+              }
+            ],
+            defaultPalettesConfig: PresetPalettes_exports.defaultPalettesConfig
+          },
+          showEditor: ({ options }) => !isChoroplethLayer(options)
+        }
+      ],
+      [
+        {
+          label: (0, i18n_exports._)("Data values"),
+          editor: "editor.columnSelector",
+          option: "layers[0].dataValues",
+          showEditor: ({ options }) => {
+            var _a, _b;
+            return !isChoroplethLayer(options) && ((_b = (_a = options.layers) == null ? void 0 : _a[0]) == null ? void 0 : _b.dataColors);
+          },
+          editorProps: {
+            dataSourceKey: "primary",
+            filterByTypes: ["number"]
+          }
+        }
+      ],
       [
         {
           label: (0, i18n_exports._)("Series colors"),
           option: "layers[0].seriesColors",
           editor: "editor.seriesColors",
-          showEditor: ({ options }) => !(options.layers && options.layers.length && options.layers[0].type === "choropleth")
+          showEditor: ({ options }) => {
+            var _a, _b;
+            return !isChoroplethLayer(options) && !((_b = (_a = options.layers) == null ? void 0 : _a[0]) == null ? void 0 : _b.dataColors);
+          }
         }
       ],
-      // TODO: add editor for data colors
-      // [
-      //     {
-      //         label: _('Data colors'),
-      //         option: 'layers[0].dataColors',
-      //         editor: 'editor.text',
-      //         editorProps: {
-      //             themes,
-      //             labelPosition: 'top',
-      //         },
-      //     },
-      // ],
       [
         {
           label: (0, i18n_exports._)("Choropleth empty area"),
           option: "layers[0].choroplethEmptyAreaColor",
           editor: "editor.color",
-          showEditor: ({ options }) => checkTypeIsLocalChoropleth(options),
+          showEditor: ({ options }) => isLocalChoroplethLayer(options),
           editorProps: {
             themes
           }
@@ -2244,7 +2296,7 @@ var editorConfig = [
           label: (0, i18n_exports._)("Choropleth stroke"),
           option: "layers[0].choroplethStrokeColor",
           editor: "editor.color",
-          showEditor: ({ options }) => checkTypeIsChoropleth(options),
+          showEditor: ({ options }) => isChoroplethLayer(options),
           editorProps: {
             themes
           }
@@ -2255,7 +2307,7 @@ var editorConfig = [
           label: (0, i18n_exports._)("Choropleth opacity (%)"),
           option: "layers[0].choroplethOpacity",
           editor: "editor.percent",
-          showEditor: ({ options }) => checkTypeIsChoropleth(options),
+          showEditor: ({ options }) => isChoroplethLayer(options),
           editorProps: {
             themes,
             min: 0
@@ -2344,72 +2396,72 @@ var getSettingsFromThemedProps_exports = {};
 __export(getSettingsFromThemedProps_exports, {
   default: () => getSettingsFromThemedProps_default
 });
-var defaultImport27 = __toESM(require("@splunk/themes/getSettingsFromThemedProps"));
+var defaultImport28 = __toESM(require("@splunk/themes/getSettingsFromThemedProps"));
 __reExport(getSettingsFromThemedProps_exports, require("@splunk/themes/getSettingsFromThemedProps"));
-var getSettingsFromThemedProps_default = "default" in defaultImport27 ? defaultImport27.default : defaultImport27;
+var getSettingsFromThemedProps_default = "default" in defaultImport28 ? defaultImport28.default : defaultImport28;
 
 // esm-externals:@splunk/visualization-encoding/Options
 var Options_exports = {};
 __export(Options_exports, {
   default: () => Options_default
 });
-var defaultImport28 = __toESM(require("@splunk/visualization-encoding/Options"));
+var defaultImport29 = __toESM(require("@splunk/visualization-encoding/Options"));
 __reExport(Options_exports, require("@splunk/visualization-encoding/Options"));
-var Options_default = "default" in defaultImport28 ? defaultImport28.default : defaultImport28;
+var Options_default = "default" in defaultImport29 ? defaultImport29.default : defaultImport29;
 
 // esm-externals:@splunk/visualizations-shared/SanitizeProps
 var SanitizeProps_exports = {};
 __export(SanitizeProps_exports, {
   default: () => SanitizeProps_default
 });
-var defaultImport29 = __toESM(require("@splunk/visualizations-shared/SanitizeProps"));
+var defaultImport30 = __toESM(require("@splunk/visualizations-shared/SanitizeProps"));
 __reExport(SanitizeProps_exports, require("@splunk/visualizations-shared/SanitizeProps"));
-var SanitizeProps_default = "default" in defaultImport29 ? defaultImport29.default : defaultImport29;
+var SanitizeProps_default = "default" in defaultImport30 ? defaultImport30.default : defaultImport30;
 
 // esm-externals:@splunk/visualization-context/TimezoneContext
 var TimezoneContext_exports = {};
 __export(TimezoneContext_exports, {
   default: () => TimezoneContext_default
 });
-var defaultImport30 = __toESM(require("@splunk/visualization-context/TimezoneContext"));
+var defaultImport31 = __toESM(require("@splunk/visualization-context/TimezoneContext"));
 __reExport(TimezoneContext_exports, require("@splunk/visualization-context/TimezoneContext"));
-var TimezoneContext_default = "default" in defaultImport30 ? defaultImport30.default : defaultImport30;
+var TimezoneContext_default = "default" in defaultImport31 ? defaultImport31.default : defaultImport31;
 
 // esm-externals:@splunk/moment
 var moment_exports = {};
 __export(moment_exports, {
   default: () => moment_default
 });
-var defaultImport31 = __toESM(require("@splunk/moment"));
+var defaultImport32 = __toESM(require("@splunk/moment"));
 __reExport(moment_exports, require("@splunk/moment"));
-var moment_default = "default" in defaultImport31 ? defaultImport31.default : defaultImport31;
+var moment_default = "default" in defaultImport32 ? defaultImport32.default : defaultImport32;
 
 // esm-externals:@splunk/visualization-context/FeatureFlagContext
 var FeatureFlagContext_exports = {};
 __export(FeatureFlagContext_exports, {
   default: () => FeatureFlagContext_default
 });
-var defaultImport32 = __toESM(require("@splunk/visualization-context/FeatureFlagContext"));
+var defaultImport33 = __toESM(require("@splunk/visualization-context/FeatureFlagContext"));
 __reExport(FeatureFlagContext_exports, require("@splunk/visualization-context/FeatureFlagContext"));
-var FeatureFlagContext_default = "default" in defaultImport32 ? defaultImport32.default : defaultImport32;
+var FeatureFlagContext_default = "default" in defaultImport33 ? defaultImport33.default : defaultImport33;
 
 // esm-externals:@splunk/async-dynamic-options-evaluator
 var async_dynamic_options_evaluator_exports = {};
 __export(async_dynamic_options_evaluator_exports, {
   default: () => async_dynamic_options_evaluator_default
 });
-var defaultImport33 = __toESM(require("@splunk/async-dynamic-options-evaluator"));
+var defaultImport34 = __toESM(require("@splunk/async-dynamic-options-evaluator"));
 __reExport(async_dynamic_options_evaluator_exports, require("@splunk/async-dynamic-options-evaluator"));
-var async_dynamic_options_evaluator_default = "default" in defaultImport33 ? defaultImport33.default : defaultImport33;
+var async_dynamic_options_evaluator_default = "default" in defaultImport34 ? defaultImport34.default : defaultImport34;
 
 // esm-externals:@splunk/ui-utils/id
 var id_exports = {};
 __export(id_exports, {
   default: () => id_default
 });
-var defaultImport34 = __toESM(require("@splunk/ui-utils/id"));
+var defaultImport35 = __toESM(require("@splunk/ui-utils/id"));
 __reExport(id_exports, require("@splunk/ui-utils/id"));
-var id_default = "default" in defaultImport34 ? defaultImport34.default : defaultImport34;
+var id_default = "default" in defaultImport35 ? defaultImport35.default : defaultImport35;
 
 // src/common/interfaces/VizActionHandler.ts
 var DefaultVizActionHandler = class {
@@ -2617,9 +2669,9 @@ var SizeAwareWrapper_exports = {};
 __export(SizeAwareWrapper_exports, {
   default: () => SizeAwareWrapper_default
 });
-var defaultImport35 = __toESM(require("@splunk/visualizations-shared/SizeAwareWrapper"));
+var defaultImport36 = __toESM(require("@splunk/visualizations-shared/SizeAwareWrapper"));
 __reExport(SizeAwareWrapper_exports, require("@splunk/visualizations-shared/SizeAwareWrapper"));
-var SizeAwareWrapper_default = "default" in defaultImport35 ? defaultImport35.default : defaultImport35;
+var SizeAwareWrapper_default = "default" in defaultImport36 ? defaultImport36.default : defaultImport36;
 
 // src/common/hocs/FixedSizeContainer.tsx
 var Item = styled_components_default.div.attrs(({ width }) => ({
@@ -2666,7 +2718,7 @@ var withFixedSizeContainer = (Viz) => {
       FixSizeItem,
       {
         "data-test": "fix-size-item",
-        "data-splunk-visualization-version": "27.0.0 - 9bf093b7d",
+        "data-splunk-visualization-version": "27.2.0 - 2e7eda8d4",
         width,
         height,
         backgroundColor
@@ -2732,7 +2784,7 @@ var Cover = styled_components_default.div`
     bottom: 0;
 `;
 var Blocker = styled_components_default.div.attrs({
-  "data-splunk-visualization-version": "27.0.0 - 9bf093b7d"
+  "data-splunk-visualization-version": "27.2.0 - 2e7eda8d4"
 })`
     position: relative;
     width: 100%;
@@ -2754,9 +2806,9 @@ var variables_exports = {};
 __export(variables_exports, {
   default: () => variables_default
 });
-var defaultImport36 = __toESM(require("@splunk/themes/variables"));
+var defaultImport37 = __toESM(require("@splunk/themes/variables"));
 __reExport(variables_exports, require("@splunk/themes/variables"));
-var variables_default = "default" in defaultImport36 ? defaultImport36.default : defaultImport36;
+var variables_default = "default" in defaultImport37 ? defaultImport37.default : defaultImport37;
 
 // src/common/components/IconPlaceholder.tsx
 var shouldShowIconPlaceholder = (dataSources, loading = false) => {
@@ -2836,9 +2888,9 @@ var numberUtils_exports = {};
 __export(numberUtils_exports, {
   default: () => numberUtils_default
 });
-var defaultImport37 = __toESM(require("@splunk/visualizations-shared/numberUtils"));
+var defaultImport38 = __toESM(require("@splunk/visualizations-shared/numberUtils"));
 __reExport(numberUtils_exports, require("@splunk/visualizations-shared/numberUtils"));
-var numberUtils_default = "default" in defaultImport37 ? defaultImport37.default : defaultImport37;
+var numberUtils_default = "default" in defaultImport38 ? defaultImport38.default : defaultImport38;
 
 // src/common/utils/dataUtils.ts
 var convertToArrOfObjects = (columns, fields) => {
@@ -3230,9 +3282,9 @@ var FeatureFlags_exports = {};
 __export(FeatureFlags_exports, {
   default: () => FeatureFlags_default
 });
-var defaultImport38 = __toESM(require("@splunk/visualization-context/FeatureFlags"));
+var defaultImport39 = __toESM(require("@splunk/visualization-context/FeatureFlags"));
 __reExport(FeatureFlags_exports, require("@splunk/visualization-context/FeatureFlags"));
-var FeatureFlags_default = "default" in defaultImport38 ? defaultImport38.default : defaultImport38;
+var FeatureFlags_default = "default" in defaultImport39 ? defaultImport39.default : defaultImport39;
 
 // src/common/utils/featureFlagUtils.ts
 var getFeatureFlag = (context, flagName) => {
@@ -3245,6 +3297,25 @@ var getFeatureFlag = (context, flagName) => {
   return false;
 };
 
+// esm-externals:@splunk/visualizations-shared/trellisUtils
+var trellisUtils_exports = {};
+__export(trellisUtils_exports, {
+  default: () => trellisUtils_default
+});
+var defaultImport40 = __toESM(require("@splunk/visualizations-shared/trellisUtils"));
+__reExport(trellisUtils_exports, require("@splunk/visualizations-shared/trellisUtils"));
+var trellisUtils_default = "default" in defaultImport40 ? defaultImport40.default : defaultImport40;
+
+// src/common/utils/trellisUtils.ts
+var turnOffLegendDisplayWhenTrellisIsOn = (isTrellisOn, options) => {
+  if (isTrellisOn && !options.legendDisplay) {
+    return {
+      legendDisplay: "off"
+    };
+  }
+  return {};
+};
+
 // src/common/withDashboardViz.tsx
 var withDashboardViz = (opts) => {
   const {
@@ -3252,6 +3323,8 @@ var withDashboardViz = (opts) => {
     vizConfig,
     computeVizProps: computeVizProps2 = () => {
     },
+    computeVizPropsBeforeEval = () => {
+    },
     disableEditModeCover,
     useIconPlaceholder: useIconPlaceholder2
   } = opts;
@@ -3301,14 +3374,26 @@ var withDashboardViz = (opts) => {
     const isDownsamplingEnabledByFeatureFlag = Boolean(
       featureFlagContext == null ? void 0 : featureFlagContext.visualizations_enableDownsampling
     );
+    const isTrellisFeatureFlagOn = Boolean(
+      featureFlagContext && featureFlagContext.visualizations_enableTrellis
+    );
+    const isTrellisOn = isTrellisFeatureFlagOn && ((_a = vizConfig == null ? void 0 : vizConfig.supports) == null ? void 0 : _a.includes("trellis" /* TRELLIS */)) && (options == null ? void 0 : options.splitByLayout) === "trellis" /* TRELLIS */;
     const isMounted = react_exports.useRef(true);
-    const optionsToEvaluate = react_exports.useMemo(
-      () => ({
+    const optionsToEvaluate = react_exports.useMemo(() => {
+      var _a2;
+      const legendDisplay = turnOffLegendDisplayWhenTrellisIsOn(isTrellisOn, options);
+      const computedOptions = (_a2 = computeVizPropsBeforeEval(options)) != null ? _a2 : {};
+      return {
         context: (0, lodash_exports.defaultsDeep)({}, context, vizConfig.defaultContext),
-        options: (0, hocUtils_exports.deepMergeWithArrayPrimitiveOverrides)({}, options, defaultOptions)
-      }),
-      [options, context]
-    );
+        options: (0, hocUtils_exports.deepMergeWithArrayPrimitiveOverrides)(
+          {},
+          legendDisplay,
+          computedOptions,
+          options,
+          defaultOptions
+        )
+      };
+    }, [isTrellisOn, options, context]);
     const [threshold, setThreshold] = react_exports.useState(Number(width));
     const onDownsamplingThresholdChange = react_exports.useCallback((newThreshold) => {
       setThreshold(newThreshold);
@@ -3389,11 +3474,8 @@ var withDashboardViz = (opts) => {
       useAsyncEvaluatedOptions
     ]);
     const evaluatedOptionsToUse = !useAsyncEvaluatedOptions ? evaluatedOptions : evaluatedOptionsAsync;
-    const isTrellisFeatureFlagOn = Boolean(
-      featureFlagContext && featureFlagContext.visualizations_enableTrellis
-    );
     let clonedEvaluatedOptions = evaluatedOptionsToUse;
-    if (isTrellisFeatureFlagOn && ((_a = vizConfig == null ? void 0 : vizConfig.supports) == null ? void 0 : _a.includes("trellis" /* TRELLIS */)) && (clonedEvaluatedOptions == null ? void 0 : clonedEvaluatedOptions.splitByLayout) === "trellis" /* TRELLIS */) {
+    if (isTrellisOn) {
       clonedEvaluatedOptions = __spreadProps(__spreadValues({}, evaluatedOptionsToUse), {
         backgroundColor: clonedEvaluatedOptions == null ? void 0 : clonedEvaluatedOptions.trellisBackgroundColor
       });
@@ -3504,9 +3586,9 @@ var dsl_exports = {};
 __export(dsl_exports, {
   default: () => dsl_default
 });
-var defaultImport39 = __toESM(require("@splunk/visualization-encoding/utils/dsl"));
+var defaultImport41 = __toESM(require("@splunk/visualization-encoding/utils/dsl"));
 __reExport(dsl_exports, require("@splunk/visualization-encoding/utils/dsl"));
-var dsl_default = "default" in defaultImport39 ? defaultImport39.default : defaultImport39;
+var dsl_default = "default" in defaultImport41 ? defaultImport41.default : defaultImport41;
 
 // src/common/utils/mapUtils.ts
 var columnsNullToZeros = (config2, dataSources, options) => {
@@ -3602,6 +3684,7 @@ var withTooltipFields = (Viz) => {
     if ((_a2 = mergedOptions.layers) == null ? void 0 : _a2[0]) {
       if (((_c = (_b2 = mergedOptions.layers) == null ? void 0 : _b2[0]) == null ? void 0 : _c.type) === "bubble") {
         mergedOptions.layers[0].bubbleSizeFields = "> bubbleSize | getField()";
+        mergedOptions.layers[0].dataValuesField = "> dataValues | getField()";
       }
       const { fields } = dataSources.primary.data;
       if (Array.isArray(mergedOptions.layers[0].additionalTooltipFields) && Array.isArray(fields) && fields.length) {