@terreno/ui 57.2.0 → 57.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/.ai/guidelines/core.md +1 -1
- package/README.md +17 -8
- package/dist/ActionSheet.d.ts +3 -3
- package/dist/ActionSheet.js +2 -2
- package/dist/ActionSheet.js.map +1 -1
- package/dist/Box.d.ts +1 -1
- package/dist/Box.js +219 -177
- package/dist/Box.js.map +1 -1
- package/dist/Button.js +101 -34
- package/dist/Button.js.map +1 -1
- package/dist/Common.d.ts +119 -9
- package/dist/Common.js.map +1 -1
- package/dist/ConsentFormScreen.js +46 -12
- package/dist/ConsentFormScreen.js.map +1 -1
- package/dist/ConsentNavigator.d.ts +5 -1
- package/dist/ConsentNavigator.js.map +1 -1
- package/dist/DataTable.d.ts +2 -2
- package/dist/DataTable.js +203 -44
- package/dist/DataTable.js.map +1 -1
- package/dist/DataTableHeaderInfoMarkdown.d.ts +6 -0
- package/dist/DataTableHeaderInfoMarkdown.js +7 -0
- package/dist/DataTableHeaderInfoMarkdown.js.map +1 -0
- package/dist/EmojiSelector.d.ts +2 -46
- package/dist/EmojiSelector.js +46 -56
- package/dist/EmojiSelector.js.map +1 -1
- package/dist/GPTChat.js +1 -1
- package/dist/GPTChat.js.map +1 -1
- package/dist/Heading.d.ts +5 -2
- package/dist/Heading.js +6 -8
- package/dist/Heading.js.map +1 -1
- package/dist/Hyperlink.js.map +1 -1
- package/dist/Icon.d.ts +1 -2
- package/dist/Icon.js +4 -1
- package/dist/Icon.js.map +1 -1
- package/dist/MarkdownView.d.ts +6 -3
- package/dist/MarkdownView.js +45 -43
- package/dist/MarkdownView.js.map +1 -1
- package/dist/MediaQuery.d.ts +5 -3
- package/dist/MediaQuery.js +9 -40
- package/dist/MediaQuery.js.map +1 -1
- package/dist/OpenAPIContext.js +7 -6
- package/dist/OpenAPIContext.js.map +1 -1
- package/dist/Page.js +7 -1
- package/dist/Page.js.map +1 -1
- package/dist/PickerSelect.js +8 -1
- package/dist/PickerSelect.js.map +1 -1
- package/dist/Popover.d.ts +12 -0
- package/dist/Popover.js +37 -0
- package/dist/Popover.js.map +1 -0
- package/dist/PortalHost.js +10 -1
- package/dist/PortalHost.js.map +1 -1
- package/dist/ResponsiveBreakpoint.d.ts +65 -0
- package/dist/ResponsiveBreakpoint.js +111 -0
- package/dist/ResponsiveBreakpoint.js.map +1 -0
- package/dist/SplitPage.d.ts +2 -2
- package/dist/SplitPage.js +7 -12
- package/dist/SplitPage.js.map +1 -1
- package/dist/SplitPage.native.d.ts +2 -2
- package/dist/SplitPage.native.js +1 -6
- package/dist/SplitPage.native.js.map +1 -1
- package/dist/TapToEdit.js +12 -10
- package/dist/TapToEdit.js.map +1 -1
- package/dist/TerrenoFontProvider.d.ts +7 -0
- package/dist/TerrenoFontProvider.js +27 -0
- package/dist/TerrenoFontProvider.js.map +1 -0
- package/dist/TerrenoProvider.js +4 -2
- package/dist/TerrenoProvider.js.map +1 -1
- package/dist/Text.d.ts +5 -2
- package/dist/Text.js +6 -11
- package/dist/Text.js.map +1 -1
- package/dist/TextFieldNumberActionSheet.js +9 -2
- package/dist/TextFieldNumberActionSheet.js.map +1 -1
- package/dist/Theme.js +10 -8
- package/dist/Theme.js.map +1 -1
- package/dist/ToastNotifications.d.ts +4 -2
- package/dist/ToastNotifications.js.map +1 -1
- package/dist/Tooltip.d.ts +4 -3
- package/dist/Tooltip.js +14 -3
- package/dist/Tooltip.js.map +1 -1
- package/dist/Unifier.d.ts +26 -1
- package/dist/Unifier.js.map +1 -1
- package/dist/WebAddressAutocomplete.js +6 -1
- package/dist/WebAddressAutocomplete.js.map +1 -1
- package/dist/emojiCategories.d.ts +46 -0
- package/dist/emojiCategories.js +47 -0
- package/dist/emojiCategories.js.map +1 -0
- package/dist/index.d.ts +13 -13
- package/dist/index.js +2 -13
- package/dist/index.js.map +1 -1
- package/dist/lazyBoundaries/createLazyComponentExport.d.ts +6 -0
- package/dist/lazyBoundaries/createLazyComponentExport.js +35 -0
- package/dist/lazyBoundaries/createLazyComponentExport.js.map +1 -0
- package/dist/lazyBoundaries/heavyOptionalExports.d.ts +41 -0
- package/dist/lazyBoundaries/heavyOptionalExports.js +43 -0
- package/dist/lazyBoundaries/heavyOptionalExports.js.map +1 -0
- package/dist/login/LoginScreen.d.ts +1 -0
- package/dist/login/LoginScreen.js +4 -2
- package/dist/login/LoginScreen.js.map +1 -1
- package/dist/login/loginTypes.d.ts +2 -0
- package/package.json +40 -1
- package/src/AIRequestExplorer.test.tsx +141 -0
- package/src/ActionSheet.tsx +9 -7
- package/src/AttachmentPreview.test.tsx +80 -0
- package/src/Box.test.tsx +97 -10
- package/src/Box.tsx +263 -200
- package/src/Button.test.tsx +207 -0
- package/src/Button.tsx +146 -48
- package/src/Common.ts +124 -25
- package/src/ConsentFormScreen.markdownGate.test.tsx +129 -0
- package/src/ConsentFormScreen.test.tsx +145 -8
- package/src/ConsentFormScreen.tsx +74 -25
- package/src/ConsentNavigator.tsx +13 -5
- package/src/DataTable.tsx +418 -147
- package/src/DataTableHeaderInfoMarkdown.test.tsx +21 -0
- package/src/DataTableHeaderInfoMarkdown.tsx +17 -0
- package/src/DataTableVirtualizationRegression.test.tsx +266 -0
- package/src/DateTimeField.test.tsx +54 -0
- package/src/EmojiSelector.test.tsx +33 -42
- package/src/EmojiSelector.tsx +60 -57
- package/src/FilePickerButton.test.tsx +167 -0
- package/src/FilterAccordion.test.tsx +37 -0
- package/src/FilterBoolean.test.tsx +96 -0
- package/src/FilterSelectMenu.test.tsx +23 -0
- package/src/GPTChat.test.tsx +696 -0
- package/src/GPTChat.tsx +2 -2
- package/src/GPTMemoryModal.test.tsx +67 -0
- package/src/Heading.tsx +8 -14
- package/src/HeightActionSheet.test.tsx +6 -9
- package/src/Hyperlink.tsx +5 -18
- package/src/Icon.tsx +6 -2
- package/src/MarkdownEditor.test.tsx +134 -0
- package/src/MarkdownEditorField.test.tsx +124 -0
- package/src/MarkdownView.test.tsx +55 -11
- package/src/MarkdownView.tsx +149 -150
- package/src/MediaQuery.ts +30 -34
- package/src/OpenAPIContext.tsx +36 -29
- package/src/OpenAPIRenderRegression.test.tsx +200 -0
- package/src/P0RenderRegression.test.tsx +214 -0
- package/src/P1RenderRegression.test.tsx +141 -0
- package/src/P2ButtonRenderRegression.test.tsx +158 -0
- package/src/Page.test.tsx +13 -0
- package/src/Page.tsx +25 -5
- package/src/PickerSelect.test.tsx +38 -0
- package/src/PickerSelect.tsx +7 -0
- package/src/Popover.test.tsx +151 -0
- package/src/Popover.tsx +211 -0
- package/src/PortalHost.tsx +12 -6
- package/src/ResponsiveBreakpoint.test.tsx +184 -0
- package/src/ResponsiveBreakpoint.tsx +195 -0
- package/src/RootImportRegression.test.tsx +62 -0
- package/src/SplitPage.native.tsx +5 -9
- package/src/SplitPage.tsx +16 -19
- package/src/TapToEdit.test.tsx +45 -0
- package/src/TapToEdit.tsx +23 -18
- package/src/TerrenoFontProvider.test.tsx +38 -0
- package/src/TerrenoFontProvider.tsx +50 -0
- package/src/TerrenoProvider.tsx +6 -1
- package/src/Text.tsx +8 -21
- package/src/TextFieldNumberActionSheet.test.tsx +100 -0
- package/src/TextFieldNumberActionSheet.tsx +11 -2
- package/src/Theme.test.tsx +27 -0
- package/src/Theme.tsx +15 -10
- package/src/Toast.tsx +1 -1
- package/src/ToastNotifications.tsx +4 -4
- package/src/Tooltip.test.tsx +64 -0
- package/src/Tooltip.tsx +18 -4
- package/src/Unifier.ts +26 -3
- package/src/WebAddressAutocomplete.tsx +6 -2
- package/src/__snapshots__/ActionSheet.test.tsx.snap +0 -36
- package/src/__snapshots__/AddressField.test.tsx.snap +1 -0
- package/src/__snapshots__/AttachmentPreview.test.tsx.snap +225 -0
- package/src/__snapshots__/CustomSelectField.test.tsx.snap +7 -0
- package/src/__snapshots__/DataTable.test.tsx.snap +793 -250
- package/src/__snapshots__/DecimalRangeActionSheet.test.tsx.snap +0 -8
- package/src/__snapshots__/EmojiSelector.test.tsx.snap +35555 -30
- package/src/__snapshots__/Field.test.tsx.snap +7 -0
- package/src/__snapshots__/FilterSelectMenu.test.tsx.snap +1 -0
- package/src/__snapshots__/HeightActionSheet.test.tsx.snap +0 -8
- package/src/__snapshots__/HeightField.test.tsx.snap +0 -20
- package/src/__snapshots__/NumberPickerActionSheet.test.tsx.snap +0 -8
- package/src/__snapshots__/Page.test.tsx.snap +13 -1
- package/src/__snapshots__/PickerSelect.test.tsx.snap +7 -0
- package/src/__snapshots__/SelectField.test.tsx.snap +6 -0
- package/src/__snapshots__/TimezonePicker.test.tsx.snap +6 -0
- package/src/benchmarks/importGraph.test.ts +71 -0
- package/src/benchmarks/importGraph.ts +136 -0
- package/src/benchmarks/importTiming.test.ts +42 -0
- package/src/benchmarks/importTiming.ts +86 -0
- package/src/bunSetup.ts +174 -32
- package/src/emojiCategories.test.ts +23 -0
- package/src/emojiCategories.ts +46 -0
- package/src/index.tsx +27 -13
- package/src/lazyBoundaries/createLazyComponentExport.test.tsx +104 -0
- package/src/lazyBoundaries/createLazyComponentExport.tsx +63 -0
- package/src/lazyBoundaries/heavyOptionalExports.test.tsx +33 -0
- package/src/lazyBoundaries/heavyOptionalExports.tsx +106 -0
- package/src/login/LoginScreen.test.tsx +9 -2
- package/src/login/LoginScreen.tsx +6 -2
- package/src/login/loginTypes.ts +2 -0
- package/src/table/TableDate.test.tsx +35 -1
- package/src/table/__snapshots__/TableBadge.test.tsx.snap +1 -0
package/src/DataTable.tsx
CHANGED
|
@@ -1,15 +1,14 @@
|
|
|
1
1
|
import {FontAwesome6} from "@expo/vector-icons";
|
|
2
2
|
import type React from "react";
|
|
3
|
-
import {type FC, useCallback, useMemo, useRef, useState} from "react";
|
|
3
|
+
import {type FC, memo, useCallback, useLayoutEffect, useMemo, useRef, useState} from "react";
|
|
4
4
|
import {
|
|
5
5
|
type NativeScrollEvent,
|
|
6
6
|
type NativeSyntheticEvent,
|
|
7
7
|
Pressable,
|
|
8
|
+
type FlatList as RNFlatList,
|
|
8
9
|
ScrollView,
|
|
9
10
|
View,
|
|
10
11
|
} from "react-native";
|
|
11
|
-
import Markdown from "react-native-markdown-display";
|
|
12
|
-
|
|
13
12
|
import {Box} from "./Box";
|
|
14
13
|
import type {
|
|
15
14
|
ColumnSortInterface,
|
|
@@ -20,6 +19,8 @@ import type {
|
|
|
20
19
|
DataTableProps,
|
|
21
20
|
SurfaceColor,
|
|
22
21
|
} from "./Common";
|
|
22
|
+
import {DataTableHeaderInfoMarkdown} from "./DataTableHeaderInfoMarkdown";
|
|
23
|
+
import {FlatList} from "./FlatList";
|
|
23
24
|
import {Icon} from "./Icon";
|
|
24
25
|
import {InfoModalIcon} from "./InfoModalIcon";
|
|
25
26
|
import {Modal} from "./Modal";
|
|
@@ -36,6 +37,11 @@ import {
|
|
|
36
37
|
// TODO: Add permanent horizontal scroll bar so users with only a mouse can scroll left/right
|
|
37
38
|
// easily.
|
|
38
39
|
|
|
40
|
+
const DATA_TABLE_INITIAL_NUM_TO_RENDER = 15;
|
|
41
|
+
const DATA_TABLE_MAX_TO_RENDER_PER_BATCH = 10;
|
|
42
|
+
const DATA_TABLE_WINDOW_SIZE = 5;
|
|
43
|
+
const DATA_TABLE_VERTICAL_SCROLL_SYNC_RELEASE_MS = 50;
|
|
44
|
+
|
|
39
45
|
const TextCell: FC<{
|
|
40
46
|
cellData: DataTableCellData;
|
|
41
47
|
column: DataTableColumn;
|
|
@@ -47,7 +53,10 @@ const TextCell: FC<{
|
|
|
47
53
|
);
|
|
48
54
|
};
|
|
49
55
|
|
|
50
|
-
const CheckedCell: FC<{
|
|
56
|
+
const CheckedCell: FC<{
|
|
57
|
+
cellData: DataTableCellData;
|
|
58
|
+
column: DataTableColumn;
|
|
59
|
+
}> = ({cellData}) => {
|
|
51
60
|
const isChecked = Boolean(cellData.value);
|
|
52
61
|
return (
|
|
53
62
|
<Box flex="grow" justifyContent="center" width="100%">
|
|
@@ -56,13 +65,17 @@ const CheckedCell: FC<{cellData: DataTableCellData; column: DataTableColumn}> =
|
|
|
56
65
|
);
|
|
57
66
|
};
|
|
58
67
|
|
|
59
|
-
|
|
68
|
+
interface InternalDataTableCellProps extends Omit<DataTableCellProps, "columnWidths"> {
|
|
69
|
+
pinnedLeft: number;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
const DataTableCellComponent: FC<InternalDataTableCellProps> = ({
|
|
60
73
|
value,
|
|
61
74
|
columnDef,
|
|
62
75
|
colIndex,
|
|
63
76
|
isPinnedHorizontal,
|
|
64
77
|
pinnedColumns,
|
|
65
|
-
|
|
78
|
+
pinnedLeft,
|
|
66
79
|
customColumnComponentMap,
|
|
67
80
|
backgroundColor,
|
|
68
81
|
height,
|
|
@@ -81,6 +94,7 @@ const DataTableCell: FC<DataTableCellProps> = ({
|
|
|
81
94
|
} else if (columnDef.columnType === "boolean") {
|
|
82
95
|
Component = CheckedCell;
|
|
83
96
|
}
|
|
97
|
+
const cellData = value.textSize === textSize ? value : {...value, textSize};
|
|
84
98
|
|
|
85
99
|
return (
|
|
86
100
|
<View
|
|
@@ -97,8 +111,7 @@ const DataTableCell: FC<DataTableCellProps> = ({
|
|
|
97
111
|
zIndex: 1,
|
|
98
112
|
// For pinned columns: use absolute positioning to stay fixed while scrolling horizontally
|
|
99
113
|
...(isPinnedHorizontal && {
|
|
100
|
-
|
|
101
|
-
left: columnWidths.slice(0, colIndex).reduce((sum, width) => sum + width, 0),
|
|
114
|
+
left: pinnedLeft,
|
|
102
115
|
position: "absolute",
|
|
103
116
|
// Higher z-index keeps pinned columns above scrollable ones, decreasing by column index
|
|
104
117
|
zIndex: 10 - colIndex,
|
|
@@ -110,31 +123,39 @@ const DataTableCell: FC<DataTableCellProps> = ({
|
|
|
110
123
|
}),
|
|
111
124
|
}}
|
|
112
125
|
>
|
|
113
|
-
<Component cellData={
|
|
126
|
+
<Component cellData={cellData} column={columnDef} />
|
|
114
127
|
</View>
|
|
115
128
|
);
|
|
116
129
|
};
|
|
117
130
|
|
|
131
|
+
const DataTableCell = memo(DataTableCellComponent);
|
|
132
|
+
|
|
118
133
|
interface DataTableRowProps {
|
|
119
134
|
rowData: DataTableCellData[];
|
|
120
135
|
rowIndex: number;
|
|
121
136
|
columns: DataTableColumn[];
|
|
137
|
+
columnEnd: number;
|
|
138
|
+
columnStart: number;
|
|
122
139
|
pinnedColumns: number;
|
|
123
|
-
|
|
140
|
+
pinnedLeftOffsets: number[];
|
|
124
141
|
alternateRowBackground: boolean;
|
|
125
142
|
customColumnComponentMap?: DataTableCustomComponentMap;
|
|
143
|
+
defaultTextSize: "sm" | "md" | "lg";
|
|
126
144
|
rowHeight: number;
|
|
127
145
|
testID?: string;
|
|
128
146
|
}
|
|
129
147
|
|
|
130
|
-
const
|
|
148
|
+
const DataTableRowComponent: FC<DataTableRowProps> = ({
|
|
131
149
|
rowData,
|
|
132
150
|
rowIndex,
|
|
133
151
|
columns,
|
|
152
|
+
columnEnd,
|
|
153
|
+
columnStart,
|
|
134
154
|
pinnedColumns,
|
|
135
|
-
|
|
155
|
+
pinnedLeftOffsets,
|
|
136
156
|
alternateRowBackground,
|
|
137
157
|
customColumnComponentMap,
|
|
158
|
+
defaultTextSize,
|
|
138
159
|
rowHeight,
|
|
139
160
|
testID,
|
|
140
161
|
}) => {
|
|
@@ -152,27 +173,34 @@ const DataTableRow: FC<DataTableRowProps> = ({
|
|
|
152
173
|
}}
|
|
153
174
|
{...toTestProps(testID)}
|
|
154
175
|
>
|
|
155
|
-
{rowData.map((cell,
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
176
|
+
{rowData.slice(columnStart, columnEnd).map((cell, relativeColumnIndex) => {
|
|
177
|
+
const columnIndex = columnStart + relativeColumnIndex;
|
|
178
|
+
return (
|
|
179
|
+
<DataTableCell
|
|
180
|
+
backgroundColor={
|
|
181
|
+
cell.highlight ? theme.surface[cell.highlight as SurfaceColor] : backgroundColor
|
|
182
|
+
}
|
|
183
|
+
colIndex={columnIndex}
|
|
184
|
+
columnDef={columns[columnIndex]}
|
|
185
|
+
customColumnComponentMap={customColumnComponentMap}
|
|
186
|
+
height={rowHeight}
|
|
187
|
+
isPinnedHorizontal={columnIndex < pinnedColumns}
|
|
188
|
+
key={columnIndex}
|
|
189
|
+
pinnedColumns={pinnedColumns}
|
|
190
|
+
pinnedLeft={pinnedLeftOffsets[columnIndex] ?? 0}
|
|
191
|
+
textSize={cell.textSize ?? defaultTextSize}
|
|
192
|
+
value={cell}
|
|
193
|
+
/>
|
|
194
|
+
);
|
|
195
|
+
})}
|
|
172
196
|
</View>
|
|
173
197
|
);
|
|
174
198
|
};
|
|
175
199
|
|
|
200
|
+
DataTableRowComponent.displayName = "DataTableRow";
|
|
201
|
+
|
|
202
|
+
const DataTableRow = memo(DataTableRowComponent);
|
|
203
|
+
|
|
176
204
|
interface MoreButtonCellProps {
|
|
177
205
|
rowIndex: number;
|
|
178
206
|
alternateRowBackground: boolean;
|
|
@@ -181,7 +209,7 @@ interface MoreButtonCellProps {
|
|
|
181
209
|
rowHeight: number;
|
|
182
210
|
}
|
|
183
211
|
|
|
184
|
-
const
|
|
212
|
+
const MoreButtonCellComponent: FC<MoreButtonCellProps> = ({
|
|
185
213
|
rowIndex,
|
|
186
214
|
alternateRowBackground,
|
|
187
215
|
onClick,
|
|
@@ -227,12 +255,14 @@ const MoreButtonCell: FC<MoreButtonCellProps> = ({
|
|
|
227
255
|
);
|
|
228
256
|
};
|
|
229
257
|
|
|
258
|
+
const MoreButtonCell = memo(MoreButtonCellComponent);
|
|
259
|
+
|
|
230
260
|
interface DataTableHeaderCellProps {
|
|
231
261
|
column: DataTableColumn;
|
|
232
262
|
index: number;
|
|
233
263
|
isPinnedHorizontal: boolean;
|
|
234
264
|
isPinnedRow?: boolean;
|
|
235
|
-
|
|
265
|
+
pinnedLeft: number;
|
|
236
266
|
sortColumn?: ColumnSortInterface;
|
|
237
267
|
onSort: (index: number) => void;
|
|
238
268
|
rowHeight: number;
|
|
@@ -243,7 +273,7 @@ const DataTableHeaderCell: FC<DataTableHeaderCellProps> = ({
|
|
|
243
273
|
column,
|
|
244
274
|
index,
|
|
245
275
|
isPinnedHorizontal,
|
|
246
|
-
|
|
276
|
+
pinnedLeft,
|
|
247
277
|
sortColumn,
|
|
248
278
|
onSort,
|
|
249
279
|
rowHeight,
|
|
@@ -265,7 +295,7 @@ const DataTableHeaderCell: FC<DataTableHeaderCellProps> = ({
|
|
|
265
295
|
padding: 16,
|
|
266
296
|
width: column.width,
|
|
267
297
|
...(isPinnedHorizontal && {
|
|
268
|
-
left:
|
|
298
|
+
left: pinnedLeft,
|
|
269
299
|
position: "absolute",
|
|
270
300
|
zIndex: 10 - index,
|
|
271
301
|
}),
|
|
@@ -277,7 +307,11 @@ const DataTableHeaderCell: FC<DataTableHeaderCellProps> = ({
|
|
|
277
307
|
) : null,
|
|
278
308
|
<View key="data-table-header-tools" style={{alignItems: "center", flexDirection: "row"}}>
|
|
279
309
|
{column.infoModalText && (
|
|
280
|
-
<InfoModalIcon
|
|
310
|
+
<InfoModalIcon
|
|
311
|
+
infoModalChildren={
|
|
312
|
+
<DataTableHeaderInfoMarkdown>{column.infoModalText}</DataTableHeaderInfoMarkdown>
|
|
313
|
+
}
|
|
314
|
+
/>
|
|
281
315
|
)}
|
|
282
316
|
{column.sortable && (
|
|
283
317
|
<Pressable hitSlop={16} onPress={() => onSort(index)}>
|
|
@@ -314,7 +348,8 @@ interface DataTableHeaderProps {
|
|
|
314
348
|
columns: DataTableColumn[];
|
|
315
349
|
hasMoreContent: boolean;
|
|
316
350
|
pinnedColumns: number;
|
|
317
|
-
|
|
351
|
+
pinnedLeftOffsets: number[];
|
|
352
|
+
pinnedWidth: number;
|
|
318
353
|
headerScrollRef: React.RefObject<ScrollView | null>;
|
|
319
354
|
sortColumn?: ColumnSortInterface;
|
|
320
355
|
onSort: (index: number) => void;
|
|
@@ -328,7 +363,8 @@ const DataTableHeader: FC<DataTableHeaderProps> = ({
|
|
|
328
363
|
columns,
|
|
329
364
|
hasMoreContent,
|
|
330
365
|
pinnedColumns,
|
|
331
|
-
|
|
366
|
+
pinnedLeftOffsets,
|
|
367
|
+
pinnedWidth,
|
|
332
368
|
headerScrollRef,
|
|
333
369
|
sortColumn,
|
|
334
370
|
onSort,
|
|
@@ -369,12 +405,12 @@ const DataTableHeader: FC<DataTableHeaderProps> = ({
|
|
|
369
405
|
{columns.slice(0, pinnedColumns).map((column, index) => (
|
|
370
406
|
<DataTableHeaderCell
|
|
371
407
|
column={column}
|
|
372
|
-
columnWidths={columnWidths}
|
|
373
408
|
headerHeight={headerHeight}
|
|
374
409
|
index={index}
|
|
375
410
|
isPinnedHorizontal
|
|
376
411
|
key={`pinned-header-${index}`}
|
|
377
412
|
onSort={onSort}
|
|
413
|
+
pinnedLeft={pinnedLeftOffsets[index] ?? 0}
|
|
378
414
|
rowHeight={rowHeight}
|
|
379
415
|
sortColumn={sortColumn}
|
|
380
416
|
/>
|
|
@@ -391,18 +427,18 @@ const DataTableHeader: FC<DataTableHeaderProps> = ({
|
|
|
391
427
|
showsHorizontalScrollIndicator={false}
|
|
392
428
|
style={{
|
|
393
429
|
// Offset scrollable area by total width of pinned columns
|
|
394
|
-
marginLeft:
|
|
430
|
+
marginLeft: pinnedWidth,
|
|
395
431
|
}}
|
|
396
432
|
>
|
|
397
433
|
{columns.slice(pinnedColumns).map((column, index) => (
|
|
398
434
|
<DataTableHeaderCell
|
|
399
435
|
column={column}
|
|
400
|
-
columnWidths={columnWidths}
|
|
401
436
|
headerHeight={headerHeight}
|
|
402
437
|
index={index + pinnedColumns}
|
|
403
438
|
isPinnedHorizontal={false}
|
|
404
439
|
key={`scrollable-header-${index + pinnedColumns}`}
|
|
405
440
|
onSort={onSort}
|
|
441
|
+
pinnedLeft={0}
|
|
406
442
|
rowHeight={rowHeight}
|
|
407
443
|
sortColumn={sortColumn}
|
|
408
444
|
/>
|
|
@@ -417,7 +453,8 @@ interface DataTableContentProps {
|
|
|
417
453
|
columns: DataTableColumn[];
|
|
418
454
|
pinnedColumns: number;
|
|
419
455
|
alternateRowBackground: boolean;
|
|
420
|
-
|
|
456
|
+
pinnedLeftOffsets: number[];
|
|
457
|
+
pinnedWidth: number;
|
|
421
458
|
bodyScrollRef: React.RefObject<ScrollView | null>;
|
|
422
459
|
onScroll: (event: NativeSyntheticEvent<NativeScrollEvent>, isHeader: boolean) => void;
|
|
423
460
|
moreContentComponent?: React.ComponentType<
|
|
@@ -431,129 +468,351 @@ interface DataTableContentProps {
|
|
|
431
468
|
moreContentExtraData?: Record<string, unknown>[];
|
|
432
469
|
moreContentSize?: "sm" | "md" | "lg";
|
|
433
470
|
customColumnComponentMap?: DataTableCustomComponentMap;
|
|
471
|
+
defaultTextSize: "sm" | "md" | "lg";
|
|
434
472
|
rowHeight: number;
|
|
435
473
|
rowTestIdBase?: string;
|
|
436
474
|
getRowTestID?: (row: DataTableCellData[], rowIndex: number) => string | number;
|
|
437
475
|
}
|
|
438
476
|
|
|
439
|
-
const
|
|
477
|
+
const DataTableContentComponent: FC<DataTableContentProps> = ({
|
|
440
478
|
data,
|
|
441
479
|
columns,
|
|
442
480
|
pinnedColumns,
|
|
443
481
|
alternateRowBackground,
|
|
444
|
-
|
|
482
|
+
pinnedLeftOffsets,
|
|
483
|
+
pinnedWidth,
|
|
445
484
|
bodyScrollRef,
|
|
446
485
|
onScroll,
|
|
447
486
|
customColumnComponentMap,
|
|
448
487
|
moreContentComponent: MoreContentContent,
|
|
449
488
|
moreContentExtraData,
|
|
450
489
|
moreContentSize = "md",
|
|
490
|
+
defaultTextSize,
|
|
451
491
|
rowHeight,
|
|
452
492
|
rowTestIdBase,
|
|
453
493
|
getRowTestID,
|
|
454
494
|
}) => {
|
|
455
495
|
const [modalRow, setModalRow] = useState<number | null>(null);
|
|
456
496
|
const {theme} = useTheme();
|
|
497
|
+
const bodyListRef = useRef<RNFlatList<DataTableCellData[]>>(null);
|
|
498
|
+
const pinnedListRef = useRef<RNFlatList<DataTableCellData[]>>(null);
|
|
499
|
+
const moreListRef = useRef<RNFlatList<DataTableCellData[]>>(null);
|
|
500
|
+
const bodyScrollYRef = useRef(0);
|
|
501
|
+
const isVerticalScrollSyncingRef = useRef(false);
|
|
502
|
+
const verticalScrollLeaderRef = useRef<"body" | "pinned" | "more" | null>(null);
|
|
503
|
+
const verticalScrollSyncReleaseTimeoutRef = useRef<ReturnType<typeof setTimeout> | null>(null);
|
|
504
|
+
|
|
505
|
+
const moreColumnOffset = MoreContentContent ? 48 : 0;
|
|
506
|
+
const scrollableWidth = useMemo(
|
|
507
|
+
() => columns.slice(pinnedColumns).reduce((sum, column) => sum + column.width, 0),
|
|
508
|
+
[columns, pinnedColumns]
|
|
509
|
+
);
|
|
510
|
+
|
|
511
|
+
const resolveRowTestId = useCallback(
|
|
512
|
+
(row: DataTableCellData[], rowIndex: number): string | undefined => {
|
|
513
|
+
const rowKey = getRowTestID ? getRowTestID(row, rowIndex) : rowIndex;
|
|
514
|
+
return resolveDataTableRowTestID(rowTestIdBase, rowKey);
|
|
515
|
+
},
|
|
516
|
+
[getRowTestID, rowTestIdBase]
|
|
517
|
+
);
|
|
518
|
+
|
|
519
|
+
const getRowItemLayout = useCallback(
|
|
520
|
+
(_: ArrayLike<DataTableCellData[]> | null | undefined, index: number) => ({
|
|
521
|
+
index,
|
|
522
|
+
length: rowHeight,
|
|
523
|
+
offset: rowHeight * index,
|
|
524
|
+
}),
|
|
525
|
+
[rowHeight]
|
|
526
|
+
);
|
|
527
|
+
|
|
528
|
+
const keyExtractor = useCallback((_: DataTableCellData[], index: number) => String(index), []);
|
|
529
|
+
|
|
530
|
+
const listExtraData = useMemo(
|
|
531
|
+
() => ({
|
|
532
|
+
alternateRowBackground,
|
|
533
|
+
columns,
|
|
534
|
+
customColumnComponentMap,
|
|
535
|
+
defaultTextSize,
|
|
536
|
+
pinnedColumns,
|
|
537
|
+
pinnedLeftOffsets,
|
|
538
|
+
rowHeight,
|
|
539
|
+
}),
|
|
540
|
+
[
|
|
541
|
+
alternateRowBackground,
|
|
542
|
+
columns,
|
|
543
|
+
customColumnComponentMap,
|
|
544
|
+
defaultTextSize,
|
|
545
|
+
pinnedColumns,
|
|
546
|
+
pinnedLeftOffsets,
|
|
547
|
+
rowHeight,
|
|
548
|
+
]
|
|
549
|
+
);
|
|
550
|
+
|
|
551
|
+
const applyVerticalScrollToFollowers = useCallback(
|
|
552
|
+
(scrollY: number, source: "body" | "pinned" | "more"): void => {
|
|
553
|
+
if (source !== "body") {
|
|
554
|
+
bodyListRef.current?.scrollToOffset({animated: false, offset: scrollY});
|
|
555
|
+
}
|
|
556
|
+
if (source !== "pinned") {
|
|
557
|
+
pinnedListRef.current?.scrollToOffset({animated: false, offset: scrollY});
|
|
558
|
+
}
|
|
559
|
+
if (source !== "more") {
|
|
560
|
+
moreListRef.current?.scrollToOffset({animated: false, offset: scrollY});
|
|
561
|
+
}
|
|
562
|
+
},
|
|
563
|
+
[]
|
|
564
|
+
);
|
|
565
|
+
|
|
566
|
+
const scheduleVerticalScrollSyncRelease = useCallback((): void => {
|
|
567
|
+
if (verticalScrollSyncReleaseTimeoutRef.current) {
|
|
568
|
+
clearTimeout(verticalScrollSyncReleaseTimeoutRef.current);
|
|
569
|
+
}
|
|
570
|
+
verticalScrollSyncReleaseTimeoutRef.current = setTimeout(() => {
|
|
571
|
+
isVerticalScrollSyncingRef.current = false;
|
|
572
|
+
verticalScrollLeaderRef.current = null;
|
|
573
|
+
verticalScrollSyncReleaseTimeoutRef.current = null;
|
|
574
|
+
}, DATA_TABLE_VERTICAL_SCROLL_SYNC_RELEASE_MS);
|
|
575
|
+
}, []);
|
|
576
|
+
|
|
577
|
+
const syncVerticalScroll = useCallback(
|
|
578
|
+
(scrollY: number, source: "body" | "pinned" | "more"): void => {
|
|
579
|
+
if (isVerticalScrollSyncingRef.current) {
|
|
580
|
+
if (source !== verticalScrollLeaderRef.current) {
|
|
581
|
+
return;
|
|
582
|
+
}
|
|
583
|
+
applyVerticalScrollToFollowers(scrollY, source);
|
|
584
|
+
scheduleVerticalScrollSyncRelease();
|
|
585
|
+
return;
|
|
586
|
+
}
|
|
587
|
+
isVerticalScrollSyncingRef.current = true;
|
|
588
|
+
verticalScrollLeaderRef.current = source;
|
|
589
|
+
applyVerticalScrollToFollowers(scrollY, source);
|
|
590
|
+
scheduleVerticalScrollSyncRelease();
|
|
591
|
+
},
|
|
592
|
+
[applyVerticalScrollToFollowers, scheduleVerticalScrollSyncRelease]
|
|
593
|
+
);
|
|
594
|
+
|
|
595
|
+
const syncSatelliteListsToBodyOffset = useCallback((): void => {
|
|
596
|
+
const scrollY = bodyScrollYRef.current;
|
|
597
|
+
if (scrollY <= 0) {
|
|
598
|
+
return;
|
|
599
|
+
}
|
|
600
|
+
if (pinnedColumns === 0 && !MoreContentContent) {
|
|
601
|
+
return;
|
|
602
|
+
}
|
|
603
|
+
isVerticalScrollSyncingRef.current = true;
|
|
604
|
+
verticalScrollLeaderRef.current = "body";
|
|
605
|
+
if (pinnedColumns > 0) {
|
|
606
|
+
pinnedListRef.current?.scrollToOffset({animated: false, offset: scrollY});
|
|
607
|
+
}
|
|
608
|
+
if (MoreContentContent) {
|
|
609
|
+
moreListRef.current?.scrollToOffset({animated: false, offset: scrollY});
|
|
610
|
+
}
|
|
611
|
+
scheduleVerticalScrollSyncRelease();
|
|
612
|
+
}, [MoreContentContent, pinnedColumns, scheduleVerticalScrollSyncRelease]);
|
|
613
|
+
|
|
614
|
+
// Pinned/more FlatLists mount at offset 0; align them with the body list's current scroll position.
|
|
615
|
+
useLayoutEffect(() => {
|
|
616
|
+
syncSatelliteListsToBodyOffset();
|
|
617
|
+
return () => {
|
|
618
|
+
if (verticalScrollSyncReleaseTimeoutRef.current) {
|
|
619
|
+
clearTimeout(verticalScrollSyncReleaseTimeoutRef.current);
|
|
620
|
+
verticalScrollSyncReleaseTimeoutRef.current = null;
|
|
621
|
+
}
|
|
622
|
+
isVerticalScrollSyncingRef.current = false;
|
|
623
|
+
verticalScrollLeaderRef.current = null;
|
|
624
|
+
};
|
|
625
|
+
}, [syncSatelliteListsToBodyOffset]);
|
|
626
|
+
|
|
627
|
+
const handleBodyVerticalScroll = useCallback(
|
|
628
|
+
(event: NativeSyntheticEvent<NativeScrollEvent>): void => {
|
|
629
|
+
const scrollY = event.nativeEvent.contentOffset.y;
|
|
630
|
+
bodyScrollYRef.current = scrollY;
|
|
631
|
+
syncVerticalScroll(scrollY, "body");
|
|
632
|
+
},
|
|
633
|
+
[syncVerticalScroll]
|
|
634
|
+
);
|
|
635
|
+
|
|
636
|
+
const handlePinnedVerticalScroll = useCallback(
|
|
637
|
+
(event: NativeSyntheticEvent<NativeScrollEvent>): void => {
|
|
638
|
+
const scrollY = event.nativeEvent.contentOffset.y;
|
|
639
|
+
bodyScrollYRef.current = scrollY;
|
|
640
|
+
syncVerticalScroll(scrollY, "pinned");
|
|
641
|
+
},
|
|
642
|
+
[syncVerticalScroll]
|
|
643
|
+
);
|
|
644
|
+
|
|
645
|
+
const handleMoreVerticalScroll = useCallback(
|
|
646
|
+
(event: NativeSyntheticEvent<NativeScrollEvent>): void => {
|
|
647
|
+
const scrollY = event.nativeEvent.contentOffset.y;
|
|
648
|
+
bodyScrollYRef.current = scrollY;
|
|
649
|
+
syncVerticalScroll(scrollY, "more");
|
|
650
|
+
},
|
|
651
|
+
[syncVerticalScroll]
|
|
652
|
+
);
|
|
653
|
+
|
|
654
|
+
const renderMoreRow = useCallback(
|
|
655
|
+
({index}: {index: number}) => (
|
|
656
|
+
<MoreButtonCell
|
|
657
|
+
alternateRowBackground={alternateRowBackground}
|
|
658
|
+
column={columns[0]}
|
|
659
|
+
onClick={setModalRow}
|
|
660
|
+
rowHeight={rowHeight}
|
|
661
|
+
rowIndex={index}
|
|
662
|
+
/>
|
|
663
|
+
),
|
|
664
|
+
[alternateRowBackground, columns, rowHeight]
|
|
665
|
+
);
|
|
457
666
|
|
|
458
|
-
const
|
|
459
|
-
|
|
460
|
-
|
|
461
|
-
|
|
667
|
+
const renderPinnedRow = useCallback(
|
|
668
|
+
({index, item}: {index: number; item: DataTableCellData[]}) => (
|
|
669
|
+
<DataTableRow
|
|
670
|
+
alternateRowBackground={alternateRowBackground}
|
|
671
|
+
columnEnd={pinnedColumns}
|
|
672
|
+
columnStart={0}
|
|
673
|
+
columns={columns}
|
|
674
|
+
customColumnComponentMap={customColumnComponentMap}
|
|
675
|
+
defaultTextSize={defaultTextSize}
|
|
676
|
+
pinnedColumns={pinnedColumns}
|
|
677
|
+
pinnedLeftOffsets={pinnedLeftOffsets}
|
|
678
|
+
rowData={item}
|
|
679
|
+
rowHeight={rowHeight}
|
|
680
|
+
rowIndex={index}
|
|
681
|
+
testID={pinnedColumns > 0 ? resolveRowTestId(item, index) : undefined}
|
|
682
|
+
/>
|
|
683
|
+
),
|
|
684
|
+
[
|
|
685
|
+
alternateRowBackground,
|
|
686
|
+
columns,
|
|
687
|
+
customColumnComponentMap,
|
|
688
|
+
defaultTextSize,
|
|
689
|
+
pinnedColumns,
|
|
690
|
+
pinnedLeftOffsets,
|
|
691
|
+
resolveRowTestId,
|
|
692
|
+
rowHeight,
|
|
693
|
+
]
|
|
694
|
+
);
|
|
695
|
+
|
|
696
|
+
const renderScrollableRow = useCallback(
|
|
697
|
+
({index, item}: {index: number; item: DataTableCellData[]}) => (
|
|
698
|
+
<DataTableRow
|
|
699
|
+
alternateRowBackground={alternateRowBackground}
|
|
700
|
+
columnEnd={columns.length}
|
|
701
|
+
columnStart={pinnedColumns}
|
|
702
|
+
columns={columns}
|
|
703
|
+
customColumnComponentMap={customColumnComponentMap}
|
|
704
|
+
defaultTextSize={defaultTextSize}
|
|
705
|
+
pinnedColumns={0}
|
|
706
|
+
pinnedLeftOffsets={pinnedLeftOffsets}
|
|
707
|
+
rowData={item}
|
|
708
|
+
rowHeight={rowHeight}
|
|
709
|
+
rowIndex={index}
|
|
710
|
+
testID={pinnedColumns === 0 ? resolveRowTestId(item, index) : undefined}
|
|
711
|
+
/>
|
|
712
|
+
),
|
|
713
|
+
[
|
|
714
|
+
alternateRowBackground,
|
|
715
|
+
columns,
|
|
716
|
+
customColumnComponentMap,
|
|
717
|
+
defaultTextSize,
|
|
718
|
+
pinnedColumns,
|
|
719
|
+
pinnedLeftOffsets,
|
|
720
|
+
resolveRowTestId,
|
|
721
|
+
rowHeight,
|
|
722
|
+
]
|
|
723
|
+
);
|
|
462
724
|
|
|
463
725
|
return (
|
|
464
726
|
<>
|
|
465
|
-
<
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
473
|
-
|
|
474
|
-
|
|
475
|
-
|
|
476
|
-
|
|
477
|
-
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
|
|
481
|
-
|
|
482
|
-
}
|
|
483
|
-
|
|
484
|
-
{
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
</View>
|
|
495
|
-
)}
|
|
496
|
-
|
|
497
|
-
{/* Container for pinned rows - stays fixed during horizontal scroll */}
|
|
498
|
-
{pinnedColumns > 0 && (
|
|
499
|
-
<View
|
|
500
|
-
style={{
|
|
501
|
-
left: MoreContentContent ? 48 : 0,
|
|
502
|
-
position: "absolute",
|
|
503
|
-
top: 0,
|
|
504
|
-
zIndex: 10,
|
|
505
|
-
}}
|
|
506
|
-
>
|
|
507
|
-
{data.map((row, rowIndex) => (
|
|
508
|
-
<DataTableRow
|
|
509
|
-
alternateRowBackground={alternateRowBackground}
|
|
510
|
-
columns={columns.slice(0, pinnedColumns)}
|
|
511
|
-
columnWidths={columnWidths}
|
|
512
|
-
customColumnComponentMap={customColumnComponentMap}
|
|
513
|
-
key={`pinned-${rowIndex}`}
|
|
514
|
-
pinnedColumns={pinnedColumns}
|
|
515
|
-
rowData={row.slice(0, pinnedColumns)}
|
|
516
|
-
rowHeight={rowHeight}
|
|
517
|
-
rowIndex={rowIndex}
|
|
518
|
-
testID={pinnedColumns > 0 ? resolveRowTestId(row, rowIndex) : undefined}
|
|
519
|
-
/>
|
|
520
|
-
))}
|
|
521
|
-
</View>
|
|
522
|
-
)}
|
|
727
|
+
<View style={{flex: 1, flexDirection: "row", position: "relative"}}>
|
|
728
|
+
{Boolean(MoreContentContent) && (
|
|
729
|
+
<View
|
|
730
|
+
style={{
|
|
731
|
+
backgroundColor: theme.surface.base,
|
|
732
|
+
bottom: 0,
|
|
733
|
+
left: 0,
|
|
734
|
+
position: "absolute",
|
|
735
|
+
top: 0,
|
|
736
|
+
width: 48,
|
|
737
|
+
zIndex: 1,
|
|
738
|
+
}}
|
|
739
|
+
>
|
|
740
|
+
<FlatList
|
|
741
|
+
data={data}
|
|
742
|
+
extraData={listExtraData}
|
|
743
|
+
getItemLayout={getRowItemLayout}
|
|
744
|
+
initialNumToRender={DATA_TABLE_INITIAL_NUM_TO_RENDER}
|
|
745
|
+
keyExtractor={keyExtractor}
|
|
746
|
+
maxToRenderPerBatch={DATA_TABLE_MAX_TO_RENDER_PER_BATCH}
|
|
747
|
+
onScroll={handleMoreVerticalScroll}
|
|
748
|
+
ref={moreListRef}
|
|
749
|
+
renderItem={renderMoreRow}
|
|
750
|
+
scrollEventThrottle={16}
|
|
751
|
+
showsVerticalScrollIndicator={false}
|
|
752
|
+
windowSize={DATA_TABLE_WINDOW_SIZE}
|
|
753
|
+
/>
|
|
754
|
+
</View>
|
|
755
|
+
)}
|
|
523
756
|
|
|
524
|
-
|
|
525
|
-
<
|
|
526
|
-
horizontal
|
|
527
|
-
onScroll={(e) => onScroll(e, false)}
|
|
528
|
-
ref={bodyScrollRef}
|
|
529
|
-
scrollEventThrottle={16}
|
|
530
|
-
showsHorizontalScrollIndicator
|
|
757
|
+
{pinnedColumns > 0 && (
|
|
758
|
+
<View
|
|
531
759
|
style={{
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
|
|
760
|
+
bottom: 0,
|
|
761
|
+
left: moreColumnOffset,
|
|
762
|
+
position: "absolute",
|
|
763
|
+
top: 0,
|
|
764
|
+
width: pinnedWidth,
|
|
765
|
+
zIndex: 10,
|
|
536
766
|
}}
|
|
537
767
|
>
|
|
538
|
-
<
|
|
539
|
-
{data
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
|
|
553
|
-
|
|
554
|
-
|
|
555
|
-
|
|
556
|
-
|
|
768
|
+
<FlatList
|
|
769
|
+
data={data}
|
|
770
|
+
extraData={listExtraData}
|
|
771
|
+
getItemLayout={getRowItemLayout}
|
|
772
|
+
initialNumToRender={DATA_TABLE_INITIAL_NUM_TO_RENDER}
|
|
773
|
+
keyExtractor={keyExtractor}
|
|
774
|
+
maxToRenderPerBatch={DATA_TABLE_MAX_TO_RENDER_PER_BATCH}
|
|
775
|
+
onScroll={handlePinnedVerticalScroll}
|
|
776
|
+
ref={pinnedListRef}
|
|
777
|
+
renderItem={renderPinnedRow}
|
|
778
|
+
scrollEventThrottle={16}
|
|
779
|
+
showsVerticalScrollIndicator={false}
|
|
780
|
+
windowSize={DATA_TABLE_WINDOW_SIZE}
|
|
781
|
+
/>
|
|
782
|
+
</View>
|
|
783
|
+
)}
|
|
784
|
+
|
|
785
|
+
<ScrollView
|
|
786
|
+
horizontal
|
|
787
|
+
nestedScrollEnabled
|
|
788
|
+
onScroll={(event) => onScroll(event, false)}
|
|
789
|
+
ref={bodyScrollRef}
|
|
790
|
+
scrollEventThrottle={16}
|
|
791
|
+
showsHorizontalScrollIndicator
|
|
792
|
+
style={{
|
|
793
|
+
flex: 1,
|
|
794
|
+
marginLeft: pinnedWidth + moreColumnOffset,
|
|
795
|
+
}}
|
|
796
|
+
>
|
|
797
|
+
<View style={{width: scrollableWidth}}>
|
|
798
|
+
<FlatList
|
|
799
|
+
data={data}
|
|
800
|
+
extraData={listExtraData}
|
|
801
|
+
getItemLayout={getRowItemLayout}
|
|
802
|
+
initialNumToRender={DATA_TABLE_INITIAL_NUM_TO_RENDER}
|
|
803
|
+
keyExtractor={keyExtractor}
|
|
804
|
+
maxToRenderPerBatch={DATA_TABLE_MAX_TO_RENDER_PER_BATCH}
|
|
805
|
+
nestedScrollEnabled
|
|
806
|
+
onScroll={handleBodyVerticalScroll}
|
|
807
|
+
ref={bodyListRef}
|
|
808
|
+
renderItem={renderScrollableRow}
|
|
809
|
+
scrollEventThrottle={16}
|
|
810
|
+
showsVerticalScrollIndicator
|
|
811
|
+
windowSize={DATA_TABLE_WINDOW_SIZE}
|
|
812
|
+
/>
|
|
813
|
+
</View>
|
|
814
|
+
</ScrollView>
|
|
815
|
+
</View>
|
|
557
816
|
|
|
558
817
|
{MoreContentContent && (
|
|
559
818
|
<Modal
|
|
@@ -573,7 +832,9 @@ const DataTableContent: FC<DataTableContentProps> = ({
|
|
|
573
832
|
);
|
|
574
833
|
};
|
|
575
834
|
|
|
576
|
-
|
|
835
|
+
const DataTableContent = memo(DataTableContentComponent);
|
|
836
|
+
|
|
837
|
+
const DataTableComponent: FC<DataTableProps> = ({
|
|
577
838
|
data,
|
|
578
839
|
columns,
|
|
579
840
|
alternateRowBackground = true,
|
|
@@ -599,6 +860,18 @@ export const DataTable: FC<DataTableProps> = ({
|
|
|
599
860
|
const bodyScrollRef = useRef<ScrollView>(null);
|
|
600
861
|
|
|
601
862
|
const columnWidths = useMemo(() => columns.map((col) => col.width), [columns]);
|
|
863
|
+
const pinnedLeftOffsets = useMemo(() => {
|
|
864
|
+
let currentOffset = 0;
|
|
865
|
+
return columnWidths.map((width) => {
|
|
866
|
+
const offset = currentOffset;
|
|
867
|
+
currentOffset += width;
|
|
868
|
+
return offset;
|
|
869
|
+
});
|
|
870
|
+
}, [columnWidths]);
|
|
871
|
+
const pinnedWidth = useMemo(
|
|
872
|
+
() => columnWidths.slice(0, pinnedColumns).reduce((sum, width) => sum + width, 0),
|
|
873
|
+
[columnWidths, pinnedColumns]
|
|
874
|
+
);
|
|
602
875
|
|
|
603
876
|
const handleScroll = useCallback(
|
|
604
877
|
(event: NativeSyntheticEvent<NativeScrollEvent>, isHeader: boolean) => {
|
|
@@ -637,15 +910,6 @@ export const DataTable: FC<DataTableProps> = ({
|
|
|
637
910
|
[sortColumn, setSortColumn, columns]
|
|
638
911
|
);
|
|
639
912
|
|
|
640
|
-
const processedData = useMemo(() => {
|
|
641
|
-
return data.map((row) =>
|
|
642
|
-
row.map((cell) => ({
|
|
643
|
-
...cell,
|
|
644
|
-
textSize: cell.textSize || defaultTextSize,
|
|
645
|
-
}))
|
|
646
|
-
);
|
|
647
|
-
}, [data, defaultTextSize]);
|
|
648
|
-
|
|
649
913
|
return (
|
|
650
914
|
<View
|
|
651
915
|
style={{display: "flex", flexDirection: "column", height: "100%"}}
|
|
@@ -663,13 +927,14 @@ export const DataTable: FC<DataTableProps> = ({
|
|
|
663
927
|
>
|
|
664
928
|
<DataTableHeader
|
|
665
929
|
columns={columns}
|
|
666
|
-
columnWidths={columnWidths}
|
|
667
930
|
hasMoreContent={Boolean(moreContentComponent)}
|
|
668
931
|
headerHeight={headerHeight}
|
|
669
932
|
headerScrollRef={headerScrollRef}
|
|
670
933
|
onScroll={handleScroll}
|
|
671
934
|
onSort={handleSort}
|
|
672
935
|
pinnedColumns={pinnedColumns}
|
|
936
|
+
pinnedLeftOffsets={pinnedLeftOffsets}
|
|
937
|
+
pinnedWidth={pinnedWidth}
|
|
673
938
|
rowHeight={rowHeight}
|
|
674
939
|
sortColumn={sortColumn}
|
|
675
940
|
testID={tableTestIDs.header}
|
|
@@ -680,14 +945,16 @@ export const DataTable: FC<DataTableProps> = ({
|
|
|
680
945
|
alternateRowBackground={alternateRowBackground}
|
|
681
946
|
bodyScrollRef={bodyScrollRef}
|
|
682
947
|
columns={columns}
|
|
683
|
-
columnWidths={columnWidths}
|
|
684
948
|
customColumnComponentMap={customColumnComponentMap}
|
|
685
|
-
data={
|
|
949
|
+
data={data}
|
|
950
|
+
defaultTextSize={defaultTextSize}
|
|
686
951
|
getRowTestID={getRowTestID}
|
|
687
952
|
moreContentComponent={moreContentComponent}
|
|
688
953
|
moreContentExtraData={moreContentExtraData}
|
|
689
954
|
onScroll={handleScroll}
|
|
690
955
|
pinnedColumns={pinnedColumns}
|
|
956
|
+
pinnedLeftOffsets={pinnedLeftOffsets}
|
|
957
|
+
pinnedWidth={pinnedWidth}
|
|
691
958
|
rowHeight={rowHeight}
|
|
692
959
|
rowTestIdBase={tableTestIDs.row}
|
|
693
960
|
/>
|
|
@@ -713,3 +980,7 @@ export const DataTable: FC<DataTableProps> = ({
|
|
|
713
980
|
</View>
|
|
714
981
|
);
|
|
715
982
|
};
|
|
983
|
+
|
|
984
|
+
DataTableComponent.displayName = "DataTable";
|
|
985
|
+
|
|
986
|
+
export const DataTable = memo(DataTableComponent);
|