@pie-element/placement-ordering 14.1.2-next.5 → 14.1.2-next.6

package/dist/controller/scoring.js

@@ -27,4 +27,4 @@ var a = r("pie-elements:placement-ordering:controller"), o = (e) => /* @__PURE__
 	}), a;
 };
 //#endregion
-export { c as flattenCorrect, l as getAllCorrectResponses, u as score };
+export { c as flattenCorrect, l as getAllCorrectResponses, o as illegalArgumentError, s as pairwiseCombinationScore, u as score };

package/dist/delivery/index.js

@@ -60,10 +60,10 @@ var s = i("pie-elements:placement-ordering"), c = ({ model: e, session: t }) =>
 		}
 	}
 	connectedCallback() {
-		this._initMathObserver();
+		this._initMathObserver(), this.render();
 	}
 	disconnectedCallback() {
-		this._disconnectMathObserver(), this._root && this._root.unmount();
+		this._disconnectMathObserver(), this._root &&= (this._root.unmount(), null);
 	}
 };
 //#endregion

package/dist/delivery/keyboard-coordinates.d.ts

@@ -0,0 +1,35 @@
+/**
+ * @synced-from pie-elements/packages/placement-ordering/src/keyboard-coordinates.js
+ * @auto-generated
+ *
+ * This file is automatically synced from pie-elements and converted to TypeScript.
+ * Manual edits will be overwritten on next sync.
+ * To make changes, edit the upstream JavaScript file and run sync again.
+ */
+/**
+ * Custom keyboard coordinate getter for placement-ordering's Tab-based placement mode
+ * (enabled only when the item is configured with `placementArea` / `includeTargets`).
+ *
+ * Tab/Shift+Tab cycle the dragged choice directly onto the next/previous enabled
+ * droppable (a placement/target tile, or an empty gap left behind in the choices row),
+ * in real on-screen position order, placing the dragged item's own top-left corner at
+ * the target's center-left point.
+ *
+ * Arrow keys are delegated to dnd-kit's own `defaultKeyboardCoordinateGetter` so the
+ * pre-existing free-form arrow-key dragging behavior is left completely unchanged.
+ *
+ * The tile currently being dragged already disables its own droppable
+ * (see `useDroppable({ disabled: isDragging })` in tile.jsx), so it's naturally
+ * excluded from the candidate list here without any extra bookkeeping.
+ *
+ * When picking up a choice from the choices row, the other not-yet-placed choice
+ * tiles are also registered droppables (tile.jsx disables a droppable only while it's
+ * the one being dragged), but dropping a choice onto another choice is a no-op in the
+ * reducer (ordering.js's updateResponse has no `choice -> choice` case) — so they're
+ * excluded from the Tab/Shift+Tab cycle, leaving only the real placement targets.
+ */
+export declare const closestDroppableKeyboardCoordinates: (event: any, { active, context, currentCoordinates }: {
+    active: any;
+    context: any;
+    currentCoordinates: any;
+}) => any;

package/dist/delivery/keyboard-coordinates.js

@@ -0,0 +1,48 @@
+import { KeyboardCode as e, defaultKeyboardCoordinateGetter as t } from "@dnd-kit/core";
+//#region src/delivery/keyboard-coordinates.ts
+var n = (n, { active: i, context: a, currentCoordinates: o }) => {
+	let { code: s } = n, c = s === "Tab", l = s === e.Down || s === e.Up || s === e.Left || s === e.Right;
+	if (!c && !l) return;
+	if (l) return t(n, {
+		context: a,
+		currentCoordinates: o
+	});
+	n.preventDefault();
+	let { droppableRects: u, droppableContainers: d, collisionRect: f } = a;
+	if (!u || u.size === 0) return o;
+	let p = {
+		x: (f?.width || 0) / 2,
+		y: (f?.height || 0) / 2
+	}, m = {
+		x: o.x + p.x,
+		y: o.y + p.y
+	}, h = i?.data?.current?.type === "choice", g = [];
+	for (let [e, t] of d) {
+		if (t?.disabled || h && t?.data?.current?.type === "choice") continue;
+		let n = u.get(e);
+		if (!n) continue;
+		let r = {
+			x: n.left + n.width / 2,
+			y: n.top + n.height / 2
+		}, i = {
+			x: n.left,
+			y: n.top + n.height / 2
+		};
+		g.push({
+			id: e,
+			dropPosition: i,
+			center: r
+		});
+	}
+	if (g.length === 0) return o;
+	let _ = n.shiftKey;
+	g.sort((e, t) => Math.abs(e.center.y - t.center.y) > 10 ? e.center.y - t.center.y : e.center.x - t.center.x);
+	let v = 0, y = Infinity;
+	for (let e = 0; e < g.length; e++) {
+		let t = r(m, g[e].center);
+		t < y && (y = t, v = e);
+	}
+	return g[_ ? (v - 1 + g.length) % g.length : (v + 1) % g.length].dropPosition;
+}, r = (e, t) => Math.sqrt((e.x - t.x) ** 2 + (e.y - t.y) ** 2);
+//#endregion
+export { n as closestDroppableKeyboardCoordinates };

