Skip to content

开源白板工具(SaaS),一体化白板,包含思维导图、流程图、自由画等。All in one open-source whiteboard tool with mind, flowchart, freehand and etc.

feat: improve link popup state (#147)

pubuzhixing8db3ea0b0928a
diff --git a/packages/drawnix/src/components/popup/link-popup/link-popup.tsx b/packages/drawnix/src/components/popup/link-popup/link-popup.tsx
index e1c9d86..2079fb6 100644
--- a/packages/drawnix/src/components/popup/link-popup/link-popup.tsx
+++ b/packages/drawnix/src/components/popup/link-popup/link-popup.tsx
@@ -1,11 +1,11 @@
-import { useEffect, useState } from 'react';
+import { useEffect, useState, useRef } from 'react';
import { Island } from '../../island';
import Stack from '../../stack';
import { ToolButton } from '../../tool-button';
import classNames from 'classnames';
import './link-popup.scss';
import { flip, offset, useFloating } from '@floating-ui/react';
-import { LinkState, useDrawnix } from '../../../hooks/use-drawnix';
+import { useDrawnix } from '../../../hooks/use-drawnix';
import { FeltTipPenIcon, TrashIcon } from '../../icons';
import { Transforms } from 'slate';
import { ReactEditor } from 'slate-react';
@@ -14,11 +14,7 @@ import { LinkElement } from '@plait/common';
import { useBoard } from '@plait-board/react-board';
export const LinkPopup = () => {
- const [isEditing, setIsEditing] = useState(false);
- const [isOpening, setIsOpening] = useState(false);
- const [linkState, setLinkState] = useState<LinkState | null>(null);
const [url, setUrl] = useState('');
- const [isHovering, setIsHovering] = useState(false);
const { appState, setAppState } = useDrawnix();
@@ -29,51 +25,29 @@ export const LinkPopup = () => {
middleware: [offset(20), flip()],
});
+ const linkState = appState.linkState;
const target = appState.linkState?.targetDom || null;
+ const isEditing = appState.linkState?.isEditing || false;
+ const isHoveringOrigin = appState.linkState?.isHoveringOrigin || false;
+ const isHovering = appState.linkState?.isHovering || false;
+ const isOpening = isEditing || isHoveringOrigin || isHovering;
- const closeHandle = () => {
- setIsOpening(false);
- setLinkState(null);
- setIsEditing(false);
- setUrl('');
- if (target) {
- setAppState({
- ...appState,
- linkState: null,
- });
- }
- };
+ const linkStateRef = useRef(appState.linkState);
useEffect(() => {
- if (isOpening && target) {
- refs.setPositionReference(target);
+ linkStateRef.current = appState.linkState;
+ if (appState.linkState) {
+ setUrl(appState.linkState.targetElement.url);
+ } else {
+ setUrl('');
}
- }, [board.viewport])
+ }, [appState.linkState]);
useEffect(() => {
if (target) {
- setIsOpening(true);
refs.setPositionReference(target);
- if (target !== linkState?.targetDom) {
- setIsEditing(false);
- }
- setLinkState(appState.linkState!);
- if (appState.linkState?.targetElement?.url) {
- setUrl(appState.linkState.targetElement.url);
- }
- if (appState.linkState?.isEditing) {
- setIsEditing(true);
- }
- } else if (!isHovering) {
- closeHandle();
}
- }, [target]);
-
- useEffect(() => {
- if (!isHovering && !isEditing && !target) {
- closeHandle();
- }
- }, [isHovering]);
+ }, [board.viewport, target]);
useEffect(() => {
const handleClickOutside = (event: MouseEvent) => {
@@ -81,13 +55,18 @@ export const LinkPopup = () => {
refs.floating.current &&
!refs.floating.current.contains(event.target as Node)
) {
- if (linkState) {
- const linkElement = LinkEditor.getLinkElement(linkState.editor);
+ if (linkStateRef.current) {
+ const linkElement = LinkEditor.getLinkElement(
+ linkStateRef.current.editor
+ );
if (linkElement && !(linkElement[0] as LinkElement).url.trim()) {
- LinkEditor.unwrapLink(linkState.editor);
+ LinkEditor.unwrapLink(linkStateRef.current.editor);
}
}
- closeHandle();
+ setAppState({
+ ...appState,
+ linkState: null,
+ });
}
};
@@ -97,46 +76,23 @@ export const LinkPopup = () => {
};
}, []);
- useEffect(() => {
- if (appState.linkState) {
- if (isEditing && !appState.linkState.isEditing) {
- setAppState({
- ...appState,
- linkState: {
- ...appState.linkState,
- isEditing: true,
- },
- });
- } else if (!isEditing && appState.linkState.isEditing) {
- setAppState({
- ...appState,
- linkState: {
- ...appState.linkState,
- isEditing: false,
- },
- });
- }
- } else if (isEditing) {
- setAppState({
- ...appState,
- linkState: {
- ...linkState!,
- isEditing: true,
- },
- });
- }
- }, [isEditing]);
-
- let timeoutId: any | null = null;
-
- const saveUrl = () => {
+ const saveUrlAndExitEditing = () => {
if (url !== linkState!.targetElement.url) {
const editor = linkState!.editor;
const node = linkState!.targetElement;
const path = ReactEditor.findPath(editor, node);
Transforms.setNodes(editor, { url: url }, { at: path });
}
- setIsEditing(false);
+ const linkElement = LinkEditor.getLinkElement(linkState!.editor);
+ setAppState({
+ ...appState,
+ linkState: {
+ ...appState.linkState!,
+ targetElement: linkElement[0] as LinkElement,
+ isEditing: false,
+ isHoveringOrigin: true,
+ },
+ });
};
return (
@@ -147,13 +103,27 @@ export const LinkPopup = () => {
padding={1}
className={classNames('link-popup')}
onPointerEnter={() => {
- clearTimeout(timeoutId);
- setIsHovering(true);
+ if (!isHovering) {
+ setAppState({
+ ...appState,
+ linkState: {
+ ...appState.linkState!,
+ isHovering: true,
+ },
+ });
+ }
}}
onPointerLeave={() => {
- timeoutId = setTimeout(() => {
- setIsHovering(false);
- }, 300);
+ if (!isEditing) {
+ console.log('set isHovering', false);
+ setAppState({
+ ...appState,
+ linkState: {
+ ...appState.linkState!,
+ isHovering: false,
+ },
+ });
+ }
}}
>
<Stack.Row gap={1} align="center">
@@ -166,7 +136,7 @@ export const LinkPopup = () => {
}}
onKeyDown={(e) => {
if (e.key === 'Enter') {
- saveUrl();
+ saveUrlAndExitEditing();
}
}}
className="link-popup__input"
@@ -190,7 +160,13 @@ export const LinkPopup = () => {
title={`Edit link`}
aria-label={`Edit link`}
onPointerDown={() => {
- setIsEditing(true);
+ setAppState({
+ ...appState,
+ linkState: {
+ ...appState.linkState!,
+ isEditing: true,
+ },
+ });
}}
></ToolButton>
<ToolButton
@@ -206,8 +182,10 @@ export const LinkPopup = () => {
Transforms.unwrapNodes(editor, {
at: path,
});
- setIsHovering(false);
- setIsEditing(false);
+ setAppState({
+ ...appState,
+ linkState: null,
+ });
}}
></ToolButton>
</>
diff --git a/packages/drawnix/src/components/toolbar/popup-toolbar/link-button.tsx b/packages/drawnix/src/components/toolbar/popup-toolbar/link-button.tsx
index db62b7c..273f543 100644
--- a/packages/drawnix/src/components/toolbar/popup-toolbar/link-button.tsx
+++ b/packages/drawnix/src/components/toolbar/popup-toolbar/link-button.tsx
@@ -4,9 +4,8 @@ import classNames from 'classnames';
import { getSelectedElements, PlaitBoard } from '@plait/core';
import { LinkIcon } from '../../icons';
import { useDrawnix } from '../../../hooks/use-drawnix';
-import { getFirstTextEditor } from '@plait/common';
+import { getFirstTextEditor, LinkElement } from '@plait/common';
import { ReactEditor } from 'slate-react';
-import { LinkElement, ParagraphElement } from '@plait-board/react-text';
import { LinkEditor } from '@plait/text-plugins';
export type PopupLinkButtonProps = {
@@ -45,6 +44,8 @@ export const PopupLinkButton: React.FC<PopupLinkButtonProps> = ({
targetDom: targetDom,
targetElement: linkElement,
isEditing: true,
+ isHovering: false,
+ isHoveringOrigin: false,
},
});
}, 0);
diff --git a/packages/drawnix/src/hooks/use-drawnix.tsx b/packages/drawnix/src/hooks/use-drawnix.tsx
index bea63c7..9fdbe93 100644
--- a/packages/drawnix/src/hooks/use-drawnix.tsx
+++ b/packages/drawnix/src/hooks/use-drawnix.tsx
@@ -30,6 +30,8 @@ export type LinkState = {
editor: Editor;
targetElement: LinkElement;
isEditing: boolean;
+ isHovering: boolean;
+ isHoveringOrigin: boolean;
};
export type DrawnixState = {
diff --git a/packages/drawnix/src/plugins/with-text-link.tsx b/packages/drawnix/src/plugins/with-text-link.tsx
index c2b5620..22f672d 100644
--- a/packages/drawnix/src/plugins/with-text-link.tsx
+++ b/packages/drawnix/src/plugins/with-text-link.tsx
@@ -9,6 +9,27 @@ import { ReactEditor } from 'slate-react';
import { Editor } from 'slate';
import { isResizing, LinkElement } from '@plait/common';
+export const isHovering = (board: PlaitBoard) => {
+ const { appState } = board as DrawnixBoard;
+ const isHovering =
+ appState && appState.linkState && appState.linkState.isHovering;
+ return isHovering;
+};
+
+export const isHoveringOrigin = (board: PlaitBoard) => {
+ const { appState } = board as DrawnixBoard;
+ const isHoveringOrigin =
+ appState && appState.linkState && appState.linkState.isHoveringOrigin;
+ return isHoveringOrigin;
+};
+
+export const isEditing = (board: PlaitBoard) => {
+ const { appState } = board as DrawnixBoard;
+ const isEditing =
+ appState && appState.linkState && appState.linkState.isEditing;
+ return isEditing;
+};
+
export const buildTextLinkPlugin = (
updateAppState: (appState: Partial<DrawnixState>) => void
) => {
@@ -20,15 +41,18 @@ export const buildTextLinkPlugin = (
let timeoutId: any | null = null;
board.pointerMove = (event: PointerEvent) => {
- const { appState } = board as DrawnixBoard;
- const isEditing =
- appState && appState.linkState && appState.linkState.isEditing;
+ // const { appState } = board as DrawnixBoard;
+ // const isEditing =
+ // appState && appState.linkState && appState.linkState.isEditing;
+ // const isHovering =
+ // appState && appState.linkState && appState.linkState.isEditing;
if (
(PlaitBoard.isPointer(board, PlaitPointerType.selection) ||
PlaitBoard.isPointer(board, PlaitPointerType.hand)) &&
!isMovingElements(board) &&
!isResizing(board) &&
- !isEditing
+ !isHovering(board) &&
+ !isEditing(board)
) {
throttleRAF(board, 'with-text-link', () => {
const textLinkDom = (event.target as HTMLElement).closest(
@@ -53,15 +77,19 @@ export const buildTextLinkPlugin = (
targetElement: node,
editor,
isEditing: false,
+ isHovering: false,
+ isHoveringOrigin: true,
},
});
clearTimeout(timeoutId);
} else {
if (!textLinkDom && target) {
timeoutId = setTimeout(() => {
- updateAppState({
- linkState: null,
- });
+ if (!isHovering(board) && !isEditing(board)) {
+ updateAppState({
+ linkState: null,
+ });
+ }
}, 300);
target = null;
}