jspsych-tangram 0.0.12 → 0.0.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (46) hide show
  1. package/dist/construct/index.browser.js +4809 -3948
  2. package/dist/construct/index.browser.js.map +1 -1
  3. package/dist/construct/index.browser.min.js +13 -13
  4. package/dist/construct/index.browser.min.js.map +1 -1
  5. package/dist/construct/index.cjs +275 -66
  6. package/dist/construct/index.cjs.map +1 -1
  7. package/dist/construct/index.d.ts +36 -0
  8. package/dist/construct/index.js +275 -66
  9. package/dist/construct/index.js.map +1 -1
  10. package/dist/index.cjs +385 -95
  11. package/dist/index.cjs.map +1 -1
  12. package/dist/index.d.ts +84 -0
  13. package/dist/index.js +385 -95
  14. package/dist/index.js.map +1 -1
  15. package/dist/nback/index.browser.js +4629 -3939
  16. package/dist/nback/index.browser.js.map +1 -1
  17. package/dist/nback/index.browser.min.js +12 -12
  18. package/dist/nback/index.browser.min.js.map +1 -1
  19. package/dist/nback/index.cjs +102 -64
  20. package/dist/nback/index.cjs.map +1 -1
  21. package/dist/nback/index.d.ts +24 -0
  22. package/dist/nback/index.js +102 -64
  23. package/dist/nback/index.js.map +1 -1
  24. package/dist/prep/index.browser.js +4805 -3952
  25. package/dist/prep/index.browser.js.map +1 -1
  26. package/dist/prep/index.browser.min.js +13 -13
  27. package/dist/prep/index.browser.min.js.map +1 -1
  28. package/dist/prep/index.cjs +271 -70
  29. package/dist/prep/index.cjs.map +1 -1
  30. package/dist/prep/index.d.ts +24 -0
  31. package/dist/prep/index.js +271 -70
  32. package/dist/prep/index.js.map +1 -1
  33. package/package.json +1 -1
  34. package/src/core/components/board/BoardView.tsx +372 -124
  35. package/src/core/components/board/GameBoard.tsx +26 -2
  36. package/src/core/components/pieces/BlueprintRing.tsx +105 -47
  37. package/src/core/config/config.ts +25 -10
  38. package/src/plugins/tangram-construct/ConstructionApp.tsx +7 -1
  39. package/src/plugins/tangram-construct/index.ts +22 -1
  40. package/src/plugins/tangram-nback/NBackApp.tsx +87 -28
  41. package/src/plugins/tangram-nback/index.ts +14 -0
  42. package/src/plugins/tangram-prep/PrepApp.tsx +7 -1
  43. package/src/plugins/tangram-prep/index.ts +14 -0
  44. package/tangram-construct.min.js +13 -13
  45. package/tangram-nback.min.js +12 -12
  46. package/tangram-prep.min.js +13 -13
@@ -7,30 +7,40 @@ var uuid = require('uuid');
7
7
 
