Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion server/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ import {
getMaxSeq,
truncateDeliveredOps,
createTransfer,
getPendingTransfers,
getTransfer,
approveTransfer,
updateTransferStatus,
Expand Down
7 changes: 4 additions & 3 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ import type { Note, FbPostInfo, MediaRef } from './types'
import { SettingsPanel } from './components/SettingsPanel'
import { FacebookFeed } from './components/FacebookFeed'
import { FacebookInsights } from './components/FacebookInsights'
import { MediaThumb, useMediaUrl } from './components/MediaThumb'
import { MediaThumb } from './components/MediaThumb'
import { useMediaUrl } from './hooks/useMediaUrl'
import { InstallPrompt } from './components/InstallPrompt'
import { LockScreen } from './components/LockScreen'
import { PhotoGallery } from './components/PhotoGallery'
Expand Down Expand Up @@ -133,7 +134,7 @@ export default function App() {
notes, createNote, updateNote, deleteNote,
addMedia, removeMedia, restoreNotes,
setFbPost, clearFbPost,
galleryItems, addToGalleryItems, removeGalleryItem, useGalleryItem,
galleryItems, addToGalleryItems, removeGalleryItem, attachGalleryItem,
syncState, initSync, stopSyncEngine, triggerSync, schedulePush,
loadFromVault, loadGallery,
} = useNotes()
Expand Down Expand Up @@ -699,7 +700,7 @@ export default function App() {
onRemove={removeGalleryItem}
onUse={(item) => {
if (selectedNote) {
useGalleryItem(item, selectedNote.id)
attachGalleryItem(item, selectedNote.id)
}
}}
hasActiveNote={!!selectedNote}
Expand Down
26 changes: 1 addition & 25 deletions src/components/MediaThumb.tsx
Original file line number Diff line number Diff line change
@@ -1,30 +1,6 @@
import { useEffect, useState } from 'react'
import { getMediaUrl, releaseMediaUrl } from '../utils/media'
import { useMediaUrl } from '../hooks/useMediaUrl'
import type { MediaRef } from '../types'

/** Returns a refcounted blob URL for the given media id (or `null` while loading). */
export function useMediaUrl(id: string | undefined | null): string | null {
const [url, setUrl] = useState<string | null>(null)
useEffect(() => {
if (!id) { setUrl(null); return }
let cancelled = false
let acquired = false
getMediaUrl(id).then((u) => {
if (cancelled) {
if (u) releaseMediaUrl(id)
return
}
acquired = !!u
setUrl(u)
})
return () => {
cancelled = true
if (acquired) releaseMediaUrl(id)
}
}, [id])
return url
}

interface ThumbProps {
refItem: MediaRef
className?: string
Expand Down
1 change: 0 additions & 1 deletion src/components/SettingsPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,6 @@ export function SettingsPanel({
value={password}
onChange={e => { setPassword(e.target.value); setPwdError('') }}
onKeyDown={e => e.key === 'Enter' && !opRunning && submitPassword()}
// eslint-disable-next-line jsx-a11y/no-autofocus
autoFocus
autoComplete="new-password"
/>
Expand Down
25 changes: 25 additions & 0 deletions src/hooks/useMediaUrl.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { useEffect, useState } from 'react'
import { getMediaUrl, releaseMediaUrl } from '../utils/media'

/** Returns a refcounted blob URL for the given media id (or `null` while loading). */
export function useMediaUrl(id: string | undefined | null): string | null {
const [url, setUrl] = useState<string | null>(null)
useEffect(() => {
if (!id) { setUrl(null); return }
let cancelled = false
let acquired = false
getMediaUrl(id).then((u) => {
if (cancelled) {
if (u) releaseMediaUrl(id)
return
}
acquired = !!u
setUrl(u)
})
return () => {
cancelled = true
if (acquired) releaseMediaUrl(id)
}
}, [id])
return url
}
4 changes: 2 additions & 2 deletions src/hooks/useNotes.ts
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ export function useNotes() {
* Move a gallery item into a note: adds it to the note's media array and
* removes it from the gallery manifest (blob stays in the media store).
*/
const useGalleryItem = useCallback((item: GalleryItem, noteId: string) => {
const attachGalleryItem = useCallback((item: GalleryItem, noteId: string) => {
// Add to note
const ref: MediaRef = {
id: item.id,
Expand Down Expand Up @@ -486,7 +486,7 @@ export function useNotes() {
galleryItems,
addToGalleryItems,
removeGalleryItem,
useGalleryItem,
attachGalleryItem,
syncState,
setSyncState,
notesLoaded,
Expand Down
Loading