Merge pull request #14 from mitsuharu/develop

fix
mitsuharu · Nov 5, 2022 · 22999b0 · 22999b0
2 parents 91070fe + 03c42da
commit 22999b0
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/src/redux/modules/printer/saga.ts b/src/redux/modules/printer/saga.ts
@@ -45,6 +45,8 @@ function* printSaga({ payload }: ReturnType<typeof print>) {
   }
 }
 
+const isEmpty = (obj: any) => !Object.keys(obj).length
+
 async function printProfile({
   name,
   iconBase64,
@@ -54,7 +56,6 @@ async function printProfile({
   qr,
   title,
 }: Profile) {
-  console.log('printProfile')
   try {
     await SPrinter.connect()
     await SPrinter.printEmptyLines(1)
@@ -79,7 +80,7 @@ async function printProfile({
     }
 
     // 肩書き
-    if (title) {
+    if (title && !isEmpty(title)) {
       const { position, company, address } = title
       await SPrinter.printText(SEPARATOR)
       if (company) {
@@ -94,7 +95,7 @@ async function printProfile({
     }
 
     // SNS情報
-    if (sns) {
+    if (sns && !isEmpty(sns)) {
       await SPrinter.printText(SEPARATOR)
       await SPrinter.setAlign(Constants.Align.LEFT)
       const { twitter, facebook, github, website } = sns
@@ -113,15 +114,17 @@ async function printProfile({
     }
 
     // QRコード
-    if (qr) {
+    if (qr && !isEmpty(qr)) {
       await SPrinter.setAlign(Constants.Align.CENTER)
       await SPrinter.printText(SEPARATOR)
       await SPrinter.setAlign(Constants.Align.CENTER)
       if (qr.description) {
         await SPrinter.printText(`${qr.description}\n`)
         await SPrinter.printEmptyLines(1)
       }
-      await SPrinter.printQRCode(qr.url, 8, 1)
+      if (qr.url) {
+        await SPrinter.printQRCode(qr.url, 8, 1)
+      }
       await SPrinter.printEmptyLines(1)
     }