package/dist/delivery/main.js

@@ -1,4 +1,4 @@
-import e from "./placement-ordering.js";
+import { PlacementOrdering as e } from "./placement-ordering.js";
 import t from "react";
 import n from "prop-types";
 import { jsx as r } from "react/jsx-runtime";

package/dist/delivery/ordering.js

@@ -90,4 +90,4 @@ function f(e, t) {
 	return t;
 }
 //#endregion
-export { d as buildState, f as reducer };
+export { d as buildState, o as push, f as reducer, s as swap };

package/dist/delivery/placement-ordering.d.ts

@@ -23,6 +23,17 @@ export declare class PlacementOrdering extends React.Component {
     onRemoveChoice: any;
     createOrdering: any;
     onDragEnd: any;
+    onDragStart: any;
+    onDragCancel: any;
+    isSameChoice: (a: any, b: any) => boolean;
+    selectChoice: any;
+    toggleChoiceSelection: any;
+    cancelSelection: any;
+    endAnyLiveKeyboardDrag: any;
+    placeSelectedChoice: any;
+    isClickSoonAfterDragEnd: () => boolean;
+    onChoiceClick: any;
+    onPlacementClick: any;
     render(): React.JSX.Element;
 }
 export default PlacementOrdering;

package/dist/delivery/placement-ordering.js

@@ -1,62 +1,84 @@
 import { HorizontalTiler as e, VerticalTiler as t } from "./tiler.js";
 import { buildState as n, reducer as r } from "./ordering.js";
 import { haveSameValuesButDifferentOrder as i } from "./utils.js";
-import a from "react";
-import { difference as o, isEqual as s, uniqueId as c } from "@pie-element/shared-lodash";
-import l from "debug";
-import { renderMath as u } from "@pie-element/shared-math-rendering-mathjax";
-import d from "prop-types";
-import f from "react-dom";
-import { styled as p } from "@mui/material/styles";
-import { closestCenter as m } from "@dnd-kit/core";
-import * as h from "@pie-lib/render-ui";
-import { Collapsible as g, Feedback as _, PreviewPrompt as v, UiLayout as y, color as b, hasMedia as x, hasText as S } from "@pie-lib/render-ui";
-import { jsx as C, jsxs as w } from "react/jsx-runtime";
-import T from "@pie-lib/translator";
-import E from "@pie-lib/correct-answer-toggle";
-import { DragProvider as D } from "@pie-lib/drag";
+import { closestDroppableKeyboardCoordinates as a } from "./keyboard-coordinates.js";
+import o from "react";
+import { difference as s, isEqual as c, uniqueId as l } from "@pie-element/shared-lodash";
+import u from "debug";
+import { renderMath as d } from "@pie-element/shared-math-rendering-mathjax";
+import f from "prop-types";
+import p from "react-dom";
+import { styled as m } from "@mui/material/styles";
+import { rectIntersection as h } from "@dnd-kit/core";
+import { restrictToParentElement as g } from "@dnd-kit/modifiers";
+import * as _ from "@pie-lib/render-ui";
+import { Collapsible as v, Feedback as y, PreviewPrompt as b, UiLayout as x, color as S, hasMedia as C, hasText as w } from "@pie-lib/render-ui";
+import { jsx as T, jsxs as E } from "react/jsx-runtime";
+import D from "@pie-lib/translator";
+import O from "@pie-lib/correct-answer-toggle";
+import { DragProvider as k } from "@pie-lib/drag";
 //#region src/delivery/placement-ordering.tsx
