Merge branch 'master' into beta

package.json

@@ -53,7 +53,7 @@
     "chai-as-promised": "^7.1.1",
     "chokidar": "^1.6.0",
     "devtron": "^1.0.0",
-    "electron": "1.6.14",
+    "electron": "1.6.15",
     "electron-devtools-installer": "^2.0.0",
     "electron-mocha": "^4.0.3",
     "electron-packager": "^9.1.0",

res/keymaps/project.en.yml

@@ -153,6 +153,7 @@ darwin:
       - Cmd+ArrowRight
     delete: Backspace
     enter: Enter
+    preview: Space
     contract: Escape
     home: Home
     end: End

res/menu/app.yml

@@ -69,6 +69,9 @@ linux:
         label: '&Paste'
         accelerator: 'CmdOrCtrl+V'
         role: 'paste'
+      - &all
+        label: 'Select All'
+        role: 'selectall'
       - type: 'separator'
       - &preferences
         label: 'Prefere&nces …'
@@ -180,6 +183,7 @@ darwin:
       - *cut
       - *copy
       - *paste
+      - *all
   - *view
   - label: 'Window'
     role: 'window'

res/strings/renderer.en.yml

@@ -1,6 +1,7 @@
 sidebar:
   lists: Lists
   tags: Tags
+  imports: Last Import
   trash: Deleted Items
 toolbar:
   import: Import Photos
@@ -323,6 +324,7 @@ activity:
     load: Loading metadata …
     save: Saving metadata …
   ontology:
+    load: Loading ontology …
     import: Importing vocabularies …
     vocab:
       save: Saving vocabulary …

src/actions/imports.js

@@ -0,0 +1,13 @@
+'use strict'
+
+const { IMPORTS } = require('../constants')
+
+module.exports = {
+  restore(payload, meta) {
+    return {
+      type: IMPORTS.RESTORE,
+      payload,
+      meta
+    }
+  }
+}

src/actions/index.js

@@ -7,6 +7,7 @@ module.exports = {
   context: require('./context'),
   edit: require('./edit'),
   history: require('./history'),
+  imports: require('./imports'),
   intl: require('./intl'),
   item: require('./item'),
   keymap: require('./keymap'),

src/actions/item.js

@@ -20,7 +20,7 @@ module.exports = {
     return {
       type: ITEM.IMPORT,
       payload,
-      meta: { cmd: 'project', history: 'add', ...meta }
+      meta: { cmd: 'project', history: 'add', search: true, ...meta }
     }
   },
 
@@ -167,11 +167,11 @@ module.exports = {
     }
   },
 
