flanders 0.13.0 → 0.13.1

package/lib/ui/BottomBlock.d.ts

@@ -74,8 +74,9 @@ export declare class BottomBlock {
     private _scheduleAnimTick;
     private _scheduleLabelTick;
     private _scheduleCountdownTick;
-    private _clearBlock;
-    private _drawBlock;
+    private _redraw;
+    private _clearString;
+    private _drawString;
     private _renderHeader;
     private _renderMetrics;
     private _resolvePair;

package/lib/ui/BottomBlock.js

@@ -44,10 +44,9 @@ class BottomBlock {
             this._workingLabel = (0, voiceVariants_1.pickVariant)(voiceVariants_1.workingPool, this._random);
         }
         this._unsubResize = this._io.onResize(() => {
-            this._clearBlock();
-            this._drawBlock();
+            this._redraw();
         });
-        this._drawBlock();
+        this._redraw();
         this._startFooterTimer();
     }
     isFinalized() {
@@ -58,8 +57,7 @@ class BottomBlock {
             return;
         this._header = fields;
         if (this._mounted) {
-            this._clearBlock();
-            this._drawBlock();
+            this._redraw();
         }
     }
     setMetrics(fields) {
@@ -68,8 +66,7 @@ class BottomBlock {
         this._metrics = fields;
         this._metricsPauseAccumMs = 0;
         if (this._mounted) {
-            this._clearBlock();
-            this._drawBlock();
+            this._redraw();
         }
     }
     setFooter(state) {
@@ -95,8 +92,7 @@ class BottomBlock {
             this._animFrame = 0;
         }
         if (this._mounted) {
-            this._clearBlock();
-            this._drawBlock();
+            this._redraw();
             this._startFooterTimer();
         }
     }
@@ -107,9 +103,7 @@ class BottomBlock {
             this._io.write(text);
             return;
         }
-        this._clearBlock();
-        this._io.write(text);
-        this._drawBlock();
+        this._redraw(text);
     }
     finalize(label) {
         if (this._disposed)
@@ -124,9 +118,7 @@ class BottomBlock {
             this._unsubResize = null;
         }
         if (this._mounted) {
-            this._clearBlock();
-            this._drawBlock();
-            this._io.write("\n");
+            this._redraw("", "\n");
         }
     }
     dispose() {
@@ -176,8 +168,7 @@ class BottomBlock {
             if (this._disposed || this._finalized || (this._footer.kind !== "working" && this._footer.kind !== "reviewing"))
                 return;
             this._animFrame = (this._animFrame + 1) % FRAMES.length;
-            this._clearBlock();
-            this._drawBlock();
+            this._redraw();
             this._scheduleAnimTick();
         }, FRAME_MS);
     }
@@ -187,8 +178,7 @@ class BottomBlock {
             if (this._disposed || this._finalized || this._footer.kind !== "working")
                 return;
             this._workingLabel = (0, voiceVariants_1.pickVariant)(voiceVariants_1.workingPool, this._random, this._workingLabel);
-            this._clearBlock();
-            this._drawBlock();
+            this._redraw();
             this._scheduleLabelTick();
         }, LABEL_MS);
     }
@@ -197,14 +187,16 @@ class BottomBlock {
             this._countdownTimer = null;
             if (this._disposed || this._finalized || this._footer.kind !== "waiting")
                 return;
-            this._clearBlock();
-            this._drawBlock();
+            this._redraw();
             this._scheduleCountdownTick();
         }, 1000);
     }
-    _clearBlock() {
+    _redraw(aboveText = "", suffix = "") {
+        this._io.write(this._clearString() + aboveText + this._drawString() + suffix);
+    }
+    _clearString() {
         if (!this._prevLineWidths)
-            return;
+            return "";
         const cols = Math.max(1, this._io.columns());
         let rows = 0;
         for (const w of this._prevLineWidths) {
@@ -214,16 +206,16 @@ class BottomBlock {
         if (rows > 4) {
             clear += `\x1b[${rows - 4}B`;
         }
-        this._io.write(clear);
+        return clear;
     }
-    _drawBlock() {
+    _drawString() {
         const cols = Math.max(0, this._io.columns());
         const separator = formatters_1.SEPARATOR_GLYPH.repeat(cols);
         const header = this._renderHeader(cols);
         const metrics = this._renderMetrics(cols);
         const footer = this._renderFooter(cols);
-        this._io.write(AUTOWRAP_OFF + separator + "\n" + header + "\n" + metrics + "\n" + footer + AUTOWRAP_ON);
         this._prevLineWidths = [cols, (0, formatters_1.stripAnsi)(header).length, (0, formatters_1.stripAnsi)(metrics).length, (0, formatters_1.stripAnsi)(footer).length];
+        return AUTOWRAP_OFF + separator + "\n" + header + "\n" + metrics + "\n" + footer + AUTOWRAP_ON;
     }
     _renderHeader(cols) {
         var _a, _b, _c, _d, _e, _f;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flanders",
-  "version": "0.13.0",
+  "version": "0.13.1",
   "description": "Flanders never breaks a rule",
   "main": "lib/",
   "types": "lib/types",