@trendr/core 0.4.7 → 0.4.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trendr/core",
-  "version": "0.4.7",
+  "version": "0.4.9",
   "description": "direct-mode TUI renderer with JSX, signals, and per-cell diffing",
   "license": "MIT",
   "author": "Jonathan Pyers",

package/src/diff-view.js

@@ -75,6 +75,7 @@ export function Diff({
   wordDiff = true,
   context = Infinity,
   lineNumbers = true,
+  folds = true,
   focused = true,
   scrollOffset: offsetProp,
   onScroll,
@@ -88,7 +89,11 @@ export function Diff({
   const offset = offsetProp ?? offsetInternal()
   const setOffset = onScroll ?? setOffsetInternal
 
-  const { rows, stats } = memoComputeDiff({ before, after, patch, hunks, wordDiff, context })
+  const computed = memoComputeDiff({ before, after, patch, hunks, wordDiff, context })
+  const stats = computed.stats
+  // the gutter numbers already show the jump across elided regions, so a
+  // caller can drop the fold banners entirely
+  const rows = folds ? computed.rows : computed.rows.filter((r) => r.type !== 'fold')
 
   const wholeMode = hunks == null && patch == null
   const hiLines = (text) => {

package/src/text-area.js

@@ -124,7 +124,7 @@ function ensureVisible(cursorRow, scroll, height, totalLines) {
   return scroll
 }
 
-export function TextArea({ onSubmit, onCancel, onChange, onKeyDown, placeholder, focused = true, maxHeight = 10, clearOnSubmit = true, cursor: cursorProp, value: valueProp, submitOnEnter = false, color }) {
+export function TextArea({ onSubmit, onCancel, onChange, onKeyDown, placeholder, focused = true, maxHeight = 10, clearOnSubmit = true, cursor: cursorProp, value: valueProp, submitOnEnter = false, color, lineCounter = false }) {
   const [value, setValue] = createSignal('')
   const [cursor, setCursor] = createSignal(0)
   if (valueProp !== undefined && valueProp !== value()) {
@@ -319,7 +319,11 @@ export function TextArea({ onSubmit, onCancel, onChange, onKeyDown, placeholder,
   const lineMap = wrapForEditor(v, effectiveWidth)
   const displayPos = cursorToDisplay(c, lineMap, v)
 
-  const displayHeight = Math.max(1, Math.min(lineMap.length, maxHeight))
+  // an active counter reserves the bottom row for itself so it can never
+  // overlap text or the cursor; overflow state costs one visible text row
+  const counterActive = lineCounter && lineMap.length > maxHeight
+  const boxMax = counterActive ? Math.max(1, maxHeight - 1) : maxHeight
+  const displayHeight = Math.max(1, Math.min(lineMap.length, boxMax))
   ref.scroll = ensureVisible(displayPos.row, ref.scroll, displayHeight, lineMap.length)
   const scroll = ref.scroll
 
@@ -365,8 +369,15 @@ export function TextArea({ onSubmit, onCancel, onChange, onKeyDown, placeholder,
     })
   })
 
+  const counter = counterActive
+    ? jsx('box', {
+        style: { flexDirection: 'row', height: 1 },
+        children: jsx('text', { style: { color: muted, dim: true }, children: `${displayPos.row + 1}/${lineMap.length}` }),
+      })
+    : null
+
   return jsx('box', {
-    style: { flexDirection: 'column', height: displayHeight, minHeight: 1, flexGrow: 1 },
-    children: rows,
+    style: { flexDirection: 'column', height: displayHeight + (counterActive ? 1 : 0), minHeight: 1, flexGrow: 1 },
+    children: counter ? [...rows, counter] : rows,
   })
 }