@pie-element/match-list 7.1.2-next.5 → 7.1.2-next.7

package/dist/delivery/main.js

@@ -1,42 +1,65 @@
-import { Answer as e } from "./answer.js";
-import t from "./answer-area.js";
-import n from "./choices-list.js";
-import r from "react";
-import i from "prop-types";
-import { swap as a } from "@pie-lib/drag";
-import { DndContext as o, DragOverlay as s } from "@dnd-kit/core";
-import { restrictToFirstScrollableAncestor as c } from "@dnd-kit/modifiers";
-import l from "@pie-lib/correct-answer-toggle";
-import * as u from "@pie-lib/render-ui";
-import { Feedback as d, PreviewPrompt as f, color as p } from "@pie-lib/render-ui";
-import { jsx as m, jsxs as h } from "react/jsx-runtime";
-import { styled as g } from "@mui/material/styles";
-import { findKey as _, isUndefined as v, uniqueId as y } from "@pie-element/shared-lodash";
+import { closestDroppableKeyboardCoordinates as e } from "./keyboard-coordinates.js";
+import { Answer as t } from "./answer.js";
+import { AnswerArea as n } from "./answer-area.js";
+import { ChoicesList as r } from "./choices-list.js";
+import i from "react";
+import a from "prop-types";
+import { swap as o } from "@pie-lib/drag";
+import { DndContext as s, DragOverlay as c, KeyboardCode as l, KeyboardSensor as u, PointerSensor as d, rectIntersection as f } from "@dnd-kit/core";
+import { restrictToFirstScrollableAncestor as p } from "@dnd-kit/modifiers";
+import m from "@pie-lib/correct-answer-toggle";
+import * as h from "@pie-lib/render-ui";
+import { Feedback as g, PreviewPrompt as _, color as v } from "@pie-lib/render-ui";
+import { jsx as y, jsxs as b } from "react/jsx-runtime";
+import { styled as x } from "@mui/material/styles";
+import { findKey as S, isUndefined as C, uniqueId as w } from "@pie-element/shared-lodash";
 //#region src/delivery/main.tsx
