jspsych-tangram 0.0.14 → 0.0.15

package/dist/index.js

@@ -14,9 +14,8 @@ const CONFIG = {
     silhouetteMask: "#374151",
     anchors: { invalid: "#7dd3fc", valid: "#475569" },
     // validFill used here for placed composites
-    piece: { draggingFill: "#8e7cc3", validFill: "#8e7cc3", invalidFill: "#d55c00", invalidStroke: "#dc2626", selectedStroke: "#674ea7", allGreenStroke: "#86efac", borderStroke: "#674ea7" },
-    ui: { light: "#60a5fa", dark: "#1d4ed8" },
-    blueprint: { fill: "#374151", selectedStroke: "#111827", badgeFill: "#000000", labelFill: "#ffffff" },
+    piece: { draggingFill: "#8e7cc3", validFill: "#8e7cc3", invalidFill: "#d55c00", invalidStroke: "#dc2626", allGreenStroke: "#86efac"},
+    blueprint: { fill: "#374151", badgeFill: "#000000", labelFill: "#ffffff" },
     tangramDecomposition: { stroke: "#fef2cc" },
     primitiveColors: [
       // from seaborn "colorblind" palette, 6 colors, with red omitted
@@ -35,7 +34,7 @@ const CONFIG = {
     piece: { invalid: 1, dragging: 1, locked: 1, normal: 1 }
   },
   size: {
-    stroke: { bandPx: 5, pieceSelectedPx: 5, allGreenStrokePx: 10, pieceBorderPx: 2, tangramDecompositionPx: 1 },
+    stroke: { bandPx: 5, allGreenStrokePx: 10, tangramDecompositionPx: 1 },
     anchorRadiusPx: { valid: 1, invalid: 1 },
     badgeFontPx: 16,
     centerBadge: { fractionOfOuterR: 0.15, minPx: 20, marginPx: 4 },
@@ -56,10 +55,7 @@ const CONFIG = {
   },
   game: {
     snapRadiusPx: 15,
-    showBorders: false,
-    hideTouchingBorders: true,
-    silhouettesBelowPieces: true
-  }
+    showBorders: false}
 };
 
 function isComposite(bp) {
@@ -3768,7 +3764,7 @@ function startConstructionTrial(display_element, params, _jsPsych) {
   return { root, display_element, jsPsych: _jsPsych };
 }
 
-const info$2 = {
+const info$3 = {
   name: "tangram-construct",
   version: "1.0.0",
   parameters: {
@@ -3900,7 +3896,7 @@ class TangramConstructPlugin {
     this.jsPsych = jsPsych;
   }
   static {
-    this.info = info$2;
+    this.info = info$3;
   }
   /**
    * Launches the trial by invoking startConstructionTrial
@@ -4051,7 +4047,7 @@ function startPrepTrial(display_element, params, jsPsych) {
   return { root, display_element, jsPsych };
 }
 
-const info$1 = {
+const info$2 = {
   name: "tangram-prep",
   version: "1.0.0",
   parameters: {
@@ -4139,7 +4135,7 @@ class TangramPrepPlugin {
     this.jsPsych = jsPsych;
   }
   static {
-    this.info = info$1;
+    this.info = info$2;
   }
   /**
    * Launches the trial by invoking startPrepTrial
@@ -4331,7 +4327,7 @@ function NBackView({ params }) {
           {
             d: pathD(scaledPoly),
             fill: fillColor,
-            opacity: CONFIG.opacity.silhouetteMask,
+            opacity: usePrimitiveColors ? CONFIG.opacity.piece.normal : CONFIG.opacity.silhouetteMask,
             stroke: "none"
           }
         ), /* @__PURE__ */ React.createElement(
@@ -4372,7 +4368,7 @@ function NBackView({ params }) {
             key: `sil-${i}`,
             d: pathD(scaledPoly),
             fill: fillColor,
-            opacity: CONFIG.opacity.silhouetteMask,
+            opacity: usePrimitiveColors ? CONFIG.opacity.piece.normal : CONFIG.opacity.silhouetteMask,
             stroke: "none"
           }
         );
@@ -4435,7 +4431,7 @@ function NBackView({ params }) {
   )));
 }
 
-const info = {
+const info$1 = {
   name: "tangram-nback",
   version: "1.0.0",
   parameters: {
@@ -4528,7 +4524,7 @@ class TangramNBackPlugin {
     this.jsPsych = jsPsych;
   }
   static {
-    this.info = info;
+    this.info = info$1;
   }
   /**
    * Launches the trial by invoking startNBackTrial
@@ -4562,5 +4558,366 @@ class TangramNBackPlugin {
   }
 }
 
-export { TangramConstructPlugin, TangramNBackPlugin, TangramPrepPlugin };
+function startAFCTrial(display_element, params, _jsPsych) {
+  const root = createRoot(display_element);
+  root.render(React.createElement(AFCView, { params }));
+  return { root, display_element, jsPsych: _jsPsych };
+}
+function AFCView({ params }) {
+  const {
+    tangramLeft,
+    tangramRight,
+    instructions,
+    buttonTextLeft,
+    buttonTextRight,
+    showTangramDecomposition,
+    usePrimitiveColors,
+    primitiveColorIndices,
+    onTrialEnd
+  } = params;
+  const trialStartTime = useRef(Date.now());
+  const [hasResponded, setHasResponded] = useState(false);
+  const handleResponse = (choice) => {
+    if (hasResponded) return;
+    setHasResponded(true);
+    const rt = Date.now() - trialStartTime.current;
+    if (onTrialEnd) {
+      onTrialEnd({
+        rt,
+        response: choice,
+        show_tangram_decomposition: showTangramDecomposition,
+        use_primitive_colors: usePrimitiveColors,
+        primitive_color_indices: primitiveColorIndices,
+        button_text_left: buttonTextLeft,
+        button_text_right: buttonTextRight
+      });
+    }
+  };
+  return /* @__PURE__ */ React.createElement("div", { style: {
+    display: "flex",
+    flexDirection: "column",
+    alignItems: "center",
+    justifyContent: "center",
+    padding: "20px",
+    background: "#fff7e0ff",
+    minHeight: "100vh"
+  } }, instructions && /* @__PURE__ */ React.createElement(
+    "div",
+    {
+      style: {
+        maxWidth: "800px",
+        width: "100%",
+        marginBottom: "30px",
+        textAlign: "center",
+        fontSize: "18px",
+        lineHeight: "1.5"
+      },
+      dangerouslySetInnerHTML: { __html: instructions }
+    }
+  ), /* @__PURE__ */ React.createElement("div", { style: {
+    display: "flex",
+    flexDirection: "row",
+    gap: "50px",
+    justifyContent: "center",
+    alignItems: "flex-start",
+    flexWrap: "wrap"
+  } }, /* @__PURE__ */ React.createElement(
+    TangramOption,
+    {
+      tangram: tangramLeft,
+      buttonText: buttonTextLeft,
+      onClick: () => handleResponse("left"),
+      disabled: hasResponded,
+      showDecomposition: showTangramDecomposition,
+      usePrimitiveColors,
+      primitiveColorIndices
+    }
+  ), /* @__PURE__ */ React.createElement(
+    TangramOption,
+    {
+      tangram: tangramRight,
+      buttonText: buttonTextRight,
+      onClick: () => handleResponse("right"),
+      disabled: hasResponded,
+      showDecomposition: showTangramDecomposition,
+      usePrimitiveColors,
+      primitiveColorIndices
+    }
+  )));
+}
+function TangramOption({
+  tangram,
+  buttonText,
+  onClick,
+  disabled,
+  showDecomposition,
+  usePrimitiveColors,
+  primitiveColorIndices
+}) {
+  if (!tangram) {
+    return /* @__PURE__ */ React.createElement("div", { style: { width: 300, height: 300, background: "#eee" } }, "No Tangram Data");
+  }
+  const CANON = /* @__PURE__ */ new Set([
+    "square",
+    "smalltriangle",
+    "parallelogram",
+    "medtriangle",
+    "largetriangle"
+  ]);
+  const filteredTans = tangram.solutionTans.filter((tan) => {
+    const tanName = tan.name ?? tan.kind;
+    return CANON.has(tanName);
+  });
+  const mask = filteredTans.map((tan) => {
+    const polygon = tan.vertices.map(([x, y]) => ({ x: x ?? 0, y: -(y ?? 0) }));
+    return polygon;
+  });
+  const primitiveDecomposition = filteredTans.map((tan) => ({
+    kind: tan.name ?? tan.kind,
+    polygon: tan.vertices.map(([x, y]) => ({ x: x ?? 0, y: -(y ?? 0) }))
+  }));
+  const DISPLAY_SIZE = 300;
+  const viewport = {
+    w: DISPLAY_SIZE,
+    h: DISPLAY_SIZE
+  };
+  const scaleS = React.useMemo(() => {
+    const u = inferUnitFromPolys$1(mask);
+    return u ? CONFIG.layout.grid.unitPx / u : 1;
+  }, [mask]);
+  const centerPos = {
+    cx: viewport.w / 2,
+    cy: viewport.h / 2
+  };
+  const pathD = (poly) => {
+    if (!poly || poly.length === 0) return "";
+    const moves = poly.map((p, i) => `${i === 0 ? "M" : "L"} ${p.x} ${p.y}`);
+    return moves.join(" ") + " Z";
+  };
+  const renderSilhouette = () => {
+    if (showDecomposition) {
+      const rawPolys = primitiveDecomposition.map((primInfo) => primInfo.polygon);
+      const placedPolys = placeSilhouetteGridAlignedAsPolys(rawPolys, scaleS, centerPos);
+      return /* @__PURE__ */ React.createElement("g", { key: "sil-decomposed", pointerEvents: "none" }, placedPolys.map((scaledPoly, i) => {
+        const primInfo = primitiveDecomposition[i];
+        let fillColor = CONFIG.color.silhouetteMask;
+        if (usePrimitiveColors && primInfo?.kind && primitiveColorIndices) {
+          const kindToIndex = {
+            "square": 0,
+            "smalltriangle": 1,
+            "parallelogram": 2,
+            "medtriangle": 3,
+            "largetriangle": 4
+          };
+          const primitiveIndex = kindToIndex[primInfo.kind];
+          if (primitiveIndex !== void 0 && primitiveColorIndices[primitiveIndex] !== void 0) {
+            const colorIndex = primitiveColorIndices[primitiveIndex];
+            const color = CONFIG.color.primitiveColors[colorIndex];
+            if (color) {
+              fillColor = color;
+            }
+          }
+        }
+        return /* @__PURE__ */ React.createElement(React.Fragment, { key: `prim-${i}` }, /* @__PURE__ */ React.createElement(
+          "path",
+          {
+            d: pathD(scaledPoly),
+            fill: fillColor,
+            opacity: usePrimitiveColors ? CONFIG.opacity.piece.normal : CONFIG.opacity.silhouetteMask,
+            stroke: "none"
+          }
+        ), /* @__PURE__ */ React.createElement(
+          "path",
+          {
+            d: pathD(scaledPoly),
+            fill: "none",
+            stroke: CONFIG.color.tangramDecomposition.stroke,
+            strokeWidth: CONFIG.size.stroke.tangramDecompositionPx
+          }
+        ));
+      }));
+    } else {
+      const placedPolys = placeSilhouetteGridAlignedAsPolys(mask, scaleS, centerPos);
+      return /* @__PURE__ */ React.createElement("g", { key: "sil-unified", pointerEvents: "none" }, placedPolys.map((scaledPoly, i) => {
+        const primInfo = primitiveDecomposition[i];
+        let fillColor = CONFIG.color.silhouetteMask;
+        if (usePrimitiveColors && primInfo?.kind && primitiveColorIndices) {
+          const kindToIndex = {
+            "square": 0,
+            "smalltriangle": 1,
+            "parallelogram": 2,
+            "medtriangle": 3,
+            "largetriangle": 4
+          };
+          const primitiveIndex = kindToIndex[primInfo.kind];
+          if (primitiveIndex !== void 0 && primitiveColorIndices[primitiveIndex] !== void 0) {
+            const colorIndex = primitiveColorIndices[primitiveIndex];
+            const color = CONFIG.color.primitiveColors[colorIndex];
+            if (color) {
+              fillColor = color;
+            }
+          }
+        }
+        return /* @__PURE__ */ React.createElement(
+          "path",
+          {
+            key: `sil-${i}`,
+            d: pathD(scaledPoly),
+            fill: fillColor,
+            opacity: usePrimitiveColors ? CONFIG.opacity.piece.normal : CONFIG.opacity.silhouetteMask,
+            stroke: "none"
+          }
+        );
+      }));
+    }
+  };
+  return /* @__PURE__ */ React.createElement("div", { style: {
+    display: "flex",
+    flexDirection: "column",
+    alignItems: "center",
+    gap: "20px"
+  } }, /* @__PURE__ */ React.createElement(
+    "svg",
+    {
+      width: viewport.w,
+      height: viewport.h,
+      viewBox: `0 0 ${viewport.w} ${viewport.h}`,
+      style: {
+        display: "block",
+        background: CONFIG.color.bands.silhouette.fillEven,
+        border: `${CONFIG.size.stroke.bandPx}px solid ${CONFIG.color.bands.silhouette.stroke}`,
+        borderRadius: "8px"
+      }
+    },
+    renderSilhouette()
+  ), /* @__PURE__ */ React.createElement(
+    "button",
+    {
+      className: "jspsych-btn",
+      onClick,
+      disabled,
+      style: {
+        padding: "12px 30px",
+        fontSize: "16px",
+        cursor: disabled ? "not-allowed" : "pointer",
+        opacity: disabled ? 0.5 : 1
+      }
+    },
+    buttonText
+  ));
+}
+
+const info = {
+  name: "tangram-afc",
+  version: "1.0.0",
+  parameters: {
+    /** Left tangram specification to display */
+    tangram_left: {
+      type: ParameterType.COMPLEX,
+      default: void 0,
+      description: "TangramSpec object defining left target shape to display"
+    },
+    /** Right tangram specification to display */
+    tangram_right: {
+      type: ParameterType.COMPLEX,
+      default: void 0,
+      description: "TangramSpec object defining right target shape to display"
+    },
+    /** HTML content to display above the tangrams as instructions */
+    instructions: {
+      type: ParameterType.STRING,
+      default: "",
+      description: "HTML content to display above the tangrams as instructions"
+    },
+    /** Text to display on left response button */
+    button_text_left: {
+      type: ParameterType.STRING,
+      default: "Select Left",
+      description: "Text to display on left response button"
+    },
+    /** Text to display on right response button */
+    button_text_right: {
+      type: ParameterType.STRING,
+      default: "Select Right",
+      description: "Text to display on right response button"
+    },
+    /** Whether to show tangram decomposed into individual primitives with borders */
+    show_tangram_decomposition: {
+      type: ParameterType.BOOL,
+      default: false,
+      description: "Whether to show tangram decomposed into individual primitives with borders"
+    },
+    /** Whether to use distinct colors for each primitive shape type */
+    use_primitive_colors: {
+      type: ParameterType.BOOL,
+      default: false,
+      description: "Whether each primitive shape type should have its own distinct color in the displayed tangram"
+    },
+    /** Indices mapping primitives to colors from the color palette */
+    primitive_color_indices: {
+      type: ParameterType.OBJECT,
+      default: [0, 1, 2, 3, 4],
+      description: "Array of 5 integers indexing into primitiveColors array, mapping [square, smalltriangle, parallelogram, medtriangle, largetriangle] to colors"
+    },
+    /** Callback fired when trial ends */
+    onTrialEnd: {
+      type: ParameterType.FUNCTION,
+      default: void 0,
+      description: "Callback when trial completes with full data"
+    }
+  },
+  data: {
+    /** Reaction time in milliseconds */
+    rt: {
+      type: ParameterType.INT,
+      description: "Milliseconds between trial start and button click"
+    },
+    /** Response choice */
+    response: {
+      type: ParameterType.STRING,
+      description: "Which button was clicked: 'left' or 'right'"
+    }
+  },
+  citations: ""
+};
+class TangramAFCPlugin {
+  constructor(jsPsych) {
+    this.jsPsych = jsPsych;
+  }
+  static {
+    this.info = info;
+  }
+  /**
+   * Launches the trial by invoking startAFCTrial
+   * with the display element, parameters, and jsPsych instance.
+   */
+  trial(display_element, trial) {
+    const wrappedOnTrialEnd = (data) => {
+      if (trial.onTrialEnd) {
+        trial.onTrialEnd(data);
+      }
+      const reactContext = display_element.__reactContext;
+      if (reactContext?.root) {
+        reactContext.root.unmount();
+      }
+      display_element.innerHTML = "";
+      this.jsPsych.finishTrial(data);
+    };
+    const params = {
+      tangramLeft: trial.tangram_left,
+      tangramRight: trial.tangram_right,
+      instructions: trial.instructions,
+      buttonTextLeft: trial.button_text_left,
+      buttonTextRight: trial.button_text_right,
+      showTangramDecomposition: trial.show_tangram_decomposition,
+      usePrimitiveColors: trial.use_primitive_colors,
+      primitiveColorIndices: trial.primitive_color_indices,
+      onTrialEnd: wrappedOnTrialEnd
+    };
+    const { root, display_element: element, jsPsych } = startAFCTrial(display_element, params, this.jsPsych);
+    element.__reactContext = { root, jsPsych };
+  }
+}
+
+export { TangramAFCPlugin, TangramConstructPlugin, TangramNBackPlugin, TangramPrepPlugin };
 //# sourceMappingURL=index.js.map