fix: check empty word fields

Closes #363
crimx · May 11, 2019 · 60f8066 · 60f8066
1 parent 4ad4dcf
commit 60f8066
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 5 deletions.
diff --git a/src/_helpers/record-manager.ts b/src/_helpers/record-manager.ts
@@ -35,6 +35,30 @@ export interface Word {
 
 export type Area = 'notebook' | 'history'
 
+export function newWord (word?: Partial<Word>): Word {
+  return word
+    ? {
+      date: word.date || Date.now(),
+      text: word.text || '',
+      context: word.context || '',
+      title: word.title || '',
+      url: word.url || '',
+      favicon: word.favicon || '',
+      trans: word.trans || '',
+      note: word.note || '',
+    }
+    : {
+      date: Date.now(),
+      text: '',
+      context: '',
+      title: '',
+      url: '',
+      favicon: '',
+      trans: '',
+      note: '',
+    }
+}
+
 export function isInNotebook (info: SelectionInfo): Promise<boolean> {
   return message.send<MsgIsInNotebook>({ type: MsgType.IsInNotebook, info })
     .catch(logError(false))

diff --git a/src/components/WordPage/App.tsx b/src/components/WordPage/App.tsx
@@ -341,7 +341,8 @@ export class WordPageMain extends React.Component<WordPageMainInnerProps, WordPa
     </Button>
   }
 
-  renderText = (text: string): React.ReactNode => {
+  renderText = (text?: string): React.ReactNode => {
+    if (!text) { return '' }
     return text.split('\n').map((line, i) => (
       <div key={i}>{line}</div>
     ))

diff --git a/src/components/WordPage/ExportModal.tsx b/src/components/WordPage/ExportModal.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 import { translate, TranslationFunction } from 'react-i18next'
 import { Layout, Modal, Table } from 'antd'
 import { ColumnProps } from 'antd/lib/table/interface'
-import { Word } from '@/_helpers/record-manager'
+import { Word, newWord } from '@/_helpers/record-manager'
 import { storage } from '@/_helpers/browser-api'
 
 const { Content, Sider } = Layout
@@ -120,13 +120,17 @@ export class ExportModalBody extends React.Component<ExportModalInnerProps, Expo
   }
 
   processWords = (template: string): string => {
+    const keys = Object.keys(newWord())
     return this.props.rawWords
       .map(word =>
         template.replace(/%(\S+)%/g, (match, k) => {
-          if (k === 'date') {
-            return new Date(word.date).toLocaleDateString(this.props.locale)
+          if (keys.includes(k)) {
+            if (k === 'date') {
+              return new Date(word.date).toLocaleDateString(this.props.locale)
+            }
+            return word[k] || ''
           }
-          return typeof word[k] === 'string' ? word[k] : match
+          return match
         })
       )
       .join('\n')