8
8
  const CONFIG = {
9
9
  color: {
10
+ background: "#fff7e0ff",
10
11
  bands: {
11
- silhouette: { fillEven: "#fff2ccff", fillOdd: "#fff2ccff", stroke: "#b1b1b1" },
12
- workspace: { fillEven: "#fff2ccff", fillOdd: "#fff2ccff", stroke: "#b1b1b1" }
12
+ silhouette: { fillEven: "#ffffff", fillOdd: "#ffffff", stroke: "#b1b1b1" },
13
+ workspace: { fillEven: "#ffffff", fillOdd: "#ffffff", stroke: "#b1b1b1" }
13
14
  },
14
- completion: { fill: "#ccfff2", stroke: "#13da57" },
15
+ completion: { fill: "#ccffcc", stroke: "#13da57" },
15
16
  silhouetteMask: "#374151",
16
17
  anchors: { invalid: "#7dd3fc", valid: "#475569" },
17
- piece: { draggingFill: "#8e7cc3ff", validFill: "#8e7cc3ff", invalidFill: "#ef4444", invalidStroke: "#dc2626", selectedStroke: "#674ea7", allGreenStroke: "#86efac", borderStroke: "#674ea7" },
18
- ui: { light: "#60a5fa", dark: "#1d4ed8" },
19
- blueprint: { fill: "#374151", selectedStroke: "#111827", badgeFill: "#000000", labelFill: "#ffffff" },
20
- tangramDecomposition: { stroke: "#fef2cc" }
18
+ // validFill used here for placed composites
19
+ piece: { draggingFill: "#8e7cc3", validFill: "#8e7cc3", invalidFill: "#d55c00", invalidStroke: "#dc2626", allGreenStroke: "#86efac"},
20
+ blueprint: { fill: "#374151", badgeFill: "#000000", labelFill: "#ffffff" },
21
+ tangramDecomposition: { stroke: "#fef2cc" },
22
+ primitiveColors: [
23
+ // from seaborn "colorblind" palette, 6 colors, with red omitted
24
+ "#0173b2",
25
+ "#de8f05",
26
+ "#029e73",
27
+ "#cc78bc",
28
+ "#ca9161"
29
+ ]
21
30
  },
22
31
  opacity: {
23
- blueprint: 0.4,
32
+ blueprint: 0.6,
24
33
  silhouetteMask: 0.25,
25
34
  //anchors: { valid: 0.80, invalid: 0.50 },
26
35
  anchors: { invalid: 0, valid: 0 },
27
- piece: { invalid: 0.35, dragging: 0.75, locked: 1, normal: 1 }
36
+ piece: { invalid: 1, dragging: 1, locked: 1, normal: 1 }
28
37
  },
29
38
  size: {
30
- stroke: { bandPx: 5, pieceSelectedPx: 3, allGreenStrokePx: 10, pieceBorderPx: 2, tangramDecompositionPx: 1 },
39
+ stroke: { bandPx: 5, allGreenStrokePx: 10, tangramDecompositionPx: 1 },
31
40
  anchorRadiusPx: { valid: 1, invalid: 1 },
32
41
  badgeFontPx: 16,
33
- centerBadge: { fractionOfOuterR: 0.15, minPx: 20, marginPx: 4 }
42
+ centerBadge: { fractionOfOuterR: 0.15, minPx: 20, marginPx: 4 },
43
+ invalidMarker: { sizePx: 10, strokePx: 4 }
34
44
  },
35
45
  layout: {
36
46
  grid: { stepPx: 20, unitPx: 40 },
@@ -47,9 +57,7 @@ const CONFIG = {
47
57
  },
48
58
  game: {
49
59
  snapRadiusPx: 15,
50
- showBorders: false,
51
- hideTouchingBorders: true
52
- }
60
+ showBorders: false}
53
61
  };
54
62
 
