@blocklet/discuss-kit-ux 2.5.19 → 2.5.20

package/dist/components/input/auto-clear-plugin.d.ts

@@ -1,7 +1,3 @@
-import { EditorState } from 'lexical';
-interface Props {
-    value: EditorState | null;
-    isChanged: boolean;
-}
-export default function AutoClearPlugin({ value, isChanged }: Props): null;
-export {};
+export declare function AutoClearPlugin({ clearKey }: {
+    clearKey: number;
+}): null;

package/dist/components/input/auto-clear-plugin.mjs

@@ -1,26 +1,20 @@
 import { useEffect } from "react";
 import { useLexicalComposerContext } from "@lexical/react/LexicalComposerContext";
 import { $createParagraphNode, $getRoot, $getSelection } from "lexical";
-export default function AutoClearPlugin({ value, isChanged }) {
+export function AutoClearPlugin({ clearKey }) {
   const [editor] = useLexicalComposerContext();
   useEffect(() => {
-    try {
-      if (!isChanged) return;
-      if (value) return;
-      if (!editor) return;
+    if (editor && clearKey) {
       editor.update(() => {
         const root = $getRoot();
-        const selection = $getSelection();
         const paragraph = $createParagraphNode();
         root.clear();
         root.append(paragraph);
-        if (selection !== null) {
+        if ($getSelection() !== null) {
           paragraph.select();
         }
       });
-    } catch (e) {
-      console.error(e);
     }
-  }, [value, isChanged, editor]);
+  }, [editor, clearKey]);
   return null;
 }

package/dist/components/input/input.mjs

@@ -6,7 +6,7 @@ import isNil from "lodash/isNil";
 import { EditorConfigProvider, useEditorConfig } from "@blocklet/editor/lib/config";
 import { isEmptyContent } from "../lexical.mjs";
 import ShortcutPlugin from "./shortcut-plugin.mjs";
-import AutoClearPlugin from "./auto-clear-plugin.mjs";
+import { AutoClearPlugin } from "./auto-clear-plugin.mjs";
 import useMeasure from "../hooks/measure.mjs";
 import { mergeSx } from "../utils.mjs";
 import { MAX_COMMENT_LENGTH } from "../../constants.mjs";
@@ -32,8 +32,9 @@ const Input = ({
   const [error, setError] = useState("");
   const [loading, setLoading] = useState(false);
   const [ref, { width }] = useMeasure();
-  const isChanged = useRef(false);
+  const [clearKey, setClearKey] = useState(0);
   const editorConfig = useEditorConfig();
+  const internalEditorRef = useRef(null);
   const inSmallView = width < 700;
   const draftContent = sessionStorage.getItem(sessionKey);
   const setDraftContent = (data) => {
@@ -70,12 +71,12 @@ const Input = ({
     setError("");
     const originContent = content;
     try {
-      isChanged.current = true;
-      const result = await send(isNil(content) ? "" : JSON.stringify(content));
+      const result = await send(isNil(content) ? "" : JSON.stringify(internalEditorRef?.current?.getEditorState()));
       setContent(null);
       if (draftKey) {
         setDraftContent(null);
       }
+      setClearKey(Date.now());
       onSuccess?.(result);
     } catch (e) {
       setContent(originContent);
@@ -83,9 +84,6 @@ const Input = ({
       console.error(e);
     } finally {
       setLoading(false);
-      setTimeout(() => {
-        isChanged.current = false;
-      }, 300);
     }
   };
   const handleCmdEnterPressed = () => {
@@ -129,14 +127,19 @@ const Input = ({
   return /* @__PURE__ */ createElement(Box, { ref, ...rest, key: draftKey, sx: mergedSx }, /* @__PURE__ */ jsx(EditorConfigProvider, { value: mergedEditorConfig, children: /* @__PURE__ */ jsxs(
     BlockletEditor,
     {
-      editorRef,
+      editorRef: (editor) => {
+        internalEditorRef.current = editor;
+        if (editorRef) {
+          editorRef.current = editor;
+        }
+      },
       placeholder,
       editorState,
       onChange: handleChange,
       autoFocus,
       children: [
         !disableCmdEnter && /* @__PURE__ */ jsx(ShortcutPlugin, { shortcut, callback: handleCmdEnterPressed }),
-        /* @__PURE__ */ jsx(AutoClearPlugin, { value: content, isChanged: isChanged.current }),
+        /* @__PURE__ */ jsx(AutoClearPlugin, { clearKey }),
         children,
         renderInnerFooter?.({ submit, content, loading, error, inSmallView })
       ]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/discuss-kit-ux",
-  "version": "2.5.19",
+  "version": "2.5.20",
   "files": [
     "dist"
   ],
@@ -47,8 +47,8 @@
     "unstated-next": "^1.1.0",
     "url-join": "^4.0.1",
     "zustand": "^4.5.5",
-    "@blocklet/editor": "2.5.19",
-    "@blocklet/labels": "2.5.19"
+    "@blocklet/editor": "2.5.20",
+    "@blocklet/labels": "2.5.20"
   },
   "peerDependencies": {
     "@arcblock/did-connect-react": "^3.1.5",