mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-07-18 02:26:21 +08:00
feat: Double-link: In-line cursor handling, e.g., up, down, left,right, backspace keys
This commit is contained in:
@@ -41,7 +41,12 @@ import { InlineDate, withDate } from './plugins/date';
|
||||
import { DoubleLinkComponent } from './plugins/DoubleLink';
|
||||
import { LinkComponent, LinkModal, withLinks, wrapLink } from './plugins/link';
|
||||
import { InlineRefLink } from './plugins/reflink';
|
||||
import { Contents, isSelectAll, SlateUtils } from './slate-utils';
|
||||
import {
|
||||
Contents,
|
||||
isSelectAll,
|
||||
SelectionStartAndEnd,
|
||||
SlateUtils,
|
||||
} from './slate-utils';
|
||||
import {
|
||||
getCommentsIdsOnTextNode,
|
||||
getExtraPropertiesFromEditorOutmostNode,
|
||||
@@ -88,8 +93,12 @@ export interface TextProps {
|
||||
/** Backspace event */
|
||||
handleBackSpace?: ({
|
||||
isCollAndStart,
|
||||
splitContents,
|
||||
selection,
|
||||
}: {
|
||||
isCollAndStart: boolean;
|
||||
splitContents: Contents;
|
||||
selection: SelectionStartAndEnd;
|
||||
}) => boolean | undefined | Promise<boolean | undefined>;
|
||||
/** Whether markdown is supported */
|
||||
supportMarkdown?: boolean;
|
||||
@@ -464,7 +473,13 @@ export const Text = forwardRef<ExtendedTextUtils, TextProps>((props, ref) => {
|
||||
if (!isCool) {
|
||||
hideInlineMenu && hideInlineMenu();
|
||||
}
|
||||
preventBindIfNeeded(handleBackSpace)(e, { isCollAndStart });
|
||||
const selection = utils.current.getSelectionStartAndEnd();
|
||||
const splitContents = utils.current.getSplitContentsBySelection();
|
||||
preventBindIfNeeded(handleBackSpace)(e, {
|
||||
isCollAndStart,
|
||||
selection,
|
||||
splitContents,
|
||||
});
|
||||
};
|
||||
|
||||
const onTab = (e: KeyboardEvent) => {
|
||||
|
||||
@@ -503,7 +503,7 @@ Editor.after = function (
|
||||
return target;
|
||||
};
|
||||
|
||||
type SelectionStartAndEnd = {
|
||||
export type SelectionStartAndEnd = {
|
||||
selectionStart: Point;
|
||||
selectionEnd: Point;
|
||||
};
|
||||
@@ -517,6 +517,10 @@ export type Contents = {
|
||||
content: Descendant[];
|
||||
isEmpty: boolean;
|
||||
};
|
||||
contentSelection: {
|
||||
content: Descendant[];
|
||||
isEmpty: boolean;
|
||||
};
|
||||
};
|
||||
|
||||
class SlateUtils {
|
||||
@@ -572,6 +576,7 @@ class SlateUtils {
|
||||
anchor: point1,
|
||||
focus: point2,
|
||||
});
|
||||
|
||||
if (!fragment.length) {
|
||||
console.error('Debug information:', point1, point2, fragment);
|
||||
throw new Error('Failed to get content between!');
|
||||
@@ -602,7 +607,7 @@ class SlateUtils {
|
||||
for (let i = 0; i < fragmentChildren.length; i++) {
|
||||
const child = fragmentChildren[i];
|
||||
if ('type' in child && child.type === 'link') {
|
||||
i !== fragmentChildren.length - 1 && textChildren.push(child);
|
||||
textChildren.push(child);
|
||||
continue;
|
||||
}
|
||||
if (!('text' in child)) {
|
||||
@@ -638,6 +643,10 @@ class SlateUtils {
|
||||
content: this.getContentBetween(selectionEnd, end),
|
||||
isEmpty: Point.equals(end, selectionEnd),
|
||||
},
|
||||
contentSelection: {
|
||||
content: this.getContentBetween(selectionStart, selectionEnd),
|
||||
isEmpty: false,
|
||||
},
|
||||
} as Contents;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
/* eslint-disable max-lines */
|
||||
import {
|
||||
CustomText,
|
||||
Text,
|
||||
type SlateUtils,
|
||||
type TextProps,
|
||||
@@ -108,7 +109,7 @@ const findLowestCommonAncestor = async (
|
||||
|
||||
export const TextManage = forwardRef<ExtendedTextUtils, CreateTextView>(
|
||||
(props, ref) => {
|
||||
const { block, editor, ...otherOptions } = props;
|
||||
const { block, editor, handleBackSpace, ...otherOptions } = props;
|
||||
const defaultRef = useRef<ExtendedTextUtils>(null);
|
||||
// Maybe there is a better way
|
||||
const textRef =
|
||||
@@ -446,6 +447,61 @@ export const TextManage = forwardRef<ExtendedTextUtils, CreateTextView>(
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
const onBackspace: TextProps['handleBackSpace'] = async props => {
|
||||
const { isCollAndStart, splitContents, selection } = props;
|
||||
if (!isCollAndStart) {
|
||||
const {
|
||||
contentBeforeSelection,
|
||||
contentAfterSelection,
|
||||
contentSelection,
|
||||
} = splitContents;
|
||||
const { selectionStart, selectionEnd } = selection;
|
||||
let hasDeleteDoubleLink = false;
|
||||
|
||||
const beforeContent = [...contentBeforeSelection.content];
|
||||
const lastItem = beforeContent[beforeContent.length - 1];
|
||||
if (
|
||||
'linkType' in lastItem &&
|
||||
lastItem.linkType === 'doubleLink'
|
||||
) {
|
||||
if (
|
||||
selectionStart === selectionEnd ||
|
||||
selectionStart.offset
|
||||
) {
|
||||
beforeContent.splice(beforeContent.length - 1, 1);
|
||||
hasDeleteDoubleLink = true;
|
||||
}
|
||||
}
|
||||
|
||||
const afterContent = [...contentAfterSelection.content];
|
||||
const beginItem = afterContent[0];
|
||||
const lastSel = contentSelection.content[0];
|
||||
if (
|
||||
selectionEnd.offset &&
|
||||
'linkType' in beginItem &&
|
||||
beginItem.linkType === 'doubleLink' &&
|
||||
'linkType' in lastSel &&
|
||||
lastSel.linkType === 'doubleLink'
|
||||
) {
|
||||
afterContent.splice(0, 1);
|
||||
hasDeleteDoubleLink = true;
|
||||
}
|
||||
|
||||
if (hasDeleteDoubleLink) {
|
||||
await block.setProperty('text', {
|
||||
value: [
|
||||
...beforeContent,
|
||||
...afterContent,
|
||||
] as CustomText[],
|
||||
});
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
return (handleBackSpace && handleBackSpace(props)) || false;
|
||||
};
|
||||
|
||||
if (!properties || !properties.text) {
|
||||
return <></>;
|
||||
}
|
||||
@@ -467,6 +523,7 @@ export const TextManage = forwardRef<ExtendedTextUtils, CreateTextView>(
|
||||
handleUndo={onUndo}
|
||||
handleRedo={onRedo}
|
||||
handleEsc={onKeyboardEsc}
|
||||
handleBackSpace={onBackspace}
|
||||
{...otherOptions}
|
||||
/>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user