Merge pull request #322 from yibn2008/fix-mb-bug

fix incorrect cursor position

lib/utils/screen-manager.js

@@ -3,6 +3,7 @@ var _ = require('lodash');
 var util = require('./readline');
 var cliWidth = require('cli-width');
 var stripAnsi = require('strip-ansi');
+var stringWidth = require('string-width');
 
 // Prevent crashes on environments where the width can't be properly detected
 cliWidth.defaultWidth = 80;
@@ -11,10 +12,6 @@ function height(content) {
   return content.split('\n').length;
 }
 
-function width(content) {
-  return stripAnsi(content).length;
-}
-
 function lastLine(content) {
   return _.last(content.split('\n'));
 }
@@ -35,8 +32,6 @@ var ScreenManager = module.exports = function (rl) {
 };
 
 ScreenManager.prototype.render = function (content, bottomContent) {
-  var cursorPos = this.rl._getCursorPos();
-
   this.rl.output.unmute();
   this.clean(this.extraLinesUnderPrompt);
 
@@ -56,6 +51,9 @@ ScreenManager.prototype.render = function (content, bottomContent) {
   }
   this.rl.setPrompt(prompt);
 
+  // setPrompt will change cursor position, now we can get correct value
+  var cursorPos = this.rl._getCursorPos();
+
   content = forceLineReturn(content);
   if (bottomContent) {
     bottomContent = forceLineReturn(bottomContent);
@@ -82,14 +80,10 @@ ScreenManager.prototype.render = function (content, bottomContent) {
   }
 
   // Reset cursor at the beginning of the line
-  util.left(this.rl, width(lastLine(fullContent)));
+  util.left(this.rl, stringWidth(lastLine(fullContent)));
 
   // Adjust cursor on the right
-  var rightPos = cursorPos.cols;
-  if (cursorPos.rows === 0) {
-    rightPos = Math.max(rightPos, width(lastLine(content)));
-  }
-  util.right(this.rl, rightPos);
+  util.right(this.rl, cursorPos.cols);
 
   /**
    * Set up state for next re-rendering

package.json

@@ -31,6 +31,7 @@
     "readline2": "^1.0.1",
     "run-async": "^0.1.0",
     "rx-lite": "^3.1.2",
+    "string-width": "^1.0.1",
     "strip-ansi": "^3.0.0",
     "through": "^2.3.6"
   },