fix: img load fail in multiple tab

1943time · Oct 28, 2023 · 7042b04 · 7042b04
1 parent cff7a43
commit 7042b04
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/src/renderer/src/editor/Editor.tsx b/src/renderer/src/editor/Editor.tsx
@@ -1,4 +1,4 @@
-import React, {useCallback, useEffect, useMemo, useRef} from 'react'
+import React, {useCallback, useEffect, useLayoutEffect, useMemo, useRef} from 'react'
 import {Editable, Slate} from 'slate-react'
 import {Editor} from 'slate'
 import {MElement, MLeaf} from './elements'

diff --git a/src/renderer/src/editor/EditorFrame.tsx b/src/renderer/src/editor/EditorFrame.tsx
@@ -3,7 +3,7 @@ import {MEditor} from './Editor'
 import {Heading} from './tools/Leading'
 import {Empty} from '../components/Empty'
 import {Tab} from '../index'
-import React, {useCallback, useEffect, useMemo} from 'react'
+import React, {useCallback, useEffect, useLayoutEffect, useMemo} from 'react'
 import {EditorStoreContext} from './store'
 import {FloatBar} from './tools/FloatBar'
 import {TableAttr} from './tools/TableAttr'
@@ -54,6 +54,11 @@ export const EditorFrame = observer(({tab}: {
       window.electron.ipcRenderer.removeListener('open-search', open)
     }
   }, [])
+
+  useLayoutEffect(() => {
+    tab.store.openFilePath = tab.current?.filePath || null
+  }, [tab.current])
+
   const mt = useMemo(() => mediaType(tab.current?.filePath || ''), [tab.current])
   const size = useMemo(() => {
     return {

diff --git a/src/renderer/src/editor/elements/media.tsx b/src/renderer/src/editor/elements/media.tsx
@@ -58,8 +58,8 @@ export function Media({element, attributes, children}: ElementProps<MediaNode>)
       return
     }
     let realUrl = element.url
-    if (!element.url.startsWith('http') && !element.url.startsWith('file:') && treeStore.openedNote) {
-      const file = isAbsolute(element.url) ? element.url : join(treeStore.currentTab.current!.filePath, '..', element.url)
+    if (!element.url.startsWith('http') && !element.url.startsWith('file:')) {
+      const file = isAbsolute(element.url) ? element.url : join(store.openFilePath || '', '..', element.url)
       const data = getImageData(file)
       if (data) {
         realUrl = data

diff --git a/src/renderer/src/editor/store.ts b/src/renderer/src/editor/store.ts
@@ -54,6 +54,7 @@ export class EditorStore {
   container: null | HTMLDivElement = null
   history = false
   inputComposition = false
+  openFilePath: string | null = null
   saveDoc$ = new Subject<any[] | null>()
   get doc() {
     return this.container?.querySelector('.content') as HTMLDivElement
@@ -67,6 +68,7 @@ export class EditorStore {
       editor: false,
       tableCellNode: false,
       inputComposition: false,
+      openFilePath: false,
       container: false,
       highlightCache: false,
       dragEl: false