@pixerate/editor-react 0.9.5 → 0.10.1

package/dist/index.d.cts

@@ -11,7 +11,11 @@ export { ImageEditor, ImageEditorProps, UseImageEditorReturn, useImageEditor } f
 import '@pixerate/editor/image-editor';
 
 interface UsePromptEditorProps {
-    /** The initial or controlled content of the editor as plain text */
+    /**
+     * The editor content as plain text. Changes from the parent (e.g. clearing
+     * after submit) are applied to the editor; echoes of the editor's own
+     * updates via `onContentChange` are ignored.
+     */
     content: string;
     /** Callback fired when the editor content changes (returns plain text) */
     onContentChange: (text: string) => void;
@@ -43,7 +47,10 @@ interface UsePromptEditorProps {
     clearSlashCommand?: () => void;
     /** Whether a slash command menu is currently active */
     slashCommandActive?: boolean;
-    /** Callback fired when certain milestones are reached (e.g., used_variable, used_magic) */
+    /**
+     * Callback fired the first time each milestone is reached while the editor
+     * is mounted: `used_variable` ({variable}) and `used_magic` (__instruction__).
+     */
     onMilestone?: (milestone: string) => void;
     /** DOM element ID of the container, used for positioning popovers */
     containerId?: string;

package/dist/index.d.ts

@@ -11,7 +11,11 @@ export { ImageEditor, ImageEditorProps, UseImageEditorReturn, useImageEditor } f
 import '@pixerate/editor/image-editor';
 
 interface UsePromptEditorProps {
-    /** The initial or controlled content of the editor as plain text */
+    /**
+     * The editor content as plain text. Changes from the parent (e.g. clearing
+     * after submit) are applied to the editor; echoes of the editor's own
+     * updates via `onContentChange` are ignored.
+     */
     content: string;
     /** Callback fired when the editor content changes (returns plain text) */
     onContentChange: (text: string) => void;
@@ -43,7 +47,10 @@ interface UsePromptEditorProps {
     clearSlashCommand?: () => void;
     /** Whether a slash command menu is currently active */
     slashCommandActive?: boolean;
-    /** Callback fired when certain milestones are reached (e.g., used_variable, used_magic) */
+    /**
+     * Callback fired the first time each milestone is reached while the editor
+     * is mounted: `used_variable` ({variable}) and `used_magic` (__instruction__).
+     */
     onMilestone?: (milestone: string) => void;
     /** DOM element ID of the container, used for positioning popovers */
     containerId?: string;

package/dist/index.js

@@ -8,18 +8,22 @@ import { useMemo, useEffect, useRef } from "react";
 import { useEditor } from "@tiptap/react";
 import StarterKit from "@tiptap/starter-kit";
 import Placeholder from "@tiptap/extension-placeholder";
-import { Slice, Fragment, Node as ProsemirrorNode } from "@tiptap/pm/model";
+import { Slice } from "@tiptap/pm/model";
 import {
   GradientText,
   TemplateSuggestions,
   LoadingNode,
   plainTextToTipTapHtml,
-  getEditorText
+  plainTextToSlice,
+  getEditorText,
+  tokenizePrompt
 } from "@pixerate/editor";
 var DEFAULT_TEMPLATES = [];
 var DEFAULT_COLOR_MAP = /* @__PURE__ */ new Map([
   ["default", { from: "#f43f5e", to: "#8b5cf6" }]
 ]);
+var DEFAULT_CLASS_NAME = "w-full border border-input rounded-md p-3 font-mono text-sm leading-relaxed focus:outline-none focus:ring-2 focus:ring-primary whitespace-pre-wrap break-words";
+var normalizeNewlines = (text) => text.replace(/\r\n?/g, "\n");
 function usePromptEditor({
   content,
   onContentChange,
@@ -60,6 +64,7 @@ function usePromptEditor({
   const templateKey = useMemo(() => {
     return (templates || []).map((t) => `${t.id || t.name}:${t.latestVersion || ""}`).sort().join(",");
   }, [templates]);
+  const colorMapKey = userColorMap ? JSON.stringify(Array.from(userColorMap.entries())) : "";
   const resolvedColorMap = useMemo(() => {
     if (userColorMap) return userColorMap;
     const map = /* @__PURE__ */ new Map();
@@ -67,7 +72,9 @@ function usePromptEditor({
       map.set(t.name, { from: "#f43f5e", to: "#8b5cf6" });
     });
     return map.size > 0 ? map : DEFAULT_COLOR_MAP;
-  }, [userColorMap, templateKey]);
+  }, [colorMapKey, templateKey]);
+  const jsonVariablesKey = (jsonVariables || []).join("\0");
+  const reachedMilestonesRef = useRef(/* @__PURE__ */ new Set());
   const StarterKitExt = StarterKit?.configure ? StarterKit : StarterKit?.default?.configure ? StarterKit?.default : StarterKit;
   const PlaceholderExt = Placeholder?.configure ? Placeholder : Placeholder?.default?.configure ? Placeholder?.default : Placeholder;
   const editor = useEditor(
@@ -97,11 +104,13 @@ function usePromptEditor({
         const plainText = getEditorText(ed);
         onContentChangeRef.current?.(plainText);
         if (onMilestoneRef.current) {
-          if (plainText.match(/(?<!\{)\{([^{}]+)\}(?!\})/g)) {
-            onMilestoneRef.current("used_variable");
-          }
-          if (plainText.match(/__([^_]+)__/g)) {
-            onMilestoneRef.current("used_magic");
+          const reached = reachedMilestonesRef.current;
+          for (const token of tokenizePrompt(plainText)) {
+            const milestone = token.type === "variable" ? "used_variable" : token.type === "instruction" ? "used_magic" : null;
+            if (milestone && !reached.has(milestone)) {
+              reached.add(milestone);
+              onMilestoneRef.current(milestone);
+            }
           }
         }
         const { state, view } = ed;
@@ -139,7 +148,7 @@ function usePromptEditor({
       },
       editorProps: {
         attributes: {
-          class: className || "w-full border border-input rounded-md p-3 font-mono text-sm leading-relaxed focus:outline-none focus:ring-2 focus:ring-primary whitespace-pre-wrap break-words",
+          class: className || DEFAULT_CLASS_NAME,
           role: "textbox",
           "aria-label": "Prompt editor"
         },
@@ -171,51 +180,61 @@ function usePromptEditor({
           event.preventDefault();
           const schema = view.state.schema;
           if (!schema) return false;
-          const blocks = text.replace(/\r\n?/g, "\n").split("\n");
-          const nodes = [];
-          blocks.forEach((line) => {
-            const nodeJson = { type: "paragraph" };
-            if (line.length > 0) {
-              nodeJson.content = [{ type: "text", text: line }];
-            }
-            try {
-              const node = ProsemirrorNode.fromJSON(schema, nodeJson);
-              nodes.push(node);
-            } catch {
-            }
-          });
-          const parsedSlice = Slice.maxOpen(Fragment.fromArray(nodes));
-          const tr = view.state.tr.replaceSelection(parsedSlice);
-          view.dispatch(tr);
+          view.dispatch(
+            view.state.tr.replaceSelection(plainTextToSlice(text, schema))
+          );
           return true;
         },
         clipboardTextParser: (text, context, _plain, view) => {
           const schema = context?.doc?.type?.schema || context?.schema || view?.state?.schema;
           if (!schema) return Slice.empty;
-          const blocks = text.replace(/\r\n?/g, "\n").split("\n");
-          const nodes = [];
-          blocks.forEach((line) => {
-            const nodeJson = { type: "paragraph" };
-            if (line.length > 0) {
-              nodeJson.content = [{ type: "text", text: line }];
-            }
-            try {
-              const node = ProsemirrorNode.fromJSON(schema, nodeJson);
-              nodes.push(node);
-            } catch {
-            }
-          });
-          return Slice.maxOpen(Fragment.fromArray(nodes));
+          return plainTextToSlice(text, schema);
         }
       }
     },
-    [resolvedColorMap, templateKey, isEditing, placeholder, speed]
+    // Only options baked into extensions recreate the editor; editable state,
+    // placeholder, class names and content are applied to the live instance.
+    [resolvedColorMap, templateKey, speed, jsonVariablesKey]
   );
   useEffect(() => {
     if (editor && !editor.isDestroyed) {
       editor.setEditable(isEditing);
     }
   }, [editor, isEditing]);
+  useEffect(() => {
+    if (!editor || editor.isDestroyed) return;
+    if (normalizeNewlines(content) === getEditorText(editor)) return;
+    const { from, to } = editor.state.selection;
+    editor.commands.setContent(plainTextToTipTapHtml(content), false);
+    const max = editor.state.doc.content.size;
+    editor.commands.setTextSelection({
+      from: Math.min(from, max),
+      to: Math.min(to, max)
+    });
+  }, [editor, content]);
+  useEffect(() => {
+    if (!editor || editor.isDestroyed) return;
+    editor.setOptions({
+      editorProps: {
+        ...editor.options.editorProps,
+        attributes: {
+          ...editor.options.editorProps.attributes,
+          class: className || DEFAULT_CLASS_NAME
+        }
+      }
+    });
+  }, [editor, className]);
+  useEffect(() => {
+    if (!editor || editor.isDestroyed) return;
+    const placeholderExt = editor.extensionManager.extensions.find(
+      (ext) => ext.name === "placeholder"
+    );
+    if (!placeholderExt || placeholderExt.options.placeholder === placeholder) {
+      return;
+    }
+    placeholderExt.options.placeholder = placeholder;
+    editor.view.dispatch(editor.state.tr);
+  }, [editor, placeholder]);
   return editor;
 }
 
@@ -518,7 +537,7 @@ var BubbleMenu = ({
 // src/components/TemplateRenderer.tsx
 import { useMemo as useMemo3 } from "react";
 import {
-  tokenizePrompt,
+  tokenizePrompt as tokenizePrompt2,
   resolveTemplates
 } from "@pixerate/editor";
 import { jsx as jsx2 } from "react/jsx-runtime";
@@ -536,7 +555,7 @@ var TemplateRenderer = ({
     return resolveTemplates(content, templates);
   }, [content, templates, resolve]);
   const tokens = useMemo3(() => {
-    return tokenizePrompt(displayText);
+    return tokenizePrompt2(displayText);
   }, [displayText]);
   return /* @__PURE__ */ jsx2("div", { className, children: tokens.map((token, index) => {
     if (token.type === "template") {