From 7374b1cc708c182522ae6235f8874823b1fdcafc Mon Sep 17 00:00:00 2001 From: sota1235 Date: Thu, 29 Dec 2016 16:56:28 +0900 Subject: [PATCH] refactor: replace code with micro components --- browser/main/NoteList/index.js | 88 +++++++++++++--------------------- 1 file changed, 34 insertions(+), 54 deletions(-) diff --git a/browser/main/NoteList/index.js b/browser/main/NoteList/index.js index c6618ff8..b6f77775 100644 --- a/browser/main/NoteList/index.js +++ b/browser/main/NoteList/index.js @@ -6,6 +6,8 @@ import _ from 'lodash' import ee from 'browser/main/lib/eventEmitter' import dataApi from 'browser/main/lib/dataApi' import ConfigManager from 'browser/main/lib/ConfigManager' +import NoteItem from './NoteItem' +import NoteItemSimple from './NoteItemSimple' const { remote } = require('electron') const { Menu, MenuItem, dialog } = remote @@ -314,62 +316,40 @@ class NoteList extends React.Component { .sort(sortFunc) let noteList = notes - .map((note) => { - if (note == null) return null - let tagElements = _.isArray(note.tags) - ? note.tags.map((tag) => { - return ( - - {tag} - - ) - }) - : [] - let isActive = location.query.key === note.storage + '-' + note.key + .map(note => { + if (note == null) { + return null + } + const isDefault = config.listStyle === 'DEFAULT' + const isActive = location.query.key === note.storage + '-' + note.key + const dateDisplay = moment( + config.sortBy === 'CREATED_AT' ? + note.createdAt : note.updatedAt + ).fromNow() + const key = `${note.storage}-${note.key}` + + if (isDefault) { + return ( + + ) + } + return ( -
this.handleNoteClick(e, note.storage + '-' + note.key)} - onContextMenu={(e) => this.handleNoteContextMenu(e, note.storage + '-' + note.key)} - > - {isDefault && -
- {moment(config.sortBy === 'CREATED_AT' ? note.createdAt : note.updatedAt).fromNow()} -
- } - -
- {note.title.trim().length > 0 - ? note.title - : Empty - } -
- - {isDefault && -
-
- {tagElements.length > 0 - ? tagElements - : '' - } -
-
- } - - {isDefault && - - } -
+ ) })