Remove kwywords through context menu.

Author: Integral

src/article/manuscript/ManuscriptPackage.js

@@ -265,7 +265,9 @@ export default {
       nodeType: 'footnote',
       commandGroup: 'footnote'
     })
-    config.addCommand('remove-keyword', RemoveKeywordCommand)
+    config.addCommand('remove-metadata-keyword', RemoveKeywordCommand, {
+      commandGroup: 'custom-metadata-fields'
+    })
     config.addCommand('replace-figure-panel-image', ReplaceFigurePanelImageCommand, {
       commandGroup: 'figure-panel'
     })

src/article/metadata/MetadataPackage.js

@@ -41,6 +41,7 @@ import {
   TableSelectAllCommand, ToggleCellHeadingCommand, ToggleCellMergeCommand
 } from '../manuscript/TableCommands'
 import OpenFigurePanelImageTool from '../shared/OpenFigurePanelImageTool'
+import RemoveKeywordCommand from '../shared/RemoveKeywordCommand'
 import ReplaceFigurePanelTool from '../shared/ReplaceFigurePanelTool'
 import TableFigureComponent from '../shared/TableFigureComponent'
 import TranslatableEntryEditor from './TranslatableEntryEditor'
@@ -260,6 +261,9 @@ export default {
     config.addCommand('remove-figure-panel', RemoveFigurePanelCommand, {
       commandGroup: 'figure-panel'
     })
+    config.addCommand('remove-metadata-keyword', RemoveKeywordCommand, {
+      commandGroup: 'custom-metadata-fields'
+    })
     config.addCommand('remove-reference', RemoveReferenceCommand, {
       commandGroup: 'reference'
     })

src/article/shared/ArticleToolbarPackage.js

@@ -373,6 +373,7 @@ export default {
     config.addLabel('move-down-metadata-field', 'Move Down Metadata Field')
     config.addLabel('move-up-metadata-field', 'Move Up Metadata Field')
     config.addLabel('remove-metadata-field', 'Remove Metadata Field')
+    config.addLabel('remove-metadata-keyword', 'Remove Keyword')
     // Author tools
     config.addLabel('edit-author', 'Edit Author')
     // Reference tools

src/article/shared/RemoveKeywordCommand.js

@@ -2,38 +2,29 @@ import { Command, documentHelpers } from 'substance'
 
 export default class RemoveKeywordCommand extends Command {
   getCommandState (params, context) {
-    return { disabled: false }
+    const xpath = params.selectionState.xpath
+    if (xpath.length > 0) {
+      const selectedType = xpath[xpath.length - 1].type
+      if (selectedType === 'custom-metadata-value') {
+        return { disabled: false }
+      }
+    }
+    return { disabled: true }
   }
 
   execute (params, context) {
-    const { path, nodeId, surfaceId } = params
+    const selectionState = params.selectionState
+    const node = selectionState.node
+    const nodeId = node.id
+    const parentNode = node.getParent()
+    const path = [parentNode.id, 'values']
     const editorSession = context.editorSession
+
     editorSession.transaction(tx => {
       const index = tx.get(path).indexOf(nodeId)
-      const size = tx.get(path).length
-      if (index === -1) return false
-
       documentHelpers.removeAt(tx, path, index)
       documentHelpers.deepDeleteNode(nodeId)
-      // NOTE: After removing keyword selection should be moved to
-      // the next reasonable place: next keyword value or new keyword input
-      if (index < size - 1) {
-        const nextNodeId = tx.get(path)[index]
-        tx.setSelection({
-          type: 'property',
-          path: [nextNodeId, 'content'],
-          surfaceId,
-          startOffset: 0
-        })
-      } else {
-        tx.setSelection({
-          type: 'custom',
-          customType: 'keywordInput',
-          nodeId,
-          data: { isExpanded: true },
-          surfaceId
-        })
-      }
+      tx.setSelection(null)
     })
   }
 }