dsh-plugin-lookatstudy 0.21.0 → 0.21.1

package/lib/client.js

@@ -937,6 +937,12 @@ html[data-dsh-lookatstudy-active] [class*='centerCol'] > :not([data-dsh-lookatst
 .lks14-composer{flex:none;display:flex;gap:6px;align-items:flex-end;padding:8px 12px 10px;border-top:1px solid var(--dsw-alias-border-l1)}
 .lks14-composertext{flex:1;font:inherit;font-size:13px;color:var(--dsw-alias-label-primary);background:var(--dsw-alias-bg-layer-1);border:1px solid var(--dsw-alias-border-l1);border-radius:10px;padding:7px 10px;resize:none;box-sizing:border-box}
 .lks14-composertext:focus{outline:none;border-color:var(--dsw-alias-state-business-primary)}
+/* issue #7: the composer's pending-attachment chip (thumbnail + name + remove) */
+.lks14-attachchip{flex:none;display:flex;align-items:center;gap:8px;margin:0 0 6px;padding:5px 8px;border:1px solid var(--dsw-alias-border-l1);border-radius:10px;background:var(--dsw-alias-bg-layer-2);max-width:100%}
+.lks14-attachchip-thumb{flex:none;width:44px;height:44px;object-fit:cover;border-radius:7px;border:1px solid var(--dsw-alias-border-l1)}
+.lks14-attachchip-name{flex:1;min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;font-size:12.5px;color:var(--dsw-alias-label-primary)}
+.lks14-attachchip-x{flex:none;border:none;background:none;color:var(--dsw-alias-label-secondary);font:inherit;font-size:13px;cursor:pointer;border-radius:6px;padding:2px 6px}
+.lks14-attachchip-x:hover{background:var(--dsw-alias-interactive-bg-hover);color:var(--dsw-alias-label-primary)}
 
 /* ============================================================
  * v0.29 pane-resize 拖拽手柄(PaneResizeHandle)——
@@ -2179,6 +2185,7 @@ mark.lks-hl{background:var(--dsw-alias-state-warn-tertiary);color:inherit;border
 			"settings.budget.on": "开启历史预算",
 			"settings.budget.off": "关闭历史预算",
 			"attach.sent": "我发了一个文件:{name}(工作区路径 {path})——请读取它再继续。",
+			"attach.remove": "移除待发附件",
 			"attach.fail": "附件上传失败",
 			"attach.label": "附件(≤20MiB,存入学习工作区)",
 			"rail.mastered": "毕业 {mastered}/{total} 课",
@@ -2525,6 +2532,7 @@ mark.lks-hl{background:var(--dsw-alias-state-warn-tertiary);color:inherit;border
 			"settings.budget.on": "Enable history budget",
 			"settings.budget.off": "Disable history budget",
 			"attach.sent": "I attached a file: {name} (workspace path {path}) — read it before continuing.",
+			"attach.remove": "Remove pending attachment",
 			"attach.fail": "Attachment upload failed",
 			"attach.label": "Attach (≤20MiB, lands in the study workspace)",
 			"rail.mastered": "{mastered}/{total} lessons graduated",
@@ -2765,10 +2773,13 @@ mark.lks-hl{background:var(--dsw-alias-state-warn-tertiary);color:inherit;border
 		}
 		/** Render inline markup (code, bold, italic, links, images) over escaped text.
 		* Image src allowlist: https?:// or data:image/ — folder imports inline local
-		* images as data URLs (capped), GitHub imports reference jsDelivr; anything
-		* else stays literal text (no broken relative images, no exotic schemes). */
+		* images as data URLs (capped), GitHub imports reference jsDelivr; the
+		* plugin's own attachment route (/lookatstudy/api/attachment/<name>, issue #7
+		* — same-origin, server-side validated) renders workspace attachments;
+		* anything else stays literal text (no broken relative images, no exotic
+		* schemes). */
 		function inline(escaped) {
-			return escaped.replace(/`([^`]+)`/g, "<code>$1</code>").replace(/\*\*([^*]+)\*\*/g, "<strong>$1</strong>").replace(/\*([^*]+)\*/g, "<em>$1</em>").replace(/!\[([^\]]*)\]\((https?:\/\/[^)\s]+|data:image\/[^)\s]+)\)/g, (_m, alt, src) => `<img src="${src}" alt="${alt}" loading="lazy">`).replace(/\[([^\]]+)\]\((https?:\/\/[^)\s]+)\)/g, "<a href=\"$2\" target=\"_blank\" rel=\"noreferrer\">$1</a>");
+			return escaped.replace(/`([^`]+)`/g, "<code>$1</code>").replace(/\*\*([^*]+)\*\*/g, "<strong>$1</strong>").replace(/\*([^*]+)\*/g, "<em>$1</em>").replace(/!\[([^\]]*)\]\((https?:\/\/[^)\s]+|data:image\/[^)\s]+|\/lookatstudy\/api\/attachment\/[^)\s]+)\)/g, (_m, alt, src) => `<img src="${src}" alt="${alt}" loading="lazy">`).replace(/\[([^\]]+)\]\((https?:\/\/[^)\s]+)\)/g, "<a href=\"$2\" target=\"_blank\" rel=\"noreferrer\">$1</a>");
 		}
 		/** True when the line opens a GFM table row (pipes with a delimiter row next). */
 		function isTableRow(line) {
@@ -8504,6 +8515,7 @@ mark.lks-hl{background:var(--dsw-alias-state-warn-tertiary);color:inherit;border
 			const stuck = (0, react.useRef)(true);
 			const [showFab, setShowFab] = (0, react.useState)(false);
 			const [threadsOpen, setThreadsOpen] = (0, react.useState)(false);
+			const [pendingAttach, setPendingAttach] = (0, react.useState)(null);
 			const onStreamScroll = () => {
 				const el = streamEl.current;
 				if (el === null) return;
@@ -8755,18 +8767,31 @@ mark.lks-hl{background:var(--dsw-alias-state-warn-tertiary);color:inherit;border
 					for (let i = 0; i < bytes.length; i += CHUNK) bin += String.fromCharCode(...bytes.subarray(i, i + CHUNK));
 					return uploadAttachment(file.name, btoa(bin));
 				}).then((path) => {
-					send(tr("attach.sent", {
+					setPendingAttach({
 						name: file.name,
-						path
-					}));
+						path,
+						image: /\.(?:png|jpe?g|gif|webp|bmp)$/i.test(file.name)
+					});
 				}, () => {
 					showStudyToast(tr("attach.fail"), { severity: "error" });
 				});
 			};
+			/** One send = draft + pending attachment merged into a single message (issue #7). */
+			const submitComposer = () => {
+				if (busy) return;
+				const text = draft.trim();
+				if (text === "" && pendingAttach === null) return;
+				const attachLine = pendingAttach === null ? "" : tr("attach.sent", {
+					name: pendingAttach.name,
+					path: pendingAttach.path
+				});
+				setPendingAttach(null);
+				send(attachLine === "" ? text : text === "" ? attachLine : `${text}\n\n${attachLine}`);
+			};
 			const onComposerKey = (e) => {
 				if (e.key === "Enter" && !e.shiftKey) {
 					e.preventDefault();
-					if (draft.trim() !== "" && !busy) send(draft);
+					if ((draft.trim() !== "" || pendingAttach !== null) && !busy) submitComposer();
 				}
 			};
 			const proposal = data?.pendingProposals[0] ?? null;
@@ -8893,7 +8918,18 @@ mark.lks-hl{background:var(--dsw-alias-state-warn-tertiary);color:inherit;border
 				onClick: () => {
 					if (!dormant) fire(setMode(mode.id));
 				}
-			}, mode.id === "direct" ? (0, react.createElement)(IconBoltFill16, { size: 12 }) : mode.id === "guide" ? (0, react.createElement)(IconGoalOutline16, { size: 12 }) : (0, react.createElement)(IconBookFill16, { size: 12 }), tr(mode.labelKey))))), (0, react.createElement)("textarea", {
+			}, mode.id === "direct" ? (0, react.createElement)(IconBoltFill16, { size: 12 }) : mode.id === "guide" ? (0, react.createElement)(IconGoalOutline16, { size: 12 }) : (0, react.createElement)(IconBookFill16, { size: 12 }), tr(mode.labelKey))))), pendingAttach !== null ? (0, react.createElement)("div", { className: "lks14-attachchip" }, pendingAttach.image ? (0, react.createElement)("img", {
+				className: "lks14-attachchip-thumb",
+				src: `/lookatstudy/api/attachment/${encodeURIComponent(pendingAttach.path.split("/").pop() ?? "")}`,
+				alt: pendingAttach.name
+			}) : null, (0, react.createElement)("span", { className: "lks14-attachchip-name" }, pendingAttach.name), (0, react.createElement)("button", {
+				className: "lks14-attachchip-x",
+				"aria-label": tr("attach.remove"),
+				"data-tooltip": tr("attach.remove"),
+				onClick: () => {
+					setPendingAttach(null);
+				}
+			}, "✕")) : null, (0, react.createElement)("textarea", {
 				className: "lks14-composertext",
 				placeholder: busy ? tr("composer.busy") : tr("tutor.empty.hint"),
 				value: draft,
@@ -8983,9 +9019,9 @@ mark.lks-hl{background:var(--dsw-alias-state-warn-tertiary);color:inherit;border
 			}, (0, react.createElement)(IconCloseFill16, { size: 14 })) : (0, react.createElement)("button", {
 				className: "lks-btn-send",
 				"aria-label": tr("composer.send"),
-				disabled: dormant || draft.trim() === "",
+				disabled: dormant || draft.trim() === "" && pendingAttach === null,
 				onClick: () => {
-					send(draft);
+					submitComposer();
 				}
 			}, (0, react.createElement)(IconArrowUpFill16, { size: 18 }))), showFab ? (0, react.createElement)("button", {
 				className: `lks14-scrollfab${busy ? " streaming" : ""}`,
@@ -9008,6 +9044,7 @@ mark.lks-hl{background:var(--dsw-alias-state-warn-tertiary);color:inherit;border
 			const [zoneOverrides, setZoneOverrides] = (0, react.useState)({});
 			const zoneCounts = (0, react.useRef)({});
 			const [editingNote, setEditingNote] = (0, react.useState)(null);
+			const [noteRev, setNoteRev] = (0, react.useState)(0);
 			const [editDraft, setEditDraft] = (0, react.useState)("");
 			const [pendingLocate, setPendingLocate] = (0, react.useState)(null);
 			const [cmapExpanded, setCmapExpanded] = (0, react.useState)(false);
@@ -9431,7 +9468,7 @@ mark.lks-hl{background:var(--dsw-alias-state-warn-tertiary);color:inherit;border
 						}));
 					}
 				}, tr(labelKey), (0, react.createElement)("span", { className: "lks14-zonecount" }, String(zoneNotes.length)), (0, react.createElement)("span", { className: "lks14-zonecaret" }, open ? "▾" : "▸")), ...open ? zoneNotes.map((n) => (0, react.createElement)("div", {
-					key: n.id,
+					key: `${n.id}:${String(noteRev)}`,
 					className: `lks-note${n.pinned ? " pinned" : ""}`
 				}, (0, react.createElement)("span", { className: "lks-note-src" }, tr("note.src." + n.source)), (0, react.createElement)("button", {
 					className: "lks-note-act",
@@ -9492,6 +9529,7 @@ mark.lks-hl{background:var(--dsw-alias-state-warn-tertiary);color:inherit;border
 					disabled: editDraft.trim() === "",
 					onClick: () => {
 						setEditingNote(null);
+						setNoteRev((r) => r + 1);
 						fire(editNote(lesson.lessonId, n.id, editDraft));
 					}
 				}, tr("note.save")))) : (0, react.createElement)(ContentBoundary, {
@@ -9499,7 +9537,10 @@ mark.lks-hl{background:var(--dsw-alias-state-warn-tertiary);color:inherit;border
 					boundaryKey: `note-${n.id}`
 				}, (0, react.createElement)("div", {
 					className: "lks-note-text",
-					dangerouslySetInnerHTML: { __html: renderMarkdown(n.text) }
+					ref: (el) => {
+						if (el !== null) enhanceRendered(el).catch(() => {});
+					},
+					dangerouslySetInnerHTML: { __html: renderMarkdown(normalizeMathNotation(n.text)) }
 				})), n.quote !== null ? (0, react.createElement)("div", { className: "lks-note-q" }, `'${n.quote}'`) : null)) : []);
 			})));
 			return (0, react.createElement)("div", { className: "lks14-col lks14-note" }, body, confirmNoteDel !== null ? (0, react.createElement)(ConfirmCard, {