Skip to content

Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.

Merge branch 'develop' of github.com:AppFlowy-IO/AppFlowy into refactor-tauri-document

qinluhed42084f2423b
diff --cc frontend/appflowy_tauri/src/appflowy_app/components/document/_shared/HoveringToolbar/index.hooks.ts
index c5099732f8,ac512b536f..cf4c803a38
--- a/frontend/appflowy_tauri/src/appflowy_app/components/document/_shared/HoveringToolbar/index.hooks.ts
+++ b/frontend/appflowy_tauri/src/appflowy_app/components/document/_shared/HoveringToolbar/index.hooks.ts
@@@ -1,7 -1,8 +1,13 @@@
import { useEffect, useRef } from 'react';
import { useFocused, useSlate } from 'slate-react';
++<<<<<<<< HEAD:frontend/appflowy_tauri/src/appflowy_app/components/document/_shared/HoveringToolbar/index.hooks.ts
+import { calcToolbarPosition } from '$app/utils/slate/toolbar';
+
++========
+ import { calcToolbarPosition } from '@/appflowy_app/utils/slate/toolbar';
+
+
++>>>>>>>> 341dce67d45ebe46ae55e11349a19191ac99b4cf:frontend/appflowy_tauri/src/appflowy_app/components/document/HoveringToolbar/index.hooks.ts
export function useHoveringToolbar(id: string) {
const editor = useSlate();
const inFocus = useFocused();
diff --cc frontend/appflowy_tauri/src/appflowy_app/components/document/_shared/HoveringToolbar/index.tsx
index d4a671ec83,a35588033c..1bb8911aa2
--- a/frontend/appflowy_tauri/src/appflowy_app/components/document/_shared/HoveringToolbar/index.tsx
+++ b/frontend/appflowy_tauri/src/appflowy_app/components/document/_shared/HoveringToolbar/index.tsx
@@@ -1,5 -1,5 +1,9 @@@
import FormatButton from './FormatButton';
++<<<<<<<< HEAD:frontend/appflowy_tauri/src/appflowy_app/components/document/_shared/HoveringToolbar/index.tsx
+import Portal from '../../BlockPortal';
++========
+ import Portal from '../BlockPortal';
++>>>>>>>> 341dce67d45ebe46ae55e11349a19191ac99b4cf:frontend/appflowy_tauri/src/appflowy_app/components/document/HoveringToolbar/index.tsx
import { useHoveringToolbar } from './index.hooks';
const HoveringToolbar = ({ id }: { id: string }) => {