vccs 0.1.0 → 0.2.0

package/dist/es/state/selectors/barSelectors.mjs

@@ -1,178 +1,241 @@
-import { isNullish as e } from "../../utils/validate.mjs";
-import { selectChartDataWithIndexesIfNotInPanorama as t } from "./dataSelectors.mjs";
-import { selectChartOffset as n } from "./selectChartOffset.mjs";
-import { selectBarCategoryGap as r, selectBarGap as i, selectRootBarSize as a, selectRootMaxBarSize as o } from "./rootPropsSelectors.mjs";
-import { getPercentValue as s } from "../../utils/data.mjs";
-import { selectChartLayout as c } from "./common.mjs";
-import { getBandSizeOfAxis as l } from "../../utils/chart.mjs";
-import { selectAxisWithScale as u, selectCartesianAxisSize as d, selectStackGroups as f, selectTicksOfGraphicalItem as p, selectUnfilteredCartesianItems as m } from "./axisSelectors.mjs";
-import { computeBarRectangles as h } from "../../cartesian/bar/utils.mjs";
-import { createSelector as g } from "@reduxjs/toolkit";
+import { isNullish } from "../../utils/validate.mjs";
+import { selectChartDataWithIndexesIfNotInPanorama } from "./dataSelectors.mjs";
+import { selectChartOffset } from "./selectChartOffset.mjs";
+import { selectBarCategoryGap, selectBarGap, selectRootBarSize, selectRootMaxBarSize } from "./rootPropsSelectors.mjs";
+import { getPercentValue } from "../../utils/data.mjs";
+import { selectChartLayout } from "./common.mjs";
+import { getBandSizeOfAxis } from "../../utils/chart.mjs";
+import { selectAxisWithScale, selectCartesianAxisSize, selectStackGroups, selectTicksOfGraphicalItem, selectUnfilteredCartesianItems } from "./axisSelectors.mjs";
+import { computeBarRectangles } from "../../cartesian/bar/utils.mjs";
+import { createSelector } from "@reduxjs/toolkit";
 //#region src/state/selectors/barSelectors.ts
