@splunk/visualizations 28.5.2 → 28.6.0

package/FillerGauge.js

@@ -12,6 +12,7 @@ var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __pow = Math.pow;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __spreadValues = (a, b) => {
   for (var prop in b || (b = {}))
@@ -59,6 +60,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 
 // src/FillerGauge/index.ts
 var FillerGauge_exports = {};
@@ -314,26 +316,59 @@ var isTrellisEnabled = ({ options, featureFlags }) => {
   const { splitByLayout = visualization_schemas_exports.LAYOUT_TYPE.Off } = options;
   return isTrellisFeatureFlagOn({ featureFlags }) && splitByLayout === visualization_schemas_exports.LAYOUT_TYPE.Trellis;
 };
-var TrellisEditorConfig = [
-  [
-    {
-      label: (0, i18n_exports._)("Trellis layout"),
-      option: "splitByLayout",
-      editor: "editor.toggle",
-      showEditor: isTrellisFeatureFlagOn
-    }
-  ],
-  [
-    {
-      label: (0, i18n_exports._)("Split by"),
-      option: "trellisSplitBy",
-      editor: "editor.trellisSplitBy",
-      editorProps: {
-        dataSourceKey: "primary"
-      },
-      showEditor: isTrellisEnabled
-    }
-  ],
+var sortByValuesBase = [
+  { label: (0, i18n_exports._)("Result"), value: "result" },
+  { label: (0, i18n_exports._)("Name"), value: "name" }
+];
+var sortByValuesWithValue = [...sortByValuesBase, { label: (0, i18n_exports._)("Value"), value: "value" }];
+var sortByValuesWithValueAndTrend = [
+  ...sortByValuesBase,
+  { label: (0, i18n_exports._)("Value"), value: "value" },
+  { label: (0, i18n_exports._)("Trend"), value: "trend" }
+];
+var makeSortRow = (sortByValues) => [
+  {
+    label: (0, i18n_exports._)("Sort by"),
+    option: "trellisSortBy",
+    editor: "editor.select",
+    editorProps: {
+      values: sortByValues
+    },
+    showEditor: isTrellisEnabled
+  },
+  {
+    label: (0, i18n_exports._)("Sort order"),
+    option: "trellisSortOrder",
+    editor: "editor.select",
+    editorProps: {
+      values: [
+        { label: (0, i18n_exports._)("Ascending"), value: "ascending" },
+        { label: (0, i18n_exports._)("Descending"), value: "descending" }
+      ]
+    },
+    showEditor: isTrellisEnabled
+  }
+];
+var trellisLayoutRow = [
+  {
+    label: (0, i18n_exports._)("Trellis layout"),
+    option: "splitByLayout",
+    editor: "editor.toggle",
+    showEditor: isTrellisFeatureFlagOn
+  }
+];
+var trellisSplitByRow = [
+  {
+    label: (0, i18n_exports._)("Split by"),
+    option: "trellisSplitBy",
+    editor: "editor.trellisSplitBy",
+    editorProps: {
+      dataSourceKey: "primary"
+    },
+    showEditor: isTrellisEnabled
+  }
+];
+var trellisLayoutRows = [
   [
     {
       label: (0, i18n_exports._)("Number of columns"),
@@ -377,6 +412,24 @@ var TrellisEditorConfig = [
     }
   ]
 ];
+var TrellisEditorConfig = [
+  trellisLayoutRow,
+  trellisSplitByRow,
+  makeSortRow(sortByValuesBase),
+  ...trellisLayoutRows
+];
+var GaugeTrellisEditorConfig = [
+  trellisLayoutRow,
+  trellisSplitByRow,
+  makeSortRow(sortByValuesWithValue),
+  ...trellisLayoutRows
+];
+var SingleValueTrellisEditorConfig = [
+  trellisLayoutRow,
+  trellisSplitByRow,
+  makeSortRow(sortByValuesWithValueAndTrend),
+  ...trellisLayoutRows
+];
 var TimechartTrellisEditorConfig = [
   [
     {
@@ -384,7 +437,6 @@ var TimechartTrellisEditorConfig = [
       option: "splitByLayout",
       editor: "editor.toggle",
       showEditor: isTrellisFeatureFlagOn,
-      // add help text for timecharts
       editorProps: {
         help: (0, i18n_exports._)(
           "Y2-axis and overlay field configurations are not supported when trellis is enabled."
@@ -393,7 +445,9 @@ var TimechartTrellisEditorConfig = [
       }
     }
   ],
-  ...TrellisEditorConfig.slice(1),
+  trellisSplitByRow,
+  makeSortRow(sortByValuesBase),
+  ...trellisLayoutRows,
   [
     {
       label: (0, i18n_exports._)("Shared y-axis scale"),
@@ -528,7 +582,7 @@ var editorConfig = [
   },
   {
     label: Gauge_default.label,
-    layout: [...Gauge_default.layout, ...TrellisEditorConfig]
+    layout: [...Gauge_default.layout, ...GaugeTrellisEditorConfig]
   },
   {
     label: (0, i18n_exports._)("Color and style"),
@@ -542,7 +596,7 @@ var editorConfig = [
             presets,
             value: ({ context, options }) => {
               const initialPreset = getInitialPreset(context, options, presets);
-              return initialPreset && initialPreset.label || null;
+              return (initialPreset == null ? void 0 : initialPreset.label) || null;
             }
           }
         }
@@ -726,7 +780,7 @@ var DefaultVizActionHandler = class {
 var INITIAL_HEIGHT = 250;
 var SplunkVisualization = class {
 };
-SplunkVisualization.propTypes = {
+__publicField(SplunkVisualization, "propTypes", {
   /**
    * display mode
    */
@@ -802,11 +856,11 @@ SplunkVisualization.propTypes = {
    * A callback to request new data with updated request params
    */
   onRequestParamsChange: prop_types_exports.func
-};
+});
 /**
  *
  */
-SplunkVisualization.defaults = {
+__publicField(SplunkVisualization, "defaults", {
   // BaseVisualization in dashboard-visualizations uses 100% for width but 250 for height
   width: "100%",
   height: INITIAL_HEIGHT,
@@ -821,7 +875,7 @@ SplunkVisualization.defaults = {
   onComputedProps: () => ({}),
   loading: false,
   onRequestParamsChange: lodash_exports.noop
-};
+});
 var SplunkVisualization_default = SplunkVisualization;
 
 // src/common/interfaces/DataSource.ts
@@ -875,9 +929,9 @@ var usePaginationParams = ({
   meta,
   onRequestParamsChange
 }) => {
-  const totalCount = meta && meta.totalCount || 0;
-  const offset = requestParams && requestParams.offset || 0;
-  const count = requestParams && requestParams.count;
+  const totalCount = (meta == null ? void 0 : meta.totalCount) || 0;
+  const offset = (requestParams == null ? void 0 : requestParams.offset) || 0;
+  const count = requestParams == null ? void 0 : requestParams.count;
   const totalPages = typeof count === "number" && count > 0 ? Math.ceil(totalCount / count) : 0;
   const current = typeof count === "number" && count > 0 ? Math.floor(offset / count) + 1 : 0;
   const isPaging = totalPages > 1 && typeof onRequestParamsChange === "function";
@@ -985,7 +1039,7 @@ var Cover = styled_components_default.div`
     bottom: 0;
 `;
 var Blocker = styled_components_default.div.attrs({
-  "data-splunk-visualization-version": "28.5.2 - fd77ce608"
+  "data-splunk-visualization-version": "28.6.0 - 92427899a"
 })`
     position: relative;
     width: 100%;
@@ -1075,7 +1129,7 @@ var withFixedSizeContainer = (Viz) => {
       FixSizeItem,
       {
         "data-test": "fix-size-item",
-        "data-splunk-visualization-version": "28.5.2 - fd77ce608",
+        "data-splunk-visualization-version": "28.6.0 - 92427899a",
         width,
         height,
         backgroundColor
@@ -1581,7 +1635,7 @@ var dataSourcesSplitByAggregationsUnknown = (dataSource) => {
   const columns = (_d = (_c = dataSource == null ? void 0 : dataSource.primary) == null ? void 0 : _c.data) == null ? void 0 : _d.columns;
   let splitDataSources = null;
   let errorCode = null;
-  if (fields && fields.length) {
+  if (fields == null ? void 0 : fields.length) {
     splitDataSources = {};
     for (let i = 0; i < fields.length; i += 1) {
       const fieldName = fields[i].name;
@@ -1632,7 +1686,7 @@ var dataSourcesSplitByAggregationsTimechartAndChart = (dataSource) => {
         }
       });
     });
-  } else if ((!splitByFields || !splitByFields.length) && fields.length > 1) {
+  } else if (!(splitByFields == null ? void 0 : splitByFields.length) && fields.length > 1) {
     splitDataSources = {};
     for (let i = 1; i < fields.length; i += 1) {
       const fieldName = fields[i].name;
@@ -1688,7 +1742,7 @@ var dataSourcesSplitByModeTimechart = (dataSource, splitBy) => {
   if (fields.length > 0) {
     splitByFields = (0, trellisUtils_exports.extractSplitByFieldsChartFields)(fields);
   }
-  if (splitByFields && splitByFields.indexOf(splitBy) > -1) {
+  if (splitByFields == null ? void 0 : splitByFields.includes(splitBy)) {
     splitDataSources = {};
     const dataSourceKeys = (0, trellisUtils_exports.extractDataSourceAggregationKeysChart)(fields);
     const valueKeys = [];
@@ -1719,6 +1773,68 @@ var dataSourcesSplitByModeTimechart = (dataSource, splitBy) => {
   }
   return { splitDataSources, errorCode };
 };
+var splitRowWise = (dataSource, columns, fields, otherSplitBy, dataSourceKeys, nonDataSourceAggregations) => {
+  const splitDataSources = {};
+  const valueKeys = (0, lodash_exports.cloneDeep)(columns[0]);
+  valueKeys.forEach((val, idx) => {
+    splitDataSources[val] = (0, lodash_exports.cloneDeep)((0, lodash_exports.omit)(dataSource, ["primary.data.fields", "primary.data.columns"]));
+    splitDataSources[val].primary.data.fields = [];
+    if (otherSplitBy.length) {
+      splitDataSources[val].primary.data.fields = [{ name: otherSplitBy[0] }];
+    }
+    if (dataSourceKeys.length) {
+      const columnValues = [[]];
+      splitDataSources[val].primary.data.fields = [
+        ...splitDataSources[val].primary.data.fields,
+        ...dataSourceKeys.map((k) => ({ name: k }))
+      ];
+      dataSourceKeys.forEach(() => {
+        columnValues.push([]);
+      });
+      for (let i = 1; i <= Math.ceil((fields.length - 1) / dataSourceKeys.length); i += 1) {
+        columnValues[0].push(fields[i].splitby_value ? fields[i].splitby_value : fields[i].name);
+        dataSourceKeys.forEach((dskey, dsIndx) => {
+          const mul = (fields.length - 1) / dataSourceKeys.length;
+          columnValues[dsIndx + 1].push(columns[i + dsIndx * mul][idx]);
+        });
+      }
+      splitDataSources[val].primary.data.columns = columnValues;
+    } else if (nonDataSourceAggregations.length) {
+      const columnValues = [];
+      fields.forEach((aggregationField, fieldIdx) => {
+        if (fieldIdx > 0) {
+          splitDataSources[val].primary.data.fields.push(aggregationField);
+          columnValues.push([columns[fieldIdx][idx]]);
+        }
+      });
+      splitDataSources[val].primary.data.columns = columnValues;
+    }
+  });
+  return splitDataSources;
+};
+var splitColumnWise = (dataSource, columns, fields, otherSplitBy, dataSourceKeys) => {
+  const splitDataSources = {};
+  const valueKeys = [];
+  for (let i = 1; i < fields.length; i += 1) {
+    valueKeys.push(fields[i].splitby_value ? fields[i].splitby_value : fields[i].name);
+  }
+  valueKeys.forEach((val) => {
+    splitDataSources[val] = (0, lodash_exports.cloneDeep)((0, lodash_exports.omit)(dataSource, ["primary.data.fields", "primary.data.columns"]));
+    splitDataSources[val].primary.data.fields = [
+      { name: otherSplitBy[0] },
+      ...dataSourceKeys.map((k) => ({ name: k }))
+    ];
+    splitDataSources[val].primary.data.columns = [[...columns[0]]];
+    dataSourceKeys.forEach((dsKey) => {
+      fields.forEach((field, idx) => {
+        if (field.data_source === dsKey && (field.splitby_value === val || field.name === val)) {
+          splitDataSources[val].primary.data.columns.push([...columns[idx]]);
+        }
+      });
+    });
+  });
+  return splitDataSources;
+};
 var dataSourcesSplitByModeChart = (dataSource, splitBy) => {
   var _a, _b, _c, _d;
   const fields = toFieldEntries((_b = (_a = dataSource == null ? void 0 : dataSource.primary) == null ? void 0 : _a.data) == null ? void 0 : _b.fields);
@@ -1729,8 +1845,7 @@ var dataSourcesSplitByModeChart = (dataSource, splitBy) => {
   if (fields.length > 0) {
     splitByFields = (0, trellisUtils_exports.extractSplitByFieldsChartFields)(fields);
   }
-  if (splitByFields && splitByFields.indexOf(splitBy) > -1) {
-    splitDataSources = {};
+  if (splitByFields == null ? void 0 : splitByFields.includes(splitBy)) {
     const splitByFieldIdx = splitByFields.findIndex((f) => f === splitBy);
     const otherSplitBy = splitByFields.filter((f) => f !== splitBy);
     const dataSourceKeys = (0, trellisUtils_exports.extractDataSourceAggregationKeysChart)(fields);
@@ -1741,71 +1856,16 @@ var dataSourcesSplitByModeChart = (dataSource, splitBy) => {
       }
     }
     if (splitByFieldIdx === 0) {
-      const valueKeys = (0, lodash_exports.cloneDeep)(columns[0]);
-      valueKeys.forEach((val, idx) => {
-        splitDataSources[val] = (0, lodash_exports.cloneDeep)(
-          (0, lodash_exports.omit)(dataSource, ["primary.data.fields", "primary.data.columns"])
-        );
-        splitDataSources[val].primary.data.fields = [];
-        if (otherSplitBy.length) {
-          splitDataSources[val].primary.data.fields = [{ name: otherSplitBy[0] }];
-        }
-        if (dataSourceKeys.length) {
-          const columnValues = [[]];
-          splitDataSources[val].primary.data.fields = [
-            ...splitDataSources[val].primary.data.fields,
-            ...dataSourceKeys.map((k) => ({
-              name: k
-            }))
-          ];
-          dataSourceKeys.forEach(() => {
-            columnValues.push([]);
-          });
-          for (let i = 1; i <= Math.ceil((fields.length - 1) / dataSourceKeys.length); i += 1) {
-            columnValues[0].push(
-              fields[i].splitby_value ? fields[i].splitby_value : fields[i].name
-            );
-            dataSourceKeys.forEach((dskey, dsIndx) => {
-              const mul = (fields.length - 1) / dataSourceKeys.length;
-              columnValues[dsIndx + 1].push(columns[i + dsIndx * mul][idx]);
-            });
-          }
-          splitDataSources[val].primary.data.columns = columnValues;
-        } else if (nonDataSourceAggregations.length) {
-          const columnValues = [];
-          fields.forEach((aggregationField, fieldIdx) => {
-            if (fieldIdx > 0) {
-              splitDataSources[val].primary.data.fields.push(aggregationField);
-              columnValues.push([columns[fieldIdx][idx]]);
-            }
-          });
-          splitDataSources[val].primary.data.columns = columnValues;
-        }
-      });
+      splitDataSources = splitRowWise(
+        dataSource,
+        columns,
+        fields,
+        otherSplitBy,
+        dataSourceKeys,
+        nonDataSourceAggregations
+      );
     } else {
-      const valueKeys = [];
-      for (let i = 1; i < fields.length; i += 1) {
-        valueKeys.push(fields[i].splitby_value ? fields[i].splitby_value : fields[i].name);
-      }
-      valueKeys.forEach((val) => {
-        splitDataSources[val] = (0, lodash_exports.cloneDeep)(
-          (0, lodash_exports.omit)(dataSource, ["primary.data.fields", "primary.data.columns"])
-        );
-        splitDataSources[val].primary.data.fields = [
-          { name: otherSplitBy[0] },
-          ...dataSourceKeys.map((k) => ({
-            name: k
-          }))
-        ];
-        splitDataSources[val].primary.data.columns = [[...columns[0]]];
-        dataSourceKeys.forEach((dsKey) => {
-          fields.forEach((field, idx) => {
-            if (field.data_source === dsKey && (field.splitby_value === val || field.name === val)) {
-              splitDataSources[val].primary.data.columns.push([...columns[idx]]);
-            }
-          });
-        });
-      });
+      splitDataSources = splitColumnWise(dataSource, columns, fields, otherSplitBy, dataSourceKeys);
     }
   } else {
     errorCode = "INVALID_SPLIT_BY_FIELD";
@@ -1823,7 +1883,7 @@ var dataSourcesSplitByModeStatsorUnknown = (dataSource, splitBy, splitMode) => {
     splitByFields = splitMode !== trellisUtils_exports.UNKNOWN ? (0, trellisUtils_exports.extractSplitByFieldsForStats)(fields) : (0, trellisUtils_exports.extractSplitByFieldsForUnknown)(fields);
   }
   const splitByIndex = fields.findIndex((field) => field.name === splitBy);
-  if (splitByFields && splitByFields.indexOf(splitBy) > -1) {
+  if (splitByFields == null ? void 0 : splitByFields.includes(splitBy)) {
     const splitByColumn = (_f = (_e = dataSource == null ? void 0 : dataSource.primary) == null ? void 0 : _e.data) == null ? void 0 : _f.columns[splitByIndex];
     splitDataSources = {};
     splitByColumn.forEach((val, idx) => {
@@ -1945,6 +2005,24 @@ var defaultImport32 = __toESM(require("@splunk/react-icons/Triangle"));
 __reExport(Triangle_exports, require("@splunk/react-icons/Triangle"));
 var Triangle_default = "default" in defaultImport32 ? defaultImport32.default : defaultImport32;
 
+// esm-externals:@splunk/visualizations-shared/propUtils
+var propUtils_exports = {};
+__export(propUtils_exports, {
+  default: () => propUtils_default
+});
+var defaultImport33 = __toESM(require("@splunk/visualizations-shared/propUtils"));
+__reExport(propUtils_exports, require("@splunk/visualizations-shared/propUtils"));
+var propUtils_default = "default" in defaultImport33 ? defaultImport33.default : defaultImport33;
+
+// esm-externals:@splunk/visualizations-shared/simpleXMLOptions
+var simpleXMLOptions_exports = {};
+__export(simpleXMLOptions_exports, {
+  default: () => simpleXMLOptions_default
+});
+var defaultImport34 = __toESM(require("@splunk/visualizations-shared/simpleXMLOptions"));
+__reExport(simpleXMLOptions_exports, require("@splunk/visualizations-shared/simpleXMLOptions"));
+var simpleXMLOptions_default = "default" in defaultImport34 ? defaultImport34.default : defaultImport34;
+
 // src/common/chartingUtils.ts
 var DEFAULT_LINE_WIDTH = 2;
 var getAnnotationsForCanvas = ({
@@ -1982,9 +2060,9 @@ var shouldEnableSearchZoom = (eventHandlers = [], xField = "") => {
   const xAxisIsTime = xField === "_time";
   return !!rangeSelectEventHandler && xAxisIsTime;
 };
-var canvasSupportedTimeSeriesCharts = ["splunk.line"];
+var canvasSupportedTimeSeriesCharts = ["splunk.line", "splunk.area"];
 var isTimeSeriesCanvasRenderSupported = (vizConfigKey) => {
-  return canvasSupportedTimeSeriesCharts.indexOf(vizConfigKey) > -1;
+  return canvasSupportedTimeSeriesCharts.includes(vizConfigKey);
 };
 var filterChartDataFromInternalFields = (chartData) => {
   const { fields, columns } = chartData;
@@ -2139,46 +2217,66 @@ var getY2ScaleConfig = (label, axisAbbreviation, axisScale, roundAxisLabelsToInt
   }
   return y2Config;
 };
-var getSeriesOverrides = (yfields, y2fields, lineWidth, overlayFields, y2Enabled, nullValueMode, markerDisplay, lineDashStyle, lineDashStylesByField, stepPosition, stepPositionsByField) => {
+var getSeriesType = (isOverlay, isAreaChart, isStacked) => {
+  if (isOverlay) return "line";
+  if (!isAreaChart) return void 0;
+  return isStacked ? "stacked-area" : "area";
+};
+var getY2Scale = (field, y2fields, overlayFields) => {
+  const assignToY2 = (y2fields == null ? void 0 : y2fields.length) > 0 && y2fields.includes(field) || !(y2fields == null ? void 0 : y2fields.length) && (overlayFields == null ? void 0 : overlayFields.includes(field));
+  return assignToY2 ? "y2" : "y";
+};
+var getSeriesOverrides = (opts) => {
+  var _a;
+  const {
+    yfields,
+    y2fields,
+    lineWidth,
+    overlayFields,
+    y2Enabled,
+    nullValueMode,
+    markerDisplay,
+    lineDashStyle,
+    lineDashStylesByField,
+    stepPosition,
+    stepPositionsByField,
+    type,
+    stackMode,
+    showLines
+  } = opts;
   const seriesConfig = {};
   let spanGaps;
-  let replaceNullsWithZero;
   if (nullValueMode === "gaps") {
     spanGaps = false;
-  } else if (nullValueMode === "connect" || nullValueMode === "zero") {
+  } else if (nullValueMode != null) {
     spanGaps = true;
-    if (nullValueMode === "zero") {
-      replaceNullsWithZero = true;
-    }
+  } else {
+    spanGaps = void 0;
   }
-  yfields.forEach((field) => {
+  const replaceNullsWithZero = nullValueMode === "zero" ? true : void 0;
+  const isAreaChart = type === "area";
+  const isStacked = isAreaChart && (stackMode === "stacked" || stackMode === "stacked100");
+  const areaFields = isAreaChart ? yfields.filter((f) => !(overlayFields == null ? void 0 : overlayFields.includes(f))) : yfields;
+  const overlayFieldsInOrder = (_a = overlayFields == null ? void 0 : overlayFields.filter((f) => yfields.includes(f))) != null ? _a : [];
+  const orderedFields = isAreaChart ? [...areaFields, ...overlayFieldsInOrder] : yfields;
+  orderedFields.forEach((field) => {
+    var _a2;
+    const isOverlay = (_a2 = overlayFields == null ? void 0 : overlayFields.includes(field)) != null ? _a2 : false;
+    const isPercent = isAreaChart && stackMode === "stacked100" && !isOverlay;
+    const shouldHideAreaOutline = isAreaChart && showLines === false && !isOverlay;
     seriesConfig[field] = {
-      overrides: { width: lineWidth != null ? lineWidth : DEFAULT_LINE_WIDTH }
+      overrides: __spreadValues({
+        width: shouldHideAreaOutline ? 0 : lineWidth != null ? lineWidth : DEFAULT_LINE_WIDTH
+      }, isPercent ? { stacking: { mode: "percent", group: "A" } } : {})
     };
-    if (spanGaps !== void 0) {
-      seriesConfig[field].overrides.spanGaps = spanGaps;
-    }
-    if (y2Enabled) {
-      const shouldAssignToY2 = (
-        // If y2Fields are present, assign all y2Fields to y2 scale
-        (y2fields == null ? void 0 : y2fields.length) > 0 && y2fields.includes(field) || // Else, assign all overlayFields to y2 scale
-        (!y2fields || y2fields.length === 0) && (overlayFields == null ? void 0 : overlayFields.includes(field))
-      );
-      if (shouldAssignToY2) {
-        seriesConfig[field].overrides.scale = "y2";
-      } else {
-        seriesConfig[field].overrides.scale = "y";
-      }
-    }
-    if (overlayFields == null ? void 0 : overlayFields.includes(field)) {
-      seriesConfig[field].type = "line";
-    }
-    if (markerDisplay !== void 0) {
-      seriesConfig[field].markerDisplay = markerDisplay;
-    }
-    const fieldDashStyle = (lineDashStylesByField == null ? void 0 : lineDashStylesByField[field]) || lineDashStyle;
-    if (fieldDashStyle) {
-      seriesConfig[field].lineDashStyle = fieldDashStyle;
+    const seriesType = getSeriesType(isOverlay, isAreaChart, isStacked);
+    if (seriesType !== void 0) seriesConfig[field].type = seriesType;
+    if (spanGaps !== void 0) seriesConfig[field].overrides.spanGaps = spanGaps;
+    if (y2Enabled) seriesConfig[field].overrides.scale = getY2Scale(field, y2fields, overlayFields);
+    if (markerDisplay !== void 0) seriesConfig[field].markerDisplay = markerDisplay;
+    if (!isAreaChart || isOverlay) {
+      const fieldDashStyle = (lineDashStylesByField == null ? void 0 : lineDashStylesByField[field]) || lineDashStyle;
+      if (fieldDashStyle) seriesConfig[field].lineDashStyle = fieldDashStyle;
     }
     const hasFieldStepPosition = Object.hasOwn(stepPositionsByField || {}, field);
     const fieldStepPosition = hasFieldStepPosition ? stepPositionsByField == null ? void 0 : stepPositionsByField[field] : stepPosition;
@@ -2249,8 +2347,27 @@ var TrellisTitleDiv = styled_components_default.div`
     background-color: ${(props) => props.backgroundColor};
     box-shadow: 0 1px ${(props) => props.backgroundColor}; // this is added to avoid a 1px gap between title and viz divs that showed up intermittently because of pixel rounding error in chrome.
 `;
+var formatTrellisKey = (value) => {
+  if (value === null || value === void 0) {
+    return "";
+  }
+  if (typeof value === "string") {
+    return value;
+  }
+  if (typeof value === "number" || typeof value === "boolean") {
+    return value.toString();
+  }
+  if (typeof value === "symbol") {
+    return value.toString();
+  }
+  try {
+    return JSON.stringify(value);
+  } catch (e) {
+    return typeof value === "bigint" ? value.toString() : "";
+  }
+};
 var TrellisTitle = (props) => {
-  const titleText = String(props.trellisKey).toString();
+  const titleText = formatTrellisKey(props.trellisKey);
   return /* @__PURE__ */ react_exports.createElement(
     TrellisTitleDiv,
     {
@@ -2386,6 +2503,38 @@ var parseArrayOption = (value) => {
   }
   return void 0;
 };
+var getAreaOpacityForCanvas = (areaOpacity) => (
+  // Preserve legacy visualizations behavior where area opacity is squared to match charting output.
+  areaOpacity !== void 0 && areaOpacity !== null ? __pow(areaOpacity, 2) : areaOpacity
+);
+var parseTickIntervalOption = (simpleXMLValue, canvasValue) => {
+  if (simpleXMLValue) return Number(simpleXMLValue);
+  if (canvasValue) return Number(canvasValue);
+  return void 0;
+};
+var getYAxisTitles = ({
+  y2Enabled,
+  yFields,
+  y2Fields,
+  overlayFields,
+  yAxisTitleText,
+  yAxisTitleVisibility,
+  y2AxisTitleText,
+  y2AxisTitleVisibility,
+  containerHeight
+}) => {
+  const yFieldsForTitle = y2Enabled ? yFields.filter((field) => !y2Fields.includes(field)) : yFields;
+  const fieldsForY2Axis = y2Fields.length > 0 ? y2Fields : overlayFields;
+  const yAxisTitle = ellipsisAxisTitle(
+    getComputedAxisTitles(yAxisTitleText, yFieldsForTitle, yAxisTitleVisibility),
+    containerHeight
+  );
+  const y2AxisTitle = ellipsisAxisTitle(
+    getComputedAxisTitles(y2AxisTitleText, fieldsForY2Axis, y2AxisTitleVisibility),
+    containerHeight
+  );
+  return { yAxisTitle, y2AxisTitle };
+};
 var TimeSeriesChartWrapper = (props) => {
   var _b, _c, _d;
   const _a = props, {
@@ -2475,6 +2624,8 @@ var TimeSeriesChartWrapper = (props) => {
     "chart.overlayFields": overlayFieldsStr,
     "chart.nullValueMode": nullValueMode,
     "chart.showDataLabels": showDataLabels,
+    "chart.showLines": showLines,
+    "chart.stackMode": stackMode,
     lineWidth,
     lineDashStyle,
     fieldDashStyles: lineDashStylesByFieldStr,
@@ -2503,7 +2654,10 @@ var TimeSeriesChartWrapper = (props) => {
     yAxisMinorTickSize,
     y2AxisMinorTickSize,
     showYAxisWithZero: showYAxisWithZeroFromOptions,
-    showY2AxisWithZero: showY2AxisWithZeroFromOptions
+    showY2AxisWithZero: showY2AxisWithZeroFromOptions,
+    // area only props
+    areaFillOpacity: areaOpacity,
+    chart: chartType
   } = options;
   const dataValuesDisplay = showDataLabels === "none" ? "off" : showDataLabels;
   const showYAxisWithZero = showYAxisWithZeroFromProps != null ? showYAxisWithZeroFromProps : showYAxisWithZeroFromOptions;
@@ -2520,13 +2674,11 @@ var TimeSeriesChartWrapper = (props) => {
   const yAxisMax = parseAxisValue(yAxisMaxRaw);
   const y2AxisMin = parseAxisValue(y2AxisMinRaw);
   const y2AxisMax = parseAxisValue(y2AxisMaxRaw);
-  const parseTickInterval = (simpleXMLValue, canvasValue) => {
-    if (simpleXMLValue) return Number(simpleXMLValue);
-    if (canvasValue) return Number(canvasValue);
-    return void 0;
-  };
-  const yAxisMajorTickIntervalNum = parseTickInterval(yAxisMajorUnitFromSimpleXML, yAxisMajorTickInterval);
-  const y2AxisMajorTickIntervalNum = parseTickInterval(
+  const yAxisMajorTickIntervalNum = parseTickIntervalOption(
+    yAxisMajorUnitFromSimpleXML,
+    yAxisMajorTickInterval
+  );
+  const y2AxisMajorTickIntervalNum = parseTickIntervalOption(
     y2AxisMajorUnitFromSimpleXML,
     y2AxisMajorTickInterval
   );
@@ -2535,6 +2687,7 @@ var TimeSeriesChartWrapper = (props) => {
   const y2AxisMajorTickSizeNum = y2AxisMajorTickSize != null ? Number(y2AxisMajorTickSize) : void 0;
   const yAxisMinorTickSizeNum = yAxisMinorTickSize != null ? Number(yAxisMinorTickSize) : void 0;
   const y2AxisMinorTickSizeNum = y2AxisMinorTickSize != null ? Number(y2AxisMinorTickSize) : void 0;
+  const areaOpacityForCanvas = getAreaOpacityForCanvas(areaOpacity);
   const seriesColors = seriesColorsStr ? JSON.parse(seriesColorsStr) : void 0;
   const seriesColorsByField = fieldColors ? JSON.parse(fieldColors) : void 0;
   const lineDashStylesByField = lineDashStylesByFieldStr ? JSON.parse(lineDashStylesByFieldStr) : void 0;
@@ -2565,26 +2718,40 @@ var TimeSeriesChartWrapper = (props) => {
   );
   let xAxisTitle = getComputedAxisTitles(xAxisTitleText, [xField], xAxisTitleVisibility);
   xAxisTitle = ellipsisAxisTitle(xAxisTitle, containerWidth);
-  const yFieldsForTitle = y2Enabled ? yFields.filter((field) => !y2Fields.includes(field)) : yFields;
-  let yAxisTitle = getComputedAxisTitles(yAxisTitleText, yFieldsForTitle, yAxisTitleVisibility);
-  yAxisTitle = ellipsisAxisTitle(yAxisTitle, containerHeight);
-  const fieldsForY2Axis = y2Fields.length > 0 ? y2Fields : overlayFields;
-  let y2AxisTitle = getComputedAxisTitles(y2AxisTitleText, fieldsForY2Axis, y2AxisTitleVisibility);
-  y2AxisTitle = ellipsisAxisTitle(y2AxisTitle, containerHeight);
+  const { yAxisTitle, y2AxisTitle } = getYAxisTitles({
+    y2Enabled,
+    yFields,
+    y2Fields,
+    overlayFields,
+    yAxisTitleText,
+    yAxisTitleVisibility,
+    y2AxisTitleText,
+    y2AxisTitleVisibility,
+    containerHeight
+  });
   const xScaleConfig = (0, react_exports.useMemo)(
     () => getXScaleConfig(xAxisTitle, xAxisLabelVisibility, xAxisLabelRotation),
     [xAxisTitle, xAxisLabelVisibility, xAxisLabelRotation]
   );
+  const isStacked100 = stackMode === "stacked100";
   const yScaleConfig = (0, react_exports.useMemo)(
-    () => getYScaleConfig(
-      yAxisTitle,
-      yAxisAbbreviation,
-      yAxisScale,
-      yAxisLabelVisibility,
-      yAxisMin,
-      yAxisMax
-    ),
-    [yAxisTitle, yAxisAbbreviation, yAxisScale, yAxisLabelVisibility, yAxisMin, yAxisMax]
+    () => {
+      const config3 = getYScaleConfig(
+        yAxisTitle,
+        yAxisAbbreviation,
+        yAxisScale,
+        yAxisLabelVisibility,
+        yAxisMin,
+        yAxisMax
+      );
+      if (isStacked100) {
+        config3.y.tickFmt = (v) => `${Math.round(v * 100)}%`;
+        config3.y.range = () => [0, 1];
+      }
+      return config3;
+    },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [yAxisTitle, yAxisAbbreviation, yAxisScale, yAxisLabelVisibility, yAxisMin, yAxisMax, isStacked100]
   );
   const y2ScaleConfig = (0, react_exports.useMemo)(() => {
     if (y2Enabled) {
@@ -2616,10 +2783,11 @@ var TimeSeriesChartWrapper = (props) => {
   ];
   chartData.fields = filteredChartData.fields;
   chartData.columns = seriesDataFormatted;
+  const normalizedStackMode = stackMode === "stacked" || stackMode === "stacked100" ? stackMode : "auto";
   const seriesOverrides = (0, react_exports.useMemo)(
-    () => getSeriesOverrides(
-      yFields,
-      y2Fields,
+    () => getSeriesOverrides({
+      yfields: yFields,
+      y2fields: y2Fields,
       lineWidth,
       overlayFields,
       y2Enabled,
@@ -2628,8 +2796,11 @@ var TimeSeriesChartWrapper = (props) => {
       lineDashStyle,
       lineDashStylesByField,
       stepPosition,
-      stepPositionsByField
-    ),
+      stepPositionsByField,
+      type: chartType,
+      stackMode: normalizedStackMode,
+      showLines
+    }),
     [
       yFields,
       y2Fields,
@@ -2641,7 +2812,10 @@ var TimeSeriesChartWrapper = (props) => {
       lineDashStyle,
       lineDashStylesByField,
       stepPosition,
-      stepPositionsByField
+      stepPositionsByField,
+      chartType,
+      normalizedStackMode,
+      showLines
     ]
   );
   const chartingEventAnnotations = (0, react_exports.useMemo)(
@@ -2709,50 +2883,54 @@ var TimeSeriesChartWrapper = (props) => {
   react_exports.useEffect(() => {
     additionalTooltipValuesRef.current = additionalTooltipValues;
   }, [additionalTooltipValues]);
+  const handleCrosshairMouseout = react_exports.useCallback(() => {
+    if (onPointMouseOut && lastPayloadRef.current) {
+      onPointMouseOut({
+        type: "point.mouseout",
+        originalEvent: lastOriginalEventRef.current,
+        payload: lastPayloadRef.current
+      });
+    }
+    previousMouseoverPayloadRef.current = null;
+  }, [onPointMouseOut]);
   const handleChartCrosshairChange = react_exports.useCallback(
     (event) => {
-      if (onPointMouseOver || onPointMouseOut) {
-        if (!event) {
-          if (onPointMouseOut && lastPayloadRef.current) {
-            onPointMouseOut({
-              type: "point.mouseout",
-              originalEvent: lastOriginalEventRef.current,
-              payload: lastPayloadRef.current
-            });
-          }
-          previousMouseoverPayloadRef.current = null;
-          return;
-        }
-        const payload = __spreadProps(__spreadValues({}, (0, lodash_exports.pick)(event, "value", "seriesKey", "time", "index", "seriesIndex")), {
-          name: event.seriesKey
+      if (!onPointMouseOver && !onPointMouseOut) {
+        return;
+      }
+      if (!event) {
+        handleCrosshairMouseout();
+        return;
+      }
+      const payload = __spreadProps(__spreadValues({}, (0, lodash_exports.pick)(event, "value", "seriesKey", "time", "index", "seriesIndex")), {
+        name: event.seriesKey
+      });
+      delete payload.seriesKey;
+      if (event.rowContext) {
+        Object.assign(
+          payload,
+          Object.keys(event.rowContext).reduce((acc, fieldName) => {
+            acc[`row.${fieldName}.value`] = event.rowContext[fieldName];
+            return acc;
+          }, {})
+        );
+      }
+      const updatedPayload = appendTrellisToPayload(payload, trellisKey, trellisSplitBy);
+      if (!hasMouseoverPayloadChanged(updatedPayload, previousMouseoverPayloadRef.current)) {
+        return;
+      }
+      lastPayloadRef.current = updatedPayload;
+      lastOriginalEventRef.current = event;
+      previousMouseoverPayloadRef.current = __spreadValues({}, updatedPayload);
+      if (onPointMouseOver) {
+        onPointMouseOver({
+          type: "point.mouseover",
+          originalEvent: event,
+          payload: updatedPayload
         });
-        delete payload.seriesKey;
-        if (event.rowContext) {
-          Object.assign(
-            payload,
-            Object.keys(event.rowContext).reduce((acc, fieldName) => {
-              acc[`row.${fieldName}.value`] = event.rowContext[fieldName];
-              return acc;
-            }, {})
-          );
-        }
-        const updatedPayload = appendTrellisToPayload(payload, trellisKey, trellisSplitBy);
-        if (!hasMouseoverPayloadChanged(updatedPayload, previousMouseoverPayloadRef.current)) {
-          return;
-        }
-        lastPayloadRef.current = updatedPayload;
-        lastOriginalEventRef.current = event;
-        previousMouseoverPayloadRef.current = __spreadValues({}, updatedPayload);
-        if (onPointMouseOver) {
-          onPointMouseOver({
-            type: "point.mouseover",
-            originalEvent: event,
-            payload: updatedPayload
-          });
-        }
       }
     },
-    [onPointMouseOver, onPointMouseOut, trellisKey, trellisSplitBy]
+    [onPointMouseOver, onPointMouseOut, trellisKey, trellisSplitBy, handleCrosshairMouseout]
   );
   const dataKey = `${(_b = chartData.columns[0]) == null ? void 0 : _b[0]}-${(_c = chartData.columns[0]) == null ? void 0 : _c[chartData.columns[0].length - 1]}-${(_d = chartData.columns[0]) == null ? void 0 : _d.length}`;
   const memoizedChart = (0, react_exports.useMemo)(() => {
@@ -2807,7 +2985,8 @@ var TimeSeriesChartWrapper = (props) => {
         showXAxisLine,
         showYAxisLine,
         showY2AxisLine,
-        xAxisMaxLabelParts
+        xAxisMaxLabelParts,
+        areaOpacity: areaOpacityForCanvas
       }
     ));
   }, [
@@ -2859,7 +3038,8 @@ var TimeSeriesChartWrapper = (props) => {
     showYAxisLine,
     showY2AxisLine,
     legendMode,
-    xAxisMaxLabelParts
+    xAxisMaxLabelParts,
+    areaOpacityForCanvas
   ]);
   const memoizedVisualization = (0, react_exports.useMemo)(() => {
     return /* @__PURE__ */ react_exports.createElement(VizStyleWrapper_default, { backgroundColor: bgColor }, memoizedChart);
@@ -2887,6 +3067,37 @@ var TimeSeriesChartWrapper_default = TimeSeriesChartWrapper;
 
 // src/common/withDashboardViz.tsx
 var SanitizedTimeSeriesChartWrapper = (0, SanitizeProps_exports.withSanitizedProps)(TimeSeriesChartWrapper_default);
+var buildEventCallbackProps = (supportedEvents, evaluatedOptionsToUse, onEventTrigger) => {
+  const result = {};
+  Object.keys(supportedEvents).forEach((eventName) => {
+    const { parentKeys, payloadKeys } = supportedEvents[eventName];
+    const eventCallbackPropName = (0, lodash_exports.camelCase)(`on.${eventName}`);
+    let payload = {};
+    if (Array.isArray(payloadKeys) && payloadKeys.length) {
+      payloadKeys.forEach((p) => {
+        payload[p] = evaluatedOptionsToUse[p];
+      });
+    }
+    result[eventCallbackPropName] = (ev) => {
+      if (ev == null ? void 0 : ev.payload) {
+        payload = __spreadValues({}, ev.payload);
+      }
+      return onEventTrigger({
+        originalEvent: ev,
+        payload,
+        type: eventName
+      });
+    };
+    if (parentKeys) {
+      for (let i = parentKeys.length - 1; i >= 0; i -= 1) {
+        const newObject = {};
+        newObject[parentKeys[i]] = result[eventCallbackPropName];
+        result[eventCallbackPropName] = newObject;
+      }
+    }
+  });
+  return result;
+};
 var withDashboardViz = (opts) => {
   const {
     ReactViz,
@@ -2944,9 +3155,7 @@ var withDashboardViz = (opts) => {
     const isDownsamplingEnabledByFeatureFlag = Boolean(
       featureFlagContext == null ? void 0 : featureFlagContext.visualizations_enableDownsampling
     );
-    const isTrellisFeatureFlagOn2 = Boolean(
-      featureFlagContext && featureFlagContext.visualizations_enableTrellis
-    );
+    const isTrellisFeatureFlagOn2 = Boolean(featureFlagContext == null ? void 0 : featureFlagContext.visualizations_enableTrellis);
     const isTrellisOn = isTrellisFeatureFlagOn2 && ((_a = vizConfig == null ? void 0 : vizConfig.supports) == null ? void 0 : _a.includes("trellis" /* TRELLIS */)) && (options == null ? void 0 : options.splitByLayout) === "trellis" /* TRELLIS */;
     const isAcceleratedRenderFeatureFlagOn = Boolean(
       featureFlagContext == null ? void 0 : featureFlagContext.visualizations_enableAcceleratedRender
@@ -3111,38 +3320,12 @@ var withDashboardViz = (opts) => {
         }
       );
     }
-    const eventCallbackProps = {};
-    if (hasEventHandlers && mode === "view" && vizConfig.supports.indexOf("events" /* EVENTS */) > -1) {
-      const supportedEvents = vizConfig.events;
-      Object.keys(supportedEvents).forEach((eventName) => {
-        const { parentKeys, payloadKeys } = supportedEvents[eventName];
-        const eventCallbackPropName = (0, lodash_exports.camelCase)(`on.${eventName}`);
-        let payload = {};
-        if (Array.isArray(payloadKeys) && payloadKeys.length) {
-          payloadKeys.forEach((p) => {
-            payload[p] = evaluatedOptionsToUse[p];
-          });
-        }
-        eventCallbackProps[eventCallbackPropName] = (ev) => {
-          if (ev == null ? void 0 : ev.payload) {
-            payload = __spreadValues({}, ev.payload);
-          }
-          return onEventTrigger({
-            originalEvent: ev,
-            payload,
-            type: eventName
-          });
-        };
-        if (parentKeys) {
-          for (let i = parentKeys.length - 1; i >= 0; i -= 1) {
-            const newObject = {};
-            newObject[parentKeys[i]] = eventCallbackProps[eventCallbackPropName];
-            eventCallbackProps[eventCallbackPropName] = newObject;
-          }
-        }
-      });
-    }
-    const computedVizProps = computeVizProps2(__spreadProps(__spreadValues(__spreadValues(__spreadValues({}, props), evaluatedOptionsToUse), eventCallbackProps), {
+    const eventCallbackProps = hasEventHandlers && mode === "view" && vizConfig.supports.includes("events" /* EVENTS */) ? buildEventCallbackProps(vizConfig.events, evaluatedOptionsToUse, onEventTrigger) : {};
+    const computedVizProps = computeVizProps2(__spreadProps(__spreadValues(__spreadProps(__spreadValues(__spreadValues({}, props), evaluatedOptionsToUse), {
+      // Align option transformation with the actual renderer selected below.
+      // This prevents canvas-only option preservation from leaking into Highcharts mode.
+      isAcceleratedRenderOn
+    }), eventCallbackProps), {
       themeFunc
     }));
     if (useAsyncEvaluatedOptions && Object.keys(evaluatedOptionsToUse).length === 0) {
@@ -3176,9 +3359,9 @@ var colorConstants_exports = {};
 __export(colorConstants_exports, {
   default: () => colorConstants_default
 });
-var defaultImport33 = __toESM(require("@splunk/visualizations-shared/colorConstants"));
+var defaultImport35 = __toESM(require("@splunk/visualizations-shared/colorConstants"));
 __reExport(colorConstants_exports, require("@splunk/visualizations-shared/colorConstants"));
-var colorConstants_default = "default" in defaultImport33 ? defaultImport33.default : defaultImport33;
+var colorConstants_default = "default" in defaultImport35 ? defaultImport35.default : defaultImport35;
 
 // src/common/gaugeUtils.ts
 var GAUGE_THICKNESS = 50;
@@ -3675,9 +3858,9 @@ var format_exports = {};
 __export(format_exports, {
   default: () => format_default
 });
-var defaultImport34 = __toESM(require("@splunk/ui-utils/format"));
+var defaultImport36 = __toESM(require("@splunk/ui-utils/format"));
 __reExport(format_exports, require("@splunk/ui-utils/format"));
-var format_default = "default" in defaultImport34 ? defaultImport34.default : defaultImport34;
+var format_default = "default" in defaultImport36 ? defaultImport36.default : defaultImport36;
 
 // src/common/GaugeValueMarker.jsx
 var MARKER_THICKNESS = 15;
@@ -4022,29 +4205,76 @@ var Paginator_exports = {};
 __export(Paginator_exports, {
   default: () => Paginator_default
 });
-var defaultImport35 = __toESM(require("@splunk/react-ui/Paginator"));
+var defaultImport37 = __toESM(require("@splunk/react-ui/Paginator"));
 __reExport(Paginator_exports, require("@splunk/react-ui/Paginator"));
-var Paginator_default = "default" in defaultImport35 ? defaultImport35.default : defaultImport35;
+var Paginator_default = "default" in defaultImport37 ? defaultImport37.default : defaultImport37;
 
 // esm-externals:@splunk/themes
 var themes_exports = {};
 __export(themes_exports, {
   default: () => themes_default
 });
-var defaultImport36 = __toESM(require("@splunk/themes"));
+var defaultImport38 = __toESM(require("@splunk/themes"));
 __reExport(themes_exports, require("@splunk/themes"));
-var themes_default = "default" in defaultImport36 ? defaultImport36.default : defaultImport36;
+var themes_default = "default" in defaultImport38 ? defaultImport38.default : defaultImport38;
 
 // esm-externals:@splunk/themes/useSplunkTheme
 var useSplunkTheme_exports = {};
 __export(useSplunkTheme_exports, {
   default: () => useSplunkTheme_default
 });
-var defaultImport37 = __toESM(require("@splunk/themes/useSplunkTheme"));
+var defaultImport39 = __toESM(require("@splunk/themes/useSplunkTheme"));
 __reExport(useSplunkTheme_exports, require("@splunk/themes/useSplunkTheme"));
-var useSplunkTheme_default = "default" in defaultImport37 ? defaultImport37.default : defaultImport37;
+var useSplunkTheme_default = "default" in defaultImport39 ? defaultImport39.default : defaultImport39;
 
 // src/common/hocs/withTrellis.tsx
+var evaluatePanelOption = (panelDataSources, allOptions, optionKey, vizContext) => {
+  try {
+    const evaluated = Options_exports.Options.evaluate({ context: vizContext, options: allOptions }, panelDataSources);
+    const num = Number(evaluated == null ? void 0 : evaluated[optionKey]);
+    return Number.isNaN(num) ? Number.NaN : num;
+  } catch (e) {
+    return Number.NaN;
+  }
+};
+var sortTrellisKeys = (keys, trellisSortBy, trellisSortOrder, modifiedDataSourceBySplitBy, mergedOptions, vizContext) => {
+  if (trellisSortBy === "name") {
+    keys.sort((a, b) => {
+      const cmp = a.localeCompare(b, void 0, { numeric: true, sensitivity: "base" });
+      return trellisSortOrder === "descending" ? -cmp : cmp;
+    });
+  } else if (trellisSortBy === "value" || trellisSortBy === "trend") {
+    let optionKey;
+    if (trellisSortBy === "trend") {
+      optionKey = "trendValue";
+    } else {
+      optionKey = mergedOptions.value !== void 0 ? "value" : "majorValue";
+    }
+    keys.sort((a, b) => {
+      const valA = evaluatePanelOption(
+        modifiedDataSourceBySplitBy[a],
+        mergedOptions,
+        optionKey,
+        vizContext
+      );
+      const valB = evaluatePanelOption(
+        modifiedDataSourceBySplitBy[b],
+        mergedOptions,
+        optionKey,
+        vizContext
+      );
+      const nanA = Number.isNaN(valA);
+      const nanB = Number.isNaN(valB);
+      if (nanA && nanB) return 0;
+      if (nanA) return 1;
+      if (nanB) return -1;
+      const cmp = valA - valB;
+      return trellisSortOrder === "descending" ? -cmp : cmp;
+    });
+  } else if (trellisSortOrder === "descending") {
+    keys.reverse();
+  }
+};
 var TrellisContainer = styled_components_default.div`
     overflow: hidden;
     display: flex;
@@ -4089,6 +4319,14 @@ var showErrorMessage = (errorCode, width, height) => {
   }
   return /* @__PURE__ */ react_exports.createElement(Message_default, { width, height, message: (0, i18n_exports._)("Error render in trellis"), level: "info" });
 };
+var resolveTrellisSplitBy = (trellisSplitBy, fields) => {
+  var _a;
+  if (trellisSplitBy && trellisSplitBy.length > 0) {
+    return trellisSplitBy;
+  }
+  const splitByPossibleFields = (0, trellisUtils_exports.getAllPossibleSplitByFields)(fields);
+  return ((_a = splitByPossibleFields.fields) == null ? void 0 : _a.length) ? splitByPossibleFields.fields[0] : AGGREGATIONS;
+};
 var withTrellis = (Viz) => {
   const VizWithTrellis = (opts) => {
     const cachedHandleResize = react_exports.useCallback((w, h) => {
@@ -4097,7 +4335,7 @@ var withTrellis = (Viz) => {
     }, []);
     const [containerWidth, setContainerWidth] = react_exports.useState(Number(opts.width));
     const [containerHeight, setContainerHeight] = react_exports.useState(Number(opts.height));
-    const _a = opts, { options = {}, height, width } = _a, otherProps = __objRest(_a, ["options", "height", "width"]);
+    const _a = opts, { options = {}, context = {}, height, width } = _a, otherProps = __objRest(_a, ["options", "context", "height", "width"]);
     const defaultOptions = (0, JSONSchemaUtils_exports.pickFieldFromJSONSchema)(Viz.config.optionsSchema, "default");
     const mergedOptions = (0, hocUtils_exports.deepMergeWithArrayPrimitiveOverrides)({}, options, defaultOptions);
     const {
@@ -4107,6 +4345,8 @@ var withTrellis = (Viz) => {
       trellisRowHeight,
       splitByLayout,
       trellisSplitBy,
+      trellisSortBy,
+      trellisSortOrder,
       trellisSharedScale,
       stackMode,
       yAxisMin,
@@ -4175,7 +4415,7 @@ var withTrellis = (Viz) => {
     }, [pageCount, trellisSplitBy]);
     (0, react_exports.useEffect)(() => {
       updateDataDisplay(pageNum);
-    }, [columns, fields, trellisSplitBy, pageNum, splitByLayout]);
+    }, [columns, fields, trellisSplitBy, trellisSortBy, trellisSortOrder, pageNum, splitByLayout]);
     const handlePageChange = (0, react_exports.useCallback)(
       (event, { page }) => {
         setPageNum(page);
@@ -4183,9 +4423,7 @@ var withTrellis = (Viz) => {
       [pageNum, pagedData]
     );
     const featureFlagContext = react_exports.useContext(FeatureFlagContext_default);
-    const isTrellisFeatureFlagOn2 = Boolean(
-      featureFlagContext && featureFlagContext.visualizations_enableTrellis
-    );
+    const isTrellisFeatureFlagOn2 = Boolean(featureFlagContext == null ? void 0 : featureFlagContext.visualizations_enableTrellis);
     if (!isTrellisFeatureFlagOn2 || !splitByLayout || splitByLayout !== visualization_schemas_exports.LAYOUT_TYPE.Trellis) {
       return /* @__PURE__ */ react_exports.createElement(Viz, __spreadValues({}, opts));
     }
@@ -4193,14 +4431,9 @@ var withTrellis = (Viz) => {
       if (noColumns || noFields) {
         return /* @__PURE__ */ react_exports.createElement(Message_default, { width, height, message: (0, i18n_exports._)("Loading"), level: "info" });
       }
-      let currTrellisSplitBy = trellisSplitBy;
-      if (!trellisSplitBy || trellisSplitBy.length === 0) {
-        const splitByPossibleFields = (0, trellisUtils_exports.getAllPossibleSplitByFields)(fields);
-        currTrellisSplitBy = splitByPossibleFields.fields && splitByPossibleFields.fields.length ? splitByPossibleFields.fields[0] : AGGREGATIONS;
-      }
-      const splitMode = (0, trellisUtils_exports.getTrellisDataSplitterMode)(fields);
+      const currTrellisSplitBy = resolveTrellisSplitBy(trellisSplitBy, fields);
       const dataSplitResult = getTrellisDataSourcesBySplitMode(
-        splitMode,
+        (0, trellisUtils_exports.getTrellisDataSplitterMode)(fields),
         dataSources,
         currTrellisSplitBy
       );
@@ -4209,12 +4442,19 @@ var withTrellis = (Viz) => {
       if (!modifiedDataSourceBySplitBy || Object.keys(modifiedDataSourceBySplitBy).length === 0 || dataSplitErrorCode) {
         return showErrorMessage(dataSplitErrorCode, width, height);
       }
-      const splitByKeysModified = modifiedDataSourceBySplitBy ? Object.keys(modifiedDataSourceBySplitBy) : [];
-      if (splitByKeysModified) {
-        showPaginator = splitByKeysModified.length > pageCount;
-        splitByKeys = splitByKeysModified;
-        totalPages = splitByKeysModified ? Math.ceil(splitByKeysModified.length / pageCount) : 0;
-      }
+      const splitByKeysModified = Object.keys(modifiedDataSourceBySplitBy);
+      const vizContext = (0, lodash_exports.defaultsDeep)({}, context, Viz.config.defaultContext);
+      sortTrellisKeys(
+        splitByKeysModified,
+        trellisSortBy,
+        trellisSortOrder,
+        modifiedDataSourceBySplitBy,
+        mergedOptions,
+        vizContext
+      );
+      showPaginator = splitByKeysModified.length > pageCount;
+      splitByKeys = splitByKeysModified;
+      totalPages = Math.ceil(splitByKeysModified.length / pageCount);
       const [calculatedMin, calculatedMax] = determineMinMax(
         modifiedDataSourceBySplitBy,
         trellisSharedScale,
@@ -4248,6 +4488,7 @@ var withTrellis = (Viz) => {
           /* @__PURE__ */ react_exports.createElement(
             Viz,
             __spreadProps(__spreadValues({}, otherProps), {
+              context,
               trellisKey: splitByKey,
               trellisSplitBy: currTrellisSplitBy,
               dataSources: modifiedDataSourceBySplitBy[splitByKey],