Fix line breaks when custom prefix is provided

jbcarpanelli · Jun 18, 2019 · 6033b14 · 6033b14
1 parent 5f5eee8
commit 6033b14
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/changelog.md b/changelog.md
@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.4.2] - 2019-06-18
+### Fixed
+- Fix line breaks when a custom succeedPrefix/failPrefix is provided
+
 ## [0.4.1] - 2019-06-18
 ### Fixed
 - Properly add line breaks in spinner texts when it has '\n' characters

diff --git a/index.js b/index.js
@@ -137,15 +137,17 @@ class Spinnies {
           text = breakText(text, prefixLength);
           line = `${chalk[spinnerColor](frame)} ${color ? chalk[color](text) : text}`;
         } else {
-          if (hasActiveSpinners) text = breakText(text, prefixLength);
           if (status === 'succeed') {
             prefixLength = succeedPrefix.length + 1;
+            if (hasActiveSpinners) text = breakText(text, prefixLength);
             line = `${chalk.green(succeedPrefix)} ${chalk[succeedColor](text)}`;
           } else if (status === 'fail') {
             prefixLength = failPrefix.length + 1;
+            if (hasActiveSpinners) text = breakText(text, prefixLength);
             line = `${chalk.red(failPrefix)} ${chalk[failColor](text)}`;
           } else {
             prefixLength = 0;
+            if (hasActiveSpinners) text = breakText(text, prefixLength);
             line = color ? chalk[color](text) : text;
           }
         }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "spinnies",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "Create and manage multiple spinners in command-line interface programs",
   "main": "index.js",
   "scripts": {

diff --git a/utils.js b/utils.js
@@ -59,13 +59,13 @@ function breakText(text, prefixLength) {
     .join('\n');
 }
 
-function breakLine(text, prefixLength) {
+function breakLine(line, prefixLength) {
   const columns = process.stderr.columns || 95;
-  return text.length  >= columns - prefixLength
-    ? `${text.substring(0, columns - prefixLength - 1)}\n${
-      breakText(text.substring(columns - prefixLength - 1, text.length), 0)
+  return line.length  >= columns - prefixLength
+    ? `${line.substring(0, columns - prefixLength - 1)}\n${
+      breakLine(line.substring(columns - prefixLength - 1, line.length), 0)
     }`
-    : text;
+    : line;
 }
 
 function getLinesLength(text, prefixLength) {