-function b(e) {
+function T(e) {
 	return typeof e == "function" || typeof e == "object" && !!e && typeof e.$$typeof == "symbol";
 }
-function x(e, t) {
-	return !e || b(e) ? e : b(e.default) ? e.default : t && b(e[t]) ? e[t] : t && b(e[t]?.default) ? e[t].default : e;
+function E(e, t) {
+	return !e || T(e) ? e : T(e.default) ? e.default : t && T(e[t]) ? e[t] : t && T(e[t]?.default) ? e[t].default : e;
 }
-var S = x(f, "PreviewPrompt") || x(E.PreviewPrompt, "PreviewPrompt"), C = x(d, "Feedback") || x(E.Feedback, "Feedback"), w = u, T = w.default, E = T && typeof T == "object" ? T : w, D = g("div")({
+var D = E(_, "PreviewPrompt") || E(j.PreviewPrompt, "PreviewPrompt"), O = E(g, "Feedback") || E(j.Feedback, "Feedback"), k = h, A = k.default, j = A && typeof A == "object" ? A : k, M = 250, N = [{
+	sensor: d,
+	options: { activationConstraint: { distance: 8 } }
+}, {
+	sensor: u,
+	options: {
+		coordinateGetter: e,
+		keyboardCodes: {
+			start: [l.Space, l.Enter],
+			cancel: [l.Esc],
+			end: [l.Space, l.Enter]
+		}
+	}
+}], P = x("div")({
 	display: "flex",
 	flexDirection: "column",
 	justifyContent: "center",
-	color: p.text(),
-	backgroundColor: p.background()
-}), O = class extends r.Component {
+	color: v.text(),
+	backgroundColor: v.background()
+}), F = x("div")({
+	width: "100%",
+	overflowX: "auto",
+	overflowY: "hidden"
+}), I = x("div")({
+	display: "flex",
+	flexDirection: "column",
+	minWidth: "min-content"
+}), L = class extends i.Component {
 	static propTypes = {
-		session: i.object.isRequired,
-		onSessionChange: i.func,
-		model: i.object.isRequired,
-		prompt: i.string
+		session: a.object.isRequired,
+		onSessionChange: a.func,
+		model: a.object.isRequired,
+		prompt: a.string
 	};
 	constructor(e) {
-		super(e), this.instanceId = y(), this.state = {
+		super(e), this.instanceId = w(), this.state = {
 			showCorrectAnswer: !1,
-			draggingElement: null
-		};
+			draggingElement: null,
+			selectedAnswer: null
+		}, this.lastDragEndAt = 0;
 	}
 	onRemoveAnswer(e) {
 		let { session: t, onSessionChange: n } = this.props;
@@ -56,7 +79,33 @@ var S = x(f, "PreviewPrompt") || x(E.PreviewPrompt, "PreviewPrompt"), C = x(d, "
 			this.setState({ draggingElement: {
 				...t.data.current,
 				rect: e
-			} });
+			} }), this.selectAnswer(t.data.current);
+		}
+	};
+	onDragCancel = () => {
+		this.setState({ draggingElement: null }), this.cancelSelection(), this.lastDragEndAt = Date.now();
+	};
+	placeAnswer = (e, t) => {
+		if (!e || !t) return;
+		let { session: n, onSessionChange: r, model: i } = this.props, { config: { duplicates: a } } = i;
+		if (C(n.value) && (n.value = {}), t.type === "choices-pool" && e.promptId !== void 0) {
+			n.value[e.promptId] = void 0, r(n);
+			return;
+		}
+		let s = e.id, c = e.promptId;
+		if (t.type === "drop-zone" && t.promptId != null) {
+			let i = t.promptId;
+			if (e.type === "choice" && i !== void 0) {
+				let e = S(n.value, (e) => e === s);
+				e && !a ? n.value = o(n.value, e, i) : n.value[i] = s;
+			} else if (e.type === "target" && c != null && c !== i) {
+				let e = n.value[i] != null;
+				if (e && !a) {
+					let e = n.value[i];
+					n.value[i] = s, n.value[c] = e;
+				} else e || (n.value[i] = s, delete n.value[c]);
+			}
+			r(n);
 		}
 	};
 	onPlaceAnswer = (e) => {
@@ -64,84 +113,101 @@ var S = x(f, "PreviewPrompt") || x(E.PreviewPrompt, "PreviewPrompt"), C = x(d, "
 		let { active: t, over: n } = e;
 		if (!t) return;
 		let r = t.data.current, i = n?.data.current;
-		if (!r) return;
-		let { session: o, onSessionChange: s, model: c } = this.props, { config: { duplicates: l } } = c;
-		if (v(o.value) && (o.value = {}), i.type === "choices-pool" && r.promptId !== void 0) {
-			o.value[r.promptId] = void 0, s(o);
-			return;
-		}
-		let u = r.id, d = r.promptId;
-		if (i && i.type === "drop-zone" && i.promptId != null) {
-			let e = i.promptId;
-			if (r.type === "choice" && i.type === "drop-zone" && e !== void 0) {
-				let t = _(o.value, (e) => e === u);
-				t && !l ? o.value = a(o.value, t, e) : o.value[e] = u;
-			} else if (r.type === "target" && d != null && d !== e) {
-				let t = o.value[e] != null;
-				if (t && !l) {
-					let t = o.value[e];
-					o.value[e] = u, o.value[d] = t;
-				} else t || (o.value[e] = u, delete o.value[d]);
-			}
-			s(o);
-		}
+		r && (this.placeAnswer(r, i), this.cancelSelection(), this.lastDragEndAt = Date.now());
+	};
+	isSameAnswer = (e, t) => !!e && !!t && e.type === t.type && e.id === t.id && e.promptId === t.promptId;
+	selectAnswer = (e) => {
+		this.setState({ selectedAnswer: e });
+	};
+	toggleAnswerSelection = (e) => {
+		this.setState((t) => ({ selectedAnswer: this.isSameAnswer(t.selectedAnswer, e) ? null : e }));
+	};
+	cancelSelection = () => {
+		this.setState({ selectedAnswer: null });
+	};
+	endAnyLiveKeyboardDrag = () => {
+		document.dispatchEvent(new KeyboardEvent("keydown", {
+			code: "Escape",
+			bubbles: !0,
+			cancelable: !0
+		}));
+	};
+	placeSelectedAnswer = (e) => {
+		let { selectedAnswer: t } = this.state;
+		t && (this.placeAnswer(t, e), this.cancelSelection(), this.endAnyLiveKeyboardDrag(), this.lastDragEndAt = Date.now());
+	};
+	isClickSoonAfterDragEnd = () => Date.now() - this.lastDragEndAt < M;
+	onChoiceClick = (e) => {
+		this.isClickSoonAfterDragEnd() || this.toggleAnswerSelection(e);
+	};
+	onPlacementClick = (e) => {
+		this.isClickSoonAfterDragEnd() || this.placeSelectedAnswer(e);
 	};
 	toggleShowCorrect = () => {
 		this.setState({ showCorrectAnswer: !this.state.showCorrectAnswer });
 	};
 	renderDragOverlay = () => {
-		let { draggingElement: t } = this.state;
-		return t ? /* @__PURE__ */ m(e, {
-			id: t.id,
-			title: t.value,
+		let { draggingElement: e } = this.state;
+		return e ? /* @__PURE__ */ y(t, {
+			id: e.id,
+			title: e.value,
 			disabled: !1,
 			isDragging: !1,
-			style: t.rect ? {
-				width: t.rect.width,
-				height: t.rect.height,
+			style: e.rect ? {
+				width: e.rect.width,
+				height: e.rect.height,
 				boxSizing: "border-box"
 			} : {}
 		}) : null;
 	};
 	render() {
-		let { showCorrectAnswer: e } = this.state, { model: r, session: i } = this.props, { config: a, mode: u } = r, { prompt: d, language: f } = a;
-		return /* @__PURE__ */ h(o, {
+		let { showCorrectAnswer: e } = this.state, { model: t, session: i } = this.props, { config: a, mode: o } = t, { prompt: l, language: u } = a;
+		return /* @__PURE__ */ b(s, {
+			sensors: N,
+			collisionDetection: f,
 			onDragStart: this.onDragStart,
 			onDragEnd: this.onPlaceAnswer,
-			modifiers: [c],
-			children: [/* @__PURE__ */ h(D, { children: [
-				/* @__PURE__ */ m(S, {
+			onDragCancel: this.onDragCancel,
+			modifiers: [p],
+			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. You can also click an answer choice to select it, then click a response area to place it there." } },
+			children: [/* @__PURE__ */ b(P, { children: [
+				/* @__PURE__ */ y(D, {
 					className: "prompt",
-					prompt: d
+					prompt: l
 				}),
-				/* @__PURE__ */ m(l, {
-					show: u === "evaluate",
+				/* @__PURE__ */ y(m, {
+					show: o === "evaluate",
 					toggled: e,
 					onToggle: this.toggleShowCorrect,
-					language: f
+					language: u
 				}),
-				/* @__PURE__ */ m(t, {
+				/* @__PURE__ */ y(F, { children: /* @__PURE__ */ b(I, { children: [/* @__PURE__ */ y(n, {
 					instanceId: this.instanceId,
-					model: r,
+					model: t,
 					session: i,
 					onRemoveAnswer: (e) => this.onRemoveAnswer(e),
-					disabled: u !== "gather",
-					showCorrect: e
-				}),
-				/* @__PURE__ */ m(n, {
+					disabled: o !== "gather",
+					showCorrect: e,
+					selectedAnswer: this.state.selectedAnswer,
+					onChoiceClick: this.onChoiceClick,
+					onPlacementClick: this.onPlacementClick
+				}), /* @__PURE__ */ y(r, {
 					instanceId: this.instanceId,
-					model: r,
+					model: t,
 					session: i,
-					disabled: u !== "gather",
-					onRemoveAnswer: (e) => this.onRemoveAnswer(e)
-				}),
-				r.correctness && r.feedback && !e && /* @__PURE__ */ m(C, {
-					correctness: r.correctness.correctness,
-					feedback: r.feedback
+					disabled: o !== "gather",
+					onRemoveAnswer: (e) => this.onRemoveAnswer(e),
+					selectedAnswer: this.state.selectedAnswer,
+					onChoiceClick: this.onChoiceClick,
+					onPlacementClick: this.onPlacementClick
+				})] }) }),
+				t.correctness && t.feedback && !e && /* @__PURE__ */ y(O, {
+					correctness: t.correctness.correctness,
+					feedback: t.feedback
 				})
-			] }), /* @__PURE__ */ m(s, { children: this.renderDragOverlay() })]
+			] }), /* @__PURE__ */ y(c, { children: this.renderDragOverlay() })]
 		});
 	}
 };
 //#endregion
-export { O as default };
+export { L as Main, L as default };