@qti-editor/interaction-choice 0.1.0 → 0.2.0

package/dist/components/qti-choice-interaction/commands/convert-selection-to-choice.commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert-selection-to-choice.commands.d.ts","sourceRoot":"","sources":["../../../../src/components/qti-choice-interaction/commands/convert-selection-to-choice.commands.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAiInD,wBAAgB,qCAAqC,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAmB/E;AAED,wBAAgB,kCAAkC,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAmD5E"}
+{"version":3,"file":"convert-selection-to-choice.commands.d.ts","sourceRoot":"","sources":["../../../../src/components/qti-choice-interaction/commands/convert-selection-to-choice.commands.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AA8LnD,wBAAgB,qCAAqC,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAwB/E;AAED,wBAAgB,kCAAkC,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAiD5E"}

package/dist/components/qti-choice-interaction/commands/convert-selection-to-choice.commands.js

@@ -1,3 +1,4 @@
+import { translateQti } from '@qti-editor/interaction-shared';
 function isFlatList(listNode, listType) {
     let hasNestedList = false;
     listNode.descendants((node, pos) => {
@@ -9,37 +10,46 @@ function isFlatList(listNode, listType) {
     });
     return !hasNestedList;
 }
-function isConvertibleRootBlock(node, schema) {
+function hasOnlyTextInlineContent(node) {
+    for (let i = 0; i < node.childCount; i++) {
+        if (!node.child(i).isText)
+            return false;
+    }
+    return true;
+}
+function isPlainTextParagraph(node, schema) {
+    const paragraphType = schema.nodes.paragraph;
+    return Boolean(paragraphType && node.type === paragraphType && hasOnlyTextInlineContent(node));
+}
+function isConvertibleList(node, schema) {
     const paragraphType = schema.nodes.paragraph;
     const listType = schema.nodes.list;
-    if (paragraphType && node.type === paragraphType) {
-        return 'paragraph';
+    if (!paragraphType || !listType || node.type !== listType) {
+        return false;
     }
-    if (listType && node.type === listType) {
-        const listKind = node.attrs?.kind;
-        if (!['bullet', 'ordered'].includes(listKind))
-            return null;
-        if (!isFlatList(node, listType))
-            return null;
-        return 'list';
+    const listKind = node.attrs?.kind;
+    if (!['bullet', 'ordered'].includes(listKind))
+        return false;
+    if (!isFlatList(node, listType))
+        return false;
+    for (let i = 0; i < node.childCount; i += 1) {
+        const child = node.child(i);
+        if (child.type !== paragraphType || !hasOnlyTextInlineContent(child)) {
+            return false;
+        }
     }
-    return null;
+    return node.childCount > 0;
 }
-function getSelectedConvertibleBlocks(view) {
+function getSelectedRootBlocks(view) {
     const { state } = view;
     const { selection } = state;
-    const schema = state.schema;
     const blocks = [];
     const seenPositions = new Set();
-    const addBlockIfConvertible = (node, start) => {
-        if (seenPositions.has(start))
-            return;
-        const kind = isConvertibleRootBlock(node, schema);
-        if (!kind)
+    const addBlock = (node, start) => {
+        if (seenPositions.has(start) || !node.isBlock)
             return;
         seenPositions.add(start);
         blocks.push({
-            kind,
             pos: start,
             end: start + node.nodeSize,
             node,
@@ -72,20 +82,16 @@ function getSelectedConvertibleBlocks(view) {
     };
     if (selection.empty) {
         const rootBlock = getRootBlockAt(selection.from);
-        if (!rootBlock)
-            return blocks;
-        addBlockIfConvertible(rootBlock.node, rootBlock.start);
+        if (rootBlock)
+            addBlock(rootBlock.node, rootBlock.start);
         return blocks;
     }
-    // Block-select plugin uses a custom "node-range" selection with explicit block ranges.
-    // Prefer those exact ranges to avoid text-range quirks across custom elements/shadow DOM.
     const selectionJSON = selection.toJSON();
     if (selectionJSON.type === 'node-range' && Array.isArray(selection.ranges)) {
         for (const range of selection.ranges) {
             const rootBlock = getRootBlockAt(range.$from.pos);
-            if (!rootBlock)
-                continue;
-            addBlockIfConvertible(rootBlock.node, rootBlock.start);
+            if (rootBlock)
+                addBlock(rootBlock.node, rootBlock.start);
         }
         if (blocks.length > 0)
             return blocks;
@@ -96,22 +102,65 @@ function getSelectedConvertibleBlocks(view) {
         const intersectsSelection = end > selection.from && start < selection.to;
         if (!intersectsSelection)
             return;
-        addBlockIfConvertible(node, start);
+        addBlock(node, start);
     });
     return blocks;
 }
-function getChoiceInlineContent(block, schema) {
-    if (block.kind === 'paragraph') {
-        return block.node.content;
+function buildConversionPlan(blocks, schema) {
+    if (blocks.length === 0)
+        return null;
+    // All-paragraph mode: first paragraph → prompt, rest → choices
+    if (blocks.every(b => isPlainTextParagraph(b.node, schema))) {
+        if (blocks.length < 2)
+            return null;
+        const [promptBlock, ...choiceBlocks] = blocks;
+        return {
+            promptText: promptBlock.node.textContent.trim() || null,
+            blocksToReplace: blocks,
+            choiceContents: choiceBlocks.map(b => b.node.content.size > 0 ? b.node.content : null),
+        };
     }
-    const paragraphType = schema.nodes.paragraph;
-    if (!paragraphType)
+    // List mode: optional leading plain-text paragraphs as prompt, then list(s)
+    const promptBlocks = [];
+    const listBlocks = [];
+    let sawList = false;
+    for (const block of blocks) {
+        if (isPlainTextParagraph(block.node, schema)) {
+            if (sawList)
+                return null;
+            promptBlocks.push(block);
+            continue;
+        }
+        if (isConvertibleList(block.node, schema)) {
+            sawList = true;
+            listBlocks.push(block);
+            continue;
+        }
         return null;
-    const firstChild = block.node.firstChild;
-    if (firstChild && firstChild.type === paragraphType) {
-        return firstChild.content;
     }
-    return null;
+    if (listBlocks.length === 0)
+        return null;
+    const promptText = promptBlocks
+        .map(block => block.node.textContent.trim())
+        .filter(Boolean)
+        .join(' ')
+        .trim();
+    const paragraphType = schema.nodes.paragraph;
+    const choiceContents = listBlocks.flatMap(block => {
+        const contents = [];
+        for (let i = 0; i < block.node.childCount; i += 1) {
+            const child = block.node.child(i);
+            if (child.type !== paragraphType)
+                continue;
+            contents.push(child.content.size > 0 ? child.content : null);
+        }
+        return contents;
+    });
+    return {
+        promptText: promptText || null,
+        blocksToReplace: [...promptBlocks, ...listBlocks],
+        choiceContents,
+    };
 }
 export function canConvertFlatListToChoiceInteraction(view) {
     const { state } = view;
@@ -124,12 +173,16 @@ export function canConvertFlatListToChoiceInteraction(view) {
     if (!interactionType || !promptType || !promptParagraphType || !choiceType || !choiceParagraphType) {
         return false;
     }
-    const selectedBlocks = getSelectedConvertibleBlocks(view);
-    if (selectedBlocks.length === 0)
+    const plan = buildConversionPlan(getSelectedRootBlocks(view), schema);
+    if (!plan)
+        return false;
+    const firstBlock = plan.blocksToReplace[0];
+    const lastBlock = plan.blocksToReplace[plan.blocksToReplace.length - 1];
+    const $from = state.doc.resolve(firstBlock.pos);
+    const $to = state.doc.resolve(lastBlock.end);
+    if ($from.parent !== $to.parent)
         return false;
-    const firstBlock = selectedBlocks[0];
-    const $pos = state.doc.resolve(firstBlock.pos);
-    return $pos.parent.canReplaceWith($pos.index(), $pos.index() + 1, interactionType);
+    return $from.parent.canReplaceWith($from.index(), $to.index(), interactionType);
 }
 export function convertFlatListToChoiceInteraction(view) {
     const { state } = view;
@@ -142,24 +195,26 @@ export function convertFlatListToChoiceInteraction(view) {
     if (!interactionType || !promptType || !promptParagraphType || !choiceType || !choiceParagraphType) {
         return false;
     }
-    const selectedBlocks = getSelectedConvertibleBlocks(view);
-    if (selectedBlocks.length === 0)
+    const plan = buildConversionPlan(getSelectedRootBlocks(view), schema);
+    if (!plan)
         return false;
-    const prompt = promptType.create(null, promptParagraphType.create(null, schema.text('Select one option')));
-    const choices = selectedBlocks.map(block => {
-        const inlineContent = getChoiceInlineContent(block, schema);
-        const paragraphContent = inlineContent ?? schema.text(block.node.textContent.trim() || 'Option');
+    const promptText = plan.promptText ?? translateQti('prompt.choice.selectOne', { target: view.dom });
+    const prompt = promptType.create(null, promptParagraphType.create(null, schema.text(promptText)));
+    const choices = plan.choiceContents.map(content => {
+        const paragraphContent = content ?? schema.text(translateQti('choice.option', { target: view.dom }));
         return choiceType.create({ identifier: `SIMPLE_CHOICE_${crypto.randomUUID()}` }, choiceParagraphType.create(null, paragraphContent));
     });
     const interaction = interactionType.create({ responseIdentifier: `RESPONSE_${crypto.randomUUID()}`, maxChoices: 1 }, [prompt, ...choices]);
-    const firstBlock = selectedBlocks[0];
-    const $pos = state.doc.resolve(firstBlock.pos);
-    if (!$pos.parent.canReplaceWith($pos.index(), $pos.index() + 1, interactionType)) {
+    const firstBlock = plan.blocksToReplace[0];
+    const lastBlock = plan.blocksToReplace[plan.blocksToReplace.length - 1];
+    const $from = state.doc.resolve(firstBlock.pos);
+    const $to = state.doc.resolve(lastBlock.end);
+    if ($from.parent !== $to.parent || !$from.parent.canReplaceWith($from.index(), $to.index(), interactionType)) {
         return false;
     }
     const tr = state.tr;
-    for (let i = selectedBlocks.length - 1; i >= 0; i -= 1) {
-        const block = selectedBlocks[i];
+    for (let i = plan.blocksToReplace.length - 1; i >= 0; i -= 1) {
+        const block = plan.blocksToReplace[i];
         tr.delete(block.pos, block.end);
     }
     tr.insert(firstBlock.pos, interaction);

package/dist/components/qti-choice-interaction/commands/insert-choice-interaction.commands.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"insert-choice-interaction.commands.d.ts","sourceRoot":"","sources":["../../../../src/components/qti-choice-interaction/commands/insert-choice-interaction.commands.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAEjD;;GAEG;AACH,eAAO,MAAM,uBAAuB,EAAE,OAoCrC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,yBAAyB,EAAE,OAcvC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,EAAE,OAA8D,CAAC"}
+{"version":3,"file":"insert-choice-interaction.commands.d.ts","sourceRoot":"","sources":["../../../../src/components/qti-choice-interaction/commands/insert-choice-interaction.commands.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAGjD;;GAEG;AACH,eAAO,MAAM,uBAAuB,EAAE,OAwCrC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,yBAAyB,EAAE,OAcvC,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,EAAE,OAA8D,CAAC"}

package/dist/components/qti-choice-interaction/commands/insert-choice-interaction.commands.js

@@ -1,10 +1,12 @@
 import { chainCommands, splitBlock } from 'prosemirror-commands';
 import { createInsertSiblingOnEnterCommand } from '@qti-editor/interaction-shared/commands/enter.js';
 import { createInsertBlockInteractionCommand } from '@qti-editor/interaction-shared/commands/insert.js';
+import { translateQti } from '@qti-editor/interaction-shared';
 /**
  * Command to insert a choice interaction at the current selection
  */
-export const insertChoiceInteraction = (state, dispatch) => {
+export const insertChoiceInteraction = (state, dispatch, view) => {
+    const target = view?.dom ?? null;
     return createInsertBlockInteractionCommand({
         createNode: currentState => {
             const { schema } = currentState;
@@ -17,11 +19,11 @@ export const insertChoiceInteraction = (state, dispatch) => {
                 return null;
             }
             const responseIdentifier = `RESPONSE_${crypto.randomUUID()}`;
-            const prompt = promptType.create(null, promptParagraphType.create(null, schema.text('Which option is correct?')));
+            const prompt = promptType.create(null, promptParagraphType.create(null, schema.text(translateQti('prompt.choice.default', { target }))));
             const choices = [
-                choiceType.create({ identifier: `SIMPLE_CHOICE_${crypto.randomUUID()}` }, choiceParagraphType.create(null, schema.text('Option A'))),
-                choiceType.create({ identifier: `SIMPLE_CHOICE_${crypto.randomUUID()}` }, choiceParagraphType.create(null, schema.text('Option B'))),
-                choiceType.create({ identifier: `SIMPLE_CHOICE_${crypto.randomUUID()}` }, choiceParagraphType.create(null, schema.text('Option C')))
+                choiceType.create({ identifier: `SIMPLE_CHOICE_${crypto.randomUUID()}` }, choiceParagraphType.create(null, schema.text(translateQti('choice.optionA', { target })))),
+                choiceType.create({ identifier: `SIMPLE_CHOICE_${crypto.randomUUID()}` }, choiceParagraphType.create(null, schema.text(translateQti('choice.optionB', { target })))),
+                choiceType.create({ identifier: `SIMPLE_CHOICE_${crypto.randomUUID()}` }, choiceParagraphType.create(null, schema.text(translateQti('choice.optionC', { target }))))
             ];
             return interactionType.create({ responseIdentifier, maxChoices: 1 }, [prompt, ...choices]);
         },

package/dist/components/qti-choice-interaction/qti-choice-interaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"qti-choice-interaction.d.ts","sourceRoot":"","sources":["../../../src/components/qti-choice-interaction/qti-choice-interaction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,0DAA0D,CAAC;AAKvF,MAAM,MAAM,WAAW,GAAG,YAAY,GAAG,UAAU,GAAG,SAAS,CAAC;AAChE,QAAA,MAAM,qBAAqB,EAAwD,OAAO,WAAW,CAAC;AAEtG,qBAAa,wBAAyB,SAAQ,qBAAqB;;IACjE,WAAoB,MAAM,8BASzB;IAGM,UAAU,SAAK;IAGf,UAAU,SAAK;IAGf,OAAO,EAAE,0BAA0B,GAAG,4BAA4B,GAAG,SAAS,CAAC;IAEtF,SAAS,CAAC,UAAU,EAAE,gBAAgB,CAAC;;IAQvC,iBAAiB,IAAI,IAAI;IAOzB,oBAAoB,IAAI,IAAI;IAMnB,OAAO,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC;IAiB/C,MAAM;CAGhB"}
+{"version":3,"file":"qti-choice-interaction.d.ts","sourceRoot":"","sources":["../../../src/components/qti-choice-interaction/qti-choice-interaction.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,0DAA0D,CAAC;AAKvF,MAAM,MAAM,WAAW,GAAG,YAAY,GAAG,UAAU,GAAG,SAAS,CAAC;AAChE,QAAA,MAAM,qBAAqB,EAAwD,OAAO,WAAW,CAAC;AAEtG,qBAAa,wBAAyB,SAAQ,qBAAqB;;IACjE,WAAoB,MAAM,8BASzB;IAGD,UAAU,SAAK;IAGf,UAAU,SAAK;IAGf,OAAO,EAAE,0BAA0B,GAAG,4BAA4B,GAAG,SAAS,CAAC;IAE/E,SAAS,CAAC,UAAU,EAAE,gBAAgB,CAAC;;IAQvC,iBAAiB,IAAI,IAAI;IAOzB,oBAAoB,IAAI,IAAI;IAMnB,OAAO,CAAC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC;IAmC/C,MAAM;CAGhB"}

package/dist/components/qti-choice-interaction/qti-choice-interaction.js

@@ -15,7 +15,7 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
-var _QtiChoiceInteractionEdit_instances, _QtiChoiceInteractionEdit_mutationObserver, _QtiChoiceInteractionEdit_updateChoices;
+var _QtiChoiceInteractionEdit_instances, _QtiChoiceInteractionEdit_mutationObserver, _QtiChoiceInteractionEdit_syncSelectedChoices, _QtiChoiceInteractionEdit_updateChoices;
 import { css, html } from 'lit';
 import { property } from 'lit/decorators.js';
 import { Interaction } from '@qti-editor/interaction-shared/components/interaction.js';
@@ -57,12 +57,24 @@ export class QtiChoiceInteractionEdit extends ChoiceInteractionBase {
         if (changedProperties.has('maxChoices')) {
             __classPrivateFieldGet(this, _QtiChoiceInteractionEdit_instances, "m", _QtiChoiceInteractionEdit_updateChoices).call(this);
         }
+        if (changedProperties.has('correctResponse')) {
+            __classPrivateFieldGet(this, _QtiChoiceInteractionEdit_instances, "m", _QtiChoiceInteractionEdit_syncSelectedChoices).call(this);
+        }
     }
     render() {
         return html `<slot part="prompt" name="prompt"></slot><slot part="slot"></slot>`;
     }
 }
-_QtiChoiceInteractionEdit_mutationObserver = new WeakMap(), _QtiChoiceInteractionEdit_instances = new WeakSet(), _QtiChoiceInteractionEdit_updateChoices = function _QtiChoiceInteractionEdit_updateChoices() {
+_QtiChoiceInteractionEdit_mutationObserver = new WeakMap(), _QtiChoiceInteractionEdit_instances = new WeakSet(), _QtiChoiceInteractionEdit_syncSelectedChoices = function _QtiChoiceInteractionEdit_syncSelectedChoices() {
+    const identifiers = new Set(typeof this.correctResponse === 'string' && this.correctResponse
+        ? this.correctResponse.split(',')
+        : Array.isArray(this.correctResponse)
+            ? this.correctResponse
+            : []);
+    this.querySelectorAll('qti-simple-choice').forEach(choice => {
+        choice.setSelected?.(identifiers.has(choice.identifier ?? ''));
+    });
+}, _QtiChoiceInteractionEdit_updateChoices = function _QtiChoiceInteractionEdit_updateChoices() {
     this._internals.role = this.maxChoices === 1 ? 'radiogroup' : null;
     const role = this.maxChoices === 1 ? 'radio' : 'checkbox';
     this.querySelectorAll('qti-simple-choice').forEach((choice) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qti-editor/interaction-choice",
   "description": "QTI choice interaction schemas, components, commands, and composer",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -16,19 +16,19 @@
     }
   },
   "dependencies": {
-    "@qti-components/base": "^1.4.1",
-    "@qti-components/choice-interaction": "^1.1.0",
+    "@qti-components/base": "^1.4.2",
+    "@qti-components/choice-interaction": "^1.1.3",
     "@qti-components/interactions": "^1.10.1",
-    "@qti-components/interactions-core": "^1.1.0",
-    "@qti-components/utilities": "^1.3.1",
-    "@qti-editor/interfaces": "0.1.0",
-    "@qti-editor/interaction-shared": "0.1.0"
+    "@qti-components/interactions-core": "^1.1.3",
+    "@qti-components/utilities": "^1.3.2",
+    "@qti-editor/interaction-shared": "0.2.0",
+    "@qti-editor/interfaces": "0.2.0"
   },
   "peerDependencies": {
     "lit": "^3.3.1"
   },
   "devDependencies": {
-    "lit": "^3.3.1",
+    "lit": "^3.3.2",
     "prosemirror-commands": "^1.7.1",
     "prosemirror-model": "^1.25.4",
     "prosemirror-state": "^1.4.4"