@trendr/core 0.4.10 → 0.4.11

package/package.json

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

package/src/ansi.js

@@ -28,6 +28,9 @@ export const ITALIC = 4
 export const UNDERLINE = 8
 export const INVERSE = 16
 export const STRIKETHROUGH = 32
+// never emitted as sgr: marks ui chrome cells (scrollbars, counters) that
+// text selection should skip when extracting copy text
+export const COPY_IGNORE = 64
 
 const ATTR_CODES = [
   [BOLD, '1'],

package/src/diff-view.js

@@ -236,7 +236,7 @@ export function Diff({
       const isThumb = i >= thumbStart && i < thumbStart + thumbH
       bar.push(jsx('text', {
         key: i,
-        style: { color: isThumb ? palette.lineNo : palette.lineNo, dim: !isThumb },
+        style: { color: palette.lineNo, dim: !isThumb, copyIgnore: true },
         children: isThumb ? '█' : '│',
       }))
     }

package/src/dropdown.js

@@ -126,7 +126,7 @@ export function Dropdown({ items, cursor, scroll, visibleCount, width, onSubmit,
       children: [
         content,
         jsx('text', {
-          style: { color: barIsThumb ? s.accent : muted, dim: !barIsThumb },
+          style: { color: barIsThumb ? s.accent : muted, dim: !barIsThumb, copyIgnore: true },
           children: ' ' + (barIsThumb ? '█' : '│'),
         }),
       ],

package/src/list.js

@@ -190,7 +190,7 @@ export function List({ items = [], selected: selectedProp, onSelect, onCursorCha
     barChildren.push(
       jsx('text', {
         key: i,
-        style: { color: isThumb ? (focused ? accent : muted) : muted, dim: !isThumb },
+        style: { color: isThumb ? (focused ? accent : muted) : muted, dim: !isThumb, copyIgnore: true },
         children: isThumb ? '\u2588' : '\u2502',
       })
     )

package/src/renderer.js

@@ -98,6 +98,7 @@ function resolveAttrs(style) {
   if (style.underline) attrs |= ansi.UNDERLINE
   if (style.inverse) attrs |= ansi.INVERSE
   if (style.strikethrough) attrs |= ansi.STRIKETHROUGH
+  if (style.copyIgnore) attrs |= ansi.COPY_IGNORE
   return attrs
 }
 

package/src/scroll-box.js

@@ -93,7 +93,7 @@ export function ScrollBox({ children, focused = true, scrollOffset: offsetProp,
       barChildren.push(
         jsx('text', {
           key: i,
-          style: { color: isThumb ? (focused ? accent : muted) : muted, dim: !isThumb },
+          style: { color: isThumb ? (focused ? accent : muted) : muted, dim: !isThumb, copyIgnore: true },
           children: isThumb ? thumbChar : trackChar,
         })
       )

package/src/scrollable-text.js

@@ -89,7 +89,7 @@ export function ScrollableText({ content = '', focused = true, scrollOffset: off
       style: { flexDirection: 'row', height: 1 },
       children: [
         jsx('text', { style: { flexGrow: 1, ...textStyle }, children: line || ' ' }),
-        jsx('text', { style: { color: barColor, dim: !isThumb }, children: ' ' + barChar }),
+        jsx('text', { style: { color: barColor, dim: !isThumb, copyIgnore: true }, children: ' ' + barChar }),
       ],
     })
   })

package/src/selection.js

@@ -1,6 +1,6 @@
 import { useMouse } from './hooks.js'
 import { getContext, registerHook } from './renderer.js'
-import { osc52Copy } from './ansi.js'
+import { osc52Copy, COPY_IGNORE } from './ansi.js'
 
 function normalize(a, b) {
   const forward = a.y < b.y || (a.y === b.y && a.x <= b.x)
@@ -22,8 +22,10 @@ export function extractSelectionText(buf, sel) {
     const to = y === sel.ey ? Math.min(sel.ex, buf.width - 1) : buf.width - 1
     let text = ''
     for (let x = 0; x <= to; x++) {
-      const ch = buf.cells[y * buf.width + x].ch
-      if (ch === '') continue
+      const cell = buf.cells[y * buf.width + x]
+      if (cell.ch === '') continue
+      // chrome cells (scrollbars, counters) never belong in copied text
+      const ch = cell.attrs & COPY_IGNORE ? ' ' : cell.ch
       text += y === sel.sy && x < sel.sx ? ' ' : ch
     }
     rows.push({ text: text.replace(/\s+$/, ''), soft: !!buf.softWrap[y] })

package/src/text-area.js

@@ -372,7 +372,7 @@ 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}` }),
+        children: jsx('text', { style: { color: muted, dim: true, copyIgnore: true }, children: `${displayPos.row + 1}/${lineMap.length}` }),
       })
     : null