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
44 changes: 37 additions & 7 deletions src/main/components/NotePage/NotePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ const folderRegexp = pathToRegexp(
sensitive: true
}
)
const tagRegexp = pathToRegexp('/storages/:storageName/tags/:tag', undefined, {
sensitive: true
})

@inject('data', 'route')
@observer
Expand Down Expand Up @@ -52,12 +55,34 @@ class NotePage extends React.Component<NotePageProps, NotePageState> {
}

@computed
get notes() {
const { currentStorage, currentFolderPath } = this
get pathname() {
return this.props.route!.pathname
}

@computed
get allNotes() {
const { currentStorage } = this
if (currentStorage == null) return []
return [...currentStorage.noteMap.values()]
}

@computed
get filteredNotes() {
const { pathname, allNotes, currentStorage } = this
if (currentStorage == null) return []
return [...currentStorage.noteMap.values()].filter(
note => note.folder === currentFolderPath
)
const folderRegexpResult = folderRegexp.exec(pathname)
if (folderRegexpResult != null) {
const folderPath =
folderRegexpResult[2] == null ? '/' : `/${folderRegexpResult[2]}`
return allNotes.filter(note => note.folder === folderPath)
}
const tagRegexpResult = tagRegexp.exec(pathname)
if (tagRegexpResult != null) {
const tag = tagRegexpResult[2]
const noteIds = [...currentStorage.tagNoteIdSetMap.get(tag)!.values()]
return noteIds.map(noteId => currentStorage.noteMap.get(noteId)!)
}
return []
}

@computed
Expand Down Expand Up @@ -117,11 +142,16 @@ class NotePage extends React.Component<NotePageProps, NotePageState> {
}

render() {
const { currentStorageName, notes, currentNote, currentNoteId } = this
const {
currentStorageName,
filteredNotes,
currentNote,
currentNoteId
} = this
return (
<>
<NoteList
notes={notes}
notes={filteredNotes}
currentNoteId={currentNoteId}
createNote={this.createNote}
/>
Expand Down
22 changes: 22 additions & 0 deletions src/main/components/SideNavigator/StorageItem.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react'
import { computed } from 'mobx'
import { observer } from 'mobx-react'
import Storage from '../../stores/Storage'
import FolderItem from './FolderItem'
Expand All @@ -16,6 +17,12 @@ type StorageItemProps = {

@observer
class StorageItem extends React.Component<StorageItemProps> {
@computed
get tags(): string[] {
const { storage } = this.props
return [...storage.tagNoteIdSetMap.keys()]
}

removeStorage = () => {
const { name, removeStorage } = this.props
removeStorage(name)
Expand Down Expand Up @@ -58,6 +65,21 @@ class StorageItem extends React.Component<StorageItemProps> {
})}
</ul>
<FolderCreateForm createFolder={this.createFolder} />
<ul>
{this.tags.map(tag => {
const tagIsActive = pathname === `/storages/${name}/tags/${tag}`
return (
<li key={tag}>
<NavLink
active={tagIsActive}
to={`/storages/${name}/tags/${tag}`}
>
{tag}
</NavLink>
</li>
)
})}
</ul>
</div>
</li>
)
Expand Down