@splunk/visualizations 28.5.3 → 28.7.0

package/SingleValue.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 = {}))
@@ -196,8 +197,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,
     {
@@ -327,7 +347,7 @@ var computeColors = (props, defaultColors) => {
     trendDisplay: props.trendDisplay,
     defaultColors
   });
-  const underLabelColor = majorColor;
+  const underLabelColor = getFormattedColor(props.underLabelColor, majorColor);
   return {
     backgroundColor,
     backgroundEnabled,
@@ -614,6 +634,15 @@ var adjustRGB = (rgb, delta) => {
   }
   return rgb;
 };
+var getUnchangedColorDelta = (r, g, b, ratio) => {
+  if (r === 0 && g === 0 && b === 0) {
+    return ratio > 1 ? 80 : 40;
+  }
+  if (r === 255 && g === 255 && b === 255) {
+    return ratio > 1 ? 20 : 80;
+  }
+  return 20;
+};
 var changeColor = (color, ratio) => {
   const hex = color.replace(/(0x|#)/, "");
   const r = parseInt(hex.substr(0, 2), 16);
@@ -623,31 +652,10 @@ var changeColor = (color, ratio) => {
   let newG = Math.max(Math.min(Math.floor(g * ratio), 255), 0);
   let newB = Math.max(Math.min(Math.floor(b * ratio), 255), 0);
   if (newR === r && newG === g && newB === b) {
-    if (newR === 0 && newG === 0 && newB === 0) {
-      if (ratio > 1) {
-        newR = adjustRGB(newR, 80);
-        newG = adjustRGB(newG, 80);
-        newB = adjustRGB(newB, 80);
-      } else {
-        newR = adjustRGB(newR, 40);
-        newG = adjustRGB(newG, 40);
-        newB = adjustRGB(newB, 40);
-      }
-    } else if (newR === 255 && newG === 255 && newB === 255) {
-      if (ratio > 1) {
-        newR = adjustRGB(newR, 20);
-        newG = adjustRGB(newG, 20);
-        newB = adjustRGB(newB, 20);
-      } else {
-        newR = adjustRGB(newR, 80);
-        newG = adjustRGB(newG, 80);
-        newB = adjustRGB(newB, 80);
-      }
-    } else {
-      newR = adjustRGB(newR, 20);
-      newG = adjustRGB(newG, 20);
-      newB = adjustRGB(newB, 20);
-    }
+    const delta = getUnchangedColorDelta(newR, newG, newB, ratio);
+    newR = adjustRGB(newR, delta);
+    newG = adjustRGB(newG, delta);
+    newB = adjustRGB(newB, delta);
   }
   return `#${newR.toString(16).padStart(2, 0)}${newG.toString(16).padStart(2, 0)}${newB.toString(16).padStart(2, 0)}`;
 };
@@ -970,7 +978,7 @@ var defaultImport20 = __toESM(require("@splunk/ui-utils/id"));
 __reExport(id_exports, require("@splunk/ui-utils/id"));
 var id_default = "default" in defaultImport20 ? defaultImport20.default : defaultImport20;
 
-// src/SparkLine/SparkLine.jsx
+// src/SparkLine/SparkLine.tsx
 var StyledSvg = styled_components_default.svg`
     /* For fixing IE11 shows overflow part line issue */
     overflow: hidden;
@@ -982,233 +990,262 @@ var StyledTooltip = styled_components_default.div`
     min-width: 20px;
 `;
 var preventDefault = (e) => e.preventDefault();
-var _SparkLine = class _SparkLine extends react_exports.Component {
-  constructor(props, ...rest) {
-    super(props, ...rest);
-    __publicField(this, "handleCursorMount", (el) => {
-      this.setState({
-        anchor: el
-      });
-    });
-    this.state = {
-      anchor: null,
-      activeIndex: 0,
-      hoveredIndex: null,
-      componentIsFocused: false
-    };
-    this.titleId = (0, id_exports.createDOMID)("sparkline-title");
-    this.pointRefs = [];
-    this.containerRef = react_default.createRef();
-    this.handleKeyDown = this.handleKeyDown.bind(this);
-    this.handleMouseOver = this.handleMouseOver.bind(this);
-    this.handleMouseLeave = this.handleMouseLeave.bind(this);
-    this.handleFocus = this.handleFocus.bind(this);
-    this.handleBlur = this.handleBlur.bind(this);
-  }
-  handleFocus(event) {
-    const { target } = event;
-    const { pointIndex: pointIndexStr } = target.dataset || {};
-    const { activeIndex, componentIsFocused, hoveredIndex } = this.state;
-    if (pointIndexStr !== void 0) {
-      const pointIndex = Number.parseInt(pointIndexStr, 10);
-      if (activeIndex !== pointIndex || !componentIsFocused || hoveredIndex !== null) {
-        this.setState({
-          activeIndex: pointIndex,
-          hoveredIndex: null,
-          componentIsFocused: true
-        });
+var PROP_KEYS = [
+  "acceptNull",
+  "data",
+  "elementRef",
+  "endDotCount",
+  "endDotFillColor",
+  "endDotRadius",
+  "endDotStroke",
+  "endDotStrokeWidth",
+  "fillColor",
+  "fillOpacity",
+  "cursorStroke",
+  "cursorStrokeWidth",
+  "cursorStrokeLinecap",
+  "cursorStrokeDasharray",
+  "height",
+  "isArea",
+  "lineColor",
+  "lineLength",
+  "lineStrokeWidth",
+  "showEndDot",
+  "showTooltip",
+  "yMax",
+  "yMin",
+  "width",
+  "title"
+];
+var SparkLineInner = (_a) => {
+  var _b = _a, {
+    acceptNull = false,
+    data = [],
+    elementRef,
+    endDotCount = 0,
+    endDotFillColor = "white",
+    endDotRadius = 0,
+    endDotStroke = "black",
+    endDotStrokeWidth = 0,
+    fillColor = "#65a637",
+    fillOpacity = ".1",
+    cursorStroke = "#5184AF",
+    cursorStrokeWidth = 3,
+    cursorStrokeLinecap = "square",
+    cursorStrokeDasharray = "1, 5",
+    height,
+    isArea = false,
+    lineColor = "#65a637",
+    lineLength,
+    lineStrokeWidth = 1,
+    showEndDot = false,
+    showTooltip = true,
+    yMax,
+    yMin,
+    width,
+    title
+  } = _b, restProps = __objRest(_b, [
+    "acceptNull",
+    "data",
+    "elementRef",
+    "endDotCount",
+    "endDotFillColor",
+    "endDotRadius",
+    "endDotStroke",
+    "endDotStrokeWidth",
+    "fillColor",
+    "fillOpacity",
+    "cursorStroke",
+    "cursorStrokeWidth",
+    "cursorStrokeLinecap",
+    "cursorStrokeDasharray",
+    "height",
+    "isArea",
+    "lineColor",
+    "lineLength",
+    "lineStrokeWidth",
+    "showEndDot",
+    "showTooltip",
+    "yMax",
+    "yMin",
+    "width",
+    "title"
+  ]);
+  const [anchor, setAnchor] = (0, react_exports.useState)(null);
+  const [activeIndex, setActiveIndex] = (0, react_exports.useState)(0);
+  const [hoveredIndex, setHoveredIndex] = (0, react_exports.useState)(null);
+  const [componentIsFocused, setComponentIsFocused] = (0, react_exports.useState)(false);
+  const titleId = (0, react_exports.useMemo)(() => (0, id_exports.createDOMID)("sparkline-title"), []);
+  const pointRefs = (0, react_exports.useRef)([]);
+  const containerRef = (0, react_exports.useRef)(null);
+  const fillNull = (0, react_exports.useCallback)(() => data.map((value) => value != null ? value : 0), [data]);
+  const getMax = (0, react_exports.useCallback)(() => {
+    const dataMax = () => acceptNull ? (0, lodash_exports.max)(fillNull()) : (0, lodash_exports.max)(data);
+    return yMax != null ? yMax : dataMax();
+  }, [acceptNull, data, fillNull, yMax]);
+  const getMin = (0, react_exports.useCallback)(() => {
+    const dataMin = () => acceptNull ? (0, lodash_exports.min)(fillNull()) : (0, lodash_exports.min)(data);
+    return yMin != null ? yMin : dataMin();
+  }, [acceptNull, data, fillNull, yMin]);
+  const getXUnit = (0, react_exports.useCallback)(
+    (xMargin2) => {
+      const xUnit = (width - xMargin2 * 2) / (data.length > 1 ? data.length - 1 : 1);
+      return Math.max(0, xUnit);
+    },
+    [data.length, width]
+  );
+  const getYUnit = (0, react_exports.useCallback)(
+    (yMargin2) => {
+      const maxValue = getMax();
+      const minValue = getMin();
+      const yUnit = (height - yMargin2 * 2) / (maxValue - minValue || 2);
+      return Math.max(0, yUnit);
+    },
+    [getMax, getMin, height]
+  );
+  const getSegmentSets = (0, react_exports.useCallback)(
+    (segmentData, points2) => {
+      const lines = [];
+      const isolatedPoints = [];
+      let currentLine = [];
+      for (const [idx, p] of segmentData.entries()) {
+        if (!acceptNull && (0, lodash_exports.isNull)(p)) {
+          if (currentLine.length > 1) {
+            lines.push(currentLine);
+          } else if (currentLine.length === 1) {
+            isolatedPoints.push(currentLine[0]);
+          }
+          currentLine = [];
+        } else {
+          currentLine.push(points2[idx]);
+        }
       }
-    } else if (this.pointRefs.length > 0) {
-      const indexToFocus = activeIndex ? Math.min(this.pointRefs.length - 1, activeIndex) : 0;
-      this.pointRefs[indexToFocus].focus();
-    }
-  }
-  handleBlur(event) {
-    if (this.containerRef.current && !this.containerRef.current.contains(event.relatedTarget)) {
-      this.setState({ componentIsFocused: false });
-    }
-  }
-  handleKeyDown(event) {
-    const { data } = this.props;
-    const { activeIndex } = this.state;
-    const numPoints = data.length;
-    if (numPoints === 0) {
-      return;
-    }
-    const allowedKeys = ["ArrowLeft", "ArrowRight", "Home", "End"];
-    if (!allowedKeys.includes(event.key)) {
-      return;
+      if (currentLine.length > 1) {
+        lines.push(currentLine);
+      } else if (currentLine.length === 1) {
+        isolatedPoints.push(currentLine[0]);
+      }
+      return { lines, isolatedPoints };
+    },
+    [acceptNull]
+  );
+  const dataToPoints = (0, react_exports.useCallback)(
+    (xMargin2, yMargin2) => {
+      const xUnit = getXUnit(xMargin2);
+      const yUnit = getYUnit(yMargin2);
+      const maxValue = getMax();
+      const minValue = getMin();
+      return data.map((val, idx) => ({
+        x: idx * xUnit + xMargin2,
+        y: maxValue === minValue ? yUnit + yMargin2 : (maxValue - val) * yUnit + yMargin2
+      })).map((p) => [p.x, p.y]);
+    },
+    [data, getMax, getMin, getXUnit, getYUnit]
+  );
+  const handleFocus = (0, react_exports.useCallback)(
+    (event) => {
+      const { target } = event;
+      const { pointIndex: pointIndexStr } = target.dataset || {};
+      if (pointIndexStr !== void 0) {
+        const pointIndex = Number.parseInt(pointIndexStr, 10);
+        if (activeIndex !== pointIndex || !componentIsFocused || hoveredIndex !== null) {
+          setActiveIndex(pointIndex);
+          setHoveredIndex(null);
+          setComponentIsFocused(true);
+        }
+      } else if (pointRefs.current.length > 0) {
+        const indexToFocus = activeIndex ? Math.min(pointRefs.current.length - 1, activeIndex) : 0;
+        pointRefs.current[indexToFocus].focus();
+      }
+    },
+    [activeIndex, componentIsFocused, hoveredIndex]
+  );
+  const handleBlur = (0, react_exports.useCallback)((event) => {
+    if (containerRef.current && !containerRef.current.contains(event.relatedTarget)) {
+      setComponentIsFocused(false);
     }
-    let newIndex;
-    switch (event.key) {
-      case "Home":
+  }, []);
+  const handleKeyDown = (0, react_exports.useCallback)(
+    (event) => {
+      const numPoints = data.length;
+      const allowedKeys = ["ArrowLeft", "ArrowRight", "Home", "End"];
+      if (!allowedKeys.includes(event.key)) {
+        return;
+      }
+      let newIndex;
+      if (event.key === "Home") {
         newIndex = 0;
-        break;
-      case "End":
+      } else if (event.key === "End") {
         newIndex = numPoints - 1;
-        break;
-      case "ArrowLeft":
+      } else if (event.key === "ArrowLeft") {
         newIndex = Math.max(0, activeIndex - 1);
-        break;
-      case "ArrowRight":
+      } else {
         newIndex = Math.min(numPoints - 1, activeIndex + 1);
-        break;
-      default:
-        return;
-    }
-    if (newIndex !== activeIndex) {
-      event.preventDefault();
-      if (this.pointRefs[newIndex]) {
-        this.pointRefs[newIndex].focus();
       }
-    }
-  }
-  handleMouseOver(event) {
-    const pointIndexStr = event.target.dataset && event.target.dataset.pointIndex;
-    if (pointIndexStr !== void 0) {
-      const pointIndex = Number.parseInt(pointIndexStr, 10);
-      if (this.state.hoveredIndex !== pointIndex) {
-        this.setState({ hoveredIndex: pointIndex });
+      if (newIndex !== activeIndex) {
+        event.preventDefault();
+        if (pointRefs.current[newIndex]) {
+          pointRefs.current[newIndex].focus();
+        }
       }
-    }
-  }
-  handleMouseLeave() {
-    if (this.state.hoveredIndex !== null) {
-      this.setState({ hoveredIndex: null });
-    }
-  }
-  getMax() {
-    const { data, acceptNull, yMax } = this.props;
-    const dataMax = () => acceptNull ? (0, lodash_exports.max)(this.fillNull()) : (0, lodash_exports.max)(data);
-    return yMax === void 0 ? dataMax() : yMax;
-  }
-  getMin() {
-    const { data, acceptNull, yMin } = this.props;
-    const dataMin = () => acceptNull ? (0, lodash_exports.min)(this.fillNull()) : (0, lodash_exports.min)(data);
-    return yMin === void 0 ? dataMin() : yMin;
-  }
-  /**
-   * Gets unit value of x axis.
-   * @param {Number} xMargin - margin of x axis.
-   * @return {Number} unit value of x axis.
-   * @private
-   */
-  getXUnit(xMargin) {
-    const { data, width } = this.props;
-    const xUnit = (width - xMargin * 2) / (data.length > 1 ? data.length - 1 : 1);
-    return Math.max(0, xUnit);
-  }
-  /**
-   * Gets unit value of y axis.
-   * @param {String} yMargin - margin of y axis.
-   * @return {Number} unit value of y axis.
-   * @private
-   */
-  getYUnit(yMargin) {
-    const { height } = this.props;
-    const maxValue = this.getMax();
-    const minValue = this.getMin();
-    const yUnit = (height - yMargin * 2) / (maxValue - minValue || 2);
-    return Math.max(0, yUnit);
-  }
-  /**
-   * Get a list of arrays of points for drawing lines, based on acceptNull property
-   * @method getSegmentSets
-   * @param {Array} data
-   * @param {Array} points
-   * @returns {Object} Object containing lines (arrays of points for polylines) and isolatedPoints (single points surrounded by nulls)
-   */
-  getSegmentSets(data, points) {
-    const { acceptNull } = this.props;
-    const lines = [];
-    const isolatedPoints = [];
-    let currentLine = [];
-    for (const [idx, p] of data.entries()) {
-      if (!acceptNull && (0, lodash_exports.isNull)(p)) {
-        if (currentLine.length > 1) {
-          lines.push(currentLine);
-        } else if (currentLine.length === 1) {
-          isolatedPoints.push(currentLine[0]);
+    },
+    [activeIndex, data.length]
+  );
+  const handleMouseOver = (0, react_exports.useCallback)(
+    (event) => {
+      var _a2;
+      const pointIndexStr = (_a2 = event.target.dataset) == null ? void 0 : _a2.pointIndex;
+      if (pointIndexStr !== void 0) {
+        const pointIndex = Number.parseInt(pointIndexStr, 10);
+        if (hoveredIndex !== pointIndex) {
+          setHoveredIndex(pointIndex);
         }
-        currentLine = [];
-      } else {
-        currentLine.push(points[idx]);
       }
+    },
+    [hoveredIndex]
+  );
+  const handleMouseLeave = (0, react_exports.useCallback)(() => {
+    if (hoveredIndex !== null) {
+      setHoveredIndex(null);
     }
-    if (currentLine.length > 1) {
-      lines.push(currentLine);
-    } else if (currentLine.length === 1) {
-      isolatedPoints.push(currentLine[0]);
-    }
-    return { lines, isolatedPoints };
-  }
-  /**
-   * Utility for fill null value with number 0.
-   * @private
-   */
-  fillNull() {
-    const { data } = this.props;
-    return data.map((value) => value === null ? 0 : value);
-  }
-  /**
-   * Converts data to points in svg
-   * @param {Number} xMargin - margin of x axis.
-   * @param {Number} yMargin - margin of x axis.
-   * @return {Array} points coordination.
-   * @private
-   */
-  dataToPoints(xMargin, yMargin) {
-    const { data } = this.props;
-    const xUnit = this.getXUnit(xMargin);
-    const yUnit = this.getYUnit(yMargin);
-    const maxValue = this.getMax();
-    const minValue = this.getMin();
-    return data.map((val, idx) => ({
-      x: idx * xUnit + xMargin,
-      y: maxValue === minValue ? yUnit + yMargin : (maxValue - val) * yUnit + yMargin
-    })).map((p) => [p.x, p.y]);
-  }
-  /**
-   * Renders rect area for each datapoint for interactions and screen reader support
-   * @param {Array} points - array of points coordination.
-   * @param {Number} xMargin - margin of x axis.
-   * @return {Array} array of svg rect objects
-   * @private
-   */
-  renderRect(points, xMargin) {
-    const { data, height, showTooltip } = this.props;
-    const xUnit = this.getXUnit(xMargin);
-    return points.map((p, i) => (
-      /* eslint-disable react/no-array-index-key */
-      /* @__PURE__ */ react_default.createElement(
-        "rect",
-        {
-          key: `${i}_${p[0]}`,
-          role: "graphics-symbol",
-          "aria-label": `Value: ${data[i] === null ? "N/A" : data[i]}, point ${i + 1} of ${data.length}`,
-          "data-test": `rect-${i}`,
-          "data-point-index": i,
-          tabIndex: showTooltip && this.state.activeIndex === i ? 0 : -1,
-          ref: (el) => {
-            this.pointRefs[i] = el;
-          },
-          x: Math.max(0, p[0] - xUnit / 2),
-          y: 0,
-          width: i === 0 && data.length !== 1 ? xUnit / 2 : xUnit,
-          height,
-          style: { fillOpacity: 0 },
-          onMouseDown: preventDefault
-        }
-      )
-    ));
-  }
-  // Renders area chart
-  renderArea(points) {
-    const { data, fillColor, fillOpacity, height, isArea } = this.props;
-    if (!isArea || points.length === 0) {
+  }, [hoveredIndex]);
+  const handleCursorMount = (0, react_exports.useCallback)((el) => {
+    setAnchor(el);
+  }, []);
+  const renderRect = (points2, xMargin2) => {
+    const xUnit = getXUnit(xMargin2);
+    return points2.map((p, i) => {
+      var _a2;
+      return (
+        /* eslint-disable react/no-array-index-key */
+        /* @__PURE__ */ react_default.createElement(
+          "rect",
+          {
+            key: `${i}_${p[0]}`,
+            role: "graphics-symbol",
+            "aria-label": `Value: ${(_a2 = data[i]) != null ? _a2 : "N/A"}, point ${i + 1} of ${data.length}`,
+            "data-test": `rect-${i}`,
+            "data-point-index": i,
+            tabIndex: showTooltip && activeIndex === i ? 0 : -1,
+            ref: (el) => {
+              pointRefs.current[i] = el;
+            },
+            x: Math.max(0, p[0] - xUnit / 2),
+            y: 0,
+            width: i === 0 && data.length !== 1 ? xUnit / 2 : xUnit,
+            height,
+            style: { fillOpacity: 0 },
+            onMouseDown: preventDefault
+          }
+        )
+      );
+    });
+  };
+  const renderArea = (points2) => {
+    if (!isArea || points2.length === 0) {
       return null;
     }
-    const { lines } = this.getSegmentSets(data, points);
+    const { lines } = getSegmentSets(data, points2);
     const segments = lines.map(
       (s) => s.concat([
         [s.at(-1)[0], height],
@@ -1232,80 +1269,56 @@ var _SparkLine = class _SparkLine extends react_exports.Component {
         }
       }
     )));
-  }
-  renderCursor(currentPointX, shouldRender) {
-    const { cursorStroke, cursorStrokeWidth, cursorStrokeLinecap, cursorStrokeDasharray, height } = this.props;
-    return shouldRender && /* @__PURE__ */ react_default.createElement(
-      "line",
-      {
-        "data-test": "cursor",
-        ref: this.handleCursorMount,
-        x1: currentPointX,
-        y1: 0,
-        x2: currentPointX,
-        y2: height,
-        style: {
-          stroke: cursorStroke,
-          strokeWidth: cursorStrokeWidth,
-          strokeLinecap: cursorStrokeLinecap,
-          strokeDasharray: cursorStrokeDasharray
-        }
+  };
+  const renderCursor = (currentPointX2, shouldRender) => shouldRender && /* @__PURE__ */ react_default.createElement(
+    "line",
+    {
+      "data-test": "cursor",
+      ref: handleCursorMount,
+      x1: currentPointX2,
+      y1: 0,
+      x2: currentPointX2,
+      y2: height,
+      style: {
+        stroke: cursorStroke,
+        strokeWidth: cursorStrokeWidth,
+        strokeLinecap: cursorStrokeLinecap,
+        strokeDasharray: cursorStrokeDasharray
       }
-    );
-  }
-  renderTooltip(tooltipValue, isOpen) {
-    const { anchor } = this.state;
-    const displayValue = tooltipValue === null ? "-" : tooltipValue;
+    }
+  );
+  const renderTooltip = (tooltipValue2, isOpen) => {
+    const displayValue = tooltipValue2 === null ? "-" : tooltipValue2;
     return /* @__PURE__ */ react_default.createElement(
       Popover_default,
       {
         "data-test": "tooltip",
         open: isOpen,
         anchor,
-        "data-test-value": tooltipValue,
+        "data-test-value": tooltipValue2,
         appearance: "inverted",
         defaultPlacement: "above",
         animation: false
       },
       /* @__PURE__ */ react_default.createElement(StyledTooltip, null, displayValue)
     );
-  }
-  /**
-   * Renders one or more svg circles to highlight values on the sparkline
-   * @method renderEndDots
-   * @param {Array[Array[Number]]} points // x,y coordinates of values
-   * @param {Number} dotsToShow           // number of end dots to display
-   * @param {Number} xMargin              // used when calculating the dot radius
-   * @returns {Object} React representation of SVG group
-   * @private
-   */
-  renderEndDots(points, dotsToShow, xMargin) {
-    const { endDotFillColor, endDotRadius, endDotStroke, endDotStrokeWidth } = this.props;
-    return /* @__PURE__ */ react_default.createElement("g", null, points.slice(-dotsToShow).map((point) => /* @__PURE__ */ react_default.createElement(
-      "circle",
-      {
-        key: `end-dot${point[0]}${point[1]}`,
-        "data-test": "end-dot",
-        cx: point[0],
-        cy: point[1],
-        r: endDotRadius === 0 ? xMargin : endDotRadius,
-        style: {
-          fill: endDotFillColor,
-          stroke: endDotStroke,
-          strokeWidth: endDotStrokeWidth
-        }
+  };
+  const renderEndDots = (points2, dotsToShow2, xMargin2) => /* @__PURE__ */ react_default.createElement("g", null, points2.slice(-dotsToShow2).map((point) => /* @__PURE__ */ react_default.createElement(
+    "circle",
+    {
+      key: `end-dot${point[0]}${point[1]}`,
+      "data-test": "end-dot",
+      cx: point[0],
+      cy: point[1],
+      r: endDotRadius === 0 ? xMargin2 : endDotRadius,
+      style: {
+        fill: endDotFillColor,
+        stroke: endDotStroke,
+        strokeWidth: endDotStrokeWidth
       }
-    )));
-  }
-  /**
-   * Renders circles for isolated points (single data points surrounded by nulls)
-   * These would otherwise be invisible since a line requires at least 2 points
-   * @method renderIsolatedPoints
-   * @param {Array} isolatedPoints - Array of [x, y] coordinates for isolated points
-   * @returns {Object} SVG Group of circles
-   */
-  renderIsolatedPoints(isolatedPoints) {
-    const { lineColor, lineStrokeWidth } = this.props;
+    }
+  )));
+  const renderIsolatedPoints = (isolatedPoints) => {
     if (!isolatedPoints || isolatedPoints.length === 0) {
       return null;
     }
@@ -1323,20 +1336,10 @@ var _SparkLine = class _SparkLine extends react_exports.Component {
         }
       }
     )));
-  }
-  /**
-   * Renders the line(s) above the area graph
-   * @method renderPolyline
-   * @param {Array} points
-   * @returns {Object} SVG Group of polylines and isolated points
-   */
-  renderPolyline(points) {
-    const { data, lineColor, lineLength, lineStrokeWidth } = this.props;
-    const linePoints = (0, lodash_exports.isFinite)(lineLength) && lineLength > 0 ? lineLength : points.length;
-    const { lines, isolatedPoints } = this.getSegmentSets(
-      data.slice(-linePoints),
-      points.slice(-linePoints)
-    );
+  };
+  const renderPolyline = (points2) => {
+    const linePoints = (0, lodash_exports.isFinite)(lineLength) && lineLength > 0 ? lineLength : points2.length;
+    const { lines, isolatedPoints } = getSegmentSets(data.slice(-linePoints), points2.slice(-linePoints));
     return /* @__PURE__ */ react_default.createElement("g", { "data-test": "sparkline" }, lines.map((lineData) => /* @__PURE__ */ react_default.createElement(
       "polyline",
       {
@@ -1351,10 +1354,18 @@ var _SparkLine = class _SparkLine extends react_exports.Component {
         },
         points: lineData.join(" ")
       }
-    )), this.renderIsolatedPoints(isolatedPoints));
-  }
-  getInteractionState({ data, points, showTooltip, activeIndex, hoveredIndex, componentIsFocused }) {
-    if (!showTooltip) {
+    )), renderIsolatedPoints(isolatedPoints));
+  };
+  const getInteractionState = ({
+    interactionData,
+    points: interactionPoints,
+    interactionShowTooltip,
+    interactionActiveIndex,
+    interactionHoveredIndex,
+    interactionComponentIsFocused
+  }) => {
+    var _a2;
+    if (!interactionShowTooltip) {
       return {
         currentPointX: null,
         tooltipValue: null,
@@ -1362,200 +1373,94 @@ var _SparkLine = class _SparkLine extends react_exports.Component {
         interactiveProps: {}
       };
     }
-    const interactiveProps = {
-      onKeyDown: this.handleKeyDown,
-      onMouseOver: this.handleMouseOver,
-      onMouseLeave: this.handleMouseLeave,
-      onFocus: this.handleFocus,
-      onBlur: this.handleBlur
+    const interactiveProps2 = {
+      onKeyDown: handleKeyDown,
+      onMouseOver: handleMouseOver,
+      onMouseLeave: handleMouseLeave,
+      onFocus: handleFocus,
+      onBlur: handleBlur
     };
-    const isHovered = hoveredIndex !== null;
-    const shouldDisplayInteractiveElements = (isHovered || componentIsFocused) && data.length > 0;
+    const isHovered = interactionHoveredIndex !== null;
+    const shouldDisplayInteractiveElements = (isHovered || interactionComponentIsFocused) && interactionData.length > 0;
     if (!shouldDisplayInteractiveElements) {
       return {
         currentPointX: null,
         tooltipValue: null,
         showCursorAndTooltip: false,
-        interactiveProps
+        interactiveProps: interactiveProps2
       };
     }
-    const displayIndex = isHovered ? hoveredIndex : activeIndex;
+    const displayIndex = isHovered ? interactionHoveredIndex : interactionActiveIndex;
     const isValidIndex = displayIndex !== null && displayIndex >= 0;
-    const withinBounds = isValidIndex && displayIndex < data.length && displayIndex < points.length;
+    const withinBounds = isValidIndex && displayIndex < interactionData.length && displayIndex < interactionPoints.length;
     if (!withinBounds) {
       return {
         currentPointX: null,
         tooltipValue: null,
         showCursorAndTooltip: false,
-        interactiveProps
+        interactiveProps: interactiveProps2
       };
     }
-    const displayPointCoords = points[displayIndex];
-    const currentPointX = displayPointCoords ? displayPointCoords[0] : null;
-    const tooltipValue = data[displayIndex];
+    const displayPointCoords = interactionPoints[displayIndex];
+    const currentPointX2 = (_a2 = displayPointCoords == null ? void 0 : displayPointCoords[0]) != null ? _a2 : null;
+    const tooltipValue2 = interactionData[displayIndex];
     return {
-      currentPointX,
-      tooltipValue,
-      showCursorAndTooltip: currentPointX !== null,
-      interactiveProps
+      currentPointX: currentPointX2,
+      tooltipValue: tooltipValue2,
+      showCursorAndTooltip: currentPointX2 !== null,
+      interactiveProps: interactiveProps2
     };
+  };
+  if (data.length === 0) {
+    return null;
   }
-  render() {
-    const {
-      data,
-      elementRef,
-      showTooltip,
-      showEndDot,
-      endDotRadius,
-      endDotStrokeWidth,
-      endDotCount,
-      height,
-      isArea,
-      lineStrokeWidth,
-      width,
-      title
-    } = this.props;
-    const { activeIndex, hoveredIndex, componentIsFocused } = this.state;
-    if (data.length === 0) {
+  if (pointRefs.current.length !== data.length) {
+    pointRefs.current.length = data.length;
+  }
+  const xMargin = endDotRadius + endDotStrokeWidth / 2;
+  const yMargin = Math.max(lineStrokeWidth / 2, endDotRadius + endDotStrokeWidth / 2);
+  const points = dataToPoints(xMargin, yMargin);
+  const dotsToShow = Math.max(showEndDot && 1, (0, lodash_exports.isFinite)(endDotCount) && endDotCount > 0 && endDotCount);
+  const { currentPointX, tooltipValue, showCursorAndTooltip, interactiveProps } = getInteractionState({
+    interactionData: data,
+    points,
+    interactionShowTooltip: showTooltip,
+    interactionActiveIndex: activeIndex,
+    interactionHoveredIndex: hoveredIndex,
+    interactionComponentIsFocused: componentIsFocused
+  });
+  const ariaLabel = title || (0, i18n_exports._)("Source count over time sparkline trend");
+  return /* @__PURE__ */ react_default.createElement(
+    "div",
+    __spreadValues(__spreadValues({
+      "data-test": "line",
+      "data-test-type": isArea ? "area" : "line",
+      ref: (el) => {
+        containerRef.current = el;
+        if (typeof elementRef === "function") {
+          elementRef(el);
+        } else if (elementRef && typeof elementRef === "object") {
+          elementRef.current = el;
+        }
+      }
+    }, interactiveProps), (0, lodash_exports.omit)(restProps, PROP_KEYS)),
+    /* @__PURE__ */ react_default.createElement(StyledSvg, { height, width, "aria-labelledby": titleId, "data-test": "sparkline-svg" }, /* @__PURE__ */ react_default.createElement("title", { id: titleId, "data-test": "sparkline-title" }, ariaLabel), /* @__PURE__ */ react_default.createElement("g", null, showTooltip ? renderCursor(currentPointX, showCursorAndTooltip) : null, renderPolyline(points), renderArea(points), dotsToShow ? renderEndDots(points, dotsToShow, xMargin) : null, renderRect(points, xMargin), showTooltip ? renderTooltip(tooltipValue, showCursorAndTooltip) : null))
+  );
+};
+var SparkLine = (_a) => {
+  var _b = _a, { data = [] } = _b, props = __objRest(_b, ["data"]);
+  if (true) {
+    if (!Array.isArray(data)) {
+      console.error("Data provided to SparkLine must be an array.");
       return null;
     }
-    if (this.pointRefs.length !== data.length) {
-      this.pointRefs.length = data.length;
+    if (!data.every((value) => value === null || (0, lodash_exports.isFinite)(value))) {
+      console.error("Data provided to SparkLine must contain finite numbers or null.");
+      return null;
     }
-    const xMargin = endDotRadius + endDotStrokeWidth / 2;
-    const yMargin = Math.max(lineStrokeWidth / 2, endDotRadius + endDotStrokeWidth / 2);
-    const points = this.dataToPoints(xMargin, yMargin);
-    const dotsToShow = Math.max(showEndDot && 1, (0, lodash_exports.isFinite)(endDotCount) && endDotCount > 0 && endDotCount);
-    const { currentPointX, tooltipValue, showCursorAndTooltip, interactiveProps } = this.getInteractionState({
-      data,
-      points,
-      showTooltip,
-      activeIndex,
-      hoveredIndex,
-      componentIsFocused
-    });
-    const ariaLabel = title || (0, i18n_exports._)("Source count over time sparkline trend");
-    return /* @__PURE__ */ react_default.createElement(
-      "div",
-      __spreadValues(__spreadValues({
-        "data-test": "line",
-        "data-test-type": isArea ? "area" : "line",
-        ref: (el) => {
-          this.containerRef.current = el;
-          if (typeof elementRef === "function") {
-            elementRef(el);
-          } else if (elementRef && typeof elementRef === "object") {
-            elementRef.current = el;
-          }
-        }
-      }, interactiveProps), (0, lodash_exports.omit)(this.props, (0, lodash_exports.keys)(_SparkLine.propTypes))),
-      /* @__PURE__ */ react_default.createElement(
-        StyledSvg,
-        {
-          height,
-          width,
-          "aria-labelledby": this.titleId,
-          "data-test": "sparkline-svg"
-        },
-        /* @__PURE__ */ react_default.createElement("title", { id: this.titleId, "data-test": "sparkline-title" }, ariaLabel),
-        /* @__PURE__ */ react_default.createElement("g", null, showTooltip ? this.renderCursor(currentPointX, showCursorAndTooltip) : null, this.renderPolyline(points), this.renderArea(points), dotsToShow ? this.renderEndDots(points, dotsToShow, xMargin) : null, this.renderRect(points, xMargin), showTooltip ? this.renderTooltip(tooltipValue, showCursorAndTooltip) : null)
-      )
-    );
   }
+  return /* @__PURE__ */ react_default.createElement(SparkLineInner, __spreadValues({ data }, props));
 };
-__publicField(_SparkLine, "propTypes", {
-  /**
-   * If true, data can contain `null` as a value and is treated as `0`. If false, this throws error when data contains `null`.
-   */
-  acceptNull: prop_types_default.bool,
-  /** Array of numbers. These data numbers are converted to points and show on sparkline. */
-  data: (props) => {
-    if (!(0, lodash_exports.isArray)(props.data)) {
-      return new Error("Data provided to Sparkline must be an array.");
-    }
-    if (props.acceptNull && !props.data.every((value) => (0, lodash_exports.isNull)(value) || (0, lodash_exports.isFinite)(value))) {
-      return new Error("Data provided to Sparkline must be finite numbers or null.");
-    }
-    if (!props.acceptNull && !props.data.every((value) => (0, lodash_exports.isFinite)(value))) {
-      return new Error("Data provided to Sparkline must be finite numbers.");
-    }
-    return null;
-  },
-  /** A React ref which is set to the DOM element when the component mounts and `null` when it unmounts. */
-  elementRef: prop_types_default.oneOfType([prop_types_default.func, prop_types_default.object]),
-  /** Sets the number of end dots to display. When showEndDot is set to `true`, endDotCount is at least 1. If set to a positive value, this overrides showEndDot. */
-  endDotCount: prop_types_default.number,
-  /** Fills color to the end dot. */
-  endDotFillColor: prop_types_default.string,
-  /**
-   * Sets end dot radius. End dot radius must be less than or equal to the margin. By default, its value equals the margin.
-   */
-  endDotRadius: prop_types_default.number,
-  /** Sets end dot circle stroke color. */
-  endDotStroke: prop_types_default.string,
-  /** Sets end dot circle stroke width in pixels. */
-  endDotStrokeWidth: prop_types_default.number,
-  /** Fills color to area. */
-  fillColor: prop_types_default.string,
-  /** Fills opacity to area. Value must be in 0 ~ 1. */
-  fillOpacity: prop_types_default.string,
-  /** Sets cursor stroke color. */
-  cursorStroke: prop_types_default.string,
-  /** Sets cursor stroke width in pixels. */
-  cursorStrokeWidth: prop_types_default.number,
-  /** Sets cursor line cap style. */
-  cursorStrokeLinecap: prop_types_default.oneOf(["butt", "round", "square"]),
-  /** Sets cursor dash array style. */
-  cursorStrokeDasharray: prop_types_default.string,
-  /**
-   * Container height. If this value is specified, sparkline calculates the size using this height. If height isn't specified,
-   * sparkline figures out the container height by itself.
-   */
-  height: prop_types_default.number.isRequired,
-  /** When set to `true`, sparkline shows as area. */
-  isArea: prop_types_default.bool,
-  /** The sparkline line color. */
-  lineColor: prop_types_default.string,
-  /** Allows user to draw only the last data points for the line. */
-  lineLength: prop_types_default.number,
-  /** The sparkline line stroke width in pixels. */
-  lineStrokeWidth: prop_types_default.number,
-  /** Enable to show end dot. */
-  showEndDot: prop_types_default.bool,
-  /** Enable to show tooltip. */
-  showTooltip: prop_types_default.bool,
-  /** Sets the data value range and maximum value shown on sparkline. */
-  yMax: prop_types_default.number,
-  /** Sets the data value range and minimum value shown on sparkline. */
-  yMin: prop_types_default.number,
-  /**
-   * The width of the container.
-   */
-  width: prop_types_default.number.isRequired,
-  /** Sets the a11y title text on sparkline. */
-  title: prop_types_default.string
-});
-__publicField(_SparkLine, "defaultProps", {
-  acceptNull: false,
-  data: [],
-  showTooltip: true,
-  endDotCount: 0,
-  showEndDot: false,
-  endDotRadius: 0,
-  endDotFillColor: "white",
-  endDotStroke: "black",
-  endDotStrokeWidth: 0,
-  fillColor: "#65a637",
-  fillOpacity: ".1",
-  cursorStroke: "#5184AF",
-  cursorStrokeWidth: 3,
-  cursorStrokeLinecap: "square",
-  cursorStrokeDasharray: "1, 5",
-  isArea: false,
-  lineColor: "#65a637",
-  lineStrokeWidth: 1
-});
-var SparkLine = _SparkLine;
 var SparkLine_default = SparkLine;
 
 // src/SingleValue/PureSingleValue/SingleValueSparkline.jsx
@@ -1679,7 +1584,7 @@ var getAvailableContentHeight = ({
   }
   return majorTextFontSize + CONTENT_SPARKLINE_SPACING + underLabelHeight;
 };
-var isValidPosition = (sparklinePosition) => VALID_SPARKLINE_POSITIONS.indexOf(sparklinePosition) > -1;
+var isValidPosition = (sparklinePosition) => VALID_SPARKLINE_POSITIONS.includes(sparklinePosition);
 var parseSparklineValues = ({ sparklineValues }) => Array.isArray(sparklineValues) ? sparklineValues.map((v) => {
   const numV = (0, numberUtils_exports.parseNumber)(v);
   if (numV === 0) {
@@ -2008,15 +1913,13 @@ var SingleValue = (_a) => {
     }
     let { sparklineDisplay = "below", trendDisplay = "absolute", unit, underLabel } = props;
     const parsedSparklineValues = parseSparklineValues({ sparklineValues });
+    if (!isValidPosition(sparklineDisplay)) {
+      sparklineDisplay = "below";
+    }
     let hasSparkline = shouldShowSparkline({
-      showSparkline: isValidPosition(sparklineDisplay) && sparklineDisplay !== "off",
+      showSparkline: sparklineDisplay !== "off",
       sparklineValues: parsedSparklineValues
     });
-    if (hasSparkline) {
-      if (!isValidPosition(sparklineDisplay)) {
-        sparklineDisplay = "below";
-      }
-    }
     const isSparklinePositionBelow = hasSparkline && sparklineDisplay === "below";
     const contentWidth = getAvailableContentWidth({
       hasSparkline,
@@ -2050,8 +1953,11 @@ var SingleValue = (_a) => {
     });
     if (!isEmpty_default(smallVizProps)) {
       ({ sparklineDisplay, trendDisplay, unit, underLabel } = smallVizProps);
+      if (!isValidPosition(sparklineDisplay)) {
+        sparklineDisplay = "below";
+      }
       hasSparkline = shouldShowSparkline({
-        showSparkline: isValidPosition(sparklineDisplay) && sparklineDisplay !== "off",
+        showSparkline: sparklineDisplay !== "off",
         sparklineValues: parsedSparklineValues
       });
     }
@@ -2086,7 +1992,7 @@ var SingleValue = (_a) => {
         majorValueTitle,
         trendColor,
         trendText,
-        trendTextFontSize,
+        trendTextFontSize: trendFontSize || Math.min(contentHeight, trendTextFontSize),
         showTrendIndicator: shouldShowTrend(trendDisplay),
         unit,
         unitPosition,
@@ -2253,7 +2159,7 @@ var DefaultVizActionHandler = class {
 var INITIAL_HEIGHT = 250;
 var SplunkVisualization = class {
 };
-SplunkVisualization.propTypes = {
+__publicField(SplunkVisualization, "propTypes", {
   /**
    * display mode
    */
@@ -2329,11 +2235,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,
@@ -2348,7 +2254,7 @@ SplunkVisualization.defaults = {
   onComputedProps: () => ({}),
   loading: false,
   onRequestParamsChange: lodash_exports.noop
-};
+});
 var SplunkVisualization_default = SplunkVisualization;
 
 // src/common/interfaces/DataSource.ts
@@ -2402,9 +2308,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";
@@ -2454,7 +2360,7 @@ var Message_default = "default" in defaultImport29 ? defaultImport29.default : d
 var isMissing = (v) => {
   return v === null || v === void 0;
 };
-var missingKeys = (keys2, target) => keys2.filter((k) => isMissing(target[k]));
+var missingKeys = (keys, target) => keys.filter((k) => isMissing(target[k]));
 var MissingPropsMessage = (props) => {
   const {
     width = SplunkVisualization_default.defaults.width,
@@ -2503,7 +2409,7 @@ var Cover = styled_components_default.div`
     bottom: 0;
 `;
 var Blocker = styled_components_default.div.attrs({
-  "data-splunk-visualization-version": "28.5.3 - 657435b86"
+  "data-splunk-visualization-version": "28.7.0 - d7b18cab6"
 })`
     position: relative;
     width: 100%;
@@ -2593,7 +2499,7 @@ var withFixedSizeContainer = (Viz) => {
       FixSizeItem,
       {
         "data-test": "fix-size-item",
-        "data-splunk-visualization-version": "28.5.3 - 657435b86",
+        "data-splunk-visualization-version": "28.7.0 - d7b18cab6",
         width,
         height,
         backgroundColor
@@ -3090,7 +2996,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;
@@ -3141,7 +3047,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;
@@ -3197,7 +3103,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 = [];
@@ -3228,6 +3134,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);
@@ -3238,8 +3206,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);
@@ -3250,71 +3217,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";
@@ -3332,7 +3244,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) => {
@@ -3439,6 +3351,15 @@ var defaultImport35 = __toESM(require("@splunk/react-icons/Triangle"));
 __reExport(Triangle_exports, require("@splunk/react-icons/Triangle"));
 var Triangle_default = "default" in defaultImport35 ? defaultImport35.default : defaultImport35;
 
+// esm-externals:@splunk/visualizations-shared/simpleXMLOptions
+var simpleXMLOptions_exports = {};
+__export(simpleXMLOptions_exports, {
+  default: () => simpleXMLOptions_default
+});
+var defaultImport36 = __toESM(require("@splunk/visualizations-shared/simpleXMLOptions"));
+__reExport(simpleXMLOptions_exports, require("@splunk/visualizations-shared/simpleXMLOptions"));
+var simpleXMLOptions_default = "default" in defaultImport36 ? defaultImport36.default : defaultImport36;
+
 // src/common/chartingUtils.ts
 var DEFAULT_LINE_WIDTH = 2;
 var getAnnotationsForCanvas = ({
@@ -3476,9 +3397,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;
@@ -3633,46 +3554,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;
-    }
-  }
-  yfields.forEach((field) => {
+  } else {
+    spanGaps = void 0;
+  }
+  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;
@@ -3838,6 +3779,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, {
@@ -3927,6 +3900,8 @@ var TimeSeriesChartWrapper = (props) => {
     "chart.overlayFields": overlayFieldsStr,
     "chart.nullValueMode": nullValueMode,
     "chart.showDataLabels": showDataLabels,
+    "chart.showLines": showLines,
+    "chart.stackMode": stackMode,
     lineWidth,
     lineDashStyle,
     fieldDashStyles: lineDashStylesByFieldStr,
@@ -3955,7 +3930,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;
@@ -3972,13 +3950,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
   );
@@ -3987,6 +3963,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;
@@ -4017,26 +3994,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) {
@@ -4068,10 +4059,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,
@@ -4080,8 +4072,11 @@ var TimeSeriesChartWrapper = (props) => {
       lineDashStyle,
       lineDashStylesByField,
       stepPosition,
-      stepPositionsByField
-    ),
+      stepPositionsByField,
+      type: chartType,
+      stackMode: normalizedStackMode,
+      showLines
+    }),
     [
       yFields,
       y2Fields,
@@ -4093,7 +4088,10 @@ var TimeSeriesChartWrapper = (props) => {
       lineDashStyle,
       lineDashStylesByField,
       stepPosition,
-      stepPositionsByField
+      stepPositionsByField,
+      chartType,
+      normalizedStackMode,
+      showLines
     ]
   );
   const chartingEventAnnotations = (0, react_exports.useMemo)(
@@ -4161,50 +4159,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)(() => {
@@ -4259,7 +4261,8 @@ var TimeSeriesChartWrapper = (props) => {
         showXAxisLine,
         showYAxisLine,
         showY2AxisLine,
-        xAxisMaxLabelParts
+        xAxisMaxLabelParts,
+        areaOpacity: areaOpacityForCanvas
       }
     ));
   }, [
@@ -4311,7 +4314,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);
@@ -4339,6 +4343,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,
@@ -4396,9 +4431,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
@@ -4563,38 +4596,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) {
@@ -4628,45 +4635,45 @@ var PresetPalettes_exports = {};
 __export(PresetPalettes_exports, {
   default: () => PresetPalettes_default
 });
-var defaultImport36 = __toESM(require("@splunk/visualization-color-palettes/editors/PresetPalettes"));
+var defaultImport37 = __toESM(require("@splunk/visualization-color-palettes/editors/PresetPalettes"));
 __reExport(PresetPalettes_exports, require("@splunk/visualization-color-palettes/editors/PresetPalettes"));
-var PresetPalettes_default = "default" in defaultImport36 ? defaultImport36.default : defaultImport36;
+var PresetPalettes_default = "default" in defaultImport37 ? defaultImport37.default : defaultImport37;
 
 // esm-externals:@splunk/visualization-themes/variables
 var variables_exports2 = {};
 __export(variables_exports2, {
   default: () => variables_default2
 });
-var defaultImport37 = __toESM(require("@splunk/visualization-themes/variables"));
+var defaultImport38 = __toESM(require("@splunk/visualization-themes/variables"));
 __reExport(variables_exports2, require("@splunk/visualization-themes/variables"));
-var variables_default2 = "default" in defaultImport37 ? defaultImport37.default : defaultImport37;
+var variables_default2 = "default" in defaultImport38 ? defaultImport38.default : defaultImport38;
 
 // esm-externals:@splunk/themes/pick
 var pick_exports2 = {};
 __export(pick_exports2, {
   default: () => pick_default2
 });
-var defaultImport38 = __toESM(require("@splunk/themes/pick"));
+var defaultImport39 = __toESM(require("@splunk/themes/pick"));
 __reExport(pick_exports2, require("@splunk/themes/pick"));
-var pick_default2 = "default" in defaultImport38 ? defaultImport38.default : defaultImport38;
+var pick_default2 = "default" in defaultImport39 ? defaultImport39.default : defaultImport39;
 
 // esm-externals:@splunk/visualization-icons
 var visualization_icons_exports = {};
 __export(visualization_icons_exports, {
   default: () => visualization_icons_default
 });
-var defaultImport39 = __toESM(require("@splunk/visualization-icons"));
+var defaultImport40 = __toESM(require("@splunk/visualization-icons"));
 __reExport(visualization_icons_exports, require("@splunk/visualization-icons"));
-var visualization_icons_default = "default" in defaultImport39 ? defaultImport39.default : defaultImport39;
+var visualization_icons_default = "default" in defaultImport40 ? defaultImport40.default : defaultImport40;
 
 // esm-externals:@splunk/visualization-icons/placeholders
 var placeholders_exports = {};
 __export(placeholders_exports, {
   default: () => placeholders_default
 });
-var defaultImport40 = __toESM(require("@splunk/visualization-icons/placeholders"));
+var defaultImport41 = __toESM(require("@splunk/visualization-icons/placeholders"));
 __reExport(placeholders_exports, require("@splunk/visualization-icons/placeholders"));
-var placeholders_default = "default" in defaultImport40 ? defaultImport40.default : defaultImport40;
+var placeholders_default = "default" in defaultImport41 ? defaultImport41.default : defaultImport41;
 
 // src/common/configContext/singleValueContext.ts
 var defaultContext = {
@@ -4698,9 +4705,9 @@ var configUtils_exports = {};
 __export(configUtils_exports, {
   default: () => configUtils_default
 });
-var defaultImport41 = __toESM(require("@splunk/visualizations-shared/configUtils"));
+var defaultImport42 = __toESM(require("@splunk/visualizations-shared/configUtils"));
 __reExport(configUtils_exports, require("@splunk/visualizations-shared/configUtils"));
-var configUtils_default = "default" in defaultImport41 ? defaultImport41.default : defaultImport41;
+var configUtils_default = "default" in defaultImport42 ? defaultImport42.default : defaultImport42;
 
 // src/common/editorConfig/DynamicMajorColorEditor.js
 var getDynamicMajorColorEditor = ({ defaultContext: defaultContext2, defaultPalettesConfig: defaultPalettesConfig2 }) => ({
@@ -4912,26 +4919,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"),
@@ -4975,6 +5015,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 = [
   [
     {
@@ -4982,7 +5040,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."
@@ -4991,7 +5048,9 @@ var TimechartTrellisEditorConfig = [
       }
     }
   ],
-  ...TrellisEditorConfig.slice(1),
+  trellisSplitByRow,
+  makeSortRow(sortByValuesBase),
+  ...trellisLayoutRows,
   [
     {
       label: (0, i18n_exports._)("Shared y-axis scale"),
@@ -5284,7 +5343,7 @@ var editorConfig = [
           showEditor: ({ options }) => options.sparklineDisplay !== "off"
         }
       ],
-      ...TrellisEditorConfig
+      ...SingleValueTrellisEditorConfig
     ]
   },
   {
@@ -5299,7 +5358,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;
             }
           }
         }
@@ -5440,29 +5499,76 @@ var Paginator_exports = {};
 __export(Paginator_exports, {
   default: () => Paginator_default
 });
-var defaultImport42 = __toESM(require("@splunk/react-ui/Paginator"));
+var defaultImport43 = __toESM(require("@splunk/react-ui/Paginator"));
 __reExport(Paginator_exports, require("@splunk/react-ui/Paginator"));
-var Paginator_default = "default" in defaultImport42 ? defaultImport42.default : defaultImport42;
+var Paginator_default = "default" in defaultImport43 ? defaultImport43.default : defaultImport43;
 
 // esm-externals:@splunk/themes
 var themes_exports = {};
 __export(themes_exports, {
   default: () => themes_default
 });
-var defaultImport43 = __toESM(require("@splunk/themes"));
+var defaultImport44 = __toESM(require("@splunk/themes"));
 __reExport(themes_exports, require("@splunk/themes"));
-var themes_default = "default" in defaultImport43 ? defaultImport43.default : defaultImport43;
+var themes_default = "default" in defaultImport44 ? defaultImport44.default : defaultImport44;
 
 // esm-externals:@splunk/themes/useSplunkTheme
 var useSplunkTheme_exports = {};
 __export(useSplunkTheme_exports, {
   default: () => useSplunkTheme_default
 });
-var defaultImport44 = __toESM(require("@splunk/themes/useSplunkTheme"));
+var defaultImport45 = __toESM(require("@splunk/themes/useSplunkTheme"));
 __reExport(useSplunkTheme_exports, require("@splunk/themes/useSplunkTheme"));
-var useSplunkTheme_default = "default" in defaultImport44 ? defaultImport44.default : defaultImport44;
+var useSplunkTheme_default = "default" in defaultImport45 ? defaultImport45.default : defaultImport45;
 
 // 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;
@@ -5507,6 +5613,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) => {
@@ -5515,7 +5629,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 {
@@ -5525,6 +5639,8 @@ var withTrellis = (Viz) => {
       trellisRowHeight,
       splitByLayout,
       trellisSplitBy,
+      trellisSortBy,
+      trellisSortOrder,
       trellisSharedScale,
       stackMode,
       yAxisMin,
@@ -5593,7 +5709,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);
@@ -5601,9 +5717,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));
     }
@@ -5611,14 +5725,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
       );
@@ -5627,12 +5736,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,
@@ -5666,6 +5782,7 @@ var withTrellis = (Viz) => {
           /* @__PURE__ */ react_exports.createElement(
             Viz,
             __spreadProps(__spreadValues({}, otherProps), {
+              context,
               trellisKey: splitByKey,
               trellisSplitBy: currTrellisSplitBy,
               dataSources: modifiedDataSourceBySplitBy[splitByKey],