-var _ = (e, t) => t, v = (e, t, n) => n;
-function y(e, t, n, r) {
-	return r;
-}
-function b(e, t, n, r, i) {
-	return i;
-}
-function x(e, t, n, r, i) {
-	return i.maxBarSize;
-}
-function S(t, n, r) {
-	let i = r ?? t;
-	return e(i) ? void 0 : s(i, n, 0);
-}
-var C = g([
-	c,
-	m,
-	_,
-	v,
-	y
-], (e, t, n, r, i) => t.filter((t) => e === "horizontal" ? t.xAxisId === n : t.yAxisId === r).filter((e) => e.isPanorama === i).filter((e) => e.hide === !1).filter((e) => e.type === "bar"));
-function w(e, t, n, r) {
-	return c(e) === "horizontal" ? f(e, "yAxis", n, r) : f(e, "xAxis", t, r);
-}
-function T(e, t, n) {
-	return c(e) === "horizontal" ? d(e, "xAxis", t) : d(e, "yAxis", n);
-}
-function E(e, t, n) {
-	let r = {}, i = e.filter((e) => e.stackId != null), a = e.filter((e) => e.stackId == null), o = i.reduce((e, t) => (e[t.stackId] || (e[t.stackId] = []), e[t.stackId].push(t), e), r), s = Object.entries(o).map(([e, r]) => ({
-		stackId: e,
-		dataKeys: r.map((e) => e.dataKey),
-		barSize: S(t, n, r[0].barSize)
-	})), c = a.map((e) => ({
-		stackId: void 0,
-		dataKeys: [e.dataKey],
-		barSize: S(t, n, e.barSize)
-	}));
-	return [...s, ...c];
-}
-var D = g([
-	C,
-	a,
-	T
-], E);
-function O(t, n, r, i, a) {
-	let s = c(t), d = o(t), { maxBarSize: f } = a, m = e(f) ? d : f, h, g;
-	return s === "horizontal" ? (h = u(t, "xAxis", n, i), g = p(t, "xAxis", n, i)) : (h = u(t, "yAxis", r, i), g = p(t, "yAxis", r, i)), l(h, g, !0) ?? m ?? 0;
-}
-function k(e, t, n, r) {
-	let i = c(e), a, o;
-	return i === "horizontal" ? (a = u(e, "xAxis", t, r), o = p(e, "xAxis", t, r)) : (a = u(e, "yAxis", n, r), o = p(e, "yAxis", n, r)), l(a, o);
-}
-function A(e, t, n, r, i) {
-	let a = r.length;
-	if (a < 1) return null;
-	let o = s(e, n, 0, !0), c, l = [];
-	if (r[0].barSize === +r[0].barSize) {
-		let e = !1, t = n / a, i = r.reduce((e, t) => e + t.barSize || 0, 0);
-		i += (a - 1) * o, i >= n && (i -= (a - 1) * o, o = 0), i >= n && t > 0 && (e = !0, t *= .9, i = a * t);
-		let s = {
-			offset: ((n - i) / 2 >> 0) - o,
+var pickXAxisId = (_state, xAxisId) => xAxisId;
+var pickYAxisId = (_state, _xAxisId, yAxisId) => yAxisId;
+function pickIsPanorama(_state, _xAxisId, _yAxisId, isPanorama) {
+	return isPanorama;
+}
+function pickBarSettings(_state, _xAxisId, _yAxisId, _isPanorama, barSettings) {
+	return barSettings;
+}
+function pickMaxBarSize(_state, _xAxisId, _yAxisId, _isPanorama, barSettings) {
+	return barSettings.maxBarSize;
+}
+function getBarSize(globalSize, totalSize, selfSize) {
+	const barSize = selfSize ?? globalSize;
+	return isNullish(barSize) ? void 0 : getPercentValue(barSize, totalSize, 0);
+}
+var selectAllVisibleBars = createSelector([
+	selectChartLayout,
+	selectUnfilteredCartesianItems,
+	pickXAxisId,
+	pickYAxisId,
+	pickIsPanorama
+], (layout, allItems, xAxisId, yAxisId, isPanorama) => allItems.filter((i) => {
+	if (layout === "horizontal") return i.xAxisId === xAxisId;
+	return i.yAxisId === yAxisId;
+}).filter((i) => i.isPanorama === isPanorama).filter((i) => i.hide === false).filter((i) => i.type === "bar"));
+function selectBarStackGroups(state, xAxisId, yAxisId, isPanorama) {
+	if (selectChartLayout(state) === "horizontal") return selectStackGroups(state, "yAxis", yAxisId, isPanorama);
+	return selectStackGroups(state, "xAxis", xAxisId, isPanorama);
+}
+function selectBarCartesianAxisSize(state, xAxisId, yAxisId) {
+	if (selectChartLayout(state) === "horizontal") return selectCartesianAxisSize(state, "xAxis", xAxisId);
+	return selectCartesianAxisSize(state, "yAxis", yAxisId);
+}
+function combineBarSizeList(allBars, globalSize, totalSize) {
+	const initialValue = {};
+	const stackedBars = allBars.filter((b) => b.stackId != null);
+	const unstackedBars = allBars.filter((b) => b.stackId == null);
+	const groupByStack = stackedBars.reduce((acc, bar) => {
+		if (!acc[bar.stackId]) acc[bar.stackId] = [];
+		acc[bar.stackId].push(bar);
+		return acc;
+	}, initialValue);
+	const stackedSizeList = Object.entries(groupByStack).map(([stackId, bars]) => {
+		return {
+			stackId,
+			dataKeys: bars.map((b) => b.dataKey),
+			barSize: getBarSize(globalSize, totalSize, bars[0].barSize)
+		};
+	});
+	const unstackedSizeList = unstackedBars.map((b) => {
+		return {
+			stackId: void 0,
+			dataKeys: [b.dataKey],
+			barSize: getBarSize(globalSize, totalSize, b.barSize)
+		};
+	});
+	return [...stackedSizeList, ...unstackedSizeList];
+}
+var selectBarSizeList = createSelector([
+	selectAllVisibleBars,
+	selectRootBarSize,
+	selectBarCartesianAxisSize
+], combineBarSizeList);
+function selectBarBandSize(state, xAxisId, yAxisId, isPanorama, barSettings) {
+	const layout = selectChartLayout(state);
+	const globalMaxBarSize = selectRootMaxBarSize(state);
+	const { maxBarSize: childMaxBarSize } = barSettings;
+	const maxBarSize = isNullish(childMaxBarSize) ? globalMaxBarSize : childMaxBarSize;
+	let axis, ticks;
+	if (layout === "horizontal") {
+		axis = selectAxisWithScale(state, "xAxis", xAxisId, isPanorama);
+		ticks = selectTicksOfGraphicalItem(state, "xAxis", xAxisId, isPanorama);
+	} else {
+		axis = selectAxisWithScale(state, "yAxis", yAxisId, isPanorama);
+		ticks = selectTicksOfGraphicalItem(state, "yAxis", yAxisId, isPanorama);
+	}
+	return getBandSizeOfAxis(axis, ticks, true) ?? maxBarSize ?? 0;
+}
+function selectAxisBandSize(state, xAxisId, yAxisId, isPanorama) {
+	const layout = selectChartLayout(state);
+	let axis, ticks;
+	if (layout === "horizontal") {
+		axis = selectAxisWithScale(state, "xAxis", xAxisId, isPanorama);
+		ticks = selectTicksOfGraphicalItem(state, "xAxis", xAxisId, isPanorama);
+	} else {
+		axis = selectAxisWithScale(state, "yAxis", yAxisId, isPanorama);
+		ticks = selectTicksOfGraphicalItem(state, "yAxis", yAxisId, isPanorama);
+	}
+	return getBandSizeOfAxis(axis, ticks);
+}
+function getBarPositions(barGap, barCategoryGap, bandSize, sizeList, maxBarSize) {
+	const len = sizeList.length;
+	if (len < 1) return null;
+	let realBarGap = getPercentValue(barGap, bandSize, 0, true);
+	let result;
+	const initialValue = [];
+	if (sizeList[0].barSize === +sizeList[0].barSize) {
+		let useFull = false;
+		let fullBarSize = bandSize / len;
+		let sum = sizeList.reduce((res, entry) => res + entry.barSize || 0, 0);
+		sum += (len - 1) * realBarGap;
+		if (sum >= bandSize) {
+			sum -= (len - 1) * realBarGap;
+			realBarGap = 0;
+		}
+		if (sum >= bandSize && fullBarSize > 0) {
+			useFull = true;
+			fullBarSize *= .9;
+			sum = len * fullBarSize;
+		}
+		let prev = {
+			offset: ((bandSize - sum) / 2 >> 0) - realBarGap,
 			size: 0
 		};
-		c = r.reduce((n, r) => {
-			let i = {
-				stackId: r.stackId,
-				dataKeys: r.dataKeys,
+		result = sizeList.reduce((res, entry) => {
+			const newPosition = {
+				stackId: entry.stackId,
+				dataKeys: entry.dataKeys,
 				position: {
-					offset: s.offset + s.size + o,
-					size: e ? t : r.barSize
+					offset: prev.offset + prev.size + realBarGap,
+					size: useFull ? fullBarSize : entry.barSize
 				}
-			}, a = [...n, i];
-			return s = a[a.length - 1].position, a;
-		}, l);
+			};
+			const newRes = [...res, newPosition];
+			prev = newRes[newRes.length - 1].position;
+			return newRes;
+		}, initialValue);
 	} else {
-		let e = s(t, n, 0, !0);
-		n - 2 * e - (a - 1) * o <= 0 && (o = 0);
-		let u = (n - 2 * e - (a - 1) * o) / a;
-		u > 1 && (u >>= 0);
-		let d = i === +i ? Math.min(u, i) : u;
-		c = r.reduce((t, n, r) => [...t, {
-			stackId: n.stackId,
-			dataKeys: n.dataKeys,
+		const offset = getPercentValue(barCategoryGap, bandSize, 0, true);
+		if (bandSize - 2 * offset - (len - 1) * realBarGap <= 0) realBarGap = 0;
+		let originalSize = (bandSize - 2 * offset - (len - 1) * realBarGap) / len;
+		if (originalSize > 1) originalSize >>= 0;
+		const size = maxBarSize === +maxBarSize ? Math.min(originalSize, maxBarSize) : originalSize;
+		result = sizeList.reduce((res, entry, i) => [...res, {
+			stackId: entry.stackId,
+			dataKeys: entry.dataKeys,
 			position: {
-				offset: e + (u + o) * r + (u - d) / 2,
-				size: d
+				offset: offset + (originalSize + realBarGap) * i + (originalSize - size) / 2,
+				size
 			}
-		}], l);
+		}], initialValue);
 	}
-	return c;
+	return result;
 }
-function j(t, n, r, i, a, o, s) {
-	let c = e(s) ? n : s, l = A(r, i, a === o ? o : a, t, c);
-	return a !== o && l != null && (l = l.map((e) => ({
-		...e,
+function combineAllBarPositions(sizeList, globalMaxBarSize, barGap, barCategoryGap, barBandSize, bandSize, childMaxBarSize) {
+	const maxBarSize = isNullish(childMaxBarSize) ? globalMaxBarSize : childMaxBarSize;
+	let allBarPositions = getBarPositions(barGap, barCategoryGap, barBandSize !== bandSize ? barBandSize : bandSize, sizeList, maxBarSize);
+	if (barBandSize !== bandSize && allBarPositions != null) allBarPositions = allBarPositions.map((pos) => ({
+		...pos,
 		position: {
-			...e.position,
-			offset: e.position.offset - a / 2
+			...pos.position,
+			offset: pos.position.offset - barBandSize / 2
 		}
-	}))), l;
-}
-var M = g([
-	D,
-	o,
-	i,
-	r,
-	O,
-	k,
-	x
-], j);
-function N(e, t, n, r) {
-	return u(e, "xAxis", t, r);
-}
-function P(e, t, n, r) {
-	return u(e, "yAxis", n, r);
-}
-function F(e, t, n, r) {
-	return p(e, "xAxis", t, r);
-}
-function I(e, t, n, r) {
-	return p(e, "yAxis", n, r);
-}
-var L = g([M, b], (e, t) => {
-	if (e == null) return;
-	let n = e.find((e) => e.stackId === t.stackId && e.dataKeys.includes(t.dataKey));
-	if (n != null) return n.position;
+	}));
+	return allBarPositions;
+}
+var selectAllBarPositions = createSelector([
+	selectBarSizeList,
+	selectRootMaxBarSize,
+	selectBarGap,
+	selectBarCategoryGap,
+	selectBarBandSize,
+	selectAxisBandSize,
+	pickMaxBarSize
+], combineAllBarPositions);
+function selectXAxisWithScale(state, xAxisId, _yAxisId, isPanorama) {
+	return selectAxisWithScale(state, "xAxis", xAxisId, isPanorama);
+}
+function selectYAxisWithScale(state, _xAxisId, yAxisId, isPanorama) {
+	return selectAxisWithScale(state, "yAxis", yAxisId, isPanorama);
+}
+function selectXAxisTicks(state, xAxisId, _yAxisId, isPanorama) {
+	return selectTicksOfGraphicalItem(state, "xAxis", xAxisId, isPanorama);
+}
+function selectYAxisTicks(state, _xAxisId, yAxisId, isPanorama) {
+	return selectTicksOfGraphicalItem(state, "yAxis", yAxisId, isPanorama);
+}
+var selectBarPosition = createSelector([selectAllBarPositions, pickBarSettings], (allBarPositions, barSettings) => {
+	if (allBarPositions == null) return;
+	const position = allBarPositions.find((p) => p.stackId === barSettings.stackId && p.dataKeys.includes(barSettings.dataKey));
+	if (position == null) return;
+	return position.position;
+});
+function combineStackedData(stackGroups, barSettings) {
+	if (!stackGroups || barSettings?.dataKey == null) return;
+	const { stackId } = barSettings;
+	const stackGroup = stackGroups[stackId];
+	if (!stackGroup) return;
+	const { stackedData } = stackGroup;
+	if (!stackedData) return;
+	return stackedData.find((sd) => sd.key === barSettings.dataKey);
+}
+var selectSynchronisedBarSettings = createSelector([selectUnfilteredCartesianItems, pickBarSettings], (graphicalItems, barSettingsFromProps) => {
+	if (graphicalItems.some((cgis) => cgis.type === "bar" && barSettingsFromProps.dataKey === cgis.dataKey && barSettingsFromProps.stackId === cgis.stackId && barSettingsFromProps.stackId === cgis.stackId)) return barSettingsFromProps;
 });
-function R(e, t) {
-	if (!e || t?.dataKey == null) return;
-	let { stackId: n } = t, r = e[n];
-	if (!r) return;
-	let { stackedData: i } = r;
-	if (i) return i.find((e) => e.key === t.dataKey);
-}
-var z = g([m, b], (e, t) => {
-	if (e.some((e) => e.type === "bar" && t.dataKey === e.dataKey && t.stackId === e.stackId && t.stackId === e.stackId)) return t;
-}), B = g([
-	n,
-	N,
-	P,
-	F,
-	I,
-	L,
-	c,
-	t,
-	k,
-	g([w, b], R),
-	z
-], (e, t, n, r, i, a, o, { chartData: s, dataStartIndex: c, dataEndIndex: l }, u, d, f) => {
-	if (f == null || a == null || o !== "horizontal" && o !== "vertical" || t == null || n == null || r == null || i == null) return;
-	let { data: p } = f, m;
-	if (m = (p?.length ?? 0) > 0 ? p : s?.slice(c, l + 1), m != null) return h({
-		layout: o,
-		barSettings: f,
-		pos: a,
-		bandSize: u,
-		xAxis: t,
-		yAxis: n,
-		xAxisTicks: r,
-		yAxisTicks: i,
-		stackedData: d,
-		displayedData: m,
-		offset: e
+var selectBarRectangles = createSelector([
+	selectChartOffset,
+	selectXAxisWithScale,
+	selectYAxisWithScale,
+	selectXAxisTicks,
+	selectYAxisTicks,
+	selectBarPosition,
+	selectChartLayout,
+	selectChartDataWithIndexesIfNotInPanorama,
+	selectAxisBandSize,
+	createSelector([selectBarStackGroups, pickBarSettings], combineStackedData),
+	selectSynchronisedBarSettings
+], (offset, xAxis, yAxis, xAxisTicks, yAxisTicks, pos, layout, { chartData, dataStartIndex, dataEndIndex }, bandSize, stackedData, barSettings) => {
+	if (barSettings == null || pos == null || layout !== "horizontal" && layout !== "vertical" || xAxis == null || yAxis == null || xAxisTicks == null || yAxisTicks == null) return;
+	const { data } = barSettings;
+	let displayedData;
+	if ((data?.length ?? 0) > 0) displayedData = data;
+	else displayedData = chartData?.slice(dataStartIndex, dataEndIndex + 1);
+	if (displayedData == null) return;
+	return computeBarRectangles({
+		layout,
+		barSettings,
+		pos,
+		bandSize,
+		xAxis,
+		yAxis,
+		xAxisTicks,
+		yAxisTicks,
+		stackedData,
+		displayedData,
+		offset
 	});
 });
 //#endregion
-export { j as combineAllBarPositions, E as combineBarSizeList, R as combineStackedData, B as selectBarRectangles };
+export { combineAllBarPositions, combineBarSizeList, combineStackedData, selectBarRectangles };

package/dist/es/state/selectors/brushSelectors.mjs

@@ -1,17 +1,18 @@
-import { isNumber as e } from "../../utils/validate.mjs";
-import { selectMargin as t } from "./containerSelectors.mjs";
-import { selectChartOffset as n } from "./selectChartOffset.mjs";
-import { createSelector as r } from "@reduxjs/toolkit";
+import { isNumber } from "../../utils/validate.mjs";
+import { selectMargin } from "./containerSelectors.mjs";
+import { selectChartOffset } from "./selectChartOffset.mjs";
+import { createSelector } from "@reduxjs/toolkit";
 //#region src/state/selectors/brushSelectors.ts
-var i = (e) => e.brush, a = r([
-	i,
-	n,
-	t
-], (t, n, r) => ({
-	height: t.height,
-	x: e(t.x) ? t.x : n.left,
-	y: e(t.y) ? t.y : n.top + n.height + n.brushBottom - (r?.bottom || 0),
-	width: e(t.width) ? t.width : n.width
+var selectBrushSettings = (state) => state.brush;
+var selectBrushDimensions = createSelector([
+	selectBrushSettings,
+	selectChartOffset,
+	selectMargin
+], (brushSettings, offset, margin) => ({
+	height: brushSettings.height,
+	x: isNumber(brushSettings.x) ? brushSettings.x : offset.left,
+	y: isNumber(brushSettings.y) ? brushSettings.y : offset.top + offset.height + offset.brushBottom - (margin?.bottom || 0),
+	width: isNumber(brushSettings.width) ? brushSettings.width : offset.width
 }));
 //#endregion
-export { a as selectBrushDimensions, i as selectBrushSettings };
+export { selectBrushDimensions, selectBrushSettings };

package/dist/es/state/selectors/combiners/combineActiveLabel.mjs

@@ -1,8 +1,9 @@
-import { isNan as e } from "../../../utils/validate.mjs";
+import { isNan } from "../../../utils/validate.mjs";
 //#region src/state/selectors/combiners/combineActiveLabel.ts
-function t(t, n) {
-	let r = Number(n);
-	if (!(e(r) || n == null)) return r >= 0 ? t?.[r]?.value : void 0;
+function combineActiveLabel(tooltipTicks, activeIndex) {
+	const n = Number(activeIndex);
+	if (isNan(n) || activeIndex == null) return;
+	return n >= 0 ? tooltipTicks?.[n]?.value : void 0;
 }
 //#endregion
-export { t as combineActiveLabel };
+export { combineActiveLabel };

package/dist/es/state/selectors/combiners/combineActiveTooltipIndex.mjs

@@ -1,34 +1,43 @@
-import { isWellBehavedNumber as e } from "../../../utils/validate.mjs";
-import { getValueByDataKey as t } from "../../../utils/chart.mjs";
-import { isWellFormedNumberDomain as n } from "../../../utils/isDomainSpecifiedByUser.mjs";
+import { isWellBehavedNumber } from "../../../utils/validate.mjs";
+import { getValueByDataKey } from "../../../utils/chart.mjs";
+import { isWellFormedNumberDomain } from "../../../utils/isDomainSpecifiedByUser.mjs";
 //#region src/state/selectors/combiners/combineActiveTooltipIndex.ts
-function r(e) {
-	if (typeof e == "number") return Number.isFinite(e) ? e : void 0;
-	if (e instanceof Date) {
-		let t = e.valueOf();
-		return Number.isFinite(t) ? t : void 0;
+function toFiniteNumber(value) {
+	if (typeof value === "number") return Number.isFinite(value) ? value : void 0;
+	if (value instanceof Date) {
+		const numericValue = value.valueOf();
+		return Number.isFinite(numericValue) ? numericValue : void 0;
 	}
-	let t = Number(e);
-	return Number.isFinite(t) ? t : void 0;
+	const parsed = Number(value);
+	return Number.isFinite(parsed) ? parsed : void 0;
 }
-function i(e, t) {
-	let n = r(e), i = t[0], a = t[1];
-	return n === void 0 ? !1 : n >= Math.min(i, a) && n <= Math.max(i, a);
+function isValueWithinNumberDomain(value, domain) {
+	const numericValue = toFiniteNumber(value);
+	const lowerBound = domain[0];
+	const upperBound = domain[1];
+	if (numericValue === void 0) return false;
+	return numericValue >= Math.min(lowerBound, upperBound) && numericValue <= Math.max(lowerBound, upperBound);
 }
-function a(e, r, a) {
-	if (a == null || r == null) return !0;
-	let o = t(e, r);
-	return o == null || !n(a) ? !0 : i(o, a);
+function isValueWithinDomain(entry, axisDataKey, domain) {
+	if (domain == null || axisDataKey == null) return true;
+	const value = getValueByDataKey(entry, axisDataKey);
+	if (value == null) return true;
+	if (!isWellFormedNumberDomain(domain)) return true;
+	return isValueWithinNumberDomain(value, domain);
 }
-function o(t, n, r, i) {
-	let o = t?.index;
-	if (o == null) return null;
-	let s = Number(o);
-	if (!e(s)) return o;
-	let c = Infinity;
-	n.length > 0 && (c = n.length - 1);
-	let l = Math.max(0, Math.min(s, c)), u = n[l];
-	return u == null || a(u, r, i) ? String(l) : null;
+function combineActiveTooltipIndex(tooltipInteraction, chartData, axisDataKey, domain) {
+	const desiredIndex = tooltipInteraction?.index;
+	if (desiredIndex == null) return null;
+	const indexAsNumber = Number(desiredIndex);
+	if (!isWellBehavedNumber(indexAsNumber)) return desiredIndex;
+	const lowerLimit = 0;
+	let upperLimit = Infinity;
+	if (chartData.length > 0) upperLimit = chartData.length - 1;
+	const clampedIndex = Math.max(lowerLimit, Math.min(indexAsNumber, upperLimit));
+	const entry = chartData[clampedIndex];
+	if (entry == null) return String(clampedIndex);
+	if (!isValueWithinDomain(entry, axisDataKey, domain)) return null;
+	return String(clampedIndex);
 }
 //#endregion
-export { o as combineActiveTooltipIndex };
+export { combineActiveTooltipIndex };

package/dist/es/state/selectors/combiners/combineAxisRangeWithReverse.mjs

@@ -1,6 +1,8 @@
 //#region src/state/selectors/combiners/combineAxisRangeWithReverse.ts
-function e(e, t) {
-	if (!(!e || !t)) return e?.reversed ? [t[1], t[0]] : t;
+function combineAxisRangeWithReverse(axisSettings, axisRange) {
+	if (!axisSettings || !axisRange) return;
+	if (axisSettings?.reversed) return [axisRange[1], axisRange[0]];
+	return axisRange;
 }
 //#endregion
-export { e as combineAxisRangeWithReverse };
+export { combineAxisRangeWithReverse };

package/dist/es/state/selectors/combiners/combineCoordinateForDefaultIndex.mjs

@@ -1,19 +1,21 @@
 //#region src/state/selectors/combiners/combineCoordinateForDefaultIndex.ts
-function e(e, t, n, r, i, a, o, s) {
-	if (a == null || r == null) return;
-	let c = o[0], l = c == null ? void 0 : s?.(c.positions, a);
-	if (l != null) return l;
-	let u = i?.[Number(a)];
-	if (u) switch (n) {
+function combineCoordinateForDefaultIndex(width, height, layout, offset, tooltipTicks, defaultIndex, tooltipConfigurations, tooltipPayloadSearcher) {
+	if (defaultIndex == null || offset == null) return;
+	const firstConfiguration = tooltipConfigurations[0];
+	const maybePosition = firstConfiguration == null ? void 0 : tooltipPayloadSearcher?.(firstConfiguration.positions, defaultIndex);
+	if (maybePosition != null) return maybePosition;
+	const tick = tooltipTicks?.[Number(defaultIndex)];
+	if (!tick) return;
+	switch (layout) {
 		case "horizontal": return {
-			x: u.coordinate,
-			y: (r.top + t) / 2
+			x: tick.coordinate,
+			y: (offset.top + height) / 2
 		};
 		default: return {
-			x: (r.left + e) / 2,
-			y: u.coordinate
+			x: (offset.left + width) / 2,
+			y: tick.coordinate
 		};
 	}
 }
 //#endregion
-export { e as combineCoordinateForDefaultIndex };
+export { combineCoordinateForDefaultIndex };

package/dist/es/state/selectors/combiners/combineTooltipInteractionState.mjs

@@ -1,32 +1,37 @@
-import { noInteraction as e } from "../../tooltipSlice.mjs";
+import { noInteraction } from "../../tooltipSlice.mjs";
 //#region src/state/selectors/combiners/combineTooltipInteractionState.ts
-function t(e, t, n) {
-	return t === "axis" ? n === "click" ? e.axisInteraction.click : e.axisInteraction.hover : n === "click" ? e.itemInteraction.click : e.itemInteraction.hover;
+function chooseAppropriateMouseInteraction(tooltipState, tooltipEventType, trigger) {
+	if (tooltipEventType === "axis") {
+		if (trigger === "click") return tooltipState.axisInteraction.click;
+		return tooltipState.axisInteraction.hover;
+	}
+	if (trigger === "click") return tooltipState.itemInteraction.click;
+	return tooltipState.itemInteraction.hover;
 }
-function n(e) {
-	return e.index != null;
+function hasBeenActivePreviously(tooltipInteractionState) {
+	return tooltipInteractionState.index != null;
 }
-function r(r, i, a, o) {
-	let s = t(r, i, a);
-	if (s?.active) return s;
-	if (r.keyboardInteraction.active) return r.keyboardInteraction;
-	if (r.syncInteraction.active && r.syncInteraction.index != null) return r.syncInteraction;
-	let c = r.settings.active === !0;
-	if (n(s)) {
-		if (c) return {
-			...s,
-			active: !0
+function combineTooltipInteractionState(tooltipState, tooltipEventType, trigger, defaultIndex) {
+	const appropriateMouseInteraction = chooseAppropriateMouseInteraction(tooltipState, tooltipEventType, trigger);
+	if (appropriateMouseInteraction?.active) return appropriateMouseInteraction;
+	if (tooltipState.keyboardInteraction.active) return tooltipState.keyboardInteraction;
+	if (tooltipState.syncInteraction.active && tooltipState.syncInteraction.index != null) return tooltipState.syncInteraction;
+	const activeFromProps = tooltipState.settings.active === true;
+	if (hasBeenActivePreviously(appropriateMouseInteraction)) {
+		if (activeFromProps) return {
+			...appropriateMouseInteraction,
+			active: true
 		};
-	} else if (o != null) return {
-		active: !0,
+	} else if (defaultIndex != null) return {
+		active: true,
 		coordinate: void 0,
 		dataKey: void 0,
-		index: o
+		index: defaultIndex
 	};
 	return {
-		...e,
-		coordinate: s?.coordinate
+		...noInteraction,
+		coordinate: appropriateMouseInteraction?.coordinate
 	};
 }
 //#endregion
-export { r as combineTooltipInteractionState };
+export { combineTooltipInteractionState };