@pie-element/image-cloze-association 10.3.1-beta.3 → 10.3.1

package/src/image-drop-target.jsx

@@ -43,7 +43,11 @@ const ImageDropTarget = ({
   maxResponsePerZone,
   onDrop,
   index,
+  selectedResponse,
+  onSelectClick,
+  onPlacementClick,
 }) => {
+  const [isHovered, setIsHovered] = useState(false);
   const [shouldHaveSmallPadding, setShouldHaveSmallPadding] = useState(false);
   const dropContainerRef = useRef(null);
   const dropContainerResponsesHeightRef = useRef(null);
@@ -73,9 +77,11 @@ const ImageDropTarget = ({
   }, []);
 
   const isDraggingElement = !!draggingElement.id;
+  const hasSelection = !!selectedResponse;
+  const showsHoverEffect = isOver || (hasSelection && isHovered && canDrag);
 
   const containerClasses = cx({
-    'is-over': isOver,
+    'is-over': showsHoverEffect,
     dashed: showDashedBorder && !isDraggingElement,
     active: isDraggingElement,
   });
@@ -84,6 +90,31 @@ const ImageDropTarget = ({
     padding: maxResponsePerZone === 1 ? '0' : responseContainerPadding,
     ...containerStyle,
     ...(responseAreaFill && !isDraggingElement && { backgroundColor: responseAreaFill }),
+    cursor: hasSelection && canDrag ? 'pointer' : undefined,
+  };
+
+  const handleContainerClick = () => {
+    if (!canDrag) return;
+
+    if (selectedResponse) {
+      onPlacementClick?.(index);
+    }
+
+    // Empty background clicked with nothing selected: nothing to place.
+  };
+
+  // Only a native Tab stop when there's nothing else in this container to carry
+  // tabbability — once it holds an answer, that answer's own tile (rendered by
+  // PossibleResponse, via dnd-kit's `useDraggable`) is already independently tabbable,
+  // and adding a second stop for the same visual container would add an extra stop to
+  // the existing Tab order (match-list's equivalent)
+  const isNativeTabStop = answers.length === 0 && canDrag;
+
+  const handleContainerKeyDown = (e) => {
+    if (e.code === 'Space' || e.code === 'Enter') {
+      e.preventDefault();
+      handleContainerClick();
+    }
   };
 
   return (
@@ -94,6 +125,12 @@ const ImageDropTarget = ({
       }}
       className={containerClasses}
       style={updatedContainerStyle}
+      role={isNativeTabStop ? 'button' : undefined}
+      tabIndex={isNativeTabStop ? 0 : -1}
+      onClick={handleContainerClick}
+      onKeyDown={isNativeTabStop ? handleContainerKeyDown : undefined}
+      onMouseEnter={() => setIsHovered(true)}
+      onMouseLeave={() => setIsHovered(false)}
     >
       {answers.length ? (
         <AnswersContainer
@@ -112,6 +149,9 @@ const ImageDropTarget = ({
               containerStyle={{
                 padding: imageDropTargetPadding ? imageDropTargetPadding : shouldHaveSmallPadding ? '2px' : '6px 10px',
               }}
+              selectedResponse={selectedResponse}
+              onSelectClick={onSelectClick}
+              onPlacementClick={onPlacementClick}
             />
           ))}
         </AnswersContainer>
@@ -135,6 +175,9 @@ ImageDropTarget.propTypes = {
   responseContainerPadding: PropTypes.string,
   imageDropTargetPadding: PropTypes.string,
   maxResponsePerZone: PropTypes.number,
+  selectedResponse: PropTypes.object,
+  onSelectClick: PropTypes.func,
+  onPlacementClick: PropTypes.func,
 };
 
 export default ImageDropTarget;

package/src/index.js

@@ -35,7 +35,7 @@ export default class ImageClozeAssociation extends HTMLElement {
     if (autoplayAudioEnabled && completeAudioEnabled && !this.audioComplete) {
       if (elementContext) {
         const audio = elementContext.querySelector('audio');
-        const isInsidePrompt = audio && audio.closest('#preview-prompt');
+        const isInsidePrompt = audio && audio.closest('.preview-prompt');
 
         // only require audio completion if audio exists and is inside the prompt
         if (audio && isInsidePrompt) {
@@ -144,7 +144,7 @@ export default class ImageClozeAssociation extends HTMLElement {
       mutationsList.forEach((mutation) => {
         if (mutation.type === 'childList') {
           const audio = this.querySelector('audio');
-          const isInsidePrompt = audio && audio.closest('#preview-prompt');
+          const isInsidePrompt = audio && audio.closest('.preview-prompt');
 
           if (!this._model) return;
           if (!this._model.autoplayAudioEnabled) return;

package/src/keyboard-coordinates.js

@@ -0,0 +1,115 @@
+import { defaultKeyboardCoordinateGetter, KeyboardCode } from '@dnd-kit/core';
+
+/**
+ * Custom keyboard coordinate getter for image-cloze-association's Tab-based placement.
+ *
+ * Tab/Shift+Tab cycle the dragged answer directly onto the next/previous enabled
+ * droppable — a response container (`response-container-{index}`) or the choices pool
+ * (`ica-board`) — sorted by on-screen position (top-to-bottom, then left-to-right),
+ * since response containers are absolutely positioned over an image rather than laid
+ * out as a simple list.
+ *
+ * Arrow keys are delegated to dnd-kit's own `defaultKeyboardCoordinateGetter`, leaving
+ * the existing free-form arrow-key dragging behavior completely unchanged.
+ */
+export const closestDroppableKeyboardCoordinates = (event, { context, currentCoordinates }) => {
+  const { code } = event;
+  const isTab = code === 'Tab';
+  const isArrow =
+    code === KeyboardCode.Down || code === KeyboardCode.Up || code === KeyboardCode.Left || code === KeyboardCode.Right;
+
+  if (!isTab && !isArrow) {
+    return undefined;
+  }
+
+  if (isArrow) {
+    return defaultKeyboardCoordinateGetter(event, { context, currentCoordinates });
+  }
+
+  event.preventDefault();
+
+  const { droppableRects, droppableContainers, collisionRect } = context;
+
+  if (!droppableRects || droppableRects.size === 0) {
+    return currentCoordinates;
+  }
+
+  const targets = [];
+
+  for (const [id, container] of droppableContainers) {
+    if (container?.disabled) continue;
+
+    const rect = droppableRects.get(id);
+
+    if (!rect) continue;
+
+    const center = {
+      x: rect.left + rect.width / 2,
+      y: rect.top + rect.height / 2,
+    };
+    // Land the dragged item's own top-left corner at the target's center-left point,
+    // rather than at the target's own top-left corner (avoids overshooting into a
+    // neighboring droppable when the target is much wider than the dragged item).
+    const dropPosition = {
+      x: rect.left,
+      y: rect.top + rect.height / 2,
+    };
+
+    targets.push({ id, rect, dropPosition, center });
+  }
+
+  if (targets.length === 0) {
+    return currentCoordinates;
+  }
+
+  const reverse = event.shiftKey;
+
+  targets.sort((a, b) => {
+    if (Math.abs(a.center.y - b.center.y) > 10) return a.center.y - b.center.y;
+    return a.center.x - b.center.x;
+  });
+
+  // Find the current target: whichever target's rect actually contains the dragged
+  // item's own center. This holds regardless of how the dragged item's size compares
+  // to the target's — a compact answer tile landed (per `dropPosition` above) at a much
+  // wider container's left edge is still contained within that container's rect.
+  // Comparing distances between reconstructed centers (as an earlier, buggy version of
+  // this same logic in match-list did) breaks down for exactly that shape: a
+  // reconstructed center can end up closer to a completely different droppable than to
+  // the one the item is actually sitting on, so the *next* press re-matches the wrong
+  // target and looks like it does nothing.
+  const draggedCenter = collisionRect
+    ? { x: collisionRect.left + collisionRect.width / 2, y: collisionRect.top + collisionRect.height / 2 }
+    : currentCoordinates;
+
+  let currentIndex = targets.findIndex(
+    (t) =>
+      draggedCenter.x >= t.rect.left &&
+      draggedCenter.x <= t.rect.right &&
+      draggedCenter.y >= t.rect.top &&
+      draggedCenter.y <= t.rect.bottom,
+  );
+
+  // Fall back to nearest-by-dropPosition if the dragged item's center isn't strictly
+  // inside any target (e.g. mid-flight after a free arrow-key move).
+  if (currentIndex === -1) {
+    let minDist = Infinity;
+
+    for (let i = 0; i < targets.length; i++) {
+      const dist = distance(currentCoordinates, targets[i].dropPosition);
+
+      if (dist < minDist) {
+        minDist = dist;
+        currentIndex = i;
+      }
+    }
+  }
+
+  const nextIndex = reverse
+    ? (currentIndex - 1 + targets.length) % targets.length
+    : (currentIndex + 1) % targets.length;
+
+  return targets[nextIndex].dropPosition;
+};
+
+const distance = (a, b) => Math.sqrt((a.x - b.x) ** 2 + (a.y - b.y) ** 2);

package/src/possible-response.jsx

@@ -40,6 +40,9 @@ const BaseContainer = styled('div')(() => ({
   '&.baseIncorrect': {
     border: `2px solid ${color.incorrect()} !important`,
   },
+  '&.selected': {
+    opacity: 0.7,
+  },
 }));
 
 const StyledSpan = styled(StaticHTMLSpan)(() => ({
@@ -50,7 +53,17 @@ const StyledSpan = styled(StaticHTMLSpan)(() => ({
   },
 }));
 
-const PossibleResponse = ({ canDrag, containerStyle, data, onDragBegin, answerChoiceTransparency, isOverlay }) => {
+const PossibleResponse = ({
+  canDrag,
+  containerStyle,
+  data,
+  onDragBegin,
+  answerChoiceTransparency,
+  isOverlay,
+  selectedResponse,
+  onSelectClick,
+  onPlacementClick,
+}) => {
   const rootRef = useRef(null);
   const longPressTimer = useRef(null);
 
@@ -64,6 +77,31 @@ const PossibleResponse = ({ canDrag, containerStyle, data, onDragBegin, answerCh
     disabled: !canDrag,
   });
 
+  const isSelected =
+    !!selectedResponse && selectedResponse.id === data.id && selectedResponse.containerIndex === data.containerIndex;
+
+  const handleClick = (e) => {
+    if (!canDrag) return;
+
+    e.stopPropagation();
+
+    const isPlaced = data.containerIndex !== undefined;
+
+    if (isSelected) {
+      // Clicking the already-selected tile again deselects it.
+      onSelectClick?.(data);
+    } else if (selectedResponse && isPlaced) {
+      // Something else is selected, and this tile is already inside a container:
+      // place the selection into that same container (a swap/insert, handled by the
+      // existing handleOnAnswerSelect logic).
+      onPlacementClick?.(data.containerIndex);
+    } else {
+      // Nothing selected yet, or this is a pool item (pool items are never placement
+      // targets — the pool itself, in possible-responses.jsx, is): select this tile.
+      onSelectClick?.(data);
+    }
+  };
+
   const handleTouchEnd = () => {
     clearTimeout(longPressTimer.current);
   };
@@ -113,6 +151,7 @@ const PossibleResponse = ({ canDrag, containerStyle, data, onDragBegin, answerCh
     answerChoiceTransparency: answerChoiceTransparency && !isDragging,
     [correctnessClass]: !!correctnessClass,
     textAnswerChoiceStyle: !containsImage && !isOverlay,
+    selected: isSelected && !isDragging,
   });
 
   const promptClassNames = classNames({ hiddenSpan: data.hidden });
@@ -125,6 +164,7 @@ const PossibleResponse = ({ canDrag, containerStyle, data, onDragBegin, answerCh
         rootRef.current = ref;
         setNodeRef(ref);
       }}
+      onClick={handleClick}
       {...listeners}
       {...attributes}
     >
@@ -141,12 +181,16 @@ PossibleResponse.propTypes = {
   onDragBegin: PropTypes.func.isRequired,
   answerChoiceTransparency: PropTypes.bool,
   isOverlay: PropTypes.bool,
+  selectedResponse: PropTypes.object,
+  onSelectClick: PropTypes.func,
+  onPlacementClick: PropTypes.func,
 };
 
 PossibleResponse.defaultProps = {
   containerStyle: {},
   answerChoiceTransparency: false,
   isOverlay: false,
+  selectedResponse: null,
 };
 
 export default PossibleResponse;

package/src/possible-responses.jsx

@@ -22,22 +22,40 @@ const PossibleResponses = ({
   customStyle,
   isVertical,
   minHeight,
-}) => (
-  <BaseContainer style={customStyle}>
-    <ICADroppablePlaceholder id="ica-board" disabled={!canDrag} isVerticalPool={isVertical} minHeight={minHeight}>
-      {(data || []).map((item) => (
-        <PossibleResponse
-          canDrag={canDrag}
-          key={item.id}
-          data={item}
-          onDragBegin={onDragBegin}
-          answerChoiceTransparency={answerChoiceTransparency}
-          containerStyle={{ margin: '4px' }}
-        />
-      ))}
-    </ICADroppablePlaceholder>
-  </BaseContainer>
-);
+  selectedResponse,
+  onSelectClick,
+  onPlacementClick,
+}) => {
+  const handlePoolClick = () => {
+    if (!canDrag) return;
+
+    if (selectedResponse) {
+      // `undefined` containerIndex means "the pool" — root.jsx's placeSelectedResponse
+      // routes it to handleOnAnswerRemove.
+      onPlacementClick?.(undefined);
+    }
+  };
+
+  return (
+    <BaseContainer style={customStyle} onClick={handlePoolClick}>
+      <ICADroppablePlaceholder id="ica-board" disabled={!canDrag} isVerticalPool={isVertical} minHeight={minHeight}>
+        {(data || []).map((item) => (
+          <PossibleResponse
+            canDrag={canDrag}
+            key={item.id}
+            data={item}
+            onDragBegin={onDragBegin}
+            answerChoiceTransparency={answerChoiceTransparency}
+            containerStyle={{ margin: '4px' }}
+            selectedResponse={selectedResponse}
+            onSelectClick={onSelectClick}
+            onPlacementClick={onPlacementClick}
+          />
+        ))}
+      </ICADroppablePlaceholder>
+    </BaseContainer>
+  );
+};
 
 PossibleResponses.propTypes = {
   canDrag: PropTypes.bool.isRequired,
@@ -47,6 +65,9 @@ PossibleResponses.propTypes = {
   customStyle: PropTypes.object,
   isVertical: PropTypes.bool,
   minHeight: PropTypes.number,
+  selectedResponse: PropTypes.object,
+  onSelectClick: PropTypes.func,
+  onPlacementClick: PropTypes.func,
 };
 
 export default PossibleResponses;

package/src/root.jsx

@@ -16,9 +16,16 @@ import InteractiveSection from './interactive-section';
 import PossibleResponses from './possible-responses';
 import { getUnansweredAnswers, getAnswersCorrectness } from './utils-correctness';
 import PossibleResponse from './possible-response';
+import { closestDroppableKeyboardCoordinates } from './keyboard-coordinates';
 
 const generateId = () => Math.random().toString(36).substring(2) + new Date().getTime().toString(36);
 
+// A click that lands right after a real drag gesture ends (pointer drag-and-drop, or
+// the browser's own synthetic click for a keyboard Space/Enter) must be ignored by the
+// click-to-select/click-to-place handlers below, or it would immediately reopen or
+// re-trigger a selection for a drag that just completed.
+const CLICK_AFTER_DRAG_GUARD_MS = 250;
+
 const StyledUiLayout = styled(UiLayout)({
   color: color.text(),
   backgroundColor: color.background(),
@@ -76,7 +83,9 @@ export class ImageClozeAssociationComponent extends React.Component {
       maxResponsePerZone: maxResponsePerZone || 1,
       showCorrect: false,
       isValidDrop: false,
+      selectedResponse: null,
     };
+    this.lastDragEndAt = 0;
   }
 
   onDragStart = (event) => {
@@ -86,6 +95,7 @@ export class ImageClozeAssociationComponent extends React.Component {
       this.setState({
         draggingElement: active.data.current,
         isValidDrop: false,
+        selectedResponse: active.data.current,
       });
     }
   };
@@ -112,6 +122,9 @@ export class ImageClozeAssociationComponent extends React.Component {
       isValidDrop: shouldDisableAnimation,
     });
 
+    this.cancelSelection();
+    this.lastDragEndAt = Date.now();
+
     if (!over || !active) {
       return;
     }
@@ -121,7 +134,9 @@ export class ImageClozeAssociationComponent extends React.Component {
     }
 
     if (over.id === 'ica-board') {
-      this.handleOnAnswerRemove(draggedItem);
+      if (draggedItem.containerIndex !== undefined) {
+        this.handleOnAnswerRemove(draggedItem);
+      }
       return;
     }
 
@@ -130,6 +145,94 @@ export class ImageClozeAssociationComponent extends React.Component {
     }
   };
 
+  onDragCancel = () => {
+    this.setState({ draggingElement: { id: '', value: '' } });
+    this.cancelSelection();
+    this.lastDragEndAt = Date.now();
+  };
+
+  isSameResponse = (a, b) => !!a && !!b && a.id === b.id && a.containerIndex === b.containerIndex;
+
+  // Click-to-select semantics: selecting the currently-selected response again clears
+  // the selection instead of re-selecting it.
+  toggleResponseSelection = (data) => {
+    this.setState((state) => ({
+      selectedResponse: this.isSameResponse(state.selectedResponse, data) ? null : data,
+    }));
+  };
+
+  cancelSelection = () => {
+    this.setState({ selectedResponse: null });
+  };
+
+  // If a real dnd-kit drag (started via keyboard Space/Enter) is still live when a
+  // click completes the placement below, it needs to be cleanly ended — otherwise
+  // dnd-kit would still think a drag is in progress. Escape is already configured as
+  // this sensor's cancel key (see the keyboardCodes passed to DragProvider below), and
+  // dispatching it as a real DOM KeyboardEvent is how dnd-kit's own document-level
+  // listener is reached from outside its sensor.
+  //
+  // Only dispatch when a drag is actually live (draggingElement.id is truthy) — this is
+  // a synthetic Escape keydown on `document`, so an unconditional dispatch would also be
+  // observed by any other document-level Escape listener (host player modals/dialogs,
+  // or another mounted instance of this same component) even when nothing here actually
+  // needed cancelling.
+  endAnyLiveKeyboardDrag = () => {
+    if (!this.state.draggingElement.id) {
+      return;
+    }
+
+    document.dispatchEvent(new KeyboardEvent('keydown', { code: 'Escape', bubbles: true, cancelable: true }));
+  };
+
+  placeSelectedResponse = (containerIndex) => {
+    const { selectedResponse } = this.state;
+
+    if (!selectedResponse) {
+      return;
+    }
+
+    if (containerIndex === undefined) {
+      // Placing into the pool = removing it from wherever it currently is
+      if (selectedResponse.containerIndex !== undefined) {
+        this.handleOnAnswerRemove(selectedResponse);
+      }
+    } else {
+      this.handleOnAnswerSelect(selectedResponse, containerIndex);
+    }
+
+    this.cancelSelection();
+    this.endAnyLiveKeyboardDrag();
+    this.lastDragEndAt = Date.now();
+  };
+
+  isClickSoonAfterDragEnd = () => Date.now() - this.lastDragEndAt < CLICK_AFTER_DRAG_GUARD_MS;
+
+  onResponseClick = (data) => {
+    if (this.isClickSoonAfterDragEnd()) {
+      return;
+    }
+
+    // A click that selects/deselects/switches a tile must end any dnd-kit drag that's
+    // still live from an earlier keyboard Space/Enter pick-up first — otherwise dnd-kit
+    // keeps thinking that earlier item is being dragged (it ignores new sensor
+    // activation while a drag is active) while selectedResponse visually points at
+    // whatever this click just selected. Ending the stale drag first (rather than
+    // after) matters: ending it also cancels the current selection as a side effect
+    // (see onDragCancel above), so doing it before
+    // toggleResponseSelection lets this click's own selection be the one that sticks.
+    this.endAnyLiveKeyboardDrag();
+    this.toggleResponseSelection(data);
+  };
+
+  onPlacementClick = (containerIndex) => {
+    if (this.isClickSoonAfterDragEnd()) {
+      return;
+    }
+
+    this.placeSelectedResponse(containerIndex);
+  };
+
   renderDragOverlay = () => {
     const { draggingElement } = this.state;
     const { model } = this.props;
@@ -353,6 +456,9 @@ export class ImageClozeAssociationComponent extends React.Component {
       responseContainerPadding,
       imageDropTargetPadding,
       maxResponsePerZone,
+      selectedResponse: this.state.selectedResponse,
+      onSelectClick: this.onResponseClick,
+      onPlacementClick: this.onPlacementClick,
     };
 
     const renderImage = () => (
@@ -381,13 +487,22 @@ export class ImageClozeAssociationComponent extends React.Component {
             }}
             isVertical={isVertical}
             minHeight={isVertical ? image?.height : undefined}
+            selectedResponse={this.state.selectedResponse}
+            onSelectClick={this.onResponseClick}
+            onPlacementClick={this.onPlacementClick}
           />
         </React.Fragment>
       );
     };
 
     return (
-      <DragProvider onDragStart={this.onDragStart} onDragEnd={this.onDragEnd}>
+      <DragProvider
+        onDragStart={this.onDragStart}
+        onDragEnd={this.onDragEnd}
+        onDragCancel={this.onDragCancel}
+        keyboardCoordinateGetter={closestDroppableKeyboardCoordinates}
+        keyboardCodes={{ start: ['Space', 'Enter'], cancel: ['Escape'], end: ['Space', 'Enter'] }}
+      >
         <StyledUiLayout extraCSSRules={extraCSSRules} id={'main-container'} fontSizeFactor={fontSizeFactor}>
           {showTeacherInstructions && (
             <StyledTeacherInstructions