@pie-lib/graphing-solution-set 5.0.1-next.20261004041321 → 5.0.1-next.20261004165705

package/dist/axis/axes.js

@@ -4,10 +4,10 @@ import { amountToIncreaseWidth as n, countWords as r, findLongestWord as i, getT
 import o from "react";
 import s from "prop-types";
 import { types as c } from "@pie-lib/plot";
-import { jsx as l, jsxs as u } from "react/jsx-runtime";
-import { styled as d } from "@mui/material/styles";
-import * as f from "@pie-lib/render-ui";
-import { Readable as p, color as m } from "@pie-lib/render-ui";
+import * as l from "@pie-lib/render-ui";
+import { Readable as u, color as d } from "@pie-lib/render-ui";
+import { jsx as f, jsxs as p } from "react/jsx-runtime";
+import { styled as m } from "@mui/material/styles";
 //#region src/axis/axes.tsx
 function h(e) {
 	return typeof e == "function" || typeof e == "object" && !!e && typeof e.$$typeof == "symbol";
@@ -15,7 +15,7 @@ function h(e) {
 function g(e, t) {
 	return !e || h(e) ? e : h(e.default) ? e.default : t && h(e[t]) ? e[t] : t && h(e[t]?.default) ? e[t].default : e;
 }
-var _ = g(p, "Readable") || g(b.Readable, "Readable"), v = f, y = v.default, b = y && typeof y == "object" ? y : v, x = {
+var _ = g(u, "Readable") || g(b.Readable, "Readable"), v = l, y = v.default, b = y && typeof y == "object" ? y : v, x = {
 	includeArrows: s.object,
 	graphProps: s.object
 }, S = { includeArrows: {
@@ -23,16 +23,16 @@ var _ = g(p, "Readable") || g(b.Readable, "Readable"), v = f, y = v.default, b =
 	right: !0,
 	up: !0,
 	down: !0
-} }, C = d("g")(() => ({
+} }, C = m("g")(() => ({
 	"& .visx-axis-line": {
 		stroke: "#8a92c0",
 		strokeWidth: 4
 	},
 	"& .visx-axis-tick": {
-		fill: m.defaults.BLACK,
+		fill: d.defaults.BLACK,
 		"& > line": { stroke: "#8a92c0" }
 	}
-})), w = d("div")(({ theme: e, centered: t }) => ({
+})), w = m("div")(({ theme: e, centered: t }) => ({
 	padding: 0,
 	margin: 0,
 	"* > *": {
@@ -42,7 +42,7 @@ var _ = g(p, "Readable") || g(b.Readable, "Readable"), v = f, y = v.default, b =
 	"& p": { margin: 0 },
 	fontSize: e.typography.fontSize,
 	...t && { textAlign: "center" }
-})), T = d(t)({ fill: "#8a92c0" }), E = {
+})), T = m(t)({ fill: "#8a92c0" }), E = {
 	fontFamily: "Roboto",
 	fontSize: "14px",
 	cursor: "inherit"
@@ -56,8 +56,8 @@ var _ = g(p, "Readable") || g(b.Readable, "Readable"), v = f, y = v.default, b =
 	};
 	static defaultProps = S;
 	render() {
-		let { includeArrows: t, graphProps: a, columnTicksValues: o, skipValues: s, distanceFromOriginToFirstNegativeY: c, dy: d } = this.props, { scale: f, domain: p, size: m, range: h } = a || {}, g = (e) => {
-			let t = s && s[0] === e ? c + 4 : d;
+		let { includeArrows: t, graphProps: a, columnTicksValues: o, skipValues: s, distanceFromOriginToFirstNegativeY: c, dy: l } = this.props, { scale: u, domain: d, size: m, range: h } = a || {}, g = (e) => {
+			let t = s && s[0] === e ? c + 4 : l;
 			return {
 				...E,
 				textAnchor: "middle",
@@ -65,39 +65,39 @@ var _ = g(p, "Readable") || g(b.Readable, "Readable"), v = f, y = v.default, b =
 				dx: e === 0 ? -10 : 0,
 				dy: e === 0 ? -7 : 0
 			};
-		}, v = r(p.axisLabel), y = n(i(p.axisLabel)) + 2;
-		return /* @__PURE__ */ u(C, { children: [
-			/* @__PURE__ */ l(e, {
-				scale: f.x,
-				top: f.y(0),
+		}, v = r(d.axisLabel), y = n(i(d.axisLabel)) + 2;
+		return /* @__PURE__ */ p(C, { children: [
+			/* @__PURE__ */ f(e, {
+				scale: u.x,
+				top: u.y(0),
 				left: 0,
-				label: p.label,
+				label: d.label,
 				rangePadding: 8,
 				tickFormat: (e) => e,
 				tickLabelProps: g,
 				tickValues: o,
-				hideZero: !(p.labelStep || h.labelStep) && p.min <= 0
+				hideZero: !(d.labelStep || h.labelStep) && d.min <= 0
 			}),
-			t && t.left && /* @__PURE__ */ l(T, {
+			t && t.left && /* @__PURE__ */ f(T, {
 				direction: "left",
-				x: p.min,
+				x: d.min,
 				y: 0,
-				scale: f
+				scale: u
 			}),
-			t && t.right && /* @__PURE__ */ l(T, {
+			t && t.right && /* @__PURE__ */ f(T, {
 				direction: "right",
-				x: p.max,
+				x: d.max,
 				y: 0,
-				scale: f
+				scale: u
 			}),
-			p.axisLabel && /* @__PURE__ */ l("foreignObject", {
+			d.axisLabel && /* @__PURE__ */ f("foreignObject", {
 				x: m.width + 17,
-				y: f.y(0) - 9,
+				y: u.y(0) - 9,
 				width: y,
 				height: 20 * v,
-				children: /* @__PURE__ */ l(_, {
+				children: /* @__PURE__ */ f(_, {
 					false: !0,
-					children: /* @__PURE__ */ l(w, { dangerouslySetInnerHTML: { __html: p.axisLabel } })
+					children: /* @__PURE__ */ f(w, { dangerouslySetInnerHTML: { __html: d.axisLabel } })
 				})
 			})
 		] });
@@ -109,9 +109,9 @@ var _ = g(p, "Readable") || g(b.Readable, "Readable"), v = f, y = v.default, b =
 	};
 	static defaultProps = S;
 	render() {
-		let { includeArrows: t, graphProps: r, skipValues: i, rowTickValues: a } = this.props, { scale: o, range: s, size: c } = r || {}, d = s.axisLabel ? n(s.axisLabel.length) : 0;
-		return /* @__PURE__ */ u(C, { children: [
-			/* @__PURE__ */ l(e, {
+		let { includeArrows: t, graphProps: r, skipValues: i, rowTickValues: a } = this.props, { scale: o, range: s, size: c } = r || {}, l = s.axisLabel ? n(s.axisLabel.length) : 0;
+		return /* @__PURE__ */ p(C, { children: [
+			/* @__PURE__ */ f(e, {
 				orientation: "left",
 				scale: o.y,
 				top: 0,
@@ -135,26 +135,26 @@ var _ = g(p, "Readable") || g(b.Readable, "Readable"), v = f, y = v.default, b =
 				tickTextAnchor: "bottom",
 				tickValues: a
 			}),
-			t && t.down && /* @__PURE__ */ l(T, {
+			t && t.down && /* @__PURE__ */ f(T, {
 				direction: "down",
 				x: 0,
 				y: s.min,
 				scale: o
 			}),
-			t && t.up && /* @__PURE__ */ l(T, {
+			t && t.up && /* @__PURE__ */ f(T, {
 				direction: "up",
 				x: 0,
 				y: s.max,
 				scale: o
 			}),
-			s.axisLabel && /* @__PURE__ */ l("foreignObject", {
-				x: o.x(0) - d / 2,
+			s.axisLabel && /* @__PURE__ */ f("foreignObject", {
+				x: o.x(0) - l / 2,
 				y: -33,
-				width: d,
+				width: l,
 				height: "20",
-				children: /* @__PURE__ */ l(_, {
+				children: /* @__PURE__ */ f(_, {
 					false: !0,
-					children: /* @__PURE__ */ l(w, {
+					children: /* @__PURE__ */ f(w, {
 						centered: !0,
 						dangerouslySetInnerHTML: { __html: s.axisLabel }
 					})
@@ -195,16 +195,16 @@ var _ = g(p, "Readable") || g(b.Readable, "Readable"), v = f, y = v.default, b =
 		};
 	};
 	render() {
-		let { graphProps: e } = this.props, { domain: t, range: n } = e || {}, { columnTicksValues: r, firstNegativeX: i, distanceFromOriginToFirstNegativeX: a } = this.xValues(), { rowTickValues: o, firstNegativeY: s, distanceFromOriginToFirstNegativeY: c } = this.yValues(), d = D(i, s, a, c, 6, 25);
-		return /* @__PURE__ */ u(C, { children: [n.min <= 0 ? /* @__PURE__ */ l(A, {
+		let { graphProps: e } = this.props, { domain: t, range: n } = e || {}, { columnTicksValues: r, firstNegativeX: i, distanceFromOriginToFirstNegativeX: a } = this.xValues(), { rowTickValues: o, firstNegativeY: s, distanceFromOriginToFirstNegativeY: c } = this.yValues(), l = D(i, s, a, c, 6, 25);
+		return /* @__PURE__ */ p(C, { children: [n.min <= 0 ? /* @__PURE__ */ f(A, {
 			...this.props,
-			skipValues: d,
+			skipValues: l,
 			columnTicksValues: r,
 			distanceFromOriginToFirstNegativeY: c,
 			dy: 25
-		}) : null, t.min <= 0 ? /* @__PURE__ */ l(M, {
+		}) : null, t.min <= 0 ? /* @__PURE__ */ f(M, {
 			...this.props,
-			skipValues: d,
+			skipValues: l,
 			rowTickValues: o,
 			distanceFromOriginToFirstNegativeX: a
 		}) : null] });

package/dist/coordinates-label.js

@@ -2,17 +2,17 @@ import { roundNumber as e } from "./utils.js";
 import "react";
 import t from "prop-types";
 import { types as n } from "@pie-lib/plot";
-import { jsx as r } from "react/jsx-runtime";
-import { styled as i } from "@mui/material/styles";
-import { color as a } from "@pie-lib/render-ui";
+import { color as r } from "@pie-lib/render-ui";
+import { jsx as i } from "react/jsx-runtime";
+import { styled as a } from "@mui/material/styles";
 import o from "@mui/material/InputBase";
 //#region src/coordinates-label.tsx
-var s = i(o)(({ theme: e }) => ({
+var s = a(o)(({ theme: e }) => ({
 	fontFamily: e.typography.fontFamily,
 	fontSize: e.typography.fontSize,
 	borderRadius: "8px",
 	background: e.palette.common.white,
-	color: a.defaults.BLACK,
+	color: r.defaults.BLACK,
 	"& .MuiInputBase-input": { padding: 0 }
 })), c = (e, t, n, r) => {
 	let { scale: i, domain: a, range: o } = e, s = n === o.min ? 16 : n === o.max ? 0 : 8;
@@ -23,15 +23,15 @@ var s = i(o)(({ theme: e }) => ({
 		left: i.x(t) + 10,
 		top: i.y(n) - s
 	};
-}, l = ({ x: t, y: n, graphProps: i }) => {
+}, l = ({ x: t, y: n, graphProps: r }) => {
 	let a = `(${e(t)}, ${e(n)})`, o = (a.length || 0) * 6;
-	return /* @__PURE__ */ r(s, {
+	return /* @__PURE__ */ i(s, {
 		style: {
 			position: "absolute",
 			pointerEvents: "auto",
 			width: o,
 			padding: 0,
-			...c(i, t, n, o)
+			...c(r, t, n, o)
 		},
 		value: a,
 		inputProps: { ariaLabel: "naked" }

package/dist/graph-with-controls.js

@@ -6,57 +6,57 @@ import { allTools as a, toolsArr as o } from "./tools/index.js";
 import s from "react";
 import c from "prop-types";
 import { isString as l, uniq as u } from "@pie-element/shared-lodash";
-import { Fragment as d, jsx as f, jsxs as p } from "react/jsx-runtime";
-import { styled as m } from "@mui/material/styles";
-import { color as h } from "@pie-lib/render-ui";
+import { color as d } from "@pie-lib/render-ui";
+import { Fragment as f, jsx as p, jsxs as m } from "react/jsx-runtime";
+import { styled as h } from "@mui/material/styles";
 import { Accordion as g, AccordionDetails as _, AccordionSummary as v, Typography as y } from "@mui/material";
 import b from "@mui/icons-material/ExpandMore";
 //#region src/graph-with-controls.tsx
 var x = (e) => o.map((t) => ({
 	...t,
 	toolbar: !!e.find((e) => e === t.type)
-})) || [], S = (e, t) => t && e && (e.find((e) => e.type === t.type) || {}).toolbar, C = (e) => e.find((e) => e.toolbar), w = (e) => e.filter((e) => !!a.find((t) => t === e.type)), T = (e, t) => t.filter((t) => !!e.find((e) => e === t.type)), E = (e) => o.find((t) => t.type === e) || null, D = m("div")(() => ({
+})) || [], S = (e, t) => t && e && (e.find((e) => e.type === t.type) || {}).toolbar, C = (e) => e.find((e) => e.toolbar), w = (e) => e.filter((e) => !!a.find((t) => t === e.type)), T = (e, t) => t.filter((t) => !!e.find((e) => e === t.type)), E = (e) => o.find((t) => t.type === e) || null, D = h("div")(() => ({
 	display: "flex",
 	flexDirection: "column",
 	width: "min-content"
-})), O = m("div")(() => ({
+})), O = h("div")(() => ({
 	display: "flex",
 	justifyContent: "space-between",
 	padding: "calc(1.25rem - 12px) calc(1.25rem - 12px) 1.25rem",
-	color: h.text(),
+	color: d.text(),
 	backgroundColor: "#9FA8DA",
 	"& button": {
 		fontSize: "0.875rem",
 		padding: "0.25rem .3rem",
 		width: "5rem"
 	}
-})), k = m(g)(() => ({
-	backgroundColor: h.primaryLight(),
+})), k = h(g)(() => ({
+	backgroundColor: d.primaryLight(),
 	width: "100%",
 	boxShadow: "none"
-})), A = m(v)(({ theme: e }) => ({
+})), A = h(v)(({ theme: e }) => ({
 	padding: `0 ${e.spacing(1)}`,
 	minHeight: "32px !important",
 	"& .MuiAccordionSummary-content": { margin: "4px 0 !important" }
-})), j = m(_)(({ theme: e }) => ({
+})), j = h(_)(({ theme: e }) => ({
 	padding: 0,
 	marginTop: e.spacing(1),
 	display: "flex",
 	justifyContent: "space-between"
-})), M = m("div")(() => ({
+})), M = h("div")(() => ({
 	display: "flex",
 	flexDirection: "column",
 	marginTop: ".5rem"
-})), N = ({ children: e, title: t }) => /* @__PURE__ */ p(k, {
+})), N = ({ children: e, title: t }) => /* @__PURE__ */ m(k, {
 	square: !0,
 	disableGutters: !0,
-	children: [/* @__PURE__ */ f(A, {
-		expandIcon: /* @__PURE__ */ f(b, {}),
-		children: /* @__PURE__ */ f(y, {
+	children: [/* @__PURE__ */ p(A, {
+		expandIcon: /* @__PURE__ */ p(b, {}),
+		children: /* @__PURE__ */ p(y, {
 			variant: "subtitle1",
 			children: t
 		})
-	}), /* @__PURE__ */ f(j, { children: e })]
+	}), /* @__PURE__ */ p(j, { children: e })]
 });
 N.propTypes = {
 	children: c.node,
@@ -96,31 +96,31 @@ var P = class extends s.Component {
 	changeCurrentTool = (e, t) => this.setState({ currentTool: t.find((t) => t.type === e) });
 	toggleLabelMode = () => this.setState((e) => ({ labelModeEnabled: !e.labelModeEnabled }));
 	render() {
-		let { currentTool: n, labelModeEnabled: a } = this.state, { axesSettings: o, className: s, coordinatesOnHover: c, collapsibleToolbar: m, collapsibleToolbarTitle: h, disabled: g, disabledLabels: _, disabledTitle: v, domain: y, labels: b, labelsPlaceholders: E, onChangeLabels: k, onChangeMarks: A, onChangeTitle: j, onUndo: P, onRedo: F, range: I, size: L, showLabels: R, showPixelGuides: z, showTitle: B, title: V, titlePlaceholder: H, language: U, disableToolbar: W = !1, gssLineData: G, onChangeGssLineData: K, onSolutionSetSelected: q, onCustomReset: J } = this.props, { backgroundMarks: Y, marks: X, toolbarTools: Z } = this.props;
+		let { currentTool: n, labelModeEnabled: a } = this.state, { axesSettings: o, className: s, coordinatesOnHover: c, collapsibleToolbar: d, collapsibleToolbarTitle: h, disabled: g, disabledLabels: _, disabledTitle: v, domain: y, labels: b, labelsPlaceholders: E, onChangeLabels: k, onChangeMarks: A, onChangeTitle: j, onUndo: P, onRedo: F, range: I, size: L, showLabels: R, showPixelGuides: z, showTitle: B, title: V, titlePlaceholder: H, language: U, disableToolbar: W = !1, gssLineData: G, onChangeGssLineData: K, onSolutionSetSelected: q, onCustomReset: J } = this.props, { backgroundMarks: Y, marks: X, toolbarTools: Z } = this.props;
 		Z = u(Z || []).filter((e) => !!l(e)) || [], Y = w(Y || []), X = T(Z, X || []), G && G.lineA && X[0] && X[0].type === "line" && (X[0].fill = G.lineA.lineType), G && G.lineB && X[1] && X[1].type === "line" && (X[1].fill = G.lineB.lineType);
 		let Q = x(Z);
 		(!n || !S(Q, n)) && (n = C(Q));
-		let $ = G && /* @__PURE__ */ p(d, { children: [/* @__PURE__ */ f(r, {
+		let $ = G && /* @__PURE__ */ m(f, { children: [/* @__PURE__ */ p(r, {
 			numberOfLines: G.numberOfLines,
 			gssLineData: G,
 			onChange: K,
 			disabled: !!g,
 			language: U
-		}), !g && /* @__PURE__ */ f(M, { children: /* @__PURE__ */ f(i, {
+		}), !g && /* @__PURE__ */ p(M, { children: /* @__PURE__ */ p(i, {
 			onUndo: P,
 			onRedo: F,
 			onReset: J,
 			language: U
 		}) })] });
-		return /* @__PURE__ */ p(D, {
+		return /* @__PURE__ */ m(D, {
 			className: e(s),
 			children: [
-				!W && /* @__PURE__ */ f(O, { children: m ? /* @__PURE__ */ f(N, {
+				!W && /* @__PURE__ */ p(O, { children: d ? /* @__PURE__ */ p(N, {
 					title: h,
 					children: $
 				}) : $ }),
-				/* @__PURE__ */ f("div", { ref: (e) => this.labelNode = e }),
-				/* @__PURE__ */ f(t, {
+				/* @__PURE__ */ p("div", { ref: (e) => this.labelNode = e }),
+				/* @__PURE__ */ p(t, {
 					axesSettings: o,
 					backgroundMarks: Y,
 					coordinatesOnHover: c,

package/dist/graph.js

@@ -7,11 +7,12 @@ import s from "react";
 import c from "prop-types";
 import { cloneDeep as l, isEqual as u } from "@pie-element/shared-lodash";
 import { Root as d, createGraphProps as f, types as p, utils as m } from "@pie-lib/plot";
-import h from "@pie-lib/translator";
-import g from "debug";
-import { jsx as _, jsxs as v } from "react/jsx-runtime";
+import { createUniqueId as h } from "@pie-lib/render-ui";
+import g from "@pie-lib/translator";
+import _ from "debug";
+import { jsx as v, jsxs as y } from "react/jsx-runtime";
 //#region src/graph.tsx
-var { translator: y } = h, b = g("pie-lib:graphing-solution-set:graph"), x = {
+var { translator: b } = g, x = _("pie-lib:graphing-solution-set:graph"), S = {
 	axesSettings: c.shape(r),
 	backgroundMarks: c.array,
 	className: c.string,
@@ -38,42 +39,42 @@ var { translator: y } = h, b = g("pie-lib:graphing-solution-set:graph"), x = {
 	title: c.string,
 	tools: c.array,
 	language: c.string
-}, S = (e) => ({
+}, C = (e) => ({
 	x: -23,
 	y: -23,
 	width: e.width + 46,
 	height: e.height + 46
-}), C = (e) => e ? m.extractTextFromHTML(e).trim() : "", w = ({ title: e, domain: t, range: n, marks: r, language: i }) => {
+}), w = (e) => e ? m.extractTextFromHTML(e).trim() : "", T = ({ title: e, domain: t, range: n, marks: r, language: i }) => {
 	let a = {
 		lng: i,
 		interpolation: { escapeValue: !1 }
-	}, o = ({ axisLabel: e, min: t, max: n }, r) => y.t("graphing.axisRange", {
+	}, o = ({ axisLabel: e, min: t, max: n }, r) => b.t("graphing.axisRange", {
 		...a,
-		axis: C(e) || r,
+		axis: w(e) || r,
 		min: t,
 		max: n
-	}), s = r.filter((e) => !e.building && (e.type !== "polygon" || e.isSolution)), c = y.t("graphing.plotted", {
+	}), s = r.filter((e) => !e.building && (e.type !== "polygon" || e.isSolution)), c = b.t("graphing.plotted", {
 		...a,
 		count: s.length,
-		marks: s.map((e) => y.t(e.type === "polygon" ? "graphing.shadedRegion" : `graphing.${e.type}`, a).trim()).join(", ")
+		marks: s.map((e) => b.t(e.type === "polygon" ? "graphing.shadedRegion" : `graphing.${e.type}`, a).trim()).join(", ")
 	});
 	return {
-		ariaLabel: C(e) || y.t("graphing.graph", a),
+		ariaLabel: w(e) || b.t("graphing.graph", a),
 		ariaDescription: `${o(t, "x")} ${o(n, "y")} ${c}`
 	};
-}, T = ({ marks: e, currentTool: t }) => {
+}, E = ({ marks: e, currentTool: t }) => {
 	let n = e.filter((e) => e.building)[0], r = l(e);
 	if (n && t && n.type !== t.type) {
 		let e = r.findIndex((e) => u(e, n));
 		e >= 0 && r.splice(e, 1);
 	}
 	return r;
-}, E = class extends s.Component {
+}, D = class extends s.Component {
 	constructor(e) {
 		super(e), this.maskUid = this.generateMaskId();
 	}
 	static propTypes = {
-		...x,
+		...S,
 		currentTool: c.object
 	};
 	static defaultProps = {
@@ -83,7 +84,7 @@ var { translator: y } = h, b = g("pie-lib:graphing-solution-set:graph"), x = {
 	};
 	state = {};
 	generateMaskId() {
-		return "graph-" + (Math.random() * 1e4).toFixed();
+		return h("graph");
 	}
 	componentDidMount = () => this.setState({ labelNode: this.labelNode });
 	changeMark = (e, n) => {
@@ -119,7 +120,7 @@ var { translator: y } = h, b = g("pie-lib:graphing-solution-set:graph"), x = {
 			if (o.numberOfLines === 1 && o.selectedTool === "lineA" && a.length === 1 && !a[0].building || o.numberOfLines === 2 && o.selectedTool === "lineA" && a.length === 2 || o.numberOfLines === 2 && o.selectedTool === "lineA" && a.length === 1 && !a[0].building || o.numberOfLines === 2 && o.selectedTool === "lineB" && a.length === 2 && !a[1].building) return;
 		}
 		if (r || !i || [null, void 0].includes(t) || [null, void 0].includes(n)) return;
-		b("[onBgClick] x,y: ", t, n);
+		x("[onBgClick] x,y: ", t, n);
 		let c = a.filter((e) => e.building)[0], l;
 		l = c && i && c.type === i.type ? i.addPoint({
 			x: t,
@@ -130,13 +131,13 @@ var { translator: y } = h, b = g("pie-lib:graphing-solution-set:graph"), x = {
 		}, void 0), this.updateMarks(c, l, !0);
 	};
 	render() {
-		let { axesSettings: t, currentTool: r, coordinatesOnHover: a, size: s, disabledLabels: c, disabledTitle: l, domain: u, backgroundMarks: p, range: m, title: h, labels: g, labelModeEnabled: y, labelsPlaceholders: b, showLabels: x, showPixelGuides: C, showTitle: E, titlePlaceholder: D, onChangeLabels: O, onChangeTitle: k, mathMlOptions: A = {}, gssLineData: j, disabled: M, language: N } = this.props, { marks: P } = this.props, F = f(u, m, s, () => this.rootNode), I = S(s), L = {
+		let { axesSettings: t, currentTool: r, coordinatesOnHover: a, size: s, disabledLabels: c, disabledTitle: l, domain: u, backgroundMarks: p, range: m, title: h, labels: g, labelModeEnabled: _, labelsPlaceholders: b, showLabels: x, showPixelGuides: S, showTitle: w, titlePlaceholder: D, onChangeLabels: O, onChangeTitle: k, mathMlOptions: A = {}, gssLineData: j, disabled: M, language: N } = this.props, { marks: P } = this.props, F = f(u, m, s, () => this.rootNode), I = C(s), L = {
 			graphProps: F,
-			labelModeEnabled: y,
+			labelModeEnabled: _,
 			gssLineData: j,
 			language: N
 		};
-		P = T({
+		P = E({
 			marks: P || [],
 			currentTool: r
 		});
@@ -155,22 +156,22 @@ var { translator: y } = h, b = g("pie-lib:graphing-solution-set:graph"), x = {
 		});
 		let z = [];
 		z.push(...P.filter((e) => e.type === "polygon")), z.push(...P.filter((e) => e.type === "line"));
-		let { ariaLabel: B, ariaDescription: V } = w({
+		let { ariaLabel: B, ariaDescription: V } = T({
 			title: h,
 			domain: u,
 			range: m,
 			marks: [...p || [], ...z],
 			language: N
 		});
-		return /* @__PURE__ */ _(d, {
+		return /* @__PURE__ */ v(d, {
 			rootRef: (e) => this.rootNode = e,
 			disabledTitle: l,
 			disabledLabels: c,
 			labels: g,
 			labelsPlaceholders: b || {},
-			showPixelGuides: C,
+			showPixelGuides: S,
 			showLabels: x,
-			showTitle: E,
+			showTitle: w,
 			title: h,
 			titlePlaceholder: D,
 			onChangeTitle: k,
@@ -179,33 +180,32 @@ var { translator: y } = h, b = g("pie-lib:graphing-solution-set:graph"), x = {
 			ariaLabel: B,
 			ariaDescription: V,
 			...L,
-			children: /* @__PURE__ */ v("g", {
+			children: /* @__PURE__ */ y("g", {
 				transform: u && u.padding && u.range ? `translate(${u.padding}, ${m.padding})` : void 0,
 				children: [
-					/* @__PURE__ */ _(i, { ...L }),
-					/* @__PURE__ */ _(n, {
+					/* @__PURE__ */ v(i, { ...L }),
+					/* @__PURE__ */ v(n, {
 						...t,
 						...L
 					}),
-					/* @__PURE__ */ _(o, {
+					/* @__PURE__ */ v(o, {
 						...s,
 						onClick: this.onBgClick,
 						...L
 					}),
-					/* @__PURE__ */ v("mask", {
+					/* @__PURE__ */ y("mask", {
 						id: `${this.maskUid}`,
-						children: [/* @__PURE__ */ _("rect", {
+						children: [/* @__PURE__ */ v("rect", {
 							...I,
 							fill: "white"
 						}), " "]
 					}),
-					/* @__PURE__ */ v("g", {
-						id: "marks",
+					/* @__PURE__ */ y("g", {
 						mask: `url('#${this.maskUid}')`,
 						children: [
 							(p || []).map((e, t) => {
 								let n = this.getComponent(e), r = e.type;
-								return /* @__PURE__ */ _(n, {
+								return /* @__PURE__ */ v(n, {
 									mark: {
 										...e,
 										disabled: !0,
@@ -218,7 +218,7 @@ var { translator: y } = h, b = g("pie-lib:graphing-solution-set:graph"), x = {
 							}),
 							z.map((e, t) => {
 								let n = this.getComponent(e), i = e.type;
-								return /* @__PURE__ */ _(n, {
+								return /* @__PURE__ */ v(n, {
 									mark: e,
 									coordinatesOnHover: a,
 									onChange: this.changeMark,
@@ -231,7 +231,7 @@ var { translator: y } = h, b = g("pie-lib:graphing-solution-set:graph"), x = {
 									...L
 								}, `${i}-${t}`);
 							}),
-							/* @__PURE__ */ _("foreignObject", {
+							/* @__PURE__ */ v("foreignObject", {
 								ref: (e) => this.labelNode = e,
 								x: "0",
 								y: "0",
@@ -249,4 +249,4 @@ var { translator: y } = h, b = g("pie-lib:graphing-solution-set:graph"), x = {
 	}
 };
 //#endregion
-export { E as Graph, E as default, x as graphPropTypes, T as removeBuildingToolIfCurrentToolDiffers };
+export { D as Graph, D as default, S as graphPropTypes, E as removeBuildingToolIfCurrentToolDiffers };