diff --git a/components/bubble/Bubble.tsx b/components/bubble/Bubble.tsx
index 1ef00ed6..8591bb5f 100644
--- a/components/bubble/Bubble.tsx
+++ b/components/bubble/Bubble.tsx
@@ -4,6 +4,8 @@ import React from 'react';
 import { Avatar } from 'antd';
 import useXComponentConfig from '../_util/hooks/use-x-component-config';
 import { useXProviderContext } from '../x-provider';
+import Editor from './Editor';
+import useMergedConfig from './hooks/useMergedConfig';
 import useTypedEffect from './hooks/useTypedEffect';
 import useTypingConfig from './hooks/useTypingConfig';
 import type { BubbleProps } from './interface';
@@ -40,6 +42,7 @@ const Bubble: React.ForwardRefRenderFunction<BubbleRef, BubbleProps> = (props, r
     onTypingComplete,
     header,
     footer,
+    editable = {},
     ...otherHtmlProps
   } = props;
 
@@ -60,6 +63,28 @@ const Bubble: React.ForwardRefRenderFunction<BubbleRef, BubbleProps> = (props, r
   // ===================== Component Config =========================
   const contextConfig = useXComponentConfig('bubble');
 
+  // =========================== Editable ===========================
+  const [enableEdit, editConfig] = useMergedConfig<BubbleProps['editable']>(editable);
+  const [isEditing, setIsEditing] = React.useState(editConfig?.editing || false);
+
+  React.useEffect(() => {
+    setIsEditing(editConfig?.editing || false);
+  }, [editConfig?.editing]);
+
+  const onEditChange = (value: string) => {
+    editConfig?.onChange?.(value);
+  };
+
+  const onEditCancel = () => {
+    editConfig?.onCancel?.();
+    setIsEditing(false);
+  };
+
+  const onEditEnd = (value: string) => {
+    editConfig?.onEnd?.(value);
+    setIsEditing(false);
+  };
+
   // ============================ Typing ============================
   const [typingEnabled, typingStep, typingInterval] = useTypingConfig(typing);
 
@@ -119,23 +144,43 @@ const Bubble: React.ForwardRefRenderFunction<BubbleRef, BubbleProps> = (props, r
     contentNode = mergedContent as React.ReactNode;
   }
 
-  let fullContent: React.ReactNode = (
-    <div
-      style={{
-        ...contextConfig.styles.content,
-        ...styles.content,
-      }}
-      className={classnames(
-        `${prefixCls}-content`,
-        `${prefixCls}-content-${variant}`,
-        shape && `${prefixCls}-content-${shape}`,
-        contextConfig.classNames.content,
-        classNames.content,
-      )}
-    >
-      {contentNode}
-    </div>
-  );
+  let fullContent: React.ReactNode =
+    enableEdit && isEditing ? (
+      <Editor
+        prefixCls={prefixCls}
+        value={mergedContent as string}
+        onChange={onEditChange}
+        onCancel={onEditCancel}
+        onEnd={onEditEnd}
+        editorStyle={{
+          ...contextConfig.styles.editor,
+          ...styles.editor,
+        }}
+        editorClassName={classnames(
+          `${prefixCls}-editor`,
+          contextConfig.classNames.editor,
+          classNames.editor,
+        )}
+        editorTextAreaConfig={editConfig?.editorTextAreaConfig}
+        editorButtonConfig={editConfig?.editorButtonConfig}
+      />
+    ) : (
+      <div
+        style={{
+          ...contextConfig.styles.content,
+          ...styles.content,
+        }}
+        className={classnames(
+          `${prefixCls}-content`,
+          `${prefixCls}-content-${variant}`,
+          shape && `${prefixCls}-content-${shape}`,
+          contextConfig.classNames.content,
+          classNames.content,
+        )}
+      >
+        {contentNode}
+      </div>
+    );
 
   if (header || footer) {
     fullContent = (
diff --git a/components/bubble/Editor.tsx b/components/bubble/Editor.tsx
new file mode 100644
index 00000000..39a000f8
--- /dev/null
+++ b/components/bubble/Editor.tsx
@@ -0,0 +1,120 @@
+import classNames from 'classnames';
+import * as React from 'react';
+
+import { Button, Flex, Input } from 'antd';
+import { TextAreaRef } from 'antd/lib/input/TextArea';
+import { EditConfig } from './interface';
+import useStyle from './style';
+
+const { TextArea } = Input;
+
+interface EditableProps {
+  prefixCls: string;
+  value: string;
+  onChange?: (value: string) => void;
+  onCancel?: () => void;
+  onEnd?: (value: string) => void;
+  editorClassName?: string;
+  editorStyle?: React.CSSProperties;
+  editorTextAreaConfig?: EditConfig['editorTextAreaConfig'];
+  editorButtonConfig?: EditConfig['editorButtonConfig'];
+}
+
+const Editor: React.FC<EditableProps> = (props) => {
+  const {
+    prefixCls,
+    editorClassName: className,
+    editorStyle,
+    value,
+    onChange,
+    onCancel,
+    onEnd,
+    editorTextAreaConfig,
+    editorButtonConfig,
+  } = props;
+  const textAreaRef = React.useRef<TextAreaRef>(null);
+
+  const [current, setCurrent] = React.useState(value);
+
+  React.useEffect(() => {
+    setCurrent(value);
+  }, [value]);
+
+  React.useEffect(() => {
+    if (textAreaRef.current?.resizableTextArea) {
+      const { textArea } = textAreaRef.current.resizableTextArea;
+      textArea.focus();
+      const { length } = textArea.value;
+      textArea.setSelectionRange(length, length);
+    }
+  }, []);
+
+  const onTextAreaChange: React.ChangeEventHandler<HTMLTextAreaElement> = ({ target }) => {
+    setCurrent(target.value.replace(/[\n\r]/g, ''));
+    onChange?.(target.value.replace(/[\n\r]/g, ''));
+  };
+
+  const confirmEnd = () => {
+    onEnd?.(current.trim());
+  };
+
+  const [wrapCSSVar, hashId, cssVarCls] = useStyle(prefixCls);
+
+  const editorClassName = classNames(
+    prefixCls,
+    `${prefixCls}-editor`,
+    className,
+    hashId,
+    cssVarCls,
+  );
+
+  const CancelButton = () =>
+    editorButtonConfig ? (
+      editorButtonConfig
+        .filter((config) => config.type === 'cancel')
+        .map((config, index) => (
+          <Button key={index} size="small" {...config.option} onClick={onCancel}>
+            {config.text || 'Cancel'}
+          </Button>
+        ))
+    ) : (
+      <Button size="small" onClick={onCancel}>
+        Cancel
+      </Button>
+    );
+  const SaveButton = () =>
+    editorButtonConfig ? (
+      editorButtonConfig
+        .filter((config) => config.type === 'save')
+        .map((config, index) => (
+          <Button key={index} type="primary" size="small" {...config.option} onClick={confirmEnd}>
+            {config.text || 'Save'}
+          </Button>
+        ))
+    ) : (
+      <Button type="primary" size="small" onClick={confirmEnd}>
+        Save
+      </Button>
+    );
+
+  return wrapCSSVar(
+    <div className={editorClassName} style={editorStyle}>
+      <Flex gap="small" vertical flex="auto">
+        <TextArea
+          variant="borderless"
+          ref={textAreaRef}
+          value={current}
+          onChange={onTextAreaChange}
+          autoSize={{ minRows: 2, maxRows: 3 }}
+          {...editorTextAreaConfig}
+        />
+        <Flex gap="small" justify="end">
+          <CancelButton />
+          <SaveButton />
+        </Flex>
+      </Flex>
+    </div>,
+  );
+};
+
+export default Editor;
diff --git a/components/bubble/demo/editable.md b/components/bubble/demo/editable.md
new file mode 100644
index 00000000..8e1460c9
--- /dev/null
+++ b/components/bubble/demo/editable.md
@@ -0,0 +1,7 @@
+## zh-CN
+
+通过设置 `editable` 属性，开启对 `content` 的编辑效果。
+
+## en-US
+
+Enable the editing effect of `content` by setting the `editable` property.
diff --git a/components/bubble/demo/editable.tsx b/components/bubble/demo/editable.tsx
new file mode 100644
index 00000000..e5659a8e
--- /dev/null
+++ b/components/bubble/demo/editable.tsx
@@ -0,0 +1,128 @@
+import {
+  DeleteOutlined,
+  EditOutlined,
+  LeftOutlined,
+  RightOutlined,
+  UserOutlined,
+} from '@ant-design/icons';
+import { Bubble } from '@ant-design/x';
+import { Button, Flex } from 'antd';
+import React from 'react';
+import { EditConfig } from '../interface';
+
+const fooAvatar: React.CSSProperties = {
+  color: '#f56a00',
+  backgroundColor: '#fde3cf',
+};
+
+const barAvatar: React.CSSProperties = {
+  color: '#fff',
+  backgroundColor: '#87d068',
+};
+
+const hideAvatar: React.CSSProperties = {
+  visibility: 'hidden',
+};
+
+const App = () => {
+  const [editing, setEditing] = React.useState(false);
+  const [currentIndex, setCurrentIndex] = React.useState(0);
+  const [editHistory, setEditHistory] = React.useState(['Good morning, how are you?']); // 编辑历史记录
+
+  const triggerEdit = () => {
+    setEditing((prev) => !prev);
+  };
+
+  const handleLeftClick = () => {
+    if (currentIndex > 0) {
+      setCurrentIndex((prev) => prev - 1);
+    }
+  };
+
+  const handleRightClick = () => {
+    if (currentIndex < editHistory.length - 1) {
+      setCurrentIndex((prev) => prev + 1);
+    }
+  };
+
+  const cancelEdit = () => {
+    setEditing(false);
+  };
+
+  const endEdit = (c: string) => {
+    setEditing(false);
+    setEditHistory((prev) => [...prev, c]);
+    setCurrentIndex(editHistory.length);
+  };
+
+  const editConfig: EditConfig = {
+    editing,
+    onCancel: cancelEdit,
+    onEnd: endEdit,
+    editorTextAreaConfig: { autoSize: { minRows: 2, maxRows: 4 } },
+    editorButtonConfig: [
+      {
+        type: 'cancel',
+        text: 'Cancel',
+        option: { size: 'small' },
+      },
+      {
+        type: 'save',
+        text: 'Save',
+        option: { size: 'small', type: 'primary' },
+      },
+    ],
+  };
+
+  return (
+    <Flex gap="middle" vertical>
+      <Bubble
+        placement="end"
+        content={editHistory[currentIndex]}
+        editable={editConfig}
+        avatar={{ icon: <UserOutlined />, style: barAvatar }}
+        header={
+          editHistory.length > 1 &&
+          !editing && (
+            <Flex justify="end">
+              <Button
+                size="small"
+                type="text"
+                icon={<LeftOutlined />}
+                onClick={handleLeftClick}
+                disabled={currentIndex === 0}
+              />
+              <span>{`${currentIndex + 1} / ${editHistory.length}`}</span>
+              <Button
+                size="small"
+                type="text"
+                icon={<RightOutlined />}
+                onClick={handleRightClick}
+                disabled={currentIndex === editHistory.length - 1}
+              />
+            </Flex>
+          )
+        }
+        footer={
+          <Flex justify="end">
+            <Button size="small" type="text" icon={<DeleteOutlined />} />
+            <Button size="small" type="text" icon={<EditOutlined />} onClick={triggerEdit} />
+          </Flex>
+        }
+      />
+      <Bubble
+        placement="start"
+        content="Hi, good morning, I'm fine!"
+        avatar={{ icon: <UserOutlined />, style: fooAvatar }}
+      />
+      <Bubble
+        placement="start"
+        content="What a beautiful day!"
+        styles={{ avatar: hideAvatar }}
+        avatar={{}}
+      />
+    </Flex>
+  );
+};
+
+export default App;
diff --git a/components/bubble/hooks/useMergedConfig.ts b/components/bubble/hooks/useMergedConfig.ts
new file mode 100644
index 00000000..bd16c97e
--- /dev/null
+++ b/components/bubble/hooks/useMergedConfig.ts
@@ -0,0 +1,18 @@
+import * as React from 'react';
+
+export default function useMergedConfig<Target>(
+  propConfig: any,
+  templateConfig?: Target,
+): readonly [boolean, Target] {
+  return React.useMemo<readonly [boolean, Target]>(() => {
+    const support = !!propConfig;
+
+    return [
+      support,
+      {
+        ...templateConfig,
+        ...(support && typeof propConfig === 'object' ? propConfig : null),
+      },
+    ] as const;
+  }, [propConfig]);
+}
diff --git a/components/bubble/index.en-US.md b/components/bubble/index.en-US.md
index 48705db7..ff9e2c43 100644
--- a/components/bubble/index.en-US.md
+++ b/components/bubble/index.en-US.md
@@ -22,6 +22,7 @@ Often used when chatting.
 <code src="./demo/avatar-and-placement.tsx">Placement and avatar</code>
 <code src="./demo/header-and-footer.tsx">Header and footer</code>
 <code src="./demo/loading.tsx">Loading</code>
+<code src="./demo/editable.tsx">Editing effect</code>
 <code src="./demo/typing.tsx">Typing effect</code>
 <code src="./demo/markdown.tsx">Content render</code>
 <code src="./demo/variant.tsx">Variant</code>
diff --git a/components/bubble/index.zh-CN.md b/components/bubble/index.zh-CN.md
index 7985340e..5538d6e7 100644
--- a/components/bubble/index.zh-CN.md
+++ b/components/bubble/index.zh-CN.md
@@ -23,6 +23,7 @@ demo:
 <code src="./demo/avatar-and-placement.tsx">支持位置和头像</code>
 <code src="./demo/header-and-footer.tsx">头和尾</code>
 <code src="./demo/loading.tsx">加载中</code>
+<code src="./demo/editable.tsx">编辑效果</code>
 <code src="./demo/typing.tsx">打字效果</code>
 <code src="./demo/markdown.tsx">自定义渲染</code>
 <code src="./demo/variant.tsx">变体</code>
diff --git a/components/bubble/interface.ts b/components/bubble/interface.ts
index 5b939090..4dff0985 100644
--- a/components/bubble/interface.ts
+++ b/components/bubble/interface.ts
@@ -1,4 +1,6 @@
 import type { AvatarProps } from 'antd';
+import { TextAreaProps } from 'antd/es/input';
+import { ButtonProps } from 'antd/lib';
 
 export interface TypingOption {
   /**
@@ -11,7 +13,18 @@ export interface TypingOption {
   interval?: number;
 }
 
-type SemanticType = 'avatar' | 'content' | 'header' | 'footer';
+type SemanticType = 'avatar' | 'content' | 'header' | 'footer' | 'editor';
+
+type EditorButtonConfig = { type: 'save' | 'cancel'; text?: string; option?: ButtonProps };
+
+export interface EditConfig {
+  editing?: boolean;
+  onChange?: (content: string) => void;
+  onCancel?: VoidFunction;
+  onEnd?: (content: string) => void;
+  editorTextAreaConfig?: TextAreaProps;
+  editorButtonConfig?: EditorButtonConfig[];
+}
 
 export interface BubbleProps extends Omit<React.HTMLAttributes<HTMLDivElement>, 'content'> {
   prefixCls?: string;
@@ -30,4 +43,5 @@ export interface BubbleProps extends Omit<React.HTMLAttributes<HTMLDivElement>,
   onTypingComplete?: VoidFunction;
   header?: React.ReactNode;
   footer?: React.ReactNode;
+  editable?: EditConfig;
 }
diff --git a/components/bubble/style/index.ts b/components/bubble/style/index.ts
index c45040fb..446b72ac 100644
--- a/components/bubble/style/index.ts
+++ b/components/bubble/style/index.ts
@@ -50,6 +50,9 @@ const genBubbleStyle: GenerateStyle<BubbleToken> = (token) => {
       [`&${componentCls}-end`]: {
         justifyContent: 'end',
         flexDirection: 'row-reverse',
+        [`& ${componentCls}-content-wrapper`]: {
+          alignItems: 'flex-end',
+        },
       },
       [`&${componentCls}-rtl`]: {
         direction: 'rtl',
@@ -90,15 +93,19 @@ const genBubbleStyle: GenerateStyle<BubbleToken> = (token) => {
 
       // =========================== Content =============================
       [`& ${componentCls}-content-wrapper`]: {
-        flex: 'auto',
+        flex: 'auto', //
         display: 'flex',
         flexDirection: 'column',
-        alignItems: 'flex-start',
+        alignItems: 'flex-start', //
+        minWidth: 0,
+        maxWidth: '100%',
       },
 
       [`& ${componentCls}-content`]: {
         position: 'relative',
         boxSizing: 'border-box',
+        minWidth: 0,
+        maxWidth: '100%',
 
         color: colorText,
         fontSize: token.fontSize,
@@ -135,6 +142,15 @@ const genBubbleStyle: GenerateStyle<BubbleToken> = (token) => {
           },
         },
       },
+      // =========================== Editor =============================
+      [`& ${componentCls}-editor`]: {
+        minWidth: '30%',
+        maxWidth: '100%',
+        border: `1px solid ${token.colorPrimary}`,
+        padding: token.paddingSM,
+        borderRadius: token.borderRadius,
+        boxShadow: token.boxShadow,
+      },
     },
   };
 };