diff --git a/src/App.tsx b/src/App.tsx index 5284129..86035c9 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -4,7 +4,7 @@ import { exportToPngImgUrl, savePngImgUrl, useEventListener, - usePageName, + getExportName, } from "./utils"; const HIDE_UI_KEY_LIST = ["Escape"]; @@ -20,7 +20,7 @@ function App() { defaultIgnoreClassName.join(" ") ); const [imageUrl, setImageUrl] = useState(""); - const pageName = usePageName(); + const [pageName, setPageName] = useState("logseq_export"); const visible = useAppVisible(); useEventListener( "keydown", @@ -44,6 +44,9 @@ function App() { useEffect(() => { if (visible) { exportOnce(); + getExportName().then((name) => { + setPageName(name); + }); } }, [visible]); diff --git a/src/utils.ts b/src/utils.ts index 14b4e9d..8ac8625 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -33,15 +33,9 @@ export const useSidebarVisible = () => { return visible; }; -export const usePageName = () => { - const [name, setName] = useState(""); - const isMounted = useMountedState(); - React.useEffect(() => { - if (isMounted()) { - setName("123123"); - } - }, []); - return name; +export const getExportName = async () => { + const currentPage = await logseq.Editor.getCurrentPage(); + return currentPage?.name; }; /** @@ -123,6 +117,7 @@ export const exportToPngImgUrl = ( // https://html2canvas.hertzen.com/configuration allowTaint: true, useCORS: true, + imageTimeout: 5000, backgroundColor: bgColor, ignoreElements: (element) => { return ignoreClassNameList.some((i) => {