leepi 0.0.3 → 0.0.4

package/CHANGELOG.md

@@ -0,0 +1,20 @@
+# leepi
+
+## 0.0.4
+
+### Patch Changes
+
+- e25ae8e: Fix bug with ul/ol toggles
+- e25ae8e: Use link paste primitive from library instead of custom
+
+## 0.0.3
+
+### Patch Changes
+
+- 2aa717f: Build package first before publishing
+
+## 0.0.2
+
+### Patch Changes
+
+- 5778861: A headless markdown editor using CodeMirror with keyboard shortcuts and built-in React primitives

package/dist/core/commands.js

@@ -209,9 +209,15 @@ function toggleHeading(level) {
 	};
 }
 const TASK_RE = /^(\s*)[-*+]\s\[([ xX])\]\s/;
+const UL_RE = /^(\s*)[-*+]\s/;
+const OL_RE = /^(\s*)\d+\.\s/;
 function detectListKind(state, pos, contentText) {
-	let node = syntaxTree(state).resolveInner(pos, 1);
 	const indent = contentText.match(/^(\s*)/)[1];
+	if (!UL_RE.test(contentText) && !OL_RE.test(contentText) && !TASK_RE.test(contentText)) return {
+		kind: "none",
+		indent: ""
+	};
+	let node = syntaxTree(state).resolveInner(pos, 1);
 	while (node) {
 		if (node.name === "ListItem" && node.getChild("Task")) return {
 			kind: "task",

package/dist/core/plugins/code-block.js

@@ -46,6 +46,7 @@ const codeBlockTheme = EditorView.theme({
 	},
 	".cm-has-deco::before": {
 		content: "attr(data-line-num)",
+		boxSizing: "content-box",
 		position: "absolute",
 		right: "calc(100% + 0.5ch)",
 		width: "calc(var(--line-digits, 3) * 1ch)",

package/dist/core/plugins/link.d.ts

@@ -18,7 +18,6 @@ interface LinkPluginOptions {
     insertLink?: string;
     removeLink?: string;
   };
-  urlRegex?: RegExp;
 }
 declare function linkPlugin(options?: LinkPluginOptions): Extension;
 //#endregion

package/dist/core/plugins/link.js

@@ -1,17 +1,17 @@
 import { markRegistry, shortcutRegistry } from "../registry.js";
 import { isInsideCodeBlock } from "../utils.js";
-import { findLinkAtCursor, insertLink } from "../commands.js";
+import { findLinkAtCursor } from "../commands.js";
 import { openPopover } from "../popover.js";
-import { EditorView, keymap } from "@codemirror/view";
+import { keymap } from "@codemirror/view";
 import { HighlightStyle, syntaxHighlighting } from "@codemirror/language";
 import { EditorSelection } from "@codemirror/state";
+import { pasteURLAsLink } from "@codemirror/lang-markdown";
 import { tags } from "@lezer/highlight";
 //#region src/core/plugins/link.ts
 const defaultShortcuts = {
 	insertLink: "Mod-k",
 	removeLink: "Mod-Shift-k"
 };
-const URL_RE = /^(?:https?:\/\/|mailto:|tel:)\S+$/;
 const linkHighlight = HighlightStyle.define([{
 	tag: tags.link,
 	color: "var(--lp-color-accent)"
@@ -24,20 +24,9 @@ function linkPlugin(options) {
 		...defaultShortcuts,
 		...options?.shortcuts
 	};
-	const urlRegex = options?.urlRegex ?? URL_RE;
 	return [
 		syntaxHighlighting(linkHighlight),
-		EditorView.domEventHandlers({ paste(event, view) {
-			const range = view.state.selection.main;
-			if (range.empty) return false;
-			if (isInsideCodeBlock(view)) return false;
-			const text = event.clipboardData?.getData("text/plain")?.trim();
-			if (!text || !urlRegex.test(text)) return false;
-			event.preventDefault();
-			const label = view.state.sliceDoc(range.from, range.to);
-			insertLink(view, range.from, range.to, label, text);
-			return true;
-		} }),
+		pasteURLAsLink,
 		shortcutRegistry.of([{
 			key: keys.insertLink,
 			action: "insertLink",

package/dist/react/toolbar.js

@@ -15,8 +15,8 @@ const blockCommands = {
 	heading1: toggleHeading(1),
 	heading2: toggleHeading(2),
 	heading3: toggleHeading(3),
-	orderedList: toggleListKind("ul"),
-	unorderedList: toggleListKind("ol"),
+	orderedList: toggleListKind("ol"),
+	unorderedList: toggleListKind("ul"),
 	taskList: toggleListKind("task"),
 	blockquote: toggleBlockquote
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "leepi",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "A composable React markdown editor with inline styling",
   "repository": {
     "type": "git",
@@ -11,7 +11,8 @@
     "dist",
     "src",
     "!src/**/*.test.ts",
-    "!src/**/test-helpers.ts"
+    "!src/**/test-helpers.ts",
+    "CHANGELOG.md"
   ],
   "type": "module",
   "exports": {

package/src/core/commands.ts

@@ -236,14 +236,25 @@ const TASK_RE = /^(\s*)[-*+]\s\[([ xX])\]\s/;
 
 type ListKind = "ul" | "ol" | "task" | "none";
 
+const UL_RE = /^(\s*)[-*+]\s/;
+const OL_RE = /^(\s*)\d+\.\s/;
+
 function detectListKind(
   state: EditorState,
   pos: number,
   contentText: string,
 ): { kind: ListKind; indent: string } {
+  const indent = contentText.match(/^(\s*)/)![1];
+
+  // Check the line text first — if it doesn't have a list prefix,
+  // it's not a list item even if the syntax tree thinks it's inside a list
+  // (e.g. continuation paragraph after a list item).
+  if (!UL_RE.test(contentText) && !OL_RE.test(contentText) && !TASK_RE.test(contentText)) {
+    return { kind: "none", indent: "" };
+  }
+
   const tree = syntaxTree(state);
   let node = tree.resolveInner(pos, 1);
-  const indent = contentText.match(/^(\s*)/)![1];
 
   while (node) {
     if (node.name === "ListItem" && node.getChild("Task")) {

package/src/core/plugins/code-block.ts

@@ -89,6 +89,7 @@ const codeBlockTheme = EditorView.theme({
   },
   ".cm-has-deco::before": {
     content: "attr(data-line-num)",
+    boxSizing: "content-box",
     position: "absolute",
     right: "calc(100% + 0.5ch)",
     width: "calc(var(--line-digits, 3) * 1ch)",

package/src/core/plugins/link.ts

@@ -1,12 +1,13 @@
-import { type Extension, EditorSelection } from "@codemirror/state";
-import { keymap, EditorView } from "@codemirror/view";
+import { pasteURLAsLink } from "@codemirror/lang-markdown";
 import { HighlightStyle, syntaxHighlighting } from "@codemirror/language";
+import { type Extension, EditorSelection } from "@codemirror/state";
+import { keymap } from "@codemirror/view";
 import { tags } from "@lezer/highlight";
-import { shortcutRegistry, markRegistry } from "../registry";
 import { findLinkAtCursor, insertLink } from "../commands";
-import { isInsideCodeBlock } from "../utils";
 import { openPopover } from "../popover";
+import { markRegistry, shortcutRegistry } from "../registry";
 import type { PopoverRequest } from "../types";
+import { isInsideCodeBlock } from "../utils";
 
 export interface LinkData {
   /** Selected text or existing link label */
@@ -25,7 +26,6 @@ export interface LinkPluginOptions {
     insertLink?: string;
     removeLink?: string;
   };
-  urlRegex?: RegExp;
 }
 
 const defaultShortcuts = {
@@ -33,8 +33,6 @@ const defaultShortcuts = {
   removeLink: "Mod-Shift-k",
 };
 
-const URL_RE = /^(?:https?:\/\/|mailto:|tel:)\S+$/;
-
 const linkHighlight = HighlightStyle.define([
   { tag: tags.link, color: "var(--lp-color-accent)" },
   { tag: tags.url, color: "var(--lp-color-accent)" },
@@ -42,25 +40,10 @@ const linkHighlight = HighlightStyle.define([
 
 export function linkPlugin(options?: LinkPluginOptions): Extension {
   const keys = { ...defaultShortcuts, ...options?.shortcuts };
-  const urlRegex = options?.urlRegex ?? URL_RE;
 
   return [
     syntaxHighlighting(linkHighlight),
-    EditorView.domEventHandlers({
-      paste(event, view) {
-        const range = view.state.selection.main;
-        if (range.empty) return false;
-        if (isInsideCodeBlock(view)) return false;
-
-        const text = event.clipboardData?.getData("text/plain")?.trim();
-        if (!text || !urlRegex.test(text)) return false;
-
-        event.preventDefault();
-        const label = view.state.sliceDoc(range.from, range.to);
-        insertLink(view, range.from, range.to, label, text);
-        return true;
-      },
-    }),
+    pasteURLAsLink,
     shortcutRegistry.of([
       { key: keys.insertLink, action: "insertLink", plugin: "link" },
       { key: keys.removeLink, action: "removeLink", plugin: "link" },
@@ -121,4 +104,4 @@ export function linkPlugin(options?: LinkPluginOptions): Extension {
 }
 
 // Re-export for convenience
-export { insertLink, findLinkAtCursor };
+export { findLinkAtCursor, insertLink };

package/src/react/toolbar.tsx

@@ -53,16 +53,16 @@ const inlineCommands: Record<Exclude<InlineAction, "link">, (view: EditorView) =
 const heading1Cmd = toggleHeading(1);
 const heading2Cmd = toggleHeading(2);
 const heading3Cmd = toggleHeading(3);
-const ulCmd = toggleListKind("ul");
 const olCmd = toggleListKind("ol");
+const ulCmd = toggleListKind("ul");
 const taskCmd = toggleListKind("task");
 
 const blockCommands: Record<Exclude<BlockAction, "codeblock">, (view: EditorView) => void> = {
   heading1: heading1Cmd,
   heading2: heading2Cmd,
   heading3: heading3Cmd,
-  orderedList: ulCmd,
-  unorderedList: olCmd,
+  orderedList: olCmd,
+  unorderedList: ulCmd,
   taskList: taskCmd,
   blockquote: toggleBlockquote,
 };