Revert "feat: New notes list design (#780)"

This reverts commit 7dd4a60595.
This commit is contained in:
Karol Sójko
2022-01-05 16:11:34 +01:00
parent b57350c899
commit d76c636e54
20 changed files with 155 additions and 296 deletions

View File

@@ -1,4 +1,3 @@
import { WebApplication } from '@/ui_models/application';
import { KeyboardKey } from '@/services/ioService';
import { AppState } from '@/ui_models/app_state';
import { DisplayOptions } from '@/ui_models/app_state/notes_view_state';
@@ -8,7 +7,6 @@ import { FunctionComponent } from 'preact';
import { NotesListItem } from './NotesListItem';
type Props = {
application: WebApplication;
appState: AppState;
notes: SNNote[];
selectedNotes: Record<string, SNNote>;
@@ -20,30 +18,23 @@ const FOCUSABLE_BUT_NOT_TABBABLE = -1;
const NOTES_LIST_SCROLL_THRESHOLD = 200;
export const NotesList: FunctionComponent<Props> = observer(
({
application,
appState,
notes,
selectedNotes,
displayOptions,
paginate,
}) => {
({ appState, notes, selectedNotes, displayOptions, paginate }) => {
const { selectPreviousNote, selectNextNote } = appState.notesView;
const { hideTags, hideDate, hideNotePreview, sortBy } = displayOptions;
const tagsForNote = (note: SNNote): string[] => {
const tagsStringForNote = (note: SNNote): string => {
if (hideTags) {
return [];
return '';
}
const selectedTag = appState.selectedTag;
if (!selectedTag) {
return [];
return '';
}
const tags = appState.getNoteTags(note);
if (!selectedTag.isSmartTag && tags.length === 1) {
return [];
return '';
}
return tags.map((tag) => tag.title);
return tags.map((tag) => `#${tag.title}`).join(' ');
};
const openNoteContextMenu = (posX: number, posY: number) => {
@@ -55,9 +46,11 @@ export const NotesList: FunctionComponent<Props> = observer(
appState.notes.setContextMenuOpen(true);
};
const onContextMenu = (note: SNNote, posX: number, posY: number) => {
appState.notes.selectNote(note.uuid, true);
openNoteContextMenu(posX, posY);
const onContextMenu = async (note: SNNote, posX: number, posY: number) => {
await appState.notes.selectNote(note.uuid, true);
if (selectedNotes[note.uuid]) {
openNoteContextMenu(posX, posY);
}
};
const onScroll = (e: Event) => {
@@ -91,10 +84,9 @@ export const NotesList: FunctionComponent<Props> = observer(
>
{notes.map((note) => (
<NotesListItem
application={application}
key={note.uuid}
note={note}
tags={tagsForNote(note)}
tags={tagsStringForNote(note)}
selected={!!selectedNotes[note.uuid]}
hideDate={hideDate}
hidePreview={hideNotePreview}