-  preview({ id, photos }, meta) {
+  preview(payload, meta) {
     return {
       type: ITEM.PREVIEW,
-      payload: { id, photos },
-      meta: { ipc: true, ...meta }
+      payload,
+      meta: { cmd: 'project', ...meta }
     }
   },
 

src/commands/item.js

@@ -12,10 +12,12 @@ const { text } = require('../value')
 const act = require('../actions')
 const mod = require('../models')
 const { get, pluck, pick, remove } = require('../common/util')
+const { darwin } = require('../common/os')
 const { ITEM, DC } = require('../constants')
 const { keys } = Object
 const { isArray } = Array
 const { writeFileAsync: write } = require('fs')
+const { win } = require('../window')
 
 const {
   getItemTemplate,
@@ -478,6 +480,22 @@ class ToggleTags extends Command {
   }
 }
 
+class Preview extends Command {
+  static get action() { return ITEM.PREVIEW }
+
+  *exec() {
+    if (!darwin) return
+
+    const { photos } = this.action.payload
+    const paths = yield select(state =>
+      photos.map(id => get(state.photos, [id, 'path'])))
+
+    if (paths.length > 0) {
+      win.current.previewFile(paths[0])
+    }
+  }
+}
+
 class AddTag extends Command {
   static get action() { return ITEM.TAG.CREATE }
 
@@ -541,6 +559,7 @@ module.exports = {
   Split,
   Restore,
   Save,
+  Preview,
   AddTag,
   RemoveTag,
   ToggleTags,

src/components/icons.js

@@ -167,6 +167,14 @@ i('Chevron16', (
   </svg>
 ))
 
+i('Clock', (
+  <svg width="16" height="16">
+    <g className="line" fill="currentColor">
+      <path d="M8.5,0A7.5,7.5,0,1,0,16,7.5,7.5,7.5,0,0,0,8.5,0Zm0,14A6.5,6.5,0,1,1,15,7.5,6.507,6.507,0,0,1,8.5,14Zm3.354-3.854a.5.5,0,1,1-.707.707l-3-3A.507.507,0,0,1,8,7.5v-5a.5.5,0,0,1,1,0V7.293Z"/>
+    </g>
+  </svg>
+))
+
 i('Copy', (
   <svg width="16" height="16">
     <g className="line" fill="currentColor">

src/components/input.js

@@ -17,11 +17,9 @@ class BufferedInput extends PureComponent {
   }
 
   componentWillReceiveProps({ value }) {
-    this.setState({ value })
-    this.clearResetTimeout()
-
     this.hasBeenCommitted = false
     this.hasBeenCancelled = false
+    this.setState({ value })
   }
 
   componentWillUnmount() {
@@ -54,11 +52,14 @@ class BufferedInput extends PureComponent {
 
   commit(force) {
     if (force || this.isValid) {
-      this.props.onCommit(this.state.value, this.hasChanged, force)
-      this.hasBeenCommitted = true
-
-      if (this.hasChanged && this.props.delay > 0) {
-        this.tm = setTimeout(this.reset, this.props.delay)
+      if (!this.hasBeenCommitted) {
+        this.hasBeenCommitted = true
+        this.props.onCommit(this.state.value, this.hasChanged, force)
+
+        if (this.hasChanged && this.props.delay > 0) {
+          this.clearResetTimeout()
+          this.tm = setTimeout(this.reset, this.props.delay)
+        }
       }
 
     } else {

src/components/item/iterable.js

@@ -34,12 +34,28 @@ class ItemIterable extends PureComponent {
     }
   }
 
-  handleOpen = () => {
-    const { item, onItemOpen } = this.props
+  // Subtle: when an item is not selected, we need to select
+  // on mouse down, because the mouse down may kick-off a
+  // drag event. If the item is already selected, we handle
+  // selection in the click event for the same reason!
+  handleMouseDown = (event) => {
+    if (this.props.isSelected) {
+      this.wasSelected = true
+    } else {
+      this.wasSelected = false
+      this.handleSelect(event)
+    }
+  }
 
-    onItemOpen({
-      id: item.id, photos: item.photos
-    })
+  handleClick = (event) => {
+    if (this.props.isSelected && this.wasSelected) {
+      this.handleSelect(event)
+    }
+  }
+
+  handleOpen = () => {
+    const { id, photos } = this.props.item
+    this.props.onItemOpen({ id, photos })
   }
 
   handleSelect = (event) => {

src/components/item/iterator.js

@@ -107,7 +107,7 @@ class ItemIterator extends Iterator {
         this.props.onItemOpen(this.current())
         break
       case 'preview':
-        this.props.onItemPreview(this.current())
+        this.preview(this.current())
         break
       case 'clear':
         this.clearSelection()
@@ -162,6 +162,10 @@ class ItemIterator extends Iterator {
     this.props.onSelect({ items }, mod, { throttle })
   }
 
+  preview({ id, photos }) {
+    this.props.onItemPreview({ id, photos })
+  }
+
   connect(element) {
     return (this.isDisabled) ? element : this.props.dt(element)
   }

src/components/item/panel.js

@@ -59,6 +59,7 @@ class ItemPanel extends PureComponent {
       selections,
       isDisabled,
       isItemOpen,
+      onItemPreview,
       onMaximize,
       onModeChange,
       onNoteCreate,
@@ -109,6 +110,7 @@ class ItemPanel extends PureComponent {
           onCreate={this.handlePhotoCreate}
           onDelete={onPhotoDelete}
           onExpand={onPhotoExpand}
+          onItemPreview={onItemPreview}
           onSelect={onPhotoSelect}
           onSort={onPhotoSort}
           onSelectionSort={onSelectionSort}
@@ -159,6 +161,7 @@ class ItemPanel extends PureComponent {
     onEdit: func.isRequired,
     onEditCancel: func,
     onItemOpen: func.isRequired,
+    onItemPreview: func.isRequired,
     onItemSave: func.isRequired,
     onItemTagAdd: func.isRequired,
     onItemTagRemove: func.isRequired,

src/components/item/table-row.js

@@ -45,8 +45,8 @@ class ItemTableRow extends ItemIterable {
       <tr
         className={cx(this.classes)}
         ref={this.setContainer}
-        onMouseDown={isSelected ? null : this.handleSelect}
-        onClick={isSelected ? this.handleSelect : null}
+        onMouseDown={this.handleMouseDown}
+        onClick={this.handleClick}
         onDoubleClick={this.handleOpen}
         onContextMenu={this.handleContextMenu}>
         {this.mapColumns(({ column, isMainColumn, next, prev }) =>

src/components/item/tile.js

@@ -10,7 +10,7 @@ const cx = require('classnames')
 
 class ItemTile extends ItemIterable {
   render() {
-    const { item, cache, photos, size, tags, isSelected } = this.props
+    const { item, cache, photos, size, tags } = this.props
 
     return this.connect(
       <li
@@ -23,8 +23,8 @@ class ItemTile extends ItemIterable {
             photos={photos}
             tags={tags}
             size={size}
-            onMouseDown={isSelected ? null : this.handleSelect}
-            onClick={isSelected ? this.handleSelect : null}
+            onMouseDown={this.handleMouseDown}
+            onClick={this.handleClick}
             onDoubleClick={this.handleOpen}
             onContextMenu={this.handleContextMenu}/>
         </div>

src/components/list/index.js

@@ -1,6 +1,7 @@
 'use strict'
 
 module.exports = {
+  ...require('./last-import'),
   ...require('./node'),
   ...require('./trash'),
   ...require('./tree')

src/components/list/last-import.js

@@ -0,0 +1,28 @@
+'use strict'
+
+const React = require('react')
+const cx = require('classnames')
+const { IconClock } = require('../icons')
+const { FormattedMessage } = require('react-intl')
+const { bool, func } = require('prop-types')
+
+
+const LastImportListNode = ({ isSelected, onClick }) => (
+  <li
+    className={cx({ active: isSelected })}
+    onClick={isSelected ? null : onClick}>
+    <IconClock/>
+    <div className="name">
+      <FormattedMessage id="sidebar.imports"/>
+    </div>
+  </li>
+)
+
+LastImportListNode.propTypes = {
+  isSelected: bool,
+  onClick: func.isRequired
+}
+
+module.exports = {
+  LastImportListNode
+}

src/components/list/trash.js

@@ -2,13 +2,12 @@
 
 const React = require('react')
 const { PureComponent } = React
-const PropTypes = require('prop-types')
 const cx = require('classnames')
 const { IconTrash } = require('../icons')
 const { FormattedMessage } = require('react-intl')
 const { DropTarget } = require('react-dnd')
 const { DND } = require('../../constants')
-const { bool, func } = PropTypes
+const { bool, func } = require('prop-types')
 
 
 class TrashListNode extends PureComponent {

src/components/photo/grid.js

@@ -144,6 +144,9 @@ class PhotoGrid extends PhotoIterator {
       case 'open':
         this.handleItemOpen(this.current())
         break
+      case 'preview':
+        this.preview(this.current())
+        break
       case 'expand':
       case 'enter':
         this.expand(this.current())

src/components/photo/iterator.js

@@ -223,6 +223,11 @@ class PhotoIterator extends Iterator {
     }
   }
 
+  preview({ id, item }) {
+    this.props.onItemPreview({ id: item, photos: [id] })
+  }
+
+
   connect(element) {
     return this.isSortable ? this.props.dt(element) : element
   }
@@ -262,6 +267,7 @@ class PhotoIterator extends Iterator {
     onDelete: func.isRequired,
     onExpand: func.isRequired,
     onItemOpen: func.isRequired,
+    onItemPreview: func.isRequired,
     onSelect: func.isRequired,
     onSort: func.isRequired,
     onSelectionSort: func.isRequired

src/components/photo/list.js

@@ -139,6 +139,9 @@ class PhotoList extends PhotoIterator {
       case 'open':
         this.handleItemOpen(this.current())
         break
+      case 'preview':
+        this.preview(this.current())
+        break
       case 'delete':
         this.handleDelete(this.current())
         this.select(this.next() || this.prev())