jspsych-tangram 0.0.4 → 0.0.6

package/dist/prep/index.cjs

@@ -187,7 +187,6 @@ class BaseGameController {
     const allDone = Object.values(this.state.sectors).every((s) => !!s.completedAt);
     if (allDone && !this.state.endedAt) {
       this.state.endedAt = NOW();
-      console.log("[BaseGameController] all sectors complete");
     }
   }
   // ===== Piece Operations =====
@@ -3155,7 +3154,9 @@ function GameBoard(props) {
       if (allSectorsComplete && !gameCompleted) {
         setGameCompleted(true);
         if (tracker) {
-          tracker.finalizeTrial("auto_complete");
+          setTimeout(() => {
+            tracker.finalizeTrial("auto_complete");
+          }, 0);
         }
       }
     };
@@ -3549,9 +3550,11 @@ function startPrepTrial(display_element, params, jsPsych) {
     layoutMode,
     requireAllSlots,
     quickstashMacros,
+    primitiveOrder,
     onInteraction,
     onTrialEnd
   } = params;
+  const PRIMITIVE_BLUEPRINTS_ORDERED = [...PRIMITIVE_BLUEPRINTS].sort((a, b) => primitiveOrder.indexOf(a.kind) - primitiveOrder.indexOf(b.kind));
   const prepSectors = Array.from({ length: numQuickstashSlots }, (_, i) => ({
     id: `prep-sector-${i}`,
     tangramId: `prep-sector-${i}`,
@@ -3565,7 +3568,7 @@ function startPrepTrial(display_element, params, jsPsych) {
   const handleControllerReady = (controller, layout, force) => {
     if (quickstashMacros && quickstashMacros.length > 0 && layout) {
       const primsByKind = /* @__PURE__ */ new Map();
-      PRIMITIVE_BLUEPRINTS.forEach((p) => primsByKind.set(p.kind, p));
+      PRIMITIVE_BLUEPRINTS_ORDERED.forEach((p) => primsByKind.set(p.kind, p));
       quickstashMacros.forEach((anchorComposite, macroIndex) => {
         const sectorId = `prep-sector-${macroIndex}`;
         const compositeBlueprint = convertAnchorCompositeToPixels(
@@ -3622,7 +3625,7 @@ function startPrepTrial(display_element, params, jsPsych) {
     sectors: prepSectors,
     quickstash: [],
     // No pre-made macros
-    primitives: PRIMITIVE_BLUEPRINTS,
+    primitives: PRIMITIVE_BLUEPRINTS_ORDERED,
     layout: layoutMode,
     target: "workspace",
     // Pieces go in sectors
@@ -3683,6 +3686,12 @@ const info = {
       default: [],
       description: "Array of AnchorComposite objects to edit as primitive pieces"
     },
+    /** Array of primitive names in the order they should be displayed */
+    primitive_order: {
+      type: jspsych.ParameterType.OBJECT,
+      default: ["square", "smalltriangle", "parallelogram", "medtriangle", "largetriangle"],
+      description: "Array of primitive names in the order they should be displayed"
+    },
     /** Callback fired after each interaction (optional analytics hook) */
     onInteraction: {
       type: jspsych.ParameterType.FUNCTION,
@@ -3726,13 +3735,14 @@ class TangramPrepPlugin {
       this.jsPsych.finishTrial(data);
     };
     const params = {
-      numQuickstashSlots: trial.num_quickstash_slots || 4,
+      numQuickstashSlots: trial.num_quickstash_slots,
       maxPiecesPerMacro: trial.max_pieces_per_macro,
       minPiecesPerMacro: trial.min_pieces_per_macro,
       inputMode: trial.input,
       layoutMode: trial.layout,
       requireAllSlots: trial.require_all_slots,
       quickstashMacros: trial.quickstash_macros,
+      primitiveOrder: trial.primitive_order,
       onInteraction: trial.onInteraction,
       onTrialEnd: wrappedOnTrialEnd
     };