-function O(e) {
+function A(e) {
 	return typeof e == "function" || typeof e == "object" && !!e && typeof e.$$typeof == "symbol";
 }
-function k(e, t) {
-	return !e || O(e) ? e : O(e.default) ? e.default : t && O(e[t]) ? e[t] : t && O(e[t]?.default) ? e[t].default : e;
+function j(e, t) {
+	return !e || A(e) ? e : A(e.default) ? e.default : t && A(e[t]) ? e[t] : t && A(e[t]?.default) ? e[t].default : e;
 }
-var A = k(y, "UiLayout") || k(I.UiLayout, "UiLayout"), j = k(v, "PreviewPrompt") || k(I.PreviewPrompt, "PreviewPrompt"), M = k(_, "Feedback") || k(I.Feedback, "Feedback"), N = k(g, "Collapsible") || k(I.Collapsible, "Collapsible"), P = h, F = P.default, I = F && typeof F == "object" ? F : P, { translator: L } = T, R = l("pie-elements:placement-ordering"), z = p("div")({
-	color: b.text(),
-	backgroundColor: b.background(),
+var M = j(x, "UiLayout") || j(R.UiLayout, "UiLayout"), N = j(b, "PreviewPrompt") || j(R.PreviewPrompt, "PreviewPrompt"), P = j(y, "Feedback") || j(R.Feedback, "Feedback"), F = j(v, "Collapsible") || j(R.Collapsible, "Collapsible"), I = _, L = I.default, R = L && typeof L == "object" ? L : I, z = 250, B = (e) => e ? {
+	keyboardCoordinateGetter: a,
+	keyboardCodes: {
+		start: ["Space", "Enter"],
+		cancel: ["Escape"],
+		end: ["Space", "Enter"]
+	},
+	accessibility: { screenReaderInstructions: { draggable: "Press Space or Enter to pick up this answer choice. Once picked up, use Tab or Shift+Tab to cycle through response areas, or use arrow keys to move it freely. Press Space or Enter to drop, or Escape to cancel." } }
+} : {}, { translator: V } = D, H = u("pie-elements:placement-ordering"), U = m("div")({
+	color: S.text(),
+	backgroundColor: S.background(),
 	display: "flex",
 	flexDirection: "column",
 	alignItems: "center",
 	boxSizing: "border-box"
-}), B = p("div")(({ theme: e }) => ({ paddingBottom: e.spacing(1) })), V = p("div")(({ theme: e }) => ({ paddingBottom: e.spacing(2) })), H = p(E)(({ theme: e }) => ({ paddingBottom: e.spacing(1) })), U = p(N)(({ theme: e }) => ({
+}), W = m("div")({
+	alignSelf: "stretch",
+	maxWidth: "100%",
+	overflowX: "auto",
+	overflowY: "hidden"
+}), G = m("div")({
+	display: "flex",
+	justifyContent: "center",
+	minWidth: "min-content"
+}), K = m("div")(({ theme: e }) => ({ paddingBottom: e.spacing(1) })), q = m("div")(({ theme: e }) => ({ paddingBottom: e.spacing(2) })), J = m(O)(({ theme: e }) => ({ paddingBottom: e.spacing(1) })), Y = m(F)(({ theme: e }) => ({
 	marginBottom: e.spacing(2),
 	alignSelf: "flex-start"
-})), W = (e) => {
+})), X = (e) => {
 	let { tiler: t, ordering: n, onDropChoice: r, onRemoveChoice: i, ...a } = e;
-	return /* @__PURE__ */ C(t, {
+	return /* @__PURE__ */ T(t, {
 		...a,
 		tiles: n.tiles,
 		onDropChoice: (e, t) => r(e, t, n),
 		onRemoveChoice: (e) => i(e, n)
 	});
 };
-W.propTypes = {
-	tiler: d.func,
-	ordering: d.any,
-	onDropChoice: d.func,
-	onRemoveChoice: d.func
+X.propTypes = {
+	tiler: f.func,
+	ordering: f.any,
+	onDropChoice: f.func,
+	onRemoveChoice: f.func
 };
-var G = class extends a.Component {
+var Z = class extends o.Component {
 	static propTypes = {
-		onSessionChange: d.func.isRequired,
-		model: d.object.isRequired,
-		session: d.oneOfType([d.array.isRequired, d.object.isRequired])
+		onSessionChange: f.func.isRequired,
+		model: f.object.isRequired,
+		session: f.oneOfType([f.array.isRequired, f.object.isRequired])
 	};
 	constructor(e) {
-		super(e), this.instanceId = c();
+		super(e), this.instanceId = l();
 		let { value: t, needsReset: n } = this.validateSession(e);
-		this.state = { showingCorrect: !1 };
+		this.state = {
+			showingCorrect: !1,
+			selectedChoice: null
+		}, this.lastDragEndAt = 0;
 		let { model: r } = e || {}, { env: i } = r || {}, { mode: a } = i || {};
 		n && a === "gather" && this.props.onSessionChange({
 			...e.session,
@@ -65,18 +87,18 @@ var G = class extends a.Component {
 	}
 	toggleCorrect = (e) => this.setState({ showingCorrect: e });
 	componentDidUpdate() {
-		u(f.findDOMNode(this));
+		d(p.findDOMNode(this));
 	}
 	validateSession = ({ model: e, session: t }, n = !1) => {
-		let { config: r, choices: i } = e || {}, { includeTargets: a } = r || {}, c = i.map((e) => e.id), { value: l } = t || {}, u;
-		if (a) l && l.length !== c.length && (u = !0, l = l.length < c.length ? l.concat(Array(c.length - l.length)) : l.filter((e) => c.includes(e)));
+		let { config: r, choices: i } = e || {}, { includeTargets: a } = r || {}, o = i.map((e) => e.id), { value: l } = t || {}, u;
+		if (a) l && l.length !== o.length && (u = !0, l = l.length < o.length ? l.concat(Array(o.length - l.length)) : l.filter((e) => o.includes(e)));
 		else {
-			if (!l || !l.length || n) l = c;
+			if (!l || !l.length || n) l = o;
 			else {
-				let e = o(c, l), t = o(l, c);
-				(e.length || t.length) && (l = c);
+				let e = s(o, l), t = s(l, o);
+				(e.length || t.length) && (l = o);
 			}
-			u = !s(t.value, l);
+			u = !c(t.value, l);
 		}
 		return u && console.warn("This session is not valid anymore. It will be reset."), {
 			value: l,
@@ -84,8 +106,8 @@ var G = class extends a.Component {
 		};
 	};
 	UNSAFE_componentWillReceiveProps(e) {
-		let { model: t = {} } = e || {}, { model: n = {} } = this.props || {}, { correctResponse: r, config: a, choices: o = [], env: s } = t, { includeTargets: c } = a || {}, l = {}, u = n.language && n.language !== t.language, d = n.note && n.note === L.t("common:commonCorrectAnswerWithAlternates", { lng: n.language });
-		u && d && (n.note = L.t("common:commonCorrectAnswerWithAlternates", { lng: t.language })), r || (l.showingCorrect = !1);
+		let { model: t = {} } = e || {}, { model: n = {} } = this.props || {}, { correctResponse: r, config: a, choices: o = [], env: s } = t, { includeTargets: c } = a || {}, l = {}, u = n.language && n.language !== t.language, d = n.note && n.note === V.t("common:commonCorrectAnswerWithAlternates", { lng: n.language });
+		u && d && (n.note = V.t("common:commonCorrectAnswerWithAlternates", { lng: t.language })), r || (l.showingCorrect = !1);
 		let f = i(o, n.choices), { value: p, needsReset: m } = this.validateSession(e, f), h = {
 			...e.session,
 			value: p
@@ -97,7 +119,7 @@ var G = class extends a.Component {
 	}
 	onDropChoice = (e, t, n) => {
 		let { onSessionChange: i, session: a } = this.props, o = n.tiles.find((e) => e.id === t.id && e.type === t.type && e.index === t.index), s = e;
-		R("[onDropChoice] ", o, s);
+		H("[onDropChoice] ", o, s);
 		let c = r({
 			type: "move",
 			from: o,
@@ -107,7 +129,7 @@ var G = class extends a.Component {
 	};
 	onRemoveChoice = (e, t) => {
 		let { onSessionChange: n, session: i } = this.props;
-		R("[onRemoveChoice]", e);
+		H("[onRemoveChoice]", e);
 		let a = r({
 			type: "remove",
 			target: e
@@ -132,7 +154,7 @@ var G = class extends a.Component {
 	};
 	onDragEnd = (e) => {
 		let { over: t, active: n } = e, r = this.createOrdering();
-		if (t && n) {
+		if (this.cancelSelection(), this.lastDragEndAt = Date.now(), t && n) {
 			let e = n.data.current, i = t.data.current;
 			if (e && i && i.type === "target") {
 				this.onDropChoice(i, e, r);
@@ -144,63 +166,109 @@ var G = class extends a.Component {
 			e && e.type === "target" && this.onRemoveChoice(e, r);
 		}
 	};
+	onDragStart = (e) => {
+		let { active: t } = e;
+		t?.data?.current && this.selectChoice(t.data.current);
+	};
+	onDragCancel = () => {
+		this.cancelSelection(), this.lastDragEndAt = Date.now();
+	};
+	isSameChoice = (e, t) => !!e && !!t && e.type === t.type && e.id === t.id && e.index === t.index;
+	selectChoice = (e) => {
+		this.setState({ selectedChoice: e });
+	};
+	toggleChoiceSelection = (e) => {
+		this.setState((t) => ({ selectedChoice: this.isSameChoice(t.selectedChoice, e) ? null : e }));
+	};
+	cancelSelection = () => {
+		this.setState({ selectedChoice: null });
+	};
+	endAnyLiveKeyboardDrag = () => {
+		document.dispatchEvent(new KeyboardEvent("keydown", {
+			code: "Escape",
+			bubbles: !0,
+			cancelable: !0
+		}));
+	};
+	placeSelectedChoice = (e) => {
+		let { selectedChoice: t } = this.state;
+		if (!t) return;
+		let n = this.createOrdering();
+		this.onDropChoice(e, t, n), this.cancelSelection(), this.endAnyLiveKeyboardDrag(), this.lastDragEndAt = Date.now();
+	};
+	isClickSoonAfterDragEnd = () => Date.now() - this.lastDragEndAt < z;
+	onChoiceClick = (e) => {
+		this.isClickSoonAfterDragEnd() || this.toggleChoiceSelection(e);
+	};
+	onPlacementClick = (e) => {
+		this.isClickSoonAfterDragEnd() || this.placeSelectedChoice(e);
+	};
 	render() {
-		let { model: n } = this.props, { correctResponse: r, correctness: i, extraCSSRules: a, prompt: o, rationale: s, feedback: c, config: l, note: u, showNote: d, env: f, disabled: p, teacherInstructions: h, language: g } = n, _ = r && r.length > 0, { showingCorrect: v } = this.state, y = l || {
+		let { model: n } = this.props, { correctResponse: r, correctness: i, extraCSSRules: a, prompt: o, rationale: s, feedback: c, config: l, note: u, showNote: d, env: f, disabled: p, teacherInstructions: m, language: _ } = n, v = r && r.length > 0, { showingCorrect: y } = this.state, b = l || {
 			orientation: "vertical",
 			includeTargets: !0
-		}, { orientation: T, includeTargets: E } = y, O = T === "vertical", k = this.createOrdering(), { mode: N, role: P } = f || {}, F = O ? t : e, I = (v || N === "view" && P === "instructor") && d && u, L = s && (S(s) || x(s)), R = h && (S(h) || x(h)), G = {
-			color: b.text(),
-			backgroundColor: b.background(),
+		}, { orientation: x, includeTargets: D } = b, O = x === "vertical", A = this.createOrdering(), { mode: j, role: F } = f || {}, I = O ? t : e, L = (y || j === "view" && F === "instructor") && d && u, R = s && (w(s) || C(s)), z = m && (w(m) || C(m)), V = {
+			color: S.text(),
+			backgroundColor: S.background(),
 			display: "flex",
 			flexDirection: "column",
 			alignItems: "center",
-			boxSizing: "border-box"
-		};
-		return /* @__PURE__ */ C(D, {
-			onDragStart: () => {},
+			boxSizing: "border-box",
+			width: "100%"
+		}, H = D ? {
+			selectedChoice: this.state.selectedChoice,
+			onChoiceClick: this.onChoiceClick,
+			onPlacementClick: this.onPlacementClick
+		} : {};
+		return /* @__PURE__ */ T(k, {
+			onDragStart: this.onDragStart,
 			onDragEnd: this.onDragEnd,
-			collisionDetection: m,
-			children: /* @__PURE__ */ C(z, { children: /* @__PURE__ */ w(A, {
+			onDragCancel: this.onDragCancel,
+			collisionDetection: h,
+			modifiers: [g],
+			...B(D),
+			children: /* @__PURE__ */ T(U, { children: /* @__PURE__ */ E(M, {
 				extraCSSRules: a,
-				style: G,
+				style: V,
 				children: [
-					R && /* @__PURE__ */ C(U, {
+					z && /* @__PURE__ */ T(Y, {
 						labels: {
 							hidden: "Show Teacher Instructions",
 							visible: "Hide Teacher Instructions"
 						},
 						className: "collapsible",
-						children: /* @__PURE__ */ C(j, { prompt: h })
+						children: /* @__PURE__ */ T(N, { prompt: m })
 					}),
-					/* @__PURE__ */ C(B, { children: /* @__PURE__ */ C(j, { prompt: o }) }),
-					/* @__PURE__ */ C(H, {
-						show: _,
-						toggled: v,
+					/* @__PURE__ */ T(K, { children: /* @__PURE__ */ T(N, { prompt: o }) }),
+					/* @__PURE__ */ T(J, {
+						show: v,
+						toggled: y,
 						onToggle: this.toggleCorrect,
-						language: g
+						language: _
 					}),
-					/* @__PURE__ */ C(W, {
+					/* @__PURE__ */ T(W, { children: /* @__PURE__ */ T(G, { children: /* @__PURE__ */ T(X, {
 						instanceId: this.instanceId,
-						choiceLabel: y.choiceLabel,
-						targetLabel: y.targetLabel,
-						ordering: k,
-						tiler: F,
+						choiceLabel: b.choiceLabel,
+						targetLabel: b.targetLabel,
+						ordering: A,
+						tiler: I,
 						disabled: p,
-						addGuide: y.showOrdering,
-						tileSize: y.tileSize,
-						includeTargets: E,
-						choiceLabelEnabled: n.config && n.config.choiceLabelEnabled
-					}),
-					I && /* @__PURE__ */ C(V, { dangerouslySetInnerHTML: { __html: u } }),
-					L && /* @__PURE__ */ C(U, {
+						addGuide: b.showOrdering,
+						tileSize: b.tileSize,
+						includeTargets: D,
+						choiceLabelEnabled: n.config && n.config.choiceLabelEnabled,
+						...H
+					}) }) }),
+					L && /* @__PURE__ */ T(q, { dangerouslySetInnerHTML: { __html: u } }),
+					R && /* @__PURE__ */ T(Y, {
 						labels: {
 							hidden: "Show Rationale",
 							visible: "Hide Rationale"
 						},
 						className: "collapsible",
-						children: /* @__PURE__ */ C(j, { prompt: s })
+						children: /* @__PURE__ */ T(N, { prompt: s })
 					}),
-					!v && /* @__PURE__ */ C(M, {
+					!y && /* @__PURE__ */ T(P, {
 						correctness: i,
 						feedback: c
 					})
@@ -210,4 +278,4 @@ var G = class extends a.Component {
 	}
 };
 //#endregion
-export { G as default };
+export { Z as PlacementOrdering, Z as default };

package/dist/delivery/tile.d.ts

@@ -23,6 +23,9 @@ export declare const Tile: {
         instanceId: PropTypes.Requireable<any>;
         draggable: PropTypes.Requireable<boolean>;
         tileIndex: PropTypes.Requireable<number>;
+        selectedChoice: PropTypes.Requireable<object>;
+        onChoiceClick: PropTypes.Requireable<(...args: any[]) => any>;
+        onPlacementClick: PropTypes.Requireable<(...args: any[]) => any>;
     };
 };
 export default Tile;