@flyingrobots/bijou 2.1.0 → 3.1.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/README.md +28 -20
- package/dist/adapters/test/clock.d.ts +36 -0
- package/dist/adapters/test/clock.d.ts.map +1 -0
- package/dist/adapters/test/clock.js +132 -0
- package/dist/adapters/test/clock.js.map +1 -0
- package/dist/adapters/test/index.d.ts +8 -1
- package/dist/adapters/test/index.d.ts.map +1 -1
- package/dist/adapters/test/index.js +24 -2
- package/dist/adapters/test/index.js.map +1 -1
- package/dist/adapters/test/io.d.ts +3 -0
- package/dist/adapters/test/io.d.ts.map +1 -1
- package/dist/adapters/test/io.js +5 -4
- package/dist/adapters/test/io.js.map +1 -1
- package/dist/adapters/test/runtime.d.ts +2 -0
- package/dist/adapters/test/runtime.d.ts.map +1 -1
- package/dist/adapters/test/runtime.js +1 -0
- package/dist/adapters/test/runtime.js.map +1 -1
- package/dist/core/ansi.d.ts +2 -0
- package/dist/core/ansi.d.ts.map +1 -1
- package/dist/core/ansi.js +2 -0
- package/dist/core/ansi.js.map +1 -1
- package/dist/core/clock.d.ts +12 -0
- package/dist/core/clock.d.ts.map +1 -0
- package/dist/core/clock.js +59 -0
- package/dist/core/clock.js.map +1 -0
- package/dist/core/components/alert-v3.d.ts +7 -0
- package/dist/core/components/alert-v3.d.ts.map +1 -0
- package/dist/core/components/alert-v3.js +37 -0
- package/dist/core/components/alert-v3.js.map +1 -0
- package/dist/core/components/alert.d.ts +4 -4
- package/dist/core/components/alert.d.ts.map +1 -1
- package/dist/core/components/alert.js +1 -1
- package/dist/core/components/alert.js.map +1 -1
- package/dist/core/components/badge.d.ts +6 -12
- package/dist/core/components/badge.d.ts.map +1 -1
- package/dist/core/components/badge.js +39 -24
- package/dist/core/components/badge.js.map +1 -1
- package/dist/core/components/bcss-style.d.ts +6 -0
- package/dist/core/components/bcss-style.d.ts.map +1 -0
- package/dist/core/components/bcss-style.js +44 -0
- package/dist/core/components/bcss-style.js.map +1 -0
- package/dist/core/components/box-v3.d.ts +17 -0
- package/dist/core/components/box-v3.d.ts.map +1 -0
- package/dist/core/components/box-v3.js +149 -0
- package/dist/core/components/box-v3.js.map +1 -0
- package/dist/core/components/box.d.ts +11 -4
- package/dist/core/components/box.d.ts.map +1 -1
- package/dist/core/components/box.js +37 -9
- package/dist/core/components/box.js.map +1 -1
- package/dist/core/components/index.d.ts +6 -0
- package/dist/core/components/index.d.ts.map +1 -1
- package/dist/core/components/index.js +4 -0
- package/dist/core/components/index.js.map +1 -1
- package/dist/core/components/log.d.ts.map +1 -1
- package/dist/core/components/log.js +6 -4
- package/dist/core/components/log.js.map +1 -1
- package/dist/core/components/overflow.d.ts +3 -0
- package/dist/core/components/overflow.d.ts.map +1 -0
- package/dist/core/components/overflow.js +33 -0
- package/dist/core/components/overflow.js.map +1 -0
- package/dist/core/components/progress.d.ts.map +1 -1
- package/dist/core/components/progress.js +3 -1
- package/dist/core/components/progress.js.map +1 -1
- package/dist/core/components/separator-v3.d.ts +7 -0
- package/dist/core/components/separator-v3.d.ts.map +1 -0
- package/dist/core/components/separator-v3.js +46 -0
- package/dist/core/components/separator-v3.js.map +1 -0
- package/dist/core/components/separator.d.ts +2 -4
- package/dist/core/components/separator.d.ts.map +1 -1
- package/dist/core/components/separator.js.map +1 -1
- package/dist/core/components/spinner.d.ts.map +1 -1
- package/dist/core/components/spinner.js +3 -1
- package/dist/core/components/spinner.js.map +1 -1
- package/dist/core/components/surface-text.d.ts +14 -0
- package/dist/core/components/surface-text.d.ts.map +1 -0
- package/dist/core/components/surface-text.js +95 -0
- package/dist/core/components/surface-text.js.map +1 -0
- package/dist/core/components/table-v3.d.ts +11 -0
- package/dist/core/components/table-v3.d.ts.map +1 -0
- package/dist/core/components/table-v3.js +148 -0
- package/dist/core/components/table-v3.js.map +1 -0
- package/dist/core/components/table.d.ts +2 -1
- package/dist/core/components/table.d.ts.map +1 -1
- package/dist/core/components/table.js +40 -11
- package/dist/core/components/table.js.map +1 -1
- package/dist/core/components/timer.d.ts.map +1 -1
- package/dist/core/components/timer.js +11 -9
- package/dist/core/components/timer.js.map +1 -1
- package/dist/core/components/types.d.ts +19 -0
- package/dist/core/components/types.d.ts.map +1 -0
- package/dist/core/components/types.js +2 -0
- package/dist/core/components/types.js.map +1 -0
- package/dist/core/layout/flex.d.ts +28 -0
- package/dist/core/layout/flex.d.ts.map +1 -0
- package/dist/core/layout/flex.js +126 -0
- package/dist/core/layout/flex.js.map +1 -0
- package/dist/core/render/differ.d.ts +49 -0
- package/dist/core/render/differ.d.ts.map +1 -0
- package/dist/core/render/differ.js +271 -0
- package/dist/core/render/differ.js.map +1 -0
- package/dist/core/runtime-viewport.d.ts +34 -0
- package/dist/core/runtime-viewport.d.ts.map +1 -0
- package/dist/core/runtime-viewport.js +74 -0
- package/dist/core/runtime-viewport.js.map +1 -0
- package/dist/core/text/index.d.ts +1 -0
- package/dist/core/text/index.d.ts.map +1 -1
- package/dist/core/text/index.js +1 -0
- package/dist/core/text/index.js.map +1 -1
- package/dist/core/text/wrap.d.ts +11 -0
- package/dist/core/text/wrap.d.ts.map +1 -0
- package/dist/core/text/wrap.js +90 -0
- package/dist/core/text/wrap.js.map +1 -0
- package/dist/core/theme/accessors.d.ts.map +1 -1
- package/dist/core/theme/accessors.js +21 -5
- package/dist/core/theme/accessors.js.map +1 -1
- package/dist/core/theme/graph-types.d.ts +58 -0
- package/dist/core/theme/graph-types.d.ts.map +1 -0
- package/dist/core/theme/graph-types.js +2 -0
- package/dist/core/theme/graph-types.js.map +1 -0
- package/dist/core/theme/graph.d.ts +27 -0
- package/dist/core/theme/graph.d.ts.map +1 -0
- package/dist/core/theme/graph.js +155 -0
- package/dist/core/theme/graph.js.map +1 -0
- package/dist/core/theme/index.d.ts +3 -0
- package/dist/core/theme/index.d.ts.map +1 -1
- package/dist/core/theme/index.js +2 -0
- package/dist/core/theme/index.js.map +1 -1
- package/dist/core/theme/resolve.d.ts +3 -0
- package/dist/core/theme/resolve.d.ts.map +1 -1
- package/dist/core/theme/resolve.js +3 -0
- package/dist/core/theme/resolve.js.map +1 -1
- package/dist/factory.d.ts +3 -0
- package/dist/factory.d.ts.map +1 -1
- package/dist/factory.js +8 -0
- package/dist/factory.js.map +1 -1
- package/dist/index.d.ts +10 -4
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +11 -3
- package/dist/index.js.map +1 -1
- package/dist/ports/clock.d.ts +29 -0
- package/dist/ports/clock.d.ts.map +1 -0
- package/dist/ports/clock.js +2 -0
- package/dist/ports/clock.js.map +1 -0
- package/dist/ports/context.d.ts +12 -0
- package/dist/ports/context.d.ts.map +1 -1
- package/dist/ports/index.d.ts +1 -0
- package/dist/ports/index.d.ts.map +1 -1
- package/dist/ports/index.js.map +1 -1
- package/dist/ports/io.d.ts +6 -0
- package/dist/ports/io.d.ts.map +1 -1
- package/dist/ports/runtime.d.ts +5 -0
- package/dist/ports/runtime.d.ts.map +1 -1
- package/dist/ports/surface.d.ts +152 -0
- package/dist/ports/surface.d.ts.map +1 -0
- package/dist/ports/surface.js +199 -0
- package/dist/ports/surface.js.map +1 -0
- package/package.json +2 -2
|
@@ -0,0 +1,148 @@
|
|
|
1
|
+
import { createSurface } from '../../ports/surface.js';
|
|
2
|
+
import { resolveSafeCtx as resolveCtx } from '../resolve-ctx.js';
|
|
3
|
+
import { createTextSurface, tokenToCellStyle, wrapSurfaceToWidth } from './surface-text.js';
|
|
4
|
+
import { resolveOverflowBehavior } from './overflow.js';
|
|
5
|
+
function normalizeColumnWidth(width) {
|
|
6
|
+
if (width == null)
|
|
7
|
+
return undefined;
|
|
8
|
+
if (!Number.isFinite(width))
|
|
9
|
+
return 0;
|
|
10
|
+
return Math.max(0, Math.floor(width));
|
|
11
|
+
}
|
|
12
|
+
function resolveColumns(columns, rows) {
|
|
13
|
+
if (columns.length > 0)
|
|
14
|
+
return [...columns];
|
|
15
|
+
const inferredCount = rows.reduce((max, row) => Math.max(max, row.length), 0);
|
|
16
|
+
return Array.from({ length: inferredCount }, () => ({ header: '' }));
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Render a bordered data table as a Surface for V3-native composition.
|
|
20
|
+
*/
|
|
21
|
+
export function tableSurface(options) {
|
|
22
|
+
const ctx = resolveCtx(options.ctx);
|
|
23
|
+
const overflow = resolveOverflowBehavior(options.overflow, ctx?.resolveBCSS({ type: 'Table', id: options.id, classes: options.class?.split(' ') }) ?? {});
|
|
24
|
+
const rawRows = (options.rows ?? []).map((row) => (row ?? []).map((cell) => cell ?? ''));
|
|
25
|
+
const columns = resolveColumns(options.columns ?? [], rawRows);
|
|
26
|
+
const rows = rawRows;
|
|
27
|
+
const headerToken = options.headerToken ?? ctx?.ui('tableHeader');
|
|
28
|
+
const headerStyle = tokenToCellStyle(headerToken);
|
|
29
|
+
const borderStyle = tokenToCellStyle(options.borderToken ?? ctx?.border('muted'));
|
|
30
|
+
const headerBg = options.headerBgToken == null ? undefined : tokenToCellStyle(options.headerBgToken);
|
|
31
|
+
const headerSurfaces = columns.map((column) => createTextSurface(column.header ?? '', {
|
|
32
|
+
...headerStyle,
|
|
33
|
+
bg: headerBg?.bg ?? headerStyle.bg,
|
|
34
|
+
}));
|
|
35
|
+
const cellSurfaces = rows.map((row) => row.map((cell) => typeof cell === 'string' ? createTextSurface(cell) : cell));
|
|
36
|
+
const colWidths = columns.map((column, index) => {
|
|
37
|
+
const normalizedWidth = normalizeColumnWidth(column.width);
|
|
38
|
+
if (normalizedWidth !== undefined)
|
|
39
|
+
return normalizedWidth;
|
|
40
|
+
let maxWidth = headerSurfaces[index]?.width ?? 0;
|
|
41
|
+
for (const row of cellSurfaces) {
|
|
42
|
+
maxWidth = Math.max(maxWidth, row[index]?.width ?? 0);
|
|
43
|
+
}
|
|
44
|
+
return maxWidth;
|
|
45
|
+
});
|
|
46
|
+
const fittedHeaderSurfaces = headerSurfaces.map((cell, index) => {
|
|
47
|
+
const cellWidth = colWidths[index] ?? 0;
|
|
48
|
+
if (columns[index]?.width === undefined || overflow === 'truncate')
|
|
49
|
+
return cell;
|
|
50
|
+
return wrapSurfaceToWidth(cell, cellWidth);
|
|
51
|
+
});
|
|
52
|
+
const headerHeight = fittedHeaderSurfaces.reduce((max, cell) => Math.max(max, cell.height), 1);
|
|
53
|
+
const fittedCellSurfaces = cellSurfaces.map((row) => row.map((cell, index) => {
|
|
54
|
+
const cellWidth = colWidths[index] ?? 0;
|
|
55
|
+
if (columns[index]?.width === undefined || overflow === 'truncate')
|
|
56
|
+
return cell;
|
|
57
|
+
return wrapSurfaceToWidth(cell, cellWidth);
|
|
58
|
+
}));
|
|
59
|
+
const rowHeights = fittedCellSurfaces.map((row) => row.reduce((max, cell, index) => {
|
|
60
|
+
const cellWidth = colWidths[index] ?? 0;
|
|
61
|
+
if (cellWidth <= 0)
|
|
62
|
+
return max;
|
|
63
|
+
return Math.max(max, cell.height);
|
|
64
|
+
}, 1));
|
|
65
|
+
const totalWidth = columns.length === 0
|
|
66
|
+
? 2
|
|
67
|
+
: colWidths.reduce((sum, width) => sum + width + 2, 0) + columns.length + 1;
|
|
68
|
+
const totalHeight = 1 + headerHeight + 1 + rowHeights.reduce((sum, height) => sum + height, 0) + 1;
|
|
69
|
+
const surface = createSurface(totalWidth, totalHeight, { char: ' ', empty: false });
|
|
70
|
+
const setBorder = (x, y, char, bg) => {
|
|
71
|
+
surface.set(x, y, { char, ...borderStyle, bg: bg ?? borderStyle.bg, empty: false });
|
|
72
|
+
};
|
|
73
|
+
const setSpace = (x, y, bg, fg) => {
|
|
74
|
+
surface.set(x, y, {
|
|
75
|
+
char: ' ',
|
|
76
|
+
fg: fg ?? headerBg?.fg,
|
|
77
|
+
bg: bg ?? headerBg?.bg,
|
|
78
|
+
modifiers: headerBg?.modifiers,
|
|
79
|
+
empty: false,
|
|
80
|
+
});
|
|
81
|
+
};
|
|
82
|
+
const drawBorderRow = (y, left, mid, right) => {
|
|
83
|
+
if (columns.length === 0) {
|
|
84
|
+
setBorder(0, y, left);
|
|
85
|
+
setBorder(1, y, right);
|
|
86
|
+
return;
|
|
87
|
+
}
|
|
88
|
+
let x = 0;
|
|
89
|
+
setBorder(x++, y, left);
|
|
90
|
+
for (let i = 0; i < colWidths.length; i++) {
|
|
91
|
+
for (let j = 0; j < colWidths[i] + 2; j++)
|
|
92
|
+
setBorder(x++, y, '\u2500');
|
|
93
|
+
setBorder(x++, y, i === colWidths.length - 1 ? right : mid);
|
|
94
|
+
}
|
|
95
|
+
};
|
|
96
|
+
drawBorderRow(0, '\u250c', '\u252c', '\u2510');
|
|
97
|
+
if (columns.length === 0) {
|
|
98
|
+
for (let headerY = 0; headerY < headerHeight; headerY++) {
|
|
99
|
+
setBorder(0, 1 + headerY, '\u2502', headerBg?.bg);
|
|
100
|
+
setBorder(1, 1 + headerY, '\u2502', headerBg?.bg);
|
|
101
|
+
}
|
|
102
|
+
drawBorderRow(1 + headerHeight, '\u251c', '\u253c', '\u2524');
|
|
103
|
+
drawBorderRow(totalHeight - 1, '\u2514', '\u2534', '\u2518');
|
|
104
|
+
return surface;
|
|
105
|
+
}
|
|
106
|
+
for (let headerLine = 0; headerLine < headerHeight; headerLine++) {
|
|
107
|
+
let headerX = 1;
|
|
108
|
+
for (let i = 0; i < columns.length; i++) {
|
|
109
|
+
const cellWidth = colWidths[i];
|
|
110
|
+
const headerSurface = fittedHeaderSurfaces[i];
|
|
111
|
+
for (let x = headerX; x < headerX + cellWidth + 2; x++)
|
|
112
|
+
setSpace(x, 1 + headerLine);
|
|
113
|
+
setBorder(headerX - 1, 1 + headerLine, '\u2502', headerBg?.bg);
|
|
114
|
+
surface.blit(headerSurface, headerX + 1, 1 + headerLine, 0, headerLine, cellWidth, 1);
|
|
115
|
+
headerX += cellWidth + 3;
|
|
116
|
+
}
|
|
117
|
+
setBorder(totalWidth - 1, 1 + headerLine, '\u2502', headerBg?.bg);
|
|
118
|
+
}
|
|
119
|
+
drawBorderRow(1 + headerHeight, '\u251c', '\u253c', '\u2524');
|
|
120
|
+
let y = 2 + headerHeight;
|
|
121
|
+
for (let rowIndex = 0; rowIndex < fittedCellSurfaces.length; rowIndex++) {
|
|
122
|
+
const row = fittedCellSurfaces[rowIndex];
|
|
123
|
+
const rowHeight = rowHeights[rowIndex];
|
|
124
|
+
for (let line = 0; line < rowHeight; line++) {
|
|
125
|
+
let x = 1;
|
|
126
|
+
for (let colIndex = 0; colIndex < columns.length; colIndex++) {
|
|
127
|
+
const cellWidth = colWidths[colIndex];
|
|
128
|
+
setBorder(x - 1, y + line, '\u2502');
|
|
129
|
+
for (let fillX = x; fillX < x + cellWidth + 2; fillX++) {
|
|
130
|
+
surface.set(fillX, y + line, { char: ' ', empty: false });
|
|
131
|
+
}
|
|
132
|
+
x += cellWidth + 3;
|
|
133
|
+
}
|
|
134
|
+
setBorder(totalWidth - 1, y + line, '\u2502');
|
|
135
|
+
}
|
|
136
|
+
let x = 1;
|
|
137
|
+
for (let colIndex = 0; colIndex < columns.length; colIndex++) {
|
|
138
|
+
const cellWidth = colWidths[colIndex];
|
|
139
|
+
const cellSurface = row[colIndex] ?? createTextSurface('');
|
|
140
|
+
surface.blit(cellSurface, x + 1, y, 0, 0, cellWidth, rowHeight);
|
|
141
|
+
x += cellWidth + 3;
|
|
142
|
+
}
|
|
143
|
+
y += rowHeight;
|
|
144
|
+
}
|
|
145
|
+
drawBorderRow(totalHeight - 1, '\u2514', '\u2534', '\u2518');
|
|
146
|
+
return surface;
|
|
147
|
+
}
|
|
148
|
+
//# sourceMappingURL=table-v3.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"table-v3.js","sourceRoot":"","sources":["../../../src/core/components/table-v3.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { BijouContext } from '../../ports/context.js';
|
|
2
2
|
import type { TokenValue } from '../theme/tokens.js';
|
|
3
|
+
import type { BijouNodeOptions } from './types.js';
|
|
3
4
|
/** Definition for a single table column. */
|
|
4
5
|
export interface TableColumn {
|
|
5
6
|
/** Column header text. */
|
|
@@ -8,7 +9,7 @@ export interface TableColumn {
|
|
|
8
9
|
width?: number;
|
|
9
10
|
}
|
|
10
11
|
/** Configuration for rendering a table. */
|
|
11
|
-
export interface TableOptions {
|
|
12
|
+
export interface TableOptions extends BijouNodeOptions {
|
|
12
13
|
/** Column definitions (headers and optional widths). */
|
|
13
14
|
columns: TableColumn[];
|
|
14
15
|
/** Two-dimensional array of cell strings, one inner array per row. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../../src/core/components/table.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"table.d.ts","sourceRoot":"","sources":["../../../src/core/components/table.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAKrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,4CAA4C;AAC5C,MAAM,WAAW,WAAW;IAC1B,0BAA0B;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,6FAA6F;IAC7F,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,2CAA2C;AAC3C,MAAM,WAAW,YAAa,SAAQ,gBAAgB;IACpD,wDAAwD;IACxD,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,sEAAsE;IACtE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC;IACjB,0CAA0C;IAC1C,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,gDAAgD;IAChD,WAAW,CAAC,EAAE,UAAU,CAAC;IACzB,0EAA0E;IAC1E,aAAa,CAAC,EAAE,UAAU,CAAC;IAC3B,0DAA0D;IAC1D,GAAG,CAAC,EAAE,YAAY,CAAC;CACpB;AA4CD;;;;;;;;;;GAUG;AACH,wBAAgB,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,MAAM,CAsFnD"}
|
|
@@ -1,7 +1,10 @@
|
|
|
1
|
+
import { graphemeWidth } from '../text/grapheme.js';
|
|
2
|
+
import { clipToWidth } from '../text/clip.js';
|
|
3
|
+
import { wrapToWidth } from '../text/wrap.js';
|
|
1
4
|
import { resolveCtx } from '../resolve-ctx.js';
|
|
2
5
|
import { renderByMode } from '../mode-render.js';
|
|
3
6
|
import { makeBgFill } from '../bg-fill.js';
|
|
4
|
-
import {
|
|
7
|
+
import { resolveOverflowBehavior } from './overflow.js';
|
|
5
8
|
/**
|
|
6
9
|
* Calculate the visible (non-ANSI) character length of a string.
|
|
7
10
|
*
|
|
@@ -9,7 +12,7 @@ import { stripAnsi } from '../text/grapheme.js';
|
|
|
9
12
|
* @returns The number of visible characters.
|
|
10
13
|
*/
|
|
11
14
|
function visibleLength(str) {
|
|
12
|
-
return
|
|
15
|
+
return graphemeWidth(str);
|
|
13
16
|
}
|
|
14
17
|
/**
|
|
15
18
|
* Right-pad a string to a target width, accounting for ANSI escape sequences.
|
|
@@ -22,6 +25,22 @@ function padRight(str, width) {
|
|
|
22
25
|
const visible = visibleLength(str);
|
|
23
26
|
return visible >= width ? str : str + ' '.repeat(width - visible);
|
|
24
27
|
}
|
|
28
|
+
function normalizeColumnWidth(width) {
|
|
29
|
+
if (width == null)
|
|
30
|
+
return undefined;
|
|
31
|
+
if (!Number.isFinite(width))
|
|
32
|
+
return 0;
|
|
33
|
+
return Math.max(0, Math.floor(width));
|
|
34
|
+
}
|
|
35
|
+
function formatCellLines(value, width, overflow, fixedWidth) {
|
|
36
|
+
const safeValue = value ?? '';
|
|
37
|
+
if (!fixedWidth)
|
|
38
|
+
return safeValue.split('\n');
|
|
39
|
+
if (overflow === 'truncate') {
|
|
40
|
+
return safeValue.split('\n').map((line) => clipToWidth(line, width));
|
|
41
|
+
}
|
|
42
|
+
return safeValue.split('\n').flatMap((line) => wrapToWidth(line, width));
|
|
43
|
+
}
|
|
25
44
|
/**
|
|
26
45
|
* Render a table with unicode box-drawing borders.
|
|
27
46
|
*
|
|
@@ -55,10 +74,12 @@ export function table(options) {
|
|
|
55
74
|
interactive: () => {
|
|
56
75
|
const headerToken = options.headerToken ?? ctx.ui('tableHeader');
|
|
57
76
|
const borderToken = options.borderToken ?? ctx.border('muted');
|
|
77
|
+
const overflow = resolveOverflowBehavior(options.overflow, ctx.resolveBCSS({ type: 'Table', id: options.id, classes: options.class?.split(' ') }));
|
|
58
78
|
const bc = (s) => ctx.style.styled(borderToken, s);
|
|
59
79
|
const colWidths = columns.map((col, i) => {
|
|
60
|
-
|
|
61
|
-
|
|
80
|
+
const normalizedWidth = normalizeColumnWidth(col.width);
|
|
81
|
+
if (normalizedWidth !== undefined)
|
|
82
|
+
return normalizedWidth;
|
|
62
83
|
let max = visibleLength(col.header ?? '');
|
|
63
84
|
for (const row of rows) {
|
|
64
85
|
const cell = row[i] ?? '';
|
|
@@ -76,14 +97,22 @@ export function table(options) {
|
|
|
76
97
|
const midSep = hLine('\u251c', '\u253c', '\u2524');
|
|
77
98
|
const bottom = hLine('\u2514', '\u2534', '\u2518');
|
|
78
99
|
const hdrBgFill = makeBgFill(options.headerBgToken, ctx);
|
|
79
|
-
const
|
|
80
|
-
const
|
|
81
|
-
const
|
|
82
|
-
|
|
83
|
-
const
|
|
84
|
-
return
|
|
100
|
+
const headerLinesByColumn = columns.map((col, i) => formatCellLines(ctx.style.styled(headerToken, col.header ?? ''), colWidths[i], overflow, col.width !== undefined));
|
|
101
|
+
const headerHeight = headerLinesByColumn.reduce((max, lines) => Math.max(max, lines.length), 1);
|
|
102
|
+
const headerRows = Array.from({ length: headerHeight }, (_row, rowIndex) => {
|
|
103
|
+
const headerCells = columns.map((_col, i) => ' ' + padRight(headerLinesByColumn[i][rowIndex] ?? '', colWidths[i]) + ' ');
|
|
104
|
+
const rawHeaderRow = bc(v) + headerCells.join(bc(v)) + bc(v);
|
|
105
|
+
return hdrBgFill ? hdrBgFill(rawHeaderRow) : rawHeaderRow;
|
|
106
|
+
});
|
|
107
|
+
const dataRows = rows.flatMap((row) => {
|
|
108
|
+
const cellLines = colWidths.map((w, i) => formatCellLines(row[i] ?? '', w, overflow, columns[i]?.width !== undefined));
|
|
109
|
+
const rowHeight = cellLines.reduce((max, lines) => Math.max(max, lines.length), 1);
|
|
110
|
+
return Array.from({ length: rowHeight }, (_line, lineIndex) => {
|
|
111
|
+
const cells = colWidths.map((w, i) => ' ' + padRight(cellLines[i][lineIndex] ?? '', w) + ' ');
|
|
112
|
+
return bc(v) + cells.join(bc(v)) + bc(v);
|
|
113
|
+
});
|
|
85
114
|
});
|
|
86
|
-
const lines = [top,
|
|
115
|
+
const lines = [top, ...headerRows, midSep, ...dataRows, bottom];
|
|
87
116
|
return lines.join('\n');
|
|
88
117
|
},
|
|
89
118
|
}, options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"table.js","sourceRoot":"","sources":["../../../src/core/components/table.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"table.js","sourceRoot":"","sources":["../../../src/core/components/table.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timer.d.ts","sourceRoot":"","sources":["../../../src/core/components/timer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"timer.d.ts","sourceRoot":"","sources":["../../../src/core/components/timer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAQ3D,yCAAyC;AACzC,MAAM,WAAW,YAAY;IAC3B,wEAAwE;IACxE,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,4DAA4D;IAC5D,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,qDAAqD;IACrD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,0DAA0D;IAC1D,GAAG,CAAC,EAAE,YAAY,CAAC;CACpB;AAED,gDAAgD;AAChD,MAAM,WAAW,eAAe;IAC9B,uBAAuB;IACvB,KAAK,IAAI,IAAI,CAAC;IACd,gDAAgD;IAChD,KAAK,IAAI,IAAI,CAAC;IACd,6BAA6B;IAC7B,MAAM,IAAI,IAAI,CAAC;IACf;;;OAGG;IACH,IAAI,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,mCAAmC;IACnC,OAAO,IAAI,MAAM,CAAC;CACnB;AAED,uCAAuC;AACvC,MAAM,WAAW,kBAAmB,SAAQ,YAAY;IACtD,+FAA+F;IAC/F,QAAQ,EAAE,MAAM,CAAC;IACjB,qDAAqD;IACrD,UAAU,CAAC,EAAE,MAAM,IAAI,CAAC;IACxB,uEAAuE;IACvE,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,2CAA2C;AAC3C,MAAM,WAAW,sBAAuB,SAAQ,YAAY;IAC1D,uEAAuE;IACvE,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,GAAE,YAAiB,GAAG,MAAM,CAmBpE;AAoID;;;;;;;;;GASG;AACH,wBAAgB,WAAW,CAAC,OAAO,EAAE,kBAAkB,GAAG,eAAe,CAsBxE;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,OAAO,GAAE,sBAA2B,GAAG,eAAe,CAUrF"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { resolveClock } from '../clock.js';
|
|
1
2
|
import { resolveCtx } from '../resolve-ctx.js';
|
|
2
3
|
import { renderByMode } from '../mode-render.js';
|
|
3
4
|
import { cursorGuard } from './cursor-guard.js';
|
|
@@ -33,10 +34,10 @@ export function timer(ms, options = {}) {
|
|
|
33
34
|
},
|
|
34
35
|
}, options);
|
|
35
36
|
}
|
|
36
|
-
function computeElapsed(s) {
|
|
37
|
+
function computeElapsed(s, nowMs) {
|
|
37
38
|
switch (s.kind) {
|
|
38
39
|
case 'idle': return 0;
|
|
39
|
-
case 'running': return s.pausedElapsed + (
|
|
40
|
+
case 'running': return s.pausedElapsed + (nowMs - s.startTime);
|
|
40
41
|
case 'paused': return s.pausedElapsed;
|
|
41
42
|
case 'stopped': return s.elapsedMs;
|
|
42
43
|
}
|
|
@@ -44,12 +45,13 @@ function computeElapsed(s) {
|
|
|
44
45
|
/** Shared controller logic for createTimer and createStopwatch. */
|
|
45
46
|
function createLiveController(config) {
|
|
46
47
|
const { ctx, interval, timerOpts, displayMs, initialDisplayMs, onTick, onComplete } = config;
|
|
48
|
+
const clock = resolveClock(ctx);
|
|
47
49
|
const mode = ctx.mode;
|
|
48
50
|
let state = { kind: 'idle' };
|
|
49
51
|
function tick() {
|
|
50
52
|
if (state.kind !== 'running')
|
|
51
53
|
return;
|
|
52
|
-
const elapsed = state.pausedElapsed + (
|
|
54
|
+
const elapsed = state.pausedElapsed + (clock.now() - state.startTime);
|
|
53
55
|
if (onTick?.(elapsed)) {
|
|
54
56
|
state.handle.dispose();
|
|
55
57
|
if (mode === 'interactive') {
|
|
@@ -88,26 +90,26 @@ function createLiveController(config) {
|
|
|
88
90
|
onComplete?.();
|
|
89
91
|
return;
|
|
90
92
|
}
|
|
91
|
-
const now =
|
|
93
|
+
const now = clock.now();
|
|
92
94
|
const line = timer(displayMs(0), { ...timerOpts, ctx });
|
|
93
95
|
ctx.io.write(`${CLEAR_LINE_RETURN}${line}`);
|
|
94
|
-
const handle =
|
|
96
|
+
const handle = clock.setInterval(tick, interval);
|
|
95
97
|
state = { kind: 'running', startTime: now, pausedElapsed: 0, handle, cursor };
|
|
96
98
|
},
|
|
97
99
|
pause() {
|
|
98
100
|
if (state.kind !== 'running')
|
|
99
101
|
return;
|
|
100
|
-
const elapsed = state.pausedElapsed + (
|
|
102
|
+
const elapsed = state.pausedElapsed + (clock.now() - state.startTime);
|
|
101
103
|
state = { kind: 'paused', pausedElapsed: elapsed, handle: state.handle, cursor: state.cursor };
|
|
102
104
|
},
|
|
103
105
|
resume() {
|
|
104
106
|
if (state.kind !== 'paused')
|
|
105
107
|
return;
|
|
106
|
-
state = { kind: 'running', startTime:
|
|
108
|
+
state = { kind: 'running', startTime: clock.now(), pausedElapsed: state.pausedElapsed,
|
|
107
109
|
handle: state.handle, cursor: state.cursor };
|
|
108
110
|
},
|
|
109
111
|
stop(finalMessage) {
|
|
110
|
-
const elapsed = computeElapsed(state);
|
|
112
|
+
const elapsed = computeElapsed(state, clock.now());
|
|
111
113
|
if (state.kind === 'running' || state.kind === 'paused') {
|
|
112
114
|
state.handle.dispose();
|
|
113
115
|
if (mode === 'interactive') {
|
|
@@ -123,7 +125,7 @@ function createLiveController(config) {
|
|
|
123
125
|
}
|
|
124
126
|
},
|
|
125
127
|
elapsed() {
|
|
126
|
-
return computeElapsed(state);
|
|
128
|
+
return computeElapsed(state, clock.now());
|
|
127
129
|
},
|
|
128
130
|
};
|
|
129
131
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timer.js","sourceRoot":"","sources":["../../../src/core/components/timer.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAyB,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AA+C/C;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,KAAK,CAAC,EAAU,EAAE,UAAwB,EAAE;IAC1D,MAAM,GAAG,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACpC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAE5B,OAAO,YAAY,CAAC,GAAG,CAAC,IAAI,EAAE;QAC5B,IAAI,EAAE,GAAG,EAAE;YACT,MAAM,SAAS,GAAG,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;YAC1C,OAAO,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,SAAS,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QACrD,CAAC;QACD,UAAU,EAAE,GAAG,EAAE;YACf,MAAM,MAAM,GAAG,YAAY,CAAC,EAAE,CAAC,CAAC;YAChC,OAAO,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;QAC/C,CAAC;QACD,WAAW,EAAE,GAAG,EAAE;YAChB,MAAM,SAAS,GAAG,UAAU,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;YAC1C,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,CAAC;YACrE,OAAO,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC;QACjD,CAAC;KACF,EAAE,OAAO,CAAC,CAAC;AACd,CAAC;AA6BD,SAAS,cAAc,CAAC,CAAa;
|
|
1
|
+
{"version":3,"file":"timer.js","sourceRoot":"","sources":["../../../src/core/components/timer.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { BijouContext } from '../../ports/context.js';
|
|
2
|
+
/** Shared overflow policy for text-bearing components. */
|
|
3
|
+
export type OverflowBehavior = 'wrap' | 'truncate';
|
|
4
|
+
/**
|
|
5
|
+
* Base options shared by all Bijou UI components.
|
|
6
|
+
*
|
|
7
|
+
* Part of the Standardized BijouNode Protocol.
|
|
8
|
+
*/
|
|
9
|
+
export interface BijouNodeOptions {
|
|
10
|
+
/** Unique identifier for the component. Used for CSS styling (#id) and layout tracking. */
|
|
11
|
+
id?: string;
|
|
12
|
+
/** CSS class name(s) for the component. Space-separated. */
|
|
13
|
+
class?: string;
|
|
14
|
+
/** Optional Bijou context. If omitted, the global default context is used. */
|
|
15
|
+
ctx?: BijouContext;
|
|
16
|
+
/** Horizontal overflow behavior for constrained text content. Defaults to `'wrap'`. */
|
|
17
|
+
overflow?: OverflowBehavior;
|
|
18
|
+
}
|
|
19
|
+
//# sourceMappingURL=types.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/core/components/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE3D,0DAA0D;AAC1D,MAAM,MAAM,gBAAgB,GAAG,MAAM,GAAG,UAAU,CAAC;AAEnD;;;;GAIG;AACH,MAAM,WAAW,gBAAgB;IAC/B,2FAA2F;IAC3F,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,4DAA4D;IAC5D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,8EAA8E;IAC9E,GAAG,CAAC,EAAE,YAAY,CAAC;IACnB,uFAAuF;IACvF,QAAQ,CAAC,EAAE,gBAAgB,CAAC;CAC7B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/core/components/types.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import type { LayoutNode, LayoutRect } from '../../ports/surface.js';
|
|
2
|
+
/**
|
|
3
|
+
* Options for the flex layout engine.
|
|
4
|
+
*/
|
|
5
|
+
export interface FlexOptions {
|
|
6
|
+
direction?: 'row' | 'column';
|
|
7
|
+
gap?: number;
|
|
8
|
+
}
|
|
9
|
+
/**
|
|
10
|
+
* Metadata for a flex child.
|
|
11
|
+
*/
|
|
12
|
+
export interface FlexChildProps {
|
|
13
|
+
id?: string;
|
|
14
|
+
flex?: number;
|
|
15
|
+
basis?: number;
|
|
16
|
+
minSize?: number;
|
|
17
|
+
maxSize?: number;
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* Calculate flex layout geometry.
|
|
21
|
+
*
|
|
22
|
+
* @param options - Flex container options.
|
|
23
|
+
* @param children - Properties for each child.
|
|
24
|
+
* @param bounds - Available space.
|
|
25
|
+
* @returns Root LayoutNode containing child rects.
|
|
26
|
+
*/
|
|
27
|
+
export declare function calculateFlex(options: FlexOptions, children: FlexChildProps[], bounds: LayoutRect): LayoutNode;
|
|
28
|
+
//# sourceMappingURL=flex.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"flex.d.ts","sourceRoot":"","sources":["../../../src/core/layout/flex.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAErE;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,SAAS,CAAC,EAAE,KAAK,GAAG,QAAQ,CAAC;IAC7B,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;GAOG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,WAAW,EACpB,QAAQ,EAAE,cAAc,EAAE,EAC1B,MAAM,EAAE,UAAU,GACjB,UAAU,CA4HZ"}
|
|
@@ -0,0 +1,126 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Calculate flex layout geometry.
|
|
3
|
+
*
|
|
4
|
+
* @param options - Flex container options.
|
|
5
|
+
* @param children - Properties for each child.
|
|
6
|
+
* @param bounds - Available space.
|
|
7
|
+
* @returns Root LayoutNode containing child rects.
|
|
8
|
+
*/
|
|
9
|
+
export function calculateFlex(options, children, bounds) {
|
|
10
|
+
const direction = options.direction ?? 'row';
|
|
11
|
+
const gap = options.gap ?? 0;
|
|
12
|
+
const isRow = direction === 'row';
|
|
13
|
+
const mainAxisTotal = isRow ? bounds.width : bounds.height;
|
|
14
|
+
const crossAxisTotal = isRow ? bounds.height : bounds.width;
|
|
15
|
+
if (children.length === 0) {
|
|
16
|
+
return { rect: bounds, children: [] };
|
|
17
|
+
}
|
|
18
|
+
const totalGaps = gap * (children.length - 1);
|
|
19
|
+
const available = Math.max(0, mainAxisTotal - totalGaps);
|
|
20
|
+
// First pass: fixed sizes
|
|
21
|
+
const sizes = [];
|
|
22
|
+
let usedByFixed = 0;
|
|
23
|
+
let totalFlex = 0;
|
|
24
|
+
for (const child of children) {
|
|
25
|
+
const flexGrow = child.flex ?? 0;
|
|
26
|
+
if (flexGrow > 0) {
|
|
27
|
+
sizes.push(0);
|
|
28
|
+
totalFlex += flexGrow;
|
|
29
|
+
}
|
|
30
|
+
else {
|
|
31
|
+
const b = child.basis ?? 0;
|
|
32
|
+
const clamped = clamp(b, child.minSize, child.maxSize);
|
|
33
|
+
sizes.push(clamped);
|
|
34
|
+
usedByFixed += clamped;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
// Second pass: distribute remaining space to flex children iteratively
|
|
38
|
+
// to correctly handle min/max constraints.
|
|
39
|
+
let remaining = Math.max(0, available - usedByFixed);
|
|
40
|
+
let activeFlex = totalFlex;
|
|
41
|
+
const isConstrained = new Array(children.length).fill(false);
|
|
42
|
+
// Iteratively distribute until all flex space is assigned or all flex children are constrained
|
|
43
|
+
while (activeFlex > 0 && remaining > 0) {
|
|
44
|
+
let spaceDistributed = false;
|
|
45
|
+
const perFlexUnit = remaining / activeFlex;
|
|
46
|
+
for (let i = 0; i < children.length; i++) {
|
|
47
|
+
if (isConstrained[i])
|
|
48
|
+
continue;
|
|
49
|
+
const child = children[i];
|
|
50
|
+
const flexGrow = child.flex ?? 0;
|
|
51
|
+
if (flexGrow <= 0)
|
|
52
|
+
continue;
|
|
53
|
+
const currentSize = sizes[i];
|
|
54
|
+
const targetSize = currentSize + (flexGrow * perFlexUnit);
|
|
55
|
+
const clamped = clamp(targetSize, child.minSize, child.maxSize);
|
|
56
|
+
if (clamped !== targetSize) {
|
|
57
|
+
// This child hit a constraint
|
|
58
|
+
sizes[i] = clamped;
|
|
59
|
+
remaining -= (clamped - currentSize);
|
|
60
|
+
activeFlex -= flexGrow;
|
|
61
|
+
isConstrained[i] = true;
|
|
62
|
+
spaceDistributed = true;
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
if (!spaceDistributed) {
|
|
66
|
+
// Final pass: distribute the last remaining bits without constraints (they are already satisfied)
|
|
67
|
+
const fractionalShares = [];
|
|
68
|
+
let assigned = 0;
|
|
69
|
+
for (let i = 0; i < children.length; i++) {
|
|
70
|
+
if (!isConstrained[i] && (children[i].flex ?? 0) > 0) {
|
|
71
|
+
const flexGrow = children[i].flex;
|
|
72
|
+
const share = (flexGrow / activeFlex) * remaining;
|
|
73
|
+
const whole = Math.floor(share);
|
|
74
|
+
sizes[i] += whole;
|
|
75
|
+
assigned += whole;
|
|
76
|
+
fractionalShares.push({ index: i, remainder: share - whole });
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
let leftover = remaining - assigned;
|
|
80
|
+
fractionalShares.sort((a, b) => b.remainder - a.remainder || a.index - b.index);
|
|
81
|
+
for (let i = 0; i < fractionalShares.length && leftover > 0; i++, leftover--) {
|
|
82
|
+
sizes[fractionalShares[i].index] += 1;
|
|
83
|
+
}
|
|
84
|
+
remaining = 0; // All done
|
|
85
|
+
}
|
|
86
|
+
}
|
|
87
|
+
// Third pass: position calculation
|
|
88
|
+
const childNodes = [];
|
|
89
|
+
let offset = 0;
|
|
90
|
+
for (let i = 0; i < children.length; i++) {
|
|
91
|
+
const child = children[i];
|
|
92
|
+
const size = sizes[i];
|
|
93
|
+
const childRect = isRow
|
|
94
|
+
? {
|
|
95
|
+
x: bounds.x + offset,
|
|
96
|
+
y: bounds.y,
|
|
97
|
+
width: size,
|
|
98
|
+
height: crossAxisTotal
|
|
99
|
+
}
|
|
100
|
+
: {
|
|
101
|
+
x: bounds.x,
|
|
102
|
+
y: bounds.y + offset,
|
|
103
|
+
width: crossAxisTotal,
|
|
104
|
+
height: size
|
|
105
|
+
};
|
|
106
|
+
childNodes.push({
|
|
107
|
+
id: child.id,
|
|
108
|
+
rect: childRect,
|
|
109
|
+
children: []
|
|
110
|
+
});
|
|
111
|
+
offset += size + gap;
|
|
112
|
+
}
|
|
113
|
+
return {
|
|
114
|
+
rect: bounds,
|
|
115
|
+
children: childNodes
|
|
116
|
+
};
|
|
117
|
+
}
|
|
118
|
+
function clamp(val, min, max) {
|
|
119
|
+
let res = val;
|
|
120
|
+
if (min !== undefined)
|
|
121
|
+
res = Math.max(res, min);
|
|
122
|
+
if (max !== undefined)
|
|
123
|
+
res = Math.min(res, max);
|
|
124
|
+
return Math.max(0, res);
|
|
125
|
+
}
|
|
126
|
+
//# sourceMappingURL=flex.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"flex.js","sourceRoot":"","sources":["../../../src/core/layout/flex.ts"],"names":[],"mappings":"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"}
|