From 3bd328e68894a7819aa26e2325d7984eaa3959e0 Mon Sep 17 00:00:00 2001
From: Florrie <towerofnix@gmail.com>
Date: Wed, 15 Jul 2020 22:08:34 -0300
Subject: don't include ANSI escape codes in measureColumns

This allows pretty much any code based around measureColumns
(e.g. buttons, labels, word-wrapping code) to handle ANSI-formatted
text without any miscalculated measurements.
---
 package-lock.json | 2 +-
 package.json      | 2 +-
 util/ansi.js      | 7 ++++++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cb7226e..8530981 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "tui-lib",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index a1d575d..2f3f82f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tui-lib",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "terminal ui library",
   "main": "index.js",
   "repository": "https://notabug.org/towerofnix/tui-lib.git",
diff --git a/util/ansi.js b/util/ansi.js
index ac511ed..f921349 100644
--- a/util/ansi.js
+++ b/util/ansi.js
@@ -153,7 +153,12 @@ const ansi = {
   },
 
   measureColumns(text) {
-    // Returns the number of columns the given text takes.
+    // Returns the number of columns the given text takes. Accounts for escape
+    // codes (by not including them in the returned width).
+
+    if (text.includes(ESC)) {
+      text = text.replace(new RegExp(ESC + '\\[\\??[0-9]*.', 'g'), '')
+    }
 
     return wcwidth(text)
   },
-- 
cgit 1.3.0-6-gf8a5