55
63
  function isComposite(bp) {
@@ -832,6 +840,31 @@ var unlockedIcon = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFoAAABaCAYAAA
832
840
  function pathD(poly) {
833
841
  return `M ${poly.map((pt) => `${pt.x} ${pt.y}`).join(" L ")} Z`;
834
842
  }
843
+ function getPieceColor(blueprint, usePrimitiveColors, defaultColor, primitiveColorIndices) {
844
+ if (!usePrimitiveColors) {
845
+ return defaultColor;
846
+ }
847
+ if ("kind" in blueprint) {
848
+ const kind = blueprint.kind;
849
+ const kindToIndex = {
850
+ "square": 0,
851
+ "smalltriangle": 1,
852
+ "parallelogram": 2,
853
+ "medtriangle": 3,
854
+ "largetriangle": 4
855
+ };
856
+ const primitiveIndex = kindToIndex[kind];
857
+ if (primitiveIndex !== void 0 && primitiveColorIndices[primitiveIndex] !== void 0) {
858
+ const colorIndex = primitiveColorIndices[primitiveIndex];
859
+ const color = CONFIG.color.primitiveColors[colorIndex];
860
+ if (color) {
861
+ return color;
862
+ }
863
+ }
864
+ return defaultColor;
865
+ }
866
+ return defaultColor;
867
+ }
835
868
  function BoardView(props) {
836
869
  const {
837
870
  controller,
@@ -851,6 +884,9 @@ function BoardView(props) {
851
884
  dragInvalid,
852
885
  lockedPieceId,
853
886
  showTangramDecomposition,
887
+ usePrimitiveColorsBlueprints,
888
+ usePrimitiveColorsTargets,
889
+ primitiveColorIndices,
854
890
  svgRef,
855
891
  setPieceRef,
856
892
  onPiecePointerDown,
@@ -861,6 +897,144 @@ function BoardView(props) {
861
897
  onCenterBadgePointerDown
862
898
  } = props;
863
899
  const VW = viewBox.w, VH = viewBox.h;
900
+ const renderSilhouettes = () => layout.sectors.map((s) => {
901
+ const sectorCfg = controller.state.cfg.sectors.find((ss) => ss.id === s.id);
902
+ if (showTangramDecomposition && sectorCfg?.silhouette.primitiveDecomposition) {
903
+ const primitiveDecomposition = sectorCfg.silhouette.primitiveDecomposition;
904
+ const rect = rectForBand(layout, s, "silhouette", 1);
905
+ const rawPolys = primitiveDecomposition.map((primInfo) => primInfo.polygon);
906
+ const placedPolys = placeSilhouetteGridAlignedAsPolys(rawPolys, scaleS, { cx: rect.cx, cy: rect.cy });
907
+ return /* @__PURE__ */ React.createElement("g", { key: `sil-decomposed-${s.id}`, pointerEvents: "none" }, placedPolys.map((scaledPoly, i) => {
908
+ const primInfo = primitiveDecomposition[i];
909
+ let fillColor = CONFIG.color.silhouetteMask;
910
+ if (usePrimitiveColorsTargets && primInfo?.kind && primitiveColorIndices) {
911
+ const kindToIndex = {
912
+ "square": 0,
913
+ "smalltriangle": 1,
914
+ "parallelogram": 2,
915
+ "medtriangle": 3,
916
+ "largetriangle": 4
917
+ };
918
+ const primitiveIndex = kindToIndex[primInfo.kind];
919
+ if (primitiveIndex !== void 0 && primitiveColorIndices[primitiveIndex] !== void 0) {
920
+ const colorIndex = primitiveColorIndices[primitiveIndex];
921
+ const color = CONFIG.color.primitiveColors[colorIndex];
922
+ if (color) {
923
+ fillColor = color;
924
+ }
925
+ }
926
+ }
927
+ return /* @__PURE__ */ React.createElement(
928
+ "path",
929
+ {
930
+ key: `prim-fill-${i}`,
931
+ d: pathD(scaledPoly),
932
+ fill: fillColor,
933
+ opacity: CONFIG.opacity.silhouetteMask,
934
+ stroke: "none"
935
+ }
936
+ );
937
+ }));
938
+ } else {
939
+ const placedPolys = placedSilBySector.get(s.id) ?? [];
940
+ if (!placedPolys.length) return null;
941
+ return /* @__PURE__ */ React.createElement("g", { key: `sil-${s.id}`, pointerEvents: "none" }, placedPolys.map((poly, i) => /* @__PURE__ */ React.createElement("path", { key: i, d: pathD(poly), fill: CONFIG.color.silhouetteMask, opacity: CONFIG.opacity.silhouetteMask })));
942
+ }
943
+ });
944
+ const renderPieces = (piecesFilter) => {
945
+ const piecesToRender = pieces;
946
+ return piecesToRender.sort((a, b) => {
947
+ if (draggingId === a.id) return 1;
948
+ if (draggingId === b.id) return -1;
949
+ return 0;
950
+ }).map((p) => {
951
+ const bp = controller.getBlueprint(p.blueprintId);
952
+ const bb = boundsOfBlueprint(bp, (k) => controller.getPrimitive(k));
953
+ const isDragging = draggingId === p.id;
954
+ const locked = p.sectorId && controller.isSectorCompleted(p.sectorId);
955
+ const isConnectivityLocked = lockedPieceId === p.id;
956
+ selectedPieceId === p.id;
957
+ const isCarriedInvalid = isDragging && dragInvalid;
958
+ const translateX = p.x - bb.min.x;
959
+ const translateY = p.y - bb.min.y;
960
+ const validFillColor = getPieceColor(
961
+ bp,
962
+ usePrimitiveColorsBlueprints || false,
963
+ CONFIG.color.piece.validFill,
964
+ primitiveColorIndices || [0, 1, 2, 3, 4]
965
+ );
966
+ const draggingFillColor = getPieceColor(
967
+ bp,
968
+ usePrimitiveColorsBlueprints || false,
969
+ CONFIG.color.piece.draggingFill,
970
+ primitiveColorIndices || [0, 1, 2, 3, 4]
971
+ );
972
+ return /* @__PURE__ */ React.createElement("g", { key: p.id, ref: setPieceRef(p.id), transform: `translate(${translateX}, ${translateY})`, style: { cursor: locked ? "default" : clickMode ? "pointer" : "grab" }, pointerEvents: clickMode && isDragging ? "none" : "auto" }, ("shape" in bp ? bp.shape : []).map((poly, idx) => {
973
+ const showBorders = shouldShowBorders();
974
+ shouldUseSelectiveBorders(p.blueprintId);
975
+ return /* @__PURE__ */ React.createElement(React.Fragment, { key: idx }, /* @__PURE__ */ React.createElement(
976
+ "path",
977
+ {
978
+ d: pathD(poly),
979
+ fill: isConnectivityLocked ? CONFIG.color.piece.invalidFill : isCarriedInvalid ? CONFIG.color.piece.invalidFill : isDragging ? draggingFillColor : validFillColor,
980
+ opacity: isConnectivityLocked ? CONFIG.opacity.piece.invalid : isCarriedInvalid ? CONFIG.opacity.piece.invalid : isDragging ? CONFIG.opacity.piece.dragging : locked ? CONFIG.opacity.piece.locked : CONFIG.opacity.piece.normal,
981
+ stroke: "none",
982
+ onPointerDown: (e) => onPiecePointerDown(e, p)
983
+ }
984
+ ), showBorders);
985
+ }), isDragging && isCarriedInvalid && "shape" in bp && bp.shape.length > 0 && (() => {
986
+ const { cx, cy } = polysAABB$1(bp.shape);
987
+ const size = CONFIG.size.invalidMarker.sizePx;
988
+ const strokeWidth = CONFIG.size.invalidMarker.strokePx;
989
+ const borderWidth = strokeWidth + 2;
990
+ return /* @__PURE__ */ React.createElement("g", { key: "invalid-marker" }, /* @__PURE__ */ React.createElement(
991
+ "line",
992
+ {
993
+ x1: cx - size,
994
+ y1: cy - size,
995
+ x2: cx + size,
996
+ y2: cy + size,
997
+ stroke: "white",
998
+ strokeWidth: borderWidth,
999
+ strokeLinecap: "round"
1000
+ }
1001
+ ), /* @__PURE__ */ React.createElement(
1002
+ "line",
1003
+ {
1004
+ x1: cx - size,
1005
+ y1: cy - size,
1006
+ x2: cx + size,
1007
+ y2: cy + size,
1008
+ stroke: CONFIG.color.piece.invalidStroke,
1009
+ strokeWidth,
1010
+ strokeLinecap: "round"
1011
+ }
1012
+ ), /* @__PURE__ */ React.createElement(
1013
+ "line",
1014
+ {
1015
+ x1: cx + size,
1016
+ y1: cy - size,
1017
+ x2: cx - size,
1018
+ y2: cy + size,
1019
+ stroke: "white",
1020
+ strokeWidth: borderWidth,
1021
+ strokeLinecap: "round"
1022
+ }
1023
+ ), /* @__PURE__ */ React.createElement(
1024
+ "line",
1025
+ {
1026
+ x1: cx + size,
1027
+ y1: cy - size,
1028
+ x2: cx - size,
1029
+ y2: cy + size,
1030
+ stroke: CONFIG.color.piece.invalidStroke,
1031
+ strokeWidth,
1032
+ strokeLinecap: "round"
1033
+ }
1034
+ ));
1035
+ })());
1036
+ });
1037
+ };
864
1038
  const centerView = controller.state.blueprintView;
865
1039
  const bps = centerView === "primitives" ? controller.state.primitives : controller.state.quickstash;
866
1040
  const QS_SLOTS = controller.state.cfg.maxQuickstashSlots;
@@ -881,6 +1055,12 @@ function BoardView(props) {
881
1055
  const bb = boundsOfBlueprint(bp, (k) => controller.getPrimitive(k));
882
1056
  const cx = bb.min.x + bb.width / 2;
883
1057
  const cy = bb.min.y + bb.height / 2;
1058
+ const fillColor = getPieceColor(
1059
+ bp,
1060
+ usePrimitiveColorsBlueprints || false,
1061
+ CONFIG.color.blueprint.fill,
1062
+ primitiveColorIndices || [0, 1, 2, 3, 4]
1063
+ );
884
1064
  return /* @__PURE__ */ React.createElement(
885
1065
  "g",
886
1066
  {
@@ -892,7 +1072,7 @@ function BoardView(props) {
892
1072
  {
893
1073
  key: idx,
894
1074
  d: pathD(poly),
895
- fill: CONFIG.color.blueprint.fill,
1075
+ fill: fillColor,
896
1076
  opacity: CONFIG.opacity.blueprint,
897
1077
  stroke: "none",
898
1078
  strokeWidth: 0,
@@ -916,7 +1096,7 @@ function BoardView(props) {
916
1096
  onPointerDown: (e) => {
917
1097
  onRootPointerDown(e);
918
1098
  },
919
- style: { background: "#f5f5f5", touchAction: "none", userSelect: "none" }
1099
+ style: { background: CONFIG.color.background, touchAction: "none", userSelect: "none" }
920
1100
  },
921
1101
  layout.sectors.map((s, i) => {
922
1102
  const done = !!controller.state.sectors[s.id].completedAt;
@@ -926,35 +1106,7 @@ function BoardView(props) {
926
1106
  const work = layout.bands.workspace;
927
1107
  return /* @__PURE__ */ React.createElement("g", { key: `bands-${s.id}` }, controller.state.cfg.target === "workspace" ? /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement("path", { d: wedgePath(layout.cx, layout.cy, sil[0], sil[1], s.start, s.end), fill: baseSil, stroke: CONFIG.color.bands.silhouette.stroke, strokeWidth: CONFIG.size.stroke.bandPx, pointerEvents: "none" }), /* @__PURE__ */ React.createElement("path", { d: wedgePath(layout.cx, layout.cy, work[0], work[1], s.start, s.end), fill: done ? CONFIG.color.completion.fill : baseWork, stroke: done ? CONFIG.color.completion.stroke : CONFIG.color.bands.workspace.stroke, strokeWidth: CONFIG.size.stroke.bandPx, pointerEvents: "none" })) : /* @__PURE__ */ React.createElement("path", { d: wedgePath(layout.cx, layout.cy, sil[0], sil[1], s.start, s.end), fill: done ? CONFIG.color.completion.fill : baseSil, stroke: done ? CONFIG.color.completion.stroke : CONFIG.color.bands.silhouette.stroke, strokeWidth: CONFIG.size.stroke.bandPx, pointerEvents: "none" }));
928
1108
  }),
929
- pieces.sort((a, b) => {
930
- if (draggingId === a.id) return 1;
931
- if (draggingId === b.id) return -1;
932
- return 0;
933
- }).map((p) => {
934
- const bp = controller.getBlueprint(p.blueprintId);
935
- const bb = boundsOfBlueprint(bp, (k) => controller.getPrimitive(k));
936
- const isDragging = draggingId === p.id;
937
- const locked = p.sectorId && controller.isSectorCompleted(p.sectorId);
938
- const isConnectivityLocked = lockedPieceId === p.id;
939
- selectedPieceId === p.id;
940
- const isCarriedInvalid = isDragging && dragInvalid;
941
- const translateX = p.x - bb.min.x;
942
- const translateY = p.y - bb.min.y;
943
- return /* @__PURE__ */ React.createElement("g", { key: p.id, ref: setPieceRef(p.id), transform: `translate(${translateX}, ${translateY})`, style: { cursor: locked ? "default" : clickMode ? "pointer" : "grab" }, pointerEvents: clickMode && isDragging ? "none" : "auto" }, ("shape" in bp ? bp.shape : []).map((poly, idx) => {
944
- const showBorders = shouldShowBorders();
945
- shouldUseSelectiveBorders(p.blueprintId);
946
- return /* @__PURE__ */ React.createElement(React.Fragment, { key: idx }, /* @__PURE__ */ React.createElement(
947
- "path",
948
- {
949
- d: pathD(poly),
950
- fill: isConnectivityLocked ? CONFIG.color.piece.invalidFill : isCarriedInvalid ? CONFIG.color.piece.invalidFill : isDragging ? CONFIG.color.piece.draggingFill : CONFIG.color.piece.validFill,
951
- opacity: isConnectivityLocked ? CONFIG.opacity.piece.invalid : isCarriedInvalid ? CONFIG.opacity.piece.invalid : isDragging ? CONFIG.opacity.piece.dragging : locked ? CONFIG.opacity.piece.locked : CONFIG.opacity.piece.normal,
952
- stroke: "none",
953
- onPointerDown: (e) => onPiecePointerDown(e, p)
954
- }
955
- ), showBorders);
956
- }));
957
- }),
1109
+ /* @__PURE__ */ React.createElement(React.Fragment, null, renderSilhouettes(), renderPieces()) ,
958
1110
  layout.sectors.map((s) => {
959
1111
  const sectorCfg = controller.state.cfg.sectors.find((ss) => ss.id === s.id);
960
1112
  if (showTangramDecomposition && sectorCfg?.silhouette.primitiveDecomposition) {
@@ -962,23 +1114,32 @@ function BoardView(props) {
962
1114
  const rect = rectForBand(layout, s, "silhouette", 1);
963
1115
  const rawPolys = primitiveDecomposition.map((primInfo) => primInfo.polygon);
964
1116
  const placedPolys = placeSilhouetteGridAlignedAsPolys(rawPolys, scaleS, { cx: rect.cx, cy: rect.cy });
965
- return /* @__PURE__ */ React.createElement("g", { key: `sil-decomposed-${s.id}`, pointerEvents: "none" }, placedPolys.map((scaledPoly, i) => /* @__PURE__ */ React.createElement(React.Fragment, { key: `prim-${i}` }, /* @__PURE__ */ React.createElement(
966
- "path",
967
- {
968
- d: pathD(scaledPoly),
969
- fill: CONFIG.color.silhouetteMask,
970
- opacity: CONFIG.opacity.silhouetteMask,
971
- stroke: "none"
972
- }
973
- ), /* @__PURE__ */ React.createElement(
974
- "path",
975
- {
976
- d: pathD(scaledPoly),
977
- fill: "none",
978
- stroke: CONFIG.color.tangramDecomposition.stroke,
979
- strokeWidth: CONFIG.size.stroke.tangramDecompositionPx
1117
+ return /* @__PURE__ */ React.createElement("g", { key: `sil-decomposed-${s.id}`, pointerEvents: "none" }, placedPolys.map((scaledPoly, i) => {
1118
+ const primInfo = primitiveDecomposition[i];
1119
+ if (usePrimitiveColorsTargets && primInfo?.kind && primitiveColorIndices) {
1120
+ const kindToIndex = {
1121
+ "square": 0,
1122
+ "smalltriangle": 1,
1123
+ "parallelogram": 2,
1124
+ "medtriangle": 3,
1125
+ "largetriangle": 4
1126
+ };
1127
+ const primitiveIndex = kindToIndex[primInfo.kind];
1128
+ if (primitiveIndex !== void 0 && primitiveColorIndices[primitiveIndex] !== void 0) {
1129
+ primitiveColorIndices[primitiveIndex];
1130
+ }
980
1131
  }
981
- ))));
1132
+ return /* @__PURE__ */ React.createElement(
1133
+ "path",
1134
+ {
1135
+ key: `prim-fill-${i}`,
1136
+ d: pathD(scaledPoly),
1137
+ fill: "none",
1138
+ opacity: 0,
1139
+ stroke: "none"
1140
+ }
1141
+ );
1142
+ }));
982
1143
  } else {
983
1144
  const placedPolys = placedSilBySector.get(s.id) ?? [];
984
1145
  if (!placedPolys.length) return null;
@@ -1069,7 +1230,25 @@ function BoardView(props) {
1069
1230
  const by = layout.cy + blueprintRingR * Math.sin(theta);
1070
1231
  return renderBlueprintGlyph(bp, bx, by);
1071
1232
  }),
1072
- controller.state.endedAt && /* @__PURE__ */ React.createElement("g", { pointerEvents: "none" }, /* @__PURE__ */ React.createElement("circle", { cx: layout.cx, cy: layout.cy, r: layout.outerR - 3, fill: "none", stroke: CONFIG.color.piece.allGreenStroke, strokeWidth: CONFIG.size.stroke.allGreenStrokePx, opacity: 0 }, /* @__PURE__ */ React.createElement("animate", { attributeName: "opacity", from: "0", to: "1", dur: "160ms", fill: "freeze" }), /* @__PURE__ */ React.createElement("animate", { attributeName: "opacity", from: "1", to: "0", begin: "560ms", dur: "520ms", fill: "freeze" })))
1233
+ controller.state.endedAt && /* @__PURE__ */ React.createElement("g", { pointerEvents: "none" }, /* @__PURE__ */ React.createElement("circle", { cx: layout.cx, cy: layout.cy, r: layout.outerR - 3, fill: "none", stroke: CONFIG.color.piece.allGreenStroke, strokeWidth: CONFIG.size.stroke.allGreenStrokePx, opacity: 0 }, /* @__PURE__ */ React.createElement("animate", { attributeName: "opacity", from: "0", to: "1", dur: "160ms", fill: "freeze" }), /* @__PURE__ */ React.createElement("animate", { attributeName: "opacity", from: "1", to: "0", begin: "560ms", dur: "520ms", fill: "freeze" }))),
1234
+ showTangramDecomposition && layout.sectors.map((s) => {
1235
+ const sectorCfg = controller.state.cfg.sectors.find((ss) => ss.id === s.id);
1236
+ if (!sectorCfg?.silhouette.primitiveDecomposition) return null;
1237
+ const primitiveDecomposition = sectorCfg.silhouette.primitiveDecomposition;
1238
+ const rect = rectForBand(layout, s, "silhouette", 1);
1239
+ const rawPolys = primitiveDecomposition.map((primInfo) => primInfo.polygon);
1240
+ const placedPolys = placeSilhouetteGridAlignedAsPolys(rawPolys, scaleS, { cx: rect.cx, cy: rect.cy });
1241
+ return /* @__PURE__ */ React.createElement("g", { key: `sil-borders-${s.id}`, pointerEvents: "none" }, placedPolys.map((scaledPoly, i) => /* @__PURE__ */ React.createElement(
1242
+ "path",
1243
+ {
1244
+ key: `prim-border-${i}`,
1245
+ d: pathD(scaledPoly),
1246
+ fill: "none",
1247
+ stroke: CONFIG.color.tangramDecomposition.stroke,
1248
+ strokeWidth: CONFIG.size.stroke.tangramDecompositionPx
1249
+ }
1250
+ )));
1251
+ })
1073
1252
  );
1074
1253
  }
1075
1254
 
@@ -2954,7 +3133,10 @@ function GameBoard(props) {
2954
3133
  onPieceRemove,
2955
3134
  onInteraction,
2956
3135
  onTrialEnd,
2957
- onControllerReady
3136
+ onControllerReady,
3137
+ usePrimitiveColorsBlueprints,
3138
+ usePrimitiveColorsTargets,
3139
+ primitiveColorIndices
2958
3140
  } = props;
2959
3141
  const [timeRemaining, setTimeRemaining] = React.useState(timeLimitMs > 0 ? Math.floor(timeLimitMs / 1e3) : 0);
2960
3142
  const controller = React.useMemo(() => {
@@ -3278,7 +3460,7 @@ function GameBoard(props) {
3278
3460
  justifyContent: "center",
3279
3461
  alignItems: "center",
3280
3462
  padding: "20px",
3281
- background: "#f5f5f5",
3463
+ background: CONFIG.color.background,
3282
3464
  flex: "0 0 auto"
3283
3465
  };
3284
3466
  const headerContentStyle = {
@@ -3346,6 +3528,9 @@ function GameBoard(props) {
3346
3528
  onCenterBadgePointerDown,
3347
3529
  showTangramDecomposition: showTangramDecomposition ?? false,
3348
3530
  scaleS,
3531
+ usePrimitiveColorsBlueprints: usePrimitiveColorsBlueprints ?? false,
3532
+ usePrimitiveColorsTargets: usePrimitiveColorsTargets ?? false,
3533
+ primitiveColorIndices: primitiveColorIndices ?? [0, 1, 2, 3, 4],
3349
3534
  ...eventCallbacks
3350
3535
  }
3351
3536
  ))));
@@ -3565,7 +3750,10 @@ function startConstructionTrial(display_element, params, _jsPsych) {
3565
3750
  trialParams,
3566
3751
  ...params.instructions && { instructions: params.instructions },
3567
3752
  ...params.onInteraction && { onInteraction: params.onInteraction },
3568
- ...params.onTrialEnd && { onTrialEnd: params.onTrialEnd }
3753
+ ...params.onTrialEnd && { onTrialEnd: params.onTrialEnd },
3754
+ ...params.usePrimitiveColorsBlueprints !== void 0 && { usePrimitiveColorsBlueprints: params.usePrimitiveColorsBlueprints },
3755
+ ...params.usePrimitiveColorsTargets !== void 0 && { usePrimitiveColorsTargets: params.usePrimitiveColorsTargets },
3756
+ ...params.primitiveColorIndices !== void 0 && { primitiveColorIndices: params.primitiveColorIndices }
3569
3757
  };
3570
3758
  const root = client.createRoot(display_element);
3571
3759
  root.render(React.createElement(GameBoard, gameBoardProps));
@@ -3650,6 +3838,24 @@ const info = {
3650
3838
  type: jspsych.ParameterType.FUNCTION,
3651
3839
  default: void 0,
3652
3840
  description: "Callback when trial completes with full data"
3841
+ },
3842
+ /** Whether to use distinct colors for each primitive shape type in blueprints */
3843
+ use_primitive_colors_blueprints: {
3844
+ type: jspsych.ParameterType.BOOL,
3845
+ default: false,
3846
+ description: "Whether each primitive shape type should have its own distinct color in the blueprint dock area"
3847
+ },
3848
+ /** Whether to use distinct colors for each primitive shape type in target tangrams */
3849
+ use_primitive_colors_targets: {
3850
+ type: jspsych.ParameterType.BOOL,
3851
+ default: false,
3852
+ description: "Whether each primitive shape type should have its own distinct color in target tangram silhouettes"
3853
+ },
3854
+ /** Indices mapping primitives to colors from the color palette */
3855
+ primitive_color_indices: {
3856
+ type: jspsych.ParameterType.OBJECT,
3857
+ default: [0, 1, 2, 3, 4],
3858
+ description: "Array of 5 integers indexing into primitiveColors array, mapping [square, smalltriangle, parallelogram, medtriangle, largetriangle] to colors"
3653
3859
  }
3654
3860
  },
3655
3861
  data: {
@@ -3715,7 +3921,10 @@ class TangramConstructPlugin {
3715
3921
  show_tangram_decomposition: trial.show_tangram_decomposition,
3716
3922
  instructions: trial.instructions,
3717
3923
  onInteraction: trial.onInteraction,
3718
- onTrialEnd: wrappedOnTrialEnd
3924
+ onTrialEnd: wrappedOnTrialEnd,
3925
+ usePrimitiveColorsBlueprints: trial.use_primitive_colors_blueprints,
3926
+ usePrimitiveColorsTargets: trial.use_primitive_colors_targets,
3927
+ primitiveColorIndices: trial.primitive_color_indices
3719
3928
  };
3720
3929
  const { root, display_element: element, jsPsych } = startConstructionTrial(display_element, params, this.jsPsych);
3721
3930
  element.__reactContext = { root, jsPsych };