@yuntijs/ui 1.1.0-beta.14 → 1.1.0-beta.16

package/es/Mentions/index.d.ts

@@ -3,6 +3,7 @@ import { type MentionPickerPluginProps } from './plugins/mention-picker';
 import { AutoSize, MentionsEditor } from './types';
 export * from './types';
 export * from './utils';
+export { CLEAR_EDITOR_COMMAND } from 'lexical';
 export interface MentionsProps extends MentionPickerPluginProps {
     className?: string;
     classNames?: {
@@ -25,6 +26,10 @@ export interface MentionsProps extends MentionPickerPluginProps {
     onPressEnter?: (value: string, { event }: {
         event: KeyboardEvent | null;
     }) => void;
+    /**
+     * 用户输入 trigger 后的回调
+     */
+    onTrigger?: (trigger: string) => void;
     variant?: 'outlined' | 'filled' | 'borderless';
     autoSize?: AutoSize;
     code?: boolean;

package/es/Mentions/index.js

@@ -1,6 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+import { ClearEditorPlugin } from '@lexical/react/LexicalClearEditorPlugin';
 import { LexicalComposer } from '@lexical/react/LexicalComposer';
 import { ContentEditable } from '@lexical/react/LexicalContentEditable';
 import { LexicalErrorBoundary } from '@lexical/react/LexicalErrorBoundary';
@@ -26,6 +27,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export * from "./types";
 export * from "./utils";
+export { CLEAR_EDITOR_COMMAND } from 'lexical';
 export var Mentions = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var className = _ref.className,
     classNames = _ref.classNames,
@@ -53,7 +55,8 @@ export var Mentions = /*#__PURE__*/forwardRef(function (_ref, ref) {
     _ref$code = _ref.code,
     code = _ref$code === void 0 ? false : _ref$code,
     getPopContainer = _ref.getPopContainer,
-    onPressEnter = _ref.onPressEnter;
+    onPressEnter = _ref.onPressEnter,
+    onTrigger = _ref.onTrigger;
   var _ConfigProvider$useCo = ConfigProvider.useConfig(),
     componentDisabled = _ConfigProvider$useCo.componentDisabled;
   var _useStyles = useStyles({
@@ -146,6 +149,10 @@ export var Mentions = /*#__PURE__*/forwardRef(function (_ref, ref) {
           })
         }), editable && /*#__PURE__*/_jsx(MentionPickerPlugin, {
           allowSpaces: allowSpaces,
+          onOpen: function onOpen(resolution) {
+            var _resolution$match$rep, _resolution$match;
+            return onTrigger === null || onTrigger === void 0 ? void 0 : onTrigger((_resolution$match$rep = (_resolution$match = resolution.match) === null || _resolution$match === void 0 ? void 0 : _resolution$match.replaceableString) !== null && _resolution$match$rep !== void 0 ? _resolution$match$rep : triggers[0]);
+          },
           onSelect: onSelect,
           options: options,
           overlayClassName: classNames === null || classNames === void 0 ? void 0 : classNames.menuOverlay,
@@ -162,7 +169,7 @@ export var Mentions = /*#__PURE__*/forwardRef(function (_ref, ref) {
           editable: editable
         }), /*#__PURE__*/_jsx(EditorRefPlugin, {
           editorRef: ref
-        }), onPressEnter && /*#__PURE__*/_jsx(ShiftEnterKeyPlugin, {
+        }), /*#__PURE__*/_jsx(ClearEditorPlugin, {}), onPressEnter && /*#__PURE__*/_jsx(ShiftEnterKeyPlugin, {
           onPressEnter: onPressEnter
         })]
       })

package/es/Mentions/plugins/mention-picker/index.d.ts

@@ -1,7 +1,8 @@
+import type { MenuOption, TypeaheadMenuPluginProps } from '@lexical/react/LexicalTypeaheadMenuPlugin';
 import React from 'react';
 import type { MentionOption } from '../../types';
 import { type MentionMenuOption } from './utils';
-export interface MentionPickerPluginProps {
+export interface MentionPickerPluginProps extends Pick<TypeaheadMenuPluginProps<MenuOption>, 'onOpen'> {
     /** The className of menu overlay */
     overlayClassName?: string;
     /** The options of menu */

package/es/Mentions/plugins/mention-picker/index.js

@@ -27,6 +27,7 @@ export var MentionPickerPlugin = /*#__PURE__*/memo(function (_ref) {
     _ref$preTriggerChars = _ref.preTriggerChars,
     preTriggerChars = _ref$preTriggerChars === void 0 ? PRE_TRIGGER_CHARS : _ref$preTriggerChars,
     onSelect = _ref.onSelect,
+    onOpen = _ref.onOpen,
     parent = _ref.parent;
   var _useStyles = useStyles({}),
     cx = _useStyles.cx,
@@ -169,6 +170,7 @@ export var MentionPickerPlugin = /*#__PURE__*/memo(function (_ref) {
     ,
     commandPriority: COMMAND_PRIORITY_NORMAL,
     menuRenderFn: renderMenu,
+    onOpen: onOpen,
     onQueryChange: setQueryString,
     onSelectOption: onSelectOption,
     options: flatOptions,

package/es/Mentions/plugins/shift-enter-key.js

@@ -36,9 +36,20 @@ export var ShiftEnterKeyPlugin = function ShiftEnterKeyPlugin(_ref) {
         return $getRoot().getTextContent();
       });
       var value = text.replaceAll('\n\n', '\n');
-      onPressEnter(value, {
-        event: event
-      });
+      // 这里把 onPressEnter 放在下一次事件循环中触发，是为了避免跟 Lexical 还未结束的输入等事务发生冲突
+      if (window.queueMicrotask === undefined) {
+        setTimeout(function () {
+          onPressEnter(value, {
+            event: event
+          });
+        }, 0);
+      } else {
+        queueMicrotask(function () {
+          onPressEnter(value, {
+            event: event
+          });
+        });
+      }
       return true;
     },
     // 优先级要低于 MentionPickerPlugin

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yuntijs/ui",
-  "version": "1.1.0-beta.14",
+  "version": "1.1.0-beta.16",
   "description": "☁️ Yunti UI - an open-source UI component library for building Cloud Native web apps",
   "keywords": [
     "yuntijs",