@threadlabs/looma 0.26.21 → 0.26.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@threadlabs/looma",
-  "version": "0.26.21",
+  "version": "0.26.22",
   "type": "module",
   "description": "Looma components as HTML, Vue, and plain DOM, with design tokens.",
   "license": "MIT",

package/vue/components.css

@@ -10097,6 +10097,15 @@ html[data-ui-input-modality="touch"]
 .looma-editor .ProseMirror li > :is(ul, ol) {
   margin-block: var(--ui-space-1) 0;
 }
+
+/* A held navigation modifier makes links actionable without interrupting editing. */
+[data-component~="ui-editor-surface"] .ProseMirror[contenteditable="true"] a[href] {
+  cursor: text;
+}
+
+[data-component~="ui-editor-surface"] .ProseMirror[data-link-navigation] a[href] {
+  cursor: pointer;
+}
 /**
  * Looma editor styles (tokens-based).
  * Tables, context menu, insert-table grid, slash menu. Use with ProseMirror/Tiptap content.

package/vue/editor/index.js

@@ -1822,6 +1822,7 @@ var LoomaEditor = defineComponent({
 		let dismissedFormattingSelection = null;
 		let heldFormattingSelection = null;
 		let formattingPopup = null;
+		let linkPopup = null;
 		let heldPressTimer;
 		let heldPress = null;
 		const floatingFormattingMode = () => props.toolbarMode !== "sticky" && !(props.toolbarMode === "popover" && props.toolbarOpen) && !mobile.value;
@@ -2032,7 +2033,30 @@ var LoomaEditor = defineComponent({
 					"aria-multiline": "true",
 					"aria-label": props.label
 				},
-				handleKeyDown: (_view, event) => onFormattingKeyDown(event)
+				handleKeyDown: (_view, event) => onFormattingKeyDown(event),
+				handleDOMEvents: { click: (view, event) => {
+					if (!(event.target instanceof Element) || event.button !== 0) return false;
+					const link = event.target.closest("a[href]");
+					if (!link || !view.dom.contains(link)) return false;
+					const href = validLinkHref(link.getAttribute("href") ?? "");
+					if (!href) return false;
+					if (isApplePlatform() ? event.metaKey : event.ctrlKey) {
+						event.preventDefault();
+						window.open(href, "_blank", "noopener,noreferrer");
+						return true;
+					}
+					dismissedFormattingSelection = null;
+					requestAnimationFrame(() => {
+						if (view.isDestroyed) return;
+						editorStateVersion.value += 1;
+						const instance = editor.value;
+						if (instance?.isFocused && instance.state.selection.empty && instance.isActive("link") && !linkOpen.value) {
+							linkPopup?.setProps({ getReferenceClientRect: () => link.getBoundingClientRect() });
+							linkPopup?.show();
+						}
+					});
+					return false;
+				} }
 			},
 			onCreate: ({ editor: instance }) => {
 				emit("ready", instance);
@@ -2360,31 +2384,38 @@ var LoomaEditor = defineComponent({
 			h(Separator),
 			h(Cluster, {
 				gap: "xs",
-				justify: "between"
-			}, () => [h(Cluster, { gap: "xs" }, () => [linkSelection?.existing ? h(Button, {
+				justify: "between",
+				wrap: "nowrap"
+			}, () => [linkSelection?.existing ? h(Button, {
 				type: "button",
 				variant: "ghost",
 				tone: "danger",
 				size: "sm",
 				onClick: removeLink
-			}, () => "Remove link") : null, linkMode.value === "url" && validLinkHref(linkHref.value) ? h(Button, {
+			}, () => "Remove link") : null, validLinkHref(linkHref.value) ? h(Button, {
 				as: "a",
-				variant: "link",
+				variant: "outline",
+				tone: "accent",
 				size: "sm",
 				href: validLinkHref(linkHref.value),
 				target: "_blank",
 				rel: "noopener noreferrer"
-			}, () => "Preview link") : null]), h(Cluster, { gap: "xs" }, () => [h(Button, {
+			}, () => "Open link") : null]),
+			h(Cluster, {
+				gap: "xs",
+				justify: "end",
+				wrap: "nowrap"
+			}, () => [h(Button, {
 				type: "button",
-				variant: "ghost",
-				tone: "neutral",
+				variant: "outline",
+				tone: "accent",
 				size: "sm",
 				onClick: cancelLink
 			}, () => "Cancel"), h(Button, {
 				type: "submit",
 				variant: "solid",
 				size: "sm"
-			}, () => "Save link")])])
+			}, () => "Save link")])
 		])]);
 		const renderLinkContext = (instance) => {
 			if (linkContextEditing.value) return renderLinkForm();
@@ -2428,7 +2459,10 @@ var LoomaEditor = defineComponent({
 					target: "_blank",
 					rel: "noopener noreferrer",
 					"aria-label": "Open link"
-				}, () => loomaIcon("external-link")) : null,
+				}, () => h(Cluster, {
+					gap: "xs",
+					wrap: "nowrap"
+				}, () => [loomaIcon("external-link"), "Open link"])) : null,
 				safeHref ? h(Tooltip, { for: openId }, () => "Open link") : null,
 				h(IconButton, {
 					id: editId,
@@ -2787,12 +2821,13 @@ var LoomaEditor = defineComponent({
 		};
 		const onFormattingKeyDown = (event) => {
 			cancelHeldPress();
-			if (event.key !== "Escape" || !floatingFormattingMode() || !(event.target instanceof Node) || !(root.value?.contains(event.target) || formattingPopup?.popper.contains(event.target)) || !(formatOpen.value || formattingPopup?.popper.style.visibility === "visible")) return false;
+			if (event.key !== "Escape" || !(event.target instanceof Node) || !(root.value?.contains(event.target) || formattingPopup?.popper.contains(event.target) || linkPopup?.popper.contains(event.target)) || !(formatOpen.value || formattingPopup?.popper.style.visibility === "visible" || linkPopup?.popper.style.visibility === "visible")) return false;
 			const selection = editor.value?.state.selection;
 			dismissedFormattingSelection = selection instanceof TextSelection || selection instanceof AllSelection ? selection : null;
 			heldFormattingSelection = null;
 			formatOpen.value = false;
 			formattingPopup?.hide();
+			linkPopup?.hide();
 			hideTool();
 			return true;
 		};
@@ -2877,7 +2912,17 @@ var LoomaEditor = defineComponent({
 				trigger: "programmatic"
 			});
 		};
+		const onLinkNavigationModifier = (event) => {
+			const dom = editor.value?.view.dom;
+			const active = isApplePlatform() ? event.metaKey : event.ctrlKey;
+			if (dom && dom.hasAttribute("data-link-navigation") !== active) dom.toggleAttribute("data-link-navigation", active);
+		};
+		const clearLinkNavigationModifier = () => editor.value?.view.dom.removeAttribute("data-link-navigation");
 		onMounted(() => {
+			window.addEventListener("keydown", onLinkNavigationModifier);
+			window.addEventListener("keyup", onLinkNavigationModifier);
+			window.addEventListener("pointermove", onLinkNavigationModifier);
+			window.addEventListener("blur", clearLinkNavigationModifier);
 			updateMobileViewport();
 			window.addEventListener("resize", onViewportChange);
 			window.addEventListener("scroll", onViewportChange, true);
@@ -2894,6 +2939,10 @@ var LoomaEditor = defineComponent({
 			root.value?.addEventListener("error", onImageError, true);
 		});
 		onBeforeUnmount(() => {
+			window.removeEventListener("keydown", onLinkNavigationModifier);
+			window.removeEventListener("keyup", onLinkNavigationModifier);
+			window.removeEventListener("pointermove", onLinkNavigationModifier);
+			window.removeEventListener("blur", clearLinkNavigationModifier);
 			window.removeEventListener("resize", onViewportChange);
 			window.removeEventListener("scroll", onViewportChange, true);
 			window.visualViewport?.removeEventListener("resize", onViewportChange);
@@ -3358,19 +3407,26 @@ var LoomaEditor = defineComponent({
 							}
 						}] } } : {}
 					}
-				}, { default: () => props.toolbarMode === "contextual" ? h(Stack, { gap: "xs" }, () => [renderToolbar(instance, true), (linkContextEditing.value || instance.state.selection.empty && instance.isActive("link")) && !linkOpen.value ? renderLinkContextCard(instance) : null]) : renderToolbar(instance, true, props.toolbarMode === "popover") }) : null,
-				instance && props.editable && !mobile.value && props.toolbarMode !== "contextual" ? h(BubbleMenu, {
+				}, { default: () => props.toolbarMode === "contextual" ? h(Stack, { gap: "xs" }, () => [renderToolbar(instance, true), (linkContextEditing.value || instance.state.selection.empty && instance.isActive("link")) && !linkOpen.value && formattingSelectionActive(instance) ? renderLinkContextCard(instance) : null]) : renderToolbar(instance, true, props.toolbarMode === "popover") }) : null,
+				instance && props.editable ? h(BubbleMenu, {
 					editor: instance,
 					pluginKey: "looma-link-context-menu",
-					shouldShow: ({ editor: menuEditor, from, to }) => from === to && menuEditor.isActive("link") && !linkOpen.value,
+					updateDelay: 0,
+					shouldShow: ({ editor: menuEditor, from, to }) => from === to && menuEditor.isActive("link") && !linkOpen.value && !dismissedFormattingSelection?.eq(menuEditor.state.selection) && Boolean(menuEditor.isFocused || linkContextEditing.value || linkPopup?.popper.contains(document.activeElement)) && !(props.toolbarMode === "contextual" && floatingFormattingMode() && formattingSelectionActive(menuEditor)),
 					tippyOptions: {
+						onCreate: (popup) => {
+							linkPopup = popup;
+						},
+						onDestroy: () => {
+							linkPopup = null;
+						},
 						appendTo: () => root.value?.closest("dialog[open], [popover]") ?? document.body,
 						onShow: () => announceOverlayOpen(root.value?.ownerDocument ?? document, root.value),
 						duration: 100,
 						maxWidth: Math.min(480, window.innerWidth - 24),
-						placement: "bottom"
+						placement: "top"
 					}
-				}, { default: () => renderLinkContextCard(instance) }) : null,
+				}, { default: () => props.toolbarMode === "contextual" && floatingFormattingMode() && formattingSelectionActive(instance) ? null : renderLinkContextCard(instance) }) : null,
 				instance && props.editable && !mobile.value && props.toolbarMode === "popover" && props.toolbarTriggerId ? h(Popover, {
 					class: "looma-editor__formatting-popover",
 					role: "region",