fix: better fix for center aligned wrapped text

oclif · Oct 4, 2024 · ae049a8 · ae049a8
1 parent 53d51bc
commit ae049a8
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 27 deletions.
diff --git a/examples/overflow.ts b/examples/overflow.ts
@@ -72,28 +72,28 @@ printTable({
   titleOptions: {bold: true},
 })
 
-printTable({
-  columns: ['id', 'name', 'age', 'description'],
-  data,
-  headerOptions: {
-    formatter: 'capitalCase',
-  },
-  horizontalAlignment: 'left',
-  overflow: 'wrap',
-  title: 'Wrap (aligned left)',
-  titleOptions: {bold: true},
-  verticalAlignment: 'center',
-})
+// printTable({
+//   columns: ['id', 'name', 'age', 'description'],
+//   data,
+//   headerOptions: {
+//     formatter: 'capitalCase',
+//   },
+//   horizontalAlignment: 'left',
+//   overflow: 'wrap',
+//   title: 'Wrap (aligned left)',
+//   titleOptions: {bold: true},
+//   verticalAlignment: 'center',
+// })
 
-printTable({
-  columns: ['id', 'name', 'age', 'description'],
-  data,
-  headerOptions: {
-    formatter: 'capitalCase',
-  },
-  horizontalAlignment: 'right',
-  overflow: 'wrap',
-  title: 'Wrap (aligned right)',
-  titleOptions: {bold: true},
-  verticalAlignment: 'bottom',
-})
+// printTable({
+//   columns: ['id', 'name', 'age', 'description'],
+//   data,
+//   headerOptions: {
+//     formatter: 'capitalCase',
+//   },
+//   horizontalAlignment: 'right',
+//   overflow: 'wrap',
+//   title: 'Wrap (aligned right)',
+//   titleOptions: {bold: true},
+//   verticalAlignment: 'bottom',
+// })
diff --git a/src/table.tsx b/src/table.tsx
@@ -155,7 +155,9 @@ export function formatTextWithMargins({
       }
 
       if (horizontalAlignment === 'center') {
-        return `${' '.repeat(lineSpecificLeftMargin)}${line}${' '.repeat(lineSpecificRightMargin - marginRight)}`
+        return idx === 0
+          ? `${' '.repeat(lineSpecificLeftMargin - marginLeft)}${line}${' '.repeat(lineSpecificRightMargin)}`
+          : `${' '.repeat(lineSpecificLeftMargin)}${line}${' '.repeat(lineSpecificRightMargin - marginRight)}`
       }
 
       // right alignment

diff --git a/test/table.test.tsx b/test/table.test.tsx
@@ -614,7 +614,7 @@ scing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.`,
       ).to.deep.equal({
         marginLeft: 1,
         marginRight: 1,
-        text: ' iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii\n              iiiiiiiiiiiiiiiiiiiiii             ',
+        text: 'iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii \n              iiiiiiiiiiiiiiiiiiiiii             ',
       })
     })
 
@@ -632,7 +632,7 @@ scing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.`,
       ).to.deep.equal({
         marginLeft: 1,
         marginRight: 2,
-        text: '     Lorem ipsum dolor sit amet, consectetur    \n                      adipi                     \n scing elit. Sed do eiusmod tempor incididunt ut\n          labore et dolore magna aliqua.        ',
+        text: '    Lorem ipsum dolor sit amet, consectetur      \n                      adipi                     \n scing elit. Sed do eiusmod tempor incididunt ut\n          labore et dolore magna aliqua.        ',
       })
     })
   })