ink 4.1.0 → 4.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/components/App.d.ts +2 -2
- package/build/components/App.js.map +1 -1
- package/build/components/Box.d.ts +2 -148
- package/build/components/Box.js +5 -17
- package/build/components/Box.js.map +1 -1
- package/build/components/ErrorOverview.d.ts +2 -2
- package/build/components/Newline.d.ts +2 -2
- package/build/components/Spacer.d.ts +2 -2
- package/build/components/Static.d.ts +2 -2
- package/build/components/Text.d.ts +2 -2
- package/build/components/Transform.d.ts +2 -2
- package/build/devtools.js +1 -0
- package/build/devtools.js.map +1 -1
- package/build/dom.js +0 -4
- package/build/dom.js.map +1 -1
- package/build/hooks/use-input.js +34 -34
- package/build/hooks/use-input.js.map +1 -1
- package/build/output.js +35 -7
- package/build/output.js.map +1 -1
- package/build/parse-keypress.d.ts +14 -0
- package/build/parse-keypress.js +225 -0
- package/build/parse-keypress.js.map +1 -0
- package/build/reconciler.js +53 -60
- package/build/reconciler.js.map +1 -1
- package/build/render-border.js +64 -10
- package/build/render-border.js.map +1 -1
- package/build/render-node-to-output.js +2 -2
- package/build/render-node-to-output.js.map +1 -1
- package/build/render.d.ts +2 -3
- package/build/render.js.map +1 -1
- package/build/styles.d.ts +118 -5
- package/build/styles.js +34 -5
- package/build/styles.js.map +1 -1
- package/package.json +12 -3
- package/readme.md +191 -21
|
@@ -0,0 +1,225 @@
|
|
|
1
|
+
// Copied from https://github.com/enquirer/enquirer/blob/36785f3399a41cd61e9d28d1eb9c2fcd73d69b4c/lib/keypress.js
|
|
2
|
+
import { Buffer } from 'node:buffer';
|
|
3
|
+
const metaKeyCodeRe = /^(?:\x1b)([a-zA-Z0-9])$/;
|
|
4
|
+
const fnKeyRe = /^(?:\x1b+)(O|N|\[|\[\[)(?:(\d+)(?:;(\d+))?([~^$])|(?:1;)?(\d+)?([a-zA-Z]))/;
|
|
5
|
+
const keyName = {
|
|
6
|
+
/* xterm/gnome ESC O letter */
|
|
7
|
+
OP: 'f1',
|
|
8
|
+
OQ: 'f2',
|
|
9
|
+
OR: 'f3',
|
|
10
|
+
OS: 'f4',
|
|
11
|
+
/* xterm/rxvt ESC [ number ~ */
|
|
12
|
+
'[11~': 'f1',
|
|
13
|
+
'[12~': 'f2',
|
|
14
|
+
'[13~': 'f3',
|
|
15
|
+
'[14~': 'f4',
|
|
16
|
+
/* from Cygwin and used in libuv */
|
|
17
|
+
'[[A': 'f1',
|
|
18
|
+
'[[B': 'f2',
|
|
19
|
+
'[[C': 'f3',
|
|
20
|
+
'[[D': 'f4',
|
|
21
|
+
'[[E': 'f5',
|
|
22
|
+
/* common */
|
|
23
|
+
'[15~': 'f5',
|
|
24
|
+
'[17~': 'f6',
|
|
25
|
+
'[18~': 'f7',
|
|
26
|
+
'[19~': 'f8',
|
|
27
|
+
'[20~': 'f9',
|
|
28
|
+
'[21~': 'f10',
|
|
29
|
+
'[23~': 'f11',
|
|
30
|
+
'[24~': 'f12',
|
|
31
|
+
/* xterm ESC [ letter */
|
|
32
|
+
'[A': 'up',
|
|
33
|
+
'[B': 'down',
|
|
34
|
+
'[C': 'right',
|
|
35
|
+
'[D': 'left',
|
|
36
|
+
'[E': 'clear',
|
|
37
|
+
'[F': 'end',
|
|
38
|
+
'[H': 'home',
|
|
39
|
+
/* xterm/gnome ESC O letter */
|
|
40
|
+
OA: 'up',
|
|
41
|
+
OB: 'down',
|
|
42
|
+
OC: 'right',
|
|
43
|
+
OD: 'left',
|
|
44
|
+
OE: 'clear',
|
|
45
|
+
OF: 'end',
|
|
46
|
+
OH: 'home',
|
|
47
|
+
/* xterm/rxvt ESC [ number ~ */
|
|
48
|
+
'[1~': 'home',
|
|
49
|
+
'[2~': 'insert',
|
|
50
|
+
'[3~': 'delete',
|
|
51
|
+
'[4~': 'end',
|
|
52
|
+
'[5~': 'pageup',
|
|
53
|
+
'[6~': 'pagedown',
|
|
54
|
+
/* putty */
|
|
55
|
+
'[[5~': 'pageup',
|
|
56
|
+
'[[6~': 'pagedown',
|
|
57
|
+
/* rxvt */
|
|
58
|
+
'[7~': 'home',
|
|
59
|
+
'[8~': 'end',
|
|
60
|
+
/* rxvt keys with modifiers */
|
|
61
|
+
'[a': 'up',
|
|
62
|
+
'[b': 'down',
|
|
63
|
+
'[c': 'right',
|
|
64
|
+
'[d': 'left',
|
|
65
|
+
'[e': 'clear',
|
|
66
|
+
'[2$': 'insert',
|
|
67
|
+
'[3$': 'delete',
|
|
68
|
+
'[5$': 'pageup',
|
|
69
|
+
'[6$': 'pagedown',
|
|
70
|
+
'[7$': 'home',
|
|
71
|
+
'[8$': 'end',
|
|
72
|
+
Oa: 'up',
|
|
73
|
+
Ob: 'down',
|
|
74
|
+
Oc: 'right',
|
|
75
|
+
Od: 'left',
|
|
76
|
+
Oe: 'clear',
|
|
77
|
+
'[2^': 'insert',
|
|
78
|
+
'[3^': 'delete',
|
|
79
|
+
'[5^': 'pageup',
|
|
80
|
+
'[6^': 'pagedown',
|
|
81
|
+
'[7^': 'home',
|
|
82
|
+
'[8^': 'end',
|
|
83
|
+
/* misc. */
|
|
84
|
+
'[Z': 'tab'
|
|
85
|
+
};
|
|
86
|
+
export const nonAlphanumericKeys = [...Object.values(keyName), 'backspace'];
|
|
87
|
+
const isShiftKey = (code) => {
|
|
88
|
+
return [
|
|
89
|
+
'[a',
|
|
90
|
+
'[b',
|
|
91
|
+
'[c',
|
|
92
|
+
'[d',
|
|
93
|
+
'[e',
|
|
94
|
+
'[2$',
|
|
95
|
+
'[3$',
|
|
96
|
+
'[5$',
|
|
97
|
+
'[6$',
|
|
98
|
+
'[7$',
|
|
99
|
+
'[8$',
|
|
100
|
+
'[Z'
|
|
101
|
+
].includes(code);
|
|
102
|
+
};
|
|
103
|
+
const isCtrlKey = (code) => {
|
|
104
|
+
return [
|
|
105
|
+
'Oa',
|
|
106
|
+
'Ob',
|
|
107
|
+
'Oc',
|
|
108
|
+
'Od',
|
|
109
|
+
'Oe',
|
|
110
|
+
'[2^',
|
|
111
|
+
'[3^',
|
|
112
|
+
'[5^',
|
|
113
|
+
'[6^',
|
|
114
|
+
'[7^',
|
|
115
|
+
'[8^'
|
|
116
|
+
].includes(code);
|
|
117
|
+
};
|
|
118
|
+
const parseKeypress = (s = '') => {
|
|
119
|
+
let parts;
|
|
120
|
+
if (Buffer.isBuffer(s)) {
|
|
121
|
+
if (s[0] > 127 && s[1] === undefined) {
|
|
122
|
+
s[0] -= 128;
|
|
123
|
+
s = '\x1b' + String(s);
|
|
124
|
+
}
|
|
125
|
+
else {
|
|
126
|
+
s = String(s);
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
else if (s !== undefined && typeof s !== 'string') {
|
|
130
|
+
s = String(s);
|
|
131
|
+
}
|
|
132
|
+
else if (!s) {
|
|
133
|
+
s = '';
|
|
134
|
+
}
|
|
135
|
+
const key = {
|
|
136
|
+
name: '',
|
|
137
|
+
ctrl: false,
|
|
138
|
+
meta: false,
|
|
139
|
+
shift: false,
|
|
140
|
+
option: false,
|
|
141
|
+
sequence: s,
|
|
142
|
+
raw: s
|
|
143
|
+
};
|
|
144
|
+
key.sequence = key.sequence || s || key.name;
|
|
145
|
+
if (s === '\r') {
|
|
146
|
+
// carriage return
|
|
147
|
+
key.raw = undefined;
|
|
148
|
+
key.name = 'return';
|
|
149
|
+
}
|
|
150
|
+
else if (s === '\n') {
|
|
151
|
+
// enter, should have been called linefeed
|
|
152
|
+
key.name = 'enter';
|
|
153
|
+
}
|
|
154
|
+
else if (s === '\t') {
|
|
155
|
+
// tab
|
|
156
|
+
key.name = 'tab';
|
|
157
|
+
}
|
|
158
|
+
else if (s === '\b' || s === '\x1b\b') {
|
|
159
|
+
// backspace or ctrl+h
|
|
160
|
+
key.name = 'backspace';
|
|
161
|
+
key.meta = s.charAt(0) === '\x1b';
|
|
162
|
+
}
|
|
163
|
+
else if (s === '\x7f' || s === '\x1b\x7f') {
|
|
164
|
+
// TODO(vadimdemedes): `enquirer` detects delete key as backspace, but I had to split them up to avoid breaking changes in Ink. Merge them back together in the next major version.
|
|
165
|
+
// delete
|
|
166
|
+
key.name = 'delete';
|
|
167
|
+
key.meta = s.charAt(0) === '\x1b';
|
|
168
|
+
}
|
|
169
|
+
else if (s === '\x1b' || s === '\x1b\x1b') {
|
|
170
|
+
// escape key
|
|
171
|
+
key.name = 'escape';
|
|
172
|
+
key.meta = s.length === 2;
|
|
173
|
+
}
|
|
174
|
+
else if (s === ' ' || s === '\x1b ') {
|
|
175
|
+
key.name = 'space';
|
|
176
|
+
key.meta = s.length === 2;
|
|
177
|
+
}
|
|
178
|
+
else if (s <= '\x1a') {
|
|
179
|
+
// ctrl+letter
|
|
180
|
+
key.name = String.fromCharCode(s.charCodeAt(0) + 'a'.charCodeAt(0) - 1);
|
|
181
|
+
key.ctrl = true;
|
|
182
|
+
}
|
|
183
|
+
else if (s.length === 1 && s >= '0' && s <= '9') {
|
|
184
|
+
// number
|
|
185
|
+
key.name = 'number';
|
|
186
|
+
}
|
|
187
|
+
else if (s.length === 1 && s >= 'a' && s <= 'z') {
|
|
188
|
+
// lowercase letter
|
|
189
|
+
key.name = s;
|
|
190
|
+
}
|
|
191
|
+
else if (s.length === 1 && s >= 'A' && s <= 'Z') {
|
|
192
|
+
// shift+letter
|
|
193
|
+
key.name = s.toLowerCase();
|
|
194
|
+
key.shift = true;
|
|
195
|
+
}
|
|
196
|
+
else if ((parts = metaKeyCodeRe.exec(s))) {
|
|
197
|
+
// meta+character key
|
|
198
|
+
key.meta = true;
|
|
199
|
+
key.shift = /^[A-Z]$/.test(parts[1]);
|
|
200
|
+
}
|
|
201
|
+
else if ((parts = fnKeyRe.exec(s))) {
|
|
202
|
+
const segs = [...s];
|
|
203
|
+
if (segs[0] === '\u001b' && segs[1] === '\u001b') {
|
|
204
|
+
key.option = true;
|
|
205
|
+
}
|
|
206
|
+
// ansi escape sequence
|
|
207
|
+
// reassemble the key code leaving out leading \x1b's,
|
|
208
|
+
// the modifier key bitflag and any meaningless "1;" sequence
|
|
209
|
+
const code = [parts[1], parts[2], parts[4], parts[6]]
|
|
210
|
+
.filter(Boolean)
|
|
211
|
+
.join('');
|
|
212
|
+
const modifier = (parts[3] || parts[5] || 1) - 1;
|
|
213
|
+
// Parse the key modifier
|
|
214
|
+
key.ctrl = !!(modifier & 4);
|
|
215
|
+
key.meta = !!(modifier & 10);
|
|
216
|
+
key.shift = !!(modifier & 1);
|
|
217
|
+
key.code = code;
|
|
218
|
+
key.name = keyName[code];
|
|
219
|
+
key.shift = isShiftKey(code) || key.shift;
|
|
220
|
+
key.ctrl = isCtrlKey(code) || key.ctrl;
|
|
221
|
+
}
|
|
222
|
+
return key;
|
|
223
|
+
};
|
|
224
|
+
export default parseKeypress;
|
|
225
|
+
//# sourceMappingURL=parse-keypress.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"parse-keypress.js","sourceRoot":"","sources":["../src/parse-keypress.ts"],"names":[],"mappings":"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"}
|
package/build/reconciler.js
CHANGED
|
@@ -4,13 +4,13 @@ import { DefaultEventPriority } from 'react-reconciler/constants.js';
|
|
|
4
4
|
// eslint-disable-next-line n/file-extension-in-import
|
|
5
5
|
import Yoga from 'yoga-wasm-web/auto';
|
|
6
6
|
import { createTextNode, appendChildNode, insertBeforeNode, removeChildNode, setStyle, setTextNodeValue, createNode, setAttribute } from './dom.js';
|
|
7
|
+
import applyStyles from './styles.js';
|
|
7
8
|
// We need to conditionally perform devtools connection to avoid
|
|
8
9
|
// accidentally breaking other third-party code.
|
|
9
10
|
// See https://github.com/vadimdemedes/ink/issues/384
|
|
10
11
|
if (process.env['DEV'] === 'true') {
|
|
11
12
|
try {
|
|
12
13
|
await import('./devtools.js');
|
|
13
|
-
// eslint-disable-next-line @typescript-eslint/no-implicit-any-catch
|
|
14
14
|
}
|
|
15
15
|
catch (error) {
|
|
16
16
|
if (error.code === 'MODULE_NOT_FOUND') {
|
|
@@ -26,6 +26,32 @@ $ npm install --save-dev react-devtools-core
|
|
|
26
26
|
}
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
|
+
const diff = (before, after) => {
|
|
30
|
+
if (before === after) {
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
if (!before) {
|
|
34
|
+
return after;
|
|
35
|
+
}
|
|
36
|
+
const changed = {};
|
|
37
|
+
let isChanged = false;
|
|
38
|
+
for (const key of Object.keys(before)) {
|
|
39
|
+
const isDeleted = after ? !Object.hasOwnProperty.call(after, key) : true;
|
|
40
|
+
if (isDeleted) {
|
|
41
|
+
changed[key] = undefined;
|
|
42
|
+
isChanged = true;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
if (after) {
|
|
46
|
+
for (const key of Object.keys(after)) {
|
|
47
|
+
if (after[key] !== before[key]) {
|
|
48
|
+
changed[key] = after[key];
|
|
49
|
+
isChanged = true;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
return isChanged ? changed : undefined;
|
|
54
|
+
};
|
|
29
55
|
const cleanupYogaNode = (node) => {
|
|
30
56
|
node?.unsetMeasureFunc();
|
|
31
57
|
node?.freeRecursive();
|
|
@@ -78,6 +104,9 @@ export default createReconciler({
|
|
|
78
104
|
}
|
|
79
105
|
if (key === 'style') {
|
|
80
106
|
setStyle(node, value);
|
|
107
|
+
if (node.yogaNode) {
|
|
108
|
+
applyStyles(node.yogaNode, value);
|
|
109
|
+
}
|
|
81
110
|
continue;
|
|
82
111
|
}
|
|
83
112
|
if (key === 'internal_transform') {
|
|
@@ -148,69 +177,33 @@ export default createReconciler({
|
|
|
148
177
|
if (node.internal_static) {
|
|
149
178
|
rootNode.isStaticDirty = true;
|
|
150
179
|
}
|
|
151
|
-
const
|
|
152
|
-
const
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
updatePayload['style'] = style;
|
|
172
|
-
}
|
|
173
|
-
updatePayload['style'].borderStyle =
|
|
174
|
-
newStyle.borderStyle;
|
|
175
|
-
updatePayload['style'].borderColor =
|
|
176
|
-
newStyle.borderColor;
|
|
177
|
-
updatePayload['style'].overflowX = newStyle.overflowX;
|
|
178
|
-
updatePayload['style'].overflowY = newStyle.overflowY;
|
|
179
|
-
}
|
|
180
|
-
if (newStyle[styleKey] !== oldStyle[styleKey]) {
|
|
181
|
-
if (typeof updatePayload['style'] !== 'object') {
|
|
182
|
-
// Linter didn't like `= {} as Style`
|
|
183
|
-
const style = {};
|
|
184
|
-
updatePayload['style'] = style;
|
|
185
|
-
}
|
|
186
|
-
updatePayload['style'][styleKey] = newStyle[styleKey];
|
|
187
|
-
}
|
|
188
|
-
}
|
|
180
|
+
const props = diff(oldProps, newProps);
|
|
181
|
+
const style = diff(oldProps['style'], newProps['style']);
|
|
182
|
+
if (!props && !style) {
|
|
183
|
+
return null;
|
|
184
|
+
}
|
|
185
|
+
return { props, style };
|
|
186
|
+
},
|
|
187
|
+
commitUpdate(node, { props, style }) {
|
|
188
|
+
if (props) {
|
|
189
|
+
for (const [key, value] of Object.entries(props)) {
|
|
190
|
+
if (key === 'style') {
|
|
191
|
+
setStyle(node, value);
|
|
192
|
+
continue;
|
|
193
|
+
}
|
|
194
|
+
if (key === 'internal_transform') {
|
|
195
|
+
node.internal_transform = value;
|
|
196
|
+
continue;
|
|
197
|
+
}
|
|
198
|
+
if (key === 'internal_static') {
|
|
199
|
+
node.internal_static = true;
|
|
189
200
|
continue;
|
|
190
201
|
}
|
|
191
|
-
|
|
202
|
+
setAttribute(node, key, value);
|
|
192
203
|
}
|
|
193
204
|
}
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
commitUpdate(node, updatePayload) {
|
|
197
|
-
for (const [key, value] of Object.entries(updatePayload)) {
|
|
198
|
-
if (key === 'children') {
|
|
199
|
-
continue;
|
|
200
|
-
}
|
|
201
|
-
if (key === 'style') {
|
|
202
|
-
setStyle(node, value);
|
|
203
|
-
continue;
|
|
204
|
-
}
|
|
205
|
-
if (key === 'internal_transform') {
|
|
206
|
-
node.internal_transform = value;
|
|
207
|
-
continue;
|
|
208
|
-
}
|
|
209
|
-
if (key === 'internal_static') {
|
|
210
|
-
node.internal_static = true;
|
|
211
|
-
continue;
|
|
212
|
-
}
|
|
213
|
-
setAttribute(node, key, value);
|
|
205
|
+
if (style && node.yogaNode) {
|
|
206
|
+
applyStyles(node.yogaNode, style);
|
|
214
207
|
}
|
|
215
208
|
},
|
|
216
209
|
commitTextUpdate(node, _oldText, newText) {
|
package/build/reconciler.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"reconciler.js","sourceRoot":"","sources":["../src/reconciler.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,cAAc,CAAC;AACnC,OAAO,gBAAgB,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAC,oBAAoB,EAAC,MAAM,+BAA+B,CAAC;AACnE,sDAAsD;AACtD,OAAO,IAA6B,MAAM,oBAAoB,CAAC;AAC/D,OAAO,EACN,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,eAAe,EACf,QAAQ,EACR,gBAAgB,EAChB,UAAU,EACV,YAAY,EAKZ,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"reconciler.js","sourceRoot":"","sources":["../src/reconciler.ts"],"names":[],"mappings":"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"}
|
package/build/render-border.js
CHANGED
|
@@ -1,18 +1,72 @@
|
|
|
1
1
|
import cliBoxes from 'cli-boxes';
|
|
2
|
+
import chalk from 'chalk';
|
|
2
3
|
import colorize from './colorize.js';
|
|
3
4
|
const renderBorder = (x, y, node, output) => {
|
|
4
|
-
if (
|
|
5
|
+
if (node.style.borderStyle) {
|
|
5
6
|
const width = node.yogaNode.getComputedWidth();
|
|
6
7
|
const height = node.yogaNode.getComputedHeight();
|
|
7
|
-
const
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
const
|
|
11
|
-
const
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
8
|
+
const box = typeof node.style.borderStyle === 'string'
|
|
9
|
+
? cliBoxes[node.style.borderStyle]
|
|
10
|
+
: node.style.borderStyle;
|
|
11
|
+
const topBorderColor = node.style.borderTopColor ?? node.style.borderColor;
|
|
12
|
+
const bottomBorderColor = node.style.borderBottomColor ?? node.style.borderColor;
|
|
13
|
+
const leftBorderColor = node.style.borderLeftColor ?? node.style.borderColor;
|
|
14
|
+
const rightBorderColor = node.style.borderRightColor ?? node.style.borderColor;
|
|
15
|
+
const dimTopBorderColor = node.style.borderTopDimColor ?? node.style.borderDimColor;
|
|
16
|
+
const dimBottomBorderColor = node.style.borderBottomDimColor ?? node.style.borderDimColor;
|
|
17
|
+
const dimLeftBorderColor = node.style.borderLeftDimColor ?? node.style.borderDimColor;
|
|
18
|
+
const dimRightBorderColor = node.style.borderRightDimColor ?? node.style.borderDimColor;
|
|
19
|
+
const showTopBorder = node.style.borderTop !== false;
|
|
20
|
+
const showBottomBorder = node.style.borderBottom !== false;
|
|
21
|
+
const showLeftBorder = node.style.borderLeft !== false;
|
|
22
|
+
const showRightBorder = node.style.borderRight !== false;
|
|
23
|
+
const contentWidth = width - (showLeftBorder ? 1 : 0) - (showRightBorder ? 1 : 0);
|
|
24
|
+
let topBorder = showTopBorder
|
|
25
|
+
? colorize((showLeftBorder ? box.topLeft : '') +
|
|
26
|
+
box.top.repeat(contentWidth) +
|
|
27
|
+
(showRightBorder ? box.topRight : ''), topBorderColor, 'foreground')
|
|
28
|
+
: undefined;
|
|
29
|
+
if (showTopBorder && dimTopBorderColor) {
|
|
30
|
+
topBorder = chalk.dim(topBorder);
|
|
31
|
+
}
|
|
32
|
+
let verticalBorderHeight = height;
|
|
33
|
+
if (showTopBorder) {
|
|
34
|
+
verticalBorderHeight -= 1;
|
|
35
|
+
}
|
|
36
|
+
if (showBottomBorder) {
|
|
37
|
+
verticalBorderHeight -= 1;
|
|
38
|
+
}
|
|
39
|
+
let leftBorder = (colorize(box.left, leftBorderColor, 'foreground') + '\n').repeat(verticalBorderHeight);
|
|
40
|
+
if (dimLeftBorderColor) {
|
|
41
|
+
leftBorder = chalk.dim(leftBorder);
|
|
42
|
+
}
|
|
43
|
+
let rightBorder = (colorize(box.right, rightBorderColor, 'foreground') + '\n').repeat(verticalBorderHeight);
|
|
44
|
+
if (dimRightBorderColor) {
|
|
45
|
+
rightBorder = chalk.dim(rightBorder);
|
|
46
|
+
}
|
|
47
|
+
let bottomBorder = showBottomBorder
|
|
48
|
+
? colorize((showLeftBorder ? box.bottomLeft : '') +
|
|
49
|
+
box.bottom.repeat(contentWidth) +
|
|
50
|
+
(showRightBorder ? box.bottomRight : ''), bottomBorderColor, 'foreground')
|
|
51
|
+
: undefined;
|
|
52
|
+
if (showBottomBorder && dimBottomBorderColor) {
|
|
53
|
+
bottomBorder = chalk.dim(bottomBorder);
|
|
54
|
+
}
|
|
55
|
+
const offsetY = showTopBorder ? 1 : 0;
|
|
56
|
+
if (topBorder) {
|
|
57
|
+
output.write(x, y, topBorder, { transformers: [] });
|
|
58
|
+
}
|
|
59
|
+
if (showLeftBorder) {
|
|
60
|
+
output.write(x, y + offsetY, leftBorder, { transformers: [] });
|
|
61
|
+
}
|
|
62
|
+
if (showRightBorder) {
|
|
63
|
+
output.write(x + width - 1, y + offsetY, rightBorder, {
|
|
64
|
+
transformers: []
|
|
65
|
+
});
|
|
66
|
+
}
|
|
67
|
+
if (bottomBorder) {
|
|
68
|
+
output.write(x, y + height - 1, bottomBorder, { transformers: [] });
|
|
69
|
+
}
|
|
16
70
|
}
|
|
17
71
|
};
|
|
18
72
|
export default renderBorder;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-border.js","sourceRoot":"","sources":["../src/render-border.ts"],"names":[],"mappings":"AAAA,OAAO,QAAQ,MAAM,WAAW,CAAC;AACjC,OAAO,QAAQ,MAAM,eAAe,CAAC;AAIrC,MAAM,YAAY,GAAG,CACpB,CAAS,EACT,CAAS,EACT,IAAa,EACb,MAAc,EACP,EAAE;IACT,IAAI,
|
|
1
|
+
{"version":3,"file":"render-border.js","sourceRoot":"","sources":["../src/render-border.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,8 +58,8 @@ const renderNodeToOutput = (node, output, options) => {
|
|
|
58
58
|
let clipped = false;
|
|
59
59
|
if (node.nodeName === 'ink-box') {
|
|
60
60
|
renderBorder(x, y, node, output);
|
|
61
|
-
const clipHorizontally = node.style.overflowX === 'hidden';
|
|
62
|
-
const clipVertically = node.style.overflowY === 'hidden';
|
|
61
|
+
const clipHorizontally = node.style.overflowX === 'hidden' || node.style.overflow === 'hidden';
|
|
62
|
+
const clipVertically = node.style.overflowY === 'hidden' || node.style.overflow === 'hidden';
|
|
63
63
|
if (clipHorizontally || clipVertically) {
|
|
64
64
|
const x1 = clipHorizontally
|
|
65
65
|
? x + yogaNode.getComputedBorder(Yoga.EDGE_LEFT)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render-node-to-output.js","sourceRoot":"","sources":["../src/render-node-to-output.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"render-node-to-output.js","sourceRoot":"","sources":["../src/render-node-to-output.ts"],"names":[],"mappings":"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"}
|
package/build/render.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/// <reference types="node" resolution-mode="require"/>
|
|
2
|
-
import {
|
|
2
|
+
import type { ReactNode } from 'react';
|
|
3
3
|
import Ink from './ink.js';
|
|
4
4
|
export type RenderOptions = {
|
|
5
5
|
/**
|
|
@@ -57,9 +57,8 @@ export type Instance = {
|
|
|
57
57
|
*/
|
|
58
58
|
clear: () => void;
|
|
59
59
|
};
|
|
60
|
-
type RenderFunction = <Props, K extends NodeJS.WriteStream | RenderOptions>(tree: ReactElement<Props>, options?: K) => Instance;
|
|
61
60
|
/**
|
|
62
61
|
* Mount a component and render the output.
|
|
63
62
|
*/
|
|
64
|
-
declare const render:
|
|
63
|
+
declare const render: (node: ReactNode, options?: NodeJS.WriteStream | RenderOptions) => Instance;
|
|
65
64
|
export default render;
|
package/build/render.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACnC,OAAO,OAAO,MAAM,cAAc,CAAC;AAEnC,OAAO,GAAiC,MAAM,UAAU,CAAC;AACzD,OAAO,SAAS,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"render.js","sourceRoot":"","sources":["../src/render.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AACnC,OAAO,OAAO,MAAM,cAAc,CAAC;AAEnC,OAAO,GAAiC,MAAM,UAAU,CAAC;AACzD,OAAO,SAAS,MAAM,gBAAgB,CAAC;AA8DvC;;GAEG;AACH,MAAM,MAAM,GAAG,CACd,IAAe,EACf,OAA4C,EACjC,EAAE;IACb,MAAM,UAAU,GAAe;QAC9B,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,KAAK,EAAE,KAAK;QACZ,WAAW,EAAE,IAAI;QACjB,YAAY,EAAE,IAAI;QAClB,GAAG,UAAU,CAAC,OAAO,CAAC;KACtB,CAAC;IAEF,MAAM,QAAQ,GAAQ,WAAW,CAChC,UAAU,CAAC,MAAM,EACjB,GAAG,EAAE,CAAC,IAAI,GAAG,CAAC,UAAU,CAAC,CACzB,CAAC;IAEF,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAEtB,OAAO;QACN,QAAQ,EAAE,QAAQ,CAAC,MAAM;QACzB,OAAO;YACN,QAAQ,CAAC,OAAO,EAAE,CAAC;QACpB,CAAC;QACD,aAAa,EAAE,QAAQ,CAAC,aAAa;QACrC,OAAO,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC;QAClD,KAAK,EAAE,QAAQ,CAAC,KAAK;KACrB,CAAC;AACH,CAAC,CAAC;AAEF,eAAe,MAAM,CAAC;AAEtB,MAAM,UAAU,GAAG,CAClB,SAAyD,EAAE,EAC3C,EAAE;IAClB,IAAI,MAAM,YAAY,MAAM,EAAE;QAC7B,OAAO;YACN,MAAM;YACN,KAAK,EAAE,OAAO,CAAC,KAAK;SACpB,CAAC;KACF;IAED,OAAO,MAAM,CAAC;AACf,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CACnB,MAA0B,EAC1B,cAAyB,EACnB,EAAE;IACR,IAAI,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAErC,IAAI,CAAC,QAAQ,EAAE;QACd,QAAQ,GAAG,cAAc,EAAE,CAAC;QAC5B,SAAS,CAAC,GAAG,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;KAChC;IAED,OAAO,QAAQ,CAAC;AACjB,CAAC,CAAC"}
|