@macrostrat/data-sheet 2.2.4 → 3.0.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.
Files changed (173) hide show
  1. package/CHANGELOG.md +8 -0
  2. package/dist/components/actions.cjs +14 -0
  3. package/dist/components/actions.cjs.map +1 -0
  4. package/dist/components/actions.d.ts +2 -0
  5. package/dist/components/actions.js +14 -0
  6. package/dist/components/actions.js.map +1 -0
  7. package/dist/components/actions.module.sass.cjs +8 -0
  8. package/dist/components/actions.module.sass.cjs.map +1 -0
  9. package/dist/components/actions.module.sass.js +8 -0
  10. package/dist/components/actions.module.sass.js.map +1 -0
  11. package/dist/components/colors.cjs +102 -0
  12. package/dist/components/colors.cjs.map +1 -0
  13. package/dist/components/colors.d.ts +27 -0
  14. package/dist/components/colors.js +102 -0
  15. package/dist/components/colors.js.map +1 -0
  16. package/dist/components/editor-popup.cjs +77 -0
  17. package/dist/components/editor-popup.cjs.map +1 -0
  18. package/dist/components/editor-popup.d.ts +1 -0
  19. package/dist/components/editor-popup.js +77 -0
  20. package/dist/components/editor-popup.js.map +1 -0
  21. package/dist/components/index.d.ts +4 -0
  22. package/dist/components/main.module.sass.cjs +18 -0
  23. package/dist/components/main.module.sass.cjs.map +1 -0
  24. package/dist/components/main.module.sass.js +18 -0
  25. package/dist/components/main.module.sass.js.map +1 -0
  26. package/dist/components/text-areas.cjs +41 -0
  27. package/dist/components/text-areas.cjs.map +1 -0
  28. package/dist/components/text-areas.d.ts +4 -0
  29. package/dist/components/text-areas.js +41 -0
  30. package/dist/components/text-areas.js.map +1 -0
  31. package/dist/core.cjs +477 -0
  32. package/dist/core.cjs.map +1 -0
  33. package/dist/core.d.ts +31 -0
  34. package/dist/core.js +475 -0
  35. package/dist/core.js.map +1 -0
  36. package/dist/data-sheet.css +1336 -0
  37. package/dist/index.cjs +51 -0
  38. package/dist/index.cjs.map +1 -0
  39. package/dist/index.d.ts +5 -0
  40. package/dist/index.js +48 -0
  41. package/dist/index.js.map +1 -0
  42. package/dist/main.module.sass.cjs +19 -0
  43. package/dist/main.module.sass.cjs.map +1 -0
  44. package/dist/main.module.sass.js +19 -0
  45. package/dist/main.module.sass.js.map +1 -0
  46. package/dist/postgrest-table/data-loaders.cjs +189 -0
  47. package/dist/postgrest-table/data-loaders.cjs.map +1 -0
  48. package/dist/postgrest-table/data-loaders.d.ts +55 -0
  49. package/dist/postgrest-table/data-loaders.js +189 -0
  50. package/dist/postgrest-table/data-loaders.js.map +1 -0
  51. package/dist/postgrest-table/index.cjs +212 -0
  52. package/dist/postgrest-table/index.cjs.map +1 -0
  53. package/dist/postgrest-table/index.d.ts +56 -0
  54. package/dist/postgrest-table/index.js +212 -0
  55. package/dist/postgrest-table/index.js.map +1 -0
  56. package/dist/postgrest-table/main.module.sass.cjs +22 -0
  57. package/dist/postgrest-table/main.module.sass.cjs.map +1 -0
  58. package/dist/postgrest-table/main.module.sass.js +22 -0
  59. package/dist/postgrest-table/main.module.sass.js.map +1 -0
  60. package/dist/provider.cjs +376 -0
  61. package/dist/provider.cjs.map +1 -0
  62. package/dist/provider.d.ts +69 -0
  63. package/dist/provider.js +376 -0
  64. package/dist/provider.js.map +1 -0
  65. package/dist/utils/column-spec.cjs +99 -0
  66. package/dist/utils/column-spec.cjs.map +1 -0
  67. package/dist/utils/column-spec.d.ts +31 -0
  68. package/dist/utils/column-spec.js +99 -0
  69. package/dist/utils/column-spec.js.map +1 -0
  70. package/dist/utils/index.cjs +9 -0
  71. package/dist/utils/index.cjs.map +1 -0
  72. package/dist/utils/index.d.ts +3 -0
  73. package/dist/utils/index.js +9 -0
  74. package/dist/utils/index.js.map +1 -0
  75. package/dist/utils/key-handling.cjs +85 -0
  76. package/dist/utils/key-handling.cjs.map +1 -0
  77. package/dist/utils/key-handling.d.ts +5 -0
  78. package/dist/utils/key-handling.js +85 -0
  79. package/dist/utils/key-handling.js.map +1 -0
  80. package/package.json +43 -37
  81. package/src/components/editor-popup.ts +2 -2
  82. package/src/components/text-areas.ts +1 -1
  83. package/src/core.ts +2 -8
  84. package/src/main.module.sass +7 -7
  85. package/src/postgrest-table/index.ts +6 -6
  86. package/src/postgrest-table/main.module.sass +1 -1
  87. package/src/provider.ts +1 -1
  88. package/dist/esm/data-sheet.186dcac8.js +0 -86
  89. package/dist/esm/data-sheet.186dcac8.js.map +0 -1
  90. package/dist/esm/data-sheet.2e11f097.js +0 -13
  91. package/dist/esm/data-sheet.2e11f097.js.map +0 -1
  92. package/dist/esm/data-sheet.37e35216.js +0 -40
  93. package/dist/esm/data-sheet.37e35216.js.map +0 -1
  94. package/dist/esm/data-sheet.403b9693.js +0 -429
  95. package/dist/esm/data-sheet.403b9693.js.map +0 -1
  96. package/dist/esm/data-sheet.40866550.js +0 -58
  97. package/dist/esm/data-sheet.40866550.js.map +0 -1
  98. package/dist/esm/data-sheet.410c5122.js +0 -83
  99. package/dist/esm/data-sheet.410c5122.js.map +0 -1
  100. package/dist/esm/data-sheet.48635112.js +0 -40
  101. package/dist/esm/data-sheet.48635112.js.map +0 -1
  102. package/dist/esm/data-sheet.53ee5bf7.js +0 -102
  103. package/dist/esm/data-sheet.53ee5bf7.js.map +0 -1
  104. package/dist/esm/data-sheet.54cfa8e8.js +0 -16
  105. package/dist/esm/data-sheet.54cfa8e8.js.map +0 -1
  106. package/dist/esm/data-sheet.560943e5.js +0 -237
  107. package/dist/esm/data-sheet.560943e5.js.map +0 -1
  108. package/dist/esm/data-sheet.706f955d.css +0 -11
  109. package/dist/esm/data-sheet.706f955d.css.map +0 -1
  110. package/dist/esm/data-sheet.8dbfccef.js +0 -16
  111. package/dist/esm/data-sheet.8dbfccef.js.map +0 -1
  112. package/dist/esm/data-sheet.9a4e4e01.js +0 -77
  113. package/dist/esm/data-sheet.9a4e4e01.js.map +0 -1
  114. package/dist/esm/data-sheet.a3eb6088.js +0 -21
  115. package/dist/esm/data-sheet.a3eb6088.js.map +0 -1
  116. package/dist/esm/data-sheet.a7230b2f.css +0 -69
  117. package/dist/esm/data-sheet.a7230b2f.css.map +0 -1
  118. package/dist/esm/data-sheet.b3ccc91b.css +0 -65
  119. package/dist/esm/data-sheet.b3ccc91b.css.map +0 -1
  120. package/dist/esm/data-sheet.c9b6b6f2.js +0 -439
  121. package/dist/esm/data-sheet.c9b6b6f2.js.map +0 -1
  122. package/dist/esm/data-sheet.d2160988.js +0 -218
  123. package/dist/esm/data-sheet.d2160988.js.map +0 -1
  124. package/dist/esm/data-sheet.d570ef95.js +0 -43
  125. package/dist/esm/data-sheet.d570ef95.js.map +0 -1
  126. package/dist/esm/data-sheet.ef63e366.css +0 -110
  127. package/dist/esm/data-sheet.ef63e366.css.map +0 -1
  128. package/dist/esm/index.d.ts +0 -292
  129. package/dist/esm/index.d.ts.map +0 -1
  130. package/dist/esm/index.js +0 -15
  131. package/dist/esm/index.js.map +0 -1
  132. package/dist/node/data-sheet.28641e23.css +0 -2
  133. package/dist/node/data-sheet.28641e23.css.map +0 -1
  134. package/dist/node/data-sheet.2cac1a8c.js +0 -2
  135. package/dist/node/data-sheet.2cac1a8c.js.map +0 -1
  136. package/dist/node/data-sheet.3680e59d.js +0 -2
  137. package/dist/node/data-sheet.3680e59d.js.map +0 -1
  138. package/dist/node/data-sheet.3c728e09.js +0 -2
  139. package/dist/node/data-sheet.3c728e09.js.map +0 -1
  140. package/dist/node/data-sheet.474755ec.js +0 -2
  141. package/dist/node/data-sheet.474755ec.js.map +0 -1
  142. package/dist/node/data-sheet.648db7af.js +0 -2
  143. package/dist/node/data-sheet.648db7af.js.map +0 -1
  144. package/dist/node/data-sheet.7b95fbc1.css +0 -2
  145. package/dist/node/data-sheet.7b95fbc1.css.map +0 -1
  146. package/dist/node/data-sheet.945becc3.js +0 -2
  147. package/dist/node/data-sheet.945becc3.js.map +0 -1
  148. package/dist/node/data-sheet.97ac1b50.js +0 -2
  149. package/dist/node/data-sheet.97ac1b50.js.map +0 -1
  150. package/dist/node/data-sheet.ae543670.js +0 -2
  151. package/dist/node/data-sheet.ae543670.js.map +0 -1
  152. package/dist/node/data-sheet.afb25a47.js +0 -2
  153. package/dist/node/data-sheet.afb25a47.js.map +0 -1
  154. package/dist/node/data-sheet.bb45401c.js +0 -2
  155. package/dist/node/data-sheet.bb45401c.js.map +0 -1
  156. package/dist/node/data-sheet.c90cb14b.css +0 -2
  157. package/dist/node/data-sheet.c90cb14b.css.map +0 -1
  158. package/dist/node/data-sheet.cbbc8d31.js +0 -2
  159. package/dist/node/data-sheet.cbbc8d31.js.map +0 -1
  160. package/dist/node/data-sheet.d971095a.js +0 -2
  161. package/dist/node/data-sheet.d971095a.js.map +0 -1
  162. package/dist/node/data-sheet.dffdda71.js +0 -2
  163. package/dist/node/data-sheet.dffdda71.js.map +0 -1
  164. package/dist/node/data-sheet.e472411d.js +0 -2
  165. package/dist/node/data-sheet.e472411d.js.map +0 -1
  166. package/dist/node/data-sheet.ef0c95f4.js +0 -2
  167. package/dist/node/data-sheet.ef0c95f4.js.map +0 -1
  168. package/dist/node/data-sheet.f0223f39.js +0 -2
  169. package/dist/node/data-sheet.f0223f39.js.map +0 -1
  170. package/dist/node/data-sheet.ffaf8ac7.css +0 -2
  171. package/dist/node/data-sheet.ffaf8ac7.css.map +0 -1
  172. package/dist/node/index.js +0 -2
  173. package/dist/node/index.js.map +0 -1
package/dist/index.cjs ADDED
@@ -0,0 +1,51 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
3
+ const core = require("./core.cjs");
4
+ const index = require("./postgrest-table/index.cjs");
5
+ const provider = require("./provider.cjs");
6
+ const index$1 = require("./utils/index.cjs");
7
+ const table = require("@blueprintjs/table");
8
+ const colors = require("./components/colors.cjs");
9
+ const actions = require("./components/actions.cjs");
10
+ const textAreas = require("./components/text-areas.cjs");
11
+ const editorPopup = require("./components/editor-popup.cjs");
12
+ const keyHandling = require("./utils/key-handling.cjs");
13
+ const columnSpec = require("./utils/column-spec.cjs");
14
+ const dataLoaders = require("./postgrest-table/data-loaders.cjs");
15
+ exports.BaseCell = core.BaseCell;
16
+ exports.DataSheet = core.DataSheet;
17
+ exports.DataSheetDensity = core.DataSheetDensity;
18
+ exports.ScrollToRowControl = core.ScrollToRowControl;
19
+ exports.getRowsToDelete = core.getRowsToDelete;
20
+ exports.ExpandedLithologies = index.ExpandedLithologies;
21
+ exports.IntervalCell = index.IntervalCell;
22
+ exports.LongTextViewer = index.LongTextViewer;
23
+ exports.PostgRESTTableView = index.PostgRESTTableView;
24
+ exports.SearchAction = index.SearchAction;
25
+ exports.lithologyRenderer = index.lithologyRenderer;
26
+ exports.notifyOnError = index.notifyOnError;
27
+ exports.wrapWithErrorHandling = index.wrapWithErrorHandling;
28
+ exports.DataSheetProvider = provider.DataSheetProvider;
29
+ exports.singleFocusedCell = provider.singleFocusedCell;
30
+ exports.topLeftCell = provider.topLeftCell;
31
+ exports.useSelector = provider.useSelector;
32
+ exports.useStoreAPI = provider.useStoreAPI;
33
+ exports.range = index$1.range;
34
+ Object.defineProperty(exports, "Cell", {
35
+ enumerable: true,
36
+ get: () => table.Cell
37
+ });
38
+ exports.ColorCell = colors.ColorCell;
39
+ exports.ColorPicker = colors.ColorPicker;
40
+ exports.colorSwatchRenderer = colors.colorSwatchRenderer;
41
+ exports.DataSheetAction = actions.DataSheetAction;
42
+ exports.DataSheetActionsRow = actions.DataSheetActionsRow;
43
+ exports.EditableTextArea = textAreas.EditableTextArea;
44
+ exports.EditorPopup = editorPopup.EditorPopup;
45
+ exports.editorKeyHandler = keyHandling.editorKeyHandler;
46
+ exports.multiLineTextKeyHandler = keyHandling.multiLineTextKeyHandler;
47
+ exports.tableKeyHandler = keyHandling.tableKeyHandler;
48
+ exports.generateColumnSpec = columnSpec.generateColumnSpec;
49
+ exports.generateDefaultColumnSpec = columnSpec.generateDefaultColumnSpec;
50
+ exports.usePostgRESTLazyLoader = dataLoaders.usePostgRESTLazyLoader;
51
+ //# sourceMappingURL=index.cjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
@@ -0,0 +1,5 @@
1
+ export * from './core';
2
+ export * from './postgrest-table';
3
+ export * from './components';
4
+ export * from './provider';
5
+ export * from './utils';
package/dist/index.js ADDED
@@ -0,0 +1,48 @@
1
+ import { BaseCell, DataSheet, DataSheetDensity, ScrollToRowControl, getRowsToDelete } from "./core.js";
2
+ import { ExpandedLithologies, IntervalCell, LongTextViewer, PostgRESTTableView, SearchAction, lithologyRenderer, notifyOnError, wrapWithErrorHandling } from "./postgrest-table/index.js";
3
+ import { DataSheetProvider, singleFocusedCell, topLeftCell, useSelector, useStoreAPI } from "./provider.js";
4
+ import { range } from "./utils/index.js";
5
+ import { Cell } from "@blueprintjs/table";
6
+ import { ColorCell, ColorPicker, colorSwatchRenderer } from "./components/colors.js";
7
+ import { DataSheetAction, DataSheetActionsRow } from "./components/actions.js";
8
+ import { EditableTextArea } from "./components/text-areas.js";
9
+ import { EditorPopup } from "./components/editor-popup.js";
10
+ import { editorKeyHandler, multiLineTextKeyHandler, tableKeyHandler } from "./utils/key-handling.js";
11
+ import { generateColumnSpec, generateDefaultColumnSpec } from "./utils/column-spec.js";
12
+ import { usePostgRESTLazyLoader } from "./postgrest-table/data-loaders.js";
13
+ export {
14
+ BaseCell,
15
+ Cell,
16
+ ColorCell,
17
+ ColorPicker,
18
+ DataSheet,
19
+ DataSheetAction,
20
+ DataSheetActionsRow,
21
+ DataSheetDensity,
22
+ DataSheetProvider,
23
+ EditableTextArea,
24
+ EditorPopup,
25
+ ExpandedLithologies,
26
+ IntervalCell,
27
+ LongTextViewer,
28
+ PostgRESTTableView,
29
+ ScrollToRowControl,
30
+ SearchAction,
31
+ colorSwatchRenderer,
32
+ editorKeyHandler,
33
+ generateColumnSpec,
34
+ generateDefaultColumnSpec,
35
+ getRowsToDelete,
36
+ lithologyRenderer,
37
+ multiLineTextKeyHandler,
38
+ notifyOnError,
39
+ range,
40
+ singleFocusedCell,
41
+ tableKeyHandler,
42
+ topLeftCell,
43
+ usePostgRESTLazyLoader,
44
+ useSelector,
45
+ useStoreAPI,
46
+ wrapWithErrorHandling
47
+ };
48
+ //# sourceMappingURL=index.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;"}
@@ -0,0 +1,19 @@
1
+ "use strict";
2
+ Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
3
+ const spacer = "_spacer_tr5j5_94";
4
+ const styles = {
5
+ "data-sheet-container": "_data-sheet-container_tr5j5_1",
6
+ "data-sheet-holder": "_data-sheet-holder_tr5j5_1",
7
+ "data-sheet": "_data-sheet_tr5j5_1",
8
+ "input-cell": "_input-cell_tr5j5_37",
9
+ "editor-cell": "_editor-cell_tr5j5_57",
10
+ "hidden-input": "_hidden-input_tr5j5_65",
11
+ "data-editor-anchor": "_data-editor-anchor_tr5j5_71",
12
+ "corner-drag-handle": "_corner-drag-handle_tr5j5_78",
13
+ "data-sheet-toolbar": "_data-sheet-toolbar_tr5j5_88",
14
+ spacer,
15
+ "table-control": "_table-control_tr5j5_98"
16
+ };
17
+ exports.default = styles;
18
+ exports.spacer = spacer;
19
+ //# sourceMappingURL=main.module.sass.cjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"main.module.sass.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;"}
@@ -0,0 +1,19 @@
1
+ const spacer = "_spacer_tr5j5_94";
2
+ const styles = {
3
+ "data-sheet-container": "_data-sheet-container_tr5j5_1",
4
+ "data-sheet-holder": "_data-sheet-holder_tr5j5_1",
5
+ "data-sheet": "_data-sheet_tr5j5_1",
6
+ "input-cell": "_input-cell_tr5j5_37",
7
+ "editor-cell": "_editor-cell_tr5j5_57",
8
+ "hidden-input": "_hidden-input_tr5j5_65",
9
+ "data-editor-anchor": "_data-editor-anchor_tr5j5_71",
10
+ "corner-drag-handle": "_corner-drag-handle_tr5j5_78",
11
+ "data-sheet-toolbar": "_data-sheet-toolbar_tr5j5_88",
12
+ spacer,
13
+ "table-control": "_table-control_tr5j5_98"
14
+ };
15
+ export {
16
+ styles as default,
17
+ spacer
18
+ };
19
+ //# sourceMappingURL=main.module.sass.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"main.module.sass.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;"}
@@ -0,0 +1,189 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
3
+ const uiComponents = require("@macrostrat/ui-components");
4
+ const underscore = require("underscore");
5
+ const react = require("react");
6
+ const update = require("immutability-helper");
7
+ const postgrestJs = require("@supabase/postgrest-js");
8
+ function adjustArraySize(arr, newSize) {
9
+ if (newSize == null || arr.length === newSize) {
10
+ return arr;
11
+ } else if (arr.length > newSize) {
12
+ arr = arr.slice(0, newSize);
13
+ }
14
+ return [...arr, ...Array(newSize - arr.length).fill(null)];
15
+ }
16
+ function lazyLoadingReducer(state, action) {
17
+ console.log(action);
18
+ switch (action.type) {
19
+ case "start-loading":
20
+ return {
21
+ ...state,
22
+ loading: true,
23
+ initialized: true
24
+ };
25
+ case "set-visible":
26
+ return {
27
+ ...state,
28
+ visibleRegion: action.region
29
+ };
30
+ case "update-data":
31
+ return {
32
+ ...state,
33
+ loading: false,
34
+ data: update(state.data, action.changes)
35
+ };
36
+ case "loaded":
37
+ let data = adjustArraySize(state.data, action.totalSize);
38
+ data = [
39
+ ...data.slice(0, action.offset),
40
+ ...action.data,
41
+ ...data.slice(action.offset + action.data.length)
42
+ ];
43
+ return {
44
+ ...state,
45
+ data,
46
+ loading: false
47
+ };
48
+ case "reset":
49
+ return {
50
+ data: [],
51
+ loading: false,
52
+ error: null,
53
+ visibleRegion: { rowIndexStart: 0, rowIndexEnd: 0 },
54
+ initialized: false
55
+ };
56
+ case "error":
57
+ return {
58
+ ...state,
59
+ error: action.error,
60
+ loading: false
61
+ };
62
+ default:
63
+ return state;
64
+ }
65
+ }
66
+ function buildQuery(client, config) {
67
+ const { columns = "*", count } = config;
68
+ const opts = { count };
69
+ console.log("config", config);
70
+ let cols;
71
+ if (Array.isArray(columns)) {
72
+ cols = columns.join(", ");
73
+ } else {
74
+ cols = columns ?? "*";
75
+ }
76
+ let query = client.select(cols, opts);
77
+ if (config.filter) {
78
+ query = config.filter(query);
79
+ }
80
+ console.log("query", query.url.search);
81
+ if (config.order != null) {
82
+ const { key: orderKey, ...rest } = config.order;
83
+ query = query.order(orderKey, rest);
84
+ if (config.after != null) {
85
+ const op = rest.ascending ?? true ? "gt" : "lt";
86
+ query = query[op](orderKey, config.after);
87
+ }
88
+ }
89
+ if (config.limit != null) {
90
+ if (config.offset != null) {
91
+ query = query.range(config.offset, config.offset + config.limit - 1);
92
+ console.log(`Random seek from ${config.offset}, this will be slow`);
93
+ } else {
94
+ query = query.limit(config.limit);
95
+ }
96
+ }
97
+ return query;
98
+ }
99
+ function _loadMoreData(client, config, state, dispatch) {
100
+ const rowIndex = indexOfFirstNullInRegion(state.data, state.visibleRegion);
101
+ if (state.loading || rowIndex == null) {
102
+ if (state.initialized) {
103
+ return;
104
+ }
105
+ }
106
+ const { chunkSize = 100, ...rest } = config;
107
+ const sortKey = config.order?.key ?? "id";
108
+ let cfg = {
109
+ ...rest,
110
+ limit: chunkSize,
111
+ offset: null
112
+ };
113
+ const isInitialQuery = !state.initialized;
114
+ if (isInitialQuery) {
115
+ cfg.count = "exact";
116
+ }
117
+ if (!isInitialQuery) {
118
+ cfg.after = state.data[rowIndex - 1]?.[sortKey];
119
+ if (cfg.after == null) {
120
+ cfg.offset = rowIndex;
121
+ }
122
+ }
123
+ dispatch({ type: "start-loading" });
124
+ const query = buildQuery(client, cfg);
125
+ query.then((res) => {
126
+ console.log(res);
127
+ const { data, count } = res;
128
+ dispatch({
129
+ type: "loaded",
130
+ data,
131
+ offset: rowIndex,
132
+ totalSize: count
133
+ });
134
+ });
135
+ }
136
+ const loadMoreData = underscore.debounce(_loadMoreData, 100);
137
+ function usePostgRESTLazyLoader(endpoint, table, config = {}) {
138
+ const initialState = {
139
+ data: [],
140
+ loading: false,
141
+ error: null,
142
+ visibleRegion: { rowIndexStart: 0, rowIndexEnd: 0 },
143
+ initialized: false
144
+ };
145
+ const client = react.useMemo(() => {
146
+ return new postgrestJs.PostgrestClient(endpoint).from(table);
147
+ }, [endpoint, table]);
148
+ const [state, dispatch] = react.useReducer(lazyLoadingReducer, initialState);
149
+ const { data, loading } = state;
150
+ uiComponents.useAsyncEffect(async () => {
151
+ loadMoreData(client, config, state, dispatch);
152
+ }, [
153
+ data,
154
+ state.visibleRegion.rowIndexStart,
155
+ state.visibleRegion.rowIndexEnd
156
+ ]);
157
+ const ref = react.useRef(null);
158
+ const onScroll = react.useCallback(
159
+ underscore.debounce((visibleCells) => {
160
+ if (visibleCells.rowIndexEnd == ref.current?.rowIndexEnd && visibleCells.rowIndexStart == ref.current?.rowIndexStart) {
161
+ return;
162
+ }
163
+ console.log("Visible cells changed", visibleCells);
164
+ dispatch({
165
+ type: "set-visible",
166
+ region: visibleCells
167
+ });
168
+ ref.current = visibleCells;
169
+ }, 500),
170
+ [dispatch]
171
+ );
172
+ return {
173
+ data,
174
+ loading,
175
+ onScroll,
176
+ dispatch,
177
+ client
178
+ };
179
+ }
180
+ function indexOfFirstNullInRegion(data, region) {
181
+ for (let i = region.rowIndexStart; i < region.rowIndexEnd; i++) {
182
+ if (data[i] == null) {
183
+ return i;
184
+ }
185
+ }
186
+ return null;
187
+ }
188
+ exports.usePostgRESTLazyLoader = usePostgRESTLazyLoader;
189
+ //# sourceMappingURL=data-loaders.cjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"data-loaders.cjs","sources":["../../src/postgrest-table/data-loaders.ts"],"sourcesContent":["/** Lazy loading of data from a PostgREST endpoint */\n\nimport { useAsyncEffect } from \"@macrostrat/ui-components\";\nimport { debounce } from \"underscore\";\nimport { useCallback, useMemo, useReducer, useRef, useEffect } from \"react\";\nimport update, { Spec } from \"immutability-helper\";\n\ninterface ChunkIndex {\n startRow: number;\n endRow: number;\n lastValue: any;\n}\n\nimport {\n PostgrestClient,\n PostgrestQueryBuilder,\n PostgrestFilterBuilder,\n} from \"@supabase/postgrest-js\";\n\ninterface LazyLoaderState<T> {\n data: (T | null)[];\n loading: boolean;\n error: Error | null;\n visibleRegion: RowRegion;\n initialized: boolean;\n}\n\nexport interface PostgrestOrder<T> {\n key: string;\n ascending?: boolean;\n nullsFirst?: boolean;\n}\n\ntype LazyLoaderAction<T> =\n | { type: \"start-loading\" }\n | { type: \"loaded\"; data: T[]; offset: number; totalSize: number }\n | { type: \"error\"; error: Error }\n | { type: \"set-visible\"; region: RowRegion }\n | { type: \"update-data\"; changes: Spec<T[]> }\n | { type: \"reset\" };\n\nfunction adjustArraySize<T>(arr: T[], newSize: number) {\n if (newSize == null || arr.length === newSize) {\n return arr;\n } else if (arr.length > newSize) {\n // Trim the array\n arr = arr.slice(0, newSize);\n }\n return [...arr, ...Array(newSize - arr.length).fill(null)];\n}\n\nfunction lazyLoadingReducer<T>(\n state: LazyLoaderState<T>,\n action: LazyLoaderAction<T>,\n): LazyLoaderState<T> {\n console.log(action);\n switch (action.type) {\n case \"start-loading\":\n return {\n ...state,\n loading: true,\n initialized: true,\n };\n case \"set-visible\":\n return {\n ...state,\n visibleRegion: action.region,\n };\n case \"update-data\":\n return {\n ...state,\n loading: false,\n data: update(state.data, action.changes),\n };\n case \"loaded\":\n let data = adjustArraySize(state.data, action.totalSize);\n data = [\n ...data.slice(0, action.offset),\n ...action.data,\n ...data.slice(action.offset + action.data.length),\n ];\n\n return {\n ...state,\n data,\n loading: false,\n };\n\n case \"reset\":\n return {\n data: [],\n loading: false,\n error: null,\n visibleRegion: { rowIndexStart: 0, rowIndexEnd: 0 },\n initialized: false,\n };\n case \"error\":\n return {\n ...state,\n error: action.error,\n loading: false,\n };\n default:\n return state;\n }\n}\n\ninterface RowRegion {\n rowIndexStart: number;\n rowIndexEnd: number;\n}\n\nenum LoadDirection {\n \"up\",\n \"down\",\n}\n\nfunction overlapsNulls(data: any[], region: RowRegion) {\n for (let i = region.rowIndexStart; i < region.rowIndexEnd; i++) {\n if (data[i] == null) {\n return true;\n }\n }\n return false;\n}\n\nfunction distanceToNextNonEmptyRow(\n data: any[],\n start: number,\n direction: LoadDirection,\n limit: number,\n): number {\n let i = start;\n while (i < data.length && i > 0 && limit > 0) {\n if (data[i] != null) {\n return i;\n }\n i += direction === LoadDirection.down ? 1 : -1;\n limit -= 1;\n }\n return i;\n}\n\ninterface QueryConfig {\n columns?: string | string[];\n count?: \"exact\" | \"estimated\";\n limit?: number;\n offset?: number;\n order?: PostgrestOrder<any>;\n after?: any;\n fullTextSearch?: string;\n filter?: (\n query: PostgrestFilterBuilder<any, any, any>,\n ) => PostgrestFilterBuilder<any, any, any>;\n}\n\nfunction buildQuery<T>(\n client: PostgrestQueryBuilder<T, any>,\n config: QueryConfig,\n) {\n const { columns = \"*\", count } = config;\n const opts = { count };\n\n console.log(\"config\", config);\n\n let cols: string;\n if (Array.isArray(columns)) {\n cols = columns.join(\", \");\n } else {\n cols = columns ?? \"*\";\n }\n\n let query = client.select(cols, opts);\n\n if (config.filter) {\n query = config.filter(query);\n }\n console.log(\"query\", query.url.search);\n\n if (config.order != null) {\n const { key: orderKey, ...rest } = config.order;\n query = query.order(orderKey, rest);\n if (config.after != null) {\n const op = (rest.ascending ?? true) ? \"gt\" : \"lt\";\n query = query[op](orderKey, config.after);\n }\n }\n if (config.limit != null) {\n if (config.offset != null) {\n query = query.range(config.offset, config.offset + config.limit - 1);\n console.log(`Random seek from ${config.offset}, this will be slow`);\n } else {\n query = query.limit(config.limit);\n }\n }\n return query;\n}\n\nfunction _loadMoreData<T>(\n client: PostgrestQueryBuilder<T, any>,\n config: QueryConfig & { chunkSize: number },\n state: LazyLoaderState<T>,\n dispatch: any,\n) {\n const rowIndex = indexOfFirstNullInRegion(state.data, state.visibleRegion);\n if (state.loading || rowIndex == null) {\n if (state.initialized) {\n return;\n }\n }\n\n const { chunkSize = 100, ...rest } = config;\n\n const sortKey = config.order?.key ?? \"id\";\n\n let cfg: QueryConfig = {\n ...rest,\n limit: chunkSize,\n offset: null,\n };\n\n // Allows random seeking\n const isInitialQuery = !state.initialized;\n if (isInitialQuery) {\n cfg.count = \"exact\";\n }\n\n // This only works for forward queries\n if (!isInitialQuery) {\n cfg.after = state.data[rowIndex - 1]?.[sortKey];\n if (cfg.after == null) {\n cfg.offset = rowIndex;\n }\n }\n\n dispatch({ type: \"start-loading\" });\n\n const query = buildQuery(client, cfg);\n\n query.then((res) => {\n console.log(res);\n const { data, count } = res;\n dispatch({\n type: \"loaded\",\n data,\n offset: rowIndex,\n totalSize: count,\n });\n });\n}\n\n// Ensure only one data load is in progress at a time\nconst loadMoreData = debounce(_loadMoreData, 100);\n\ntype LazyLoaderOptions = Omit<QueryConfig, \"count\" | \"offset\" | \"limit\"> & {\n chunkSize?: number;\n sortKey?: string;\n filter?: (\n query: PostgrestFilterBuilder<any, any, any>,\n ) => PostgrestFilterBuilder<any, any, any>;\n};\n\nexport function usePostgRESTLazyLoader(\n endpoint: string,\n table: string,\n config: LazyLoaderOptions = {},\n) {\n const initialState: LazyLoaderState<any> = {\n data: [],\n loading: false,\n error: null,\n visibleRegion: { rowIndexStart: 0, rowIndexEnd: 0 },\n initialized: false,\n };\n\n const client = useMemo(() => {\n return new PostgrestClient(endpoint).from(table);\n }, [endpoint, table]);\n\n const [state, dispatch] = useReducer(lazyLoadingReducer, initialState);\n const { data, loading } = state;\n\n useAsyncEffect(async () => {\n loadMoreData(client, config, state, dispatch);\n }, [\n data,\n state.visibleRegion.rowIndexStart,\n state.visibleRegion.rowIndexEnd,\n ]);\n\n // Reference to hold onto the scroll position\n const ref = useRef(null);\n\n const onScroll = useCallback(\n debounce((visibleCells: RowRegion) => {\n if (\n visibleCells.rowIndexEnd == ref.current?.rowIndexEnd &&\n visibleCells.rowIndexStart == ref.current?.rowIndexStart\n ) {\n return;\n }\n console.log(\"Visible cells changed\", visibleCells);\n dispatch({\n type: \"set-visible\",\n region: visibleCells,\n });\n ref.current = visibleCells;\n }, 500),\n [dispatch],\n );\n\n return {\n data,\n loading,\n onScroll,\n dispatch,\n client,\n };\n}\n\nfunction getRowIndexToLoadFrom<T>(\n data: (T | null)[],\n visibleRegion: RowRegion,\n chunkSize: number,\n) {\n return indexOfFirstNullInRegion(data, visibleRegion);\n}\n\nfunction indexOfFirstNullInRegion(\n data: any[],\n region: RowRegion,\n): number | null {\n for (let i = region.rowIndexStart; i < region.rowIndexEnd; i++) {\n if (data[i] == null) {\n return i;\n }\n }\n return null;\n}\n"],"names":["debounce","useMemo","PostgrestClient","useReducer","useAsyncEffect","useRef","useCallback"],"mappings":"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"}
@@ -0,0 +1,55 @@
1
+ import { Spec } from 'immutability-helper';
2
+ import { PostgrestQueryBuilder, PostgrestFilterBuilder } from '@supabase/postgrest-js';
3
+ export interface PostgrestOrder<T> {
4
+ key: string;
5
+ ascending?: boolean;
6
+ nullsFirst?: boolean;
7
+ }
8
+ type LazyLoaderAction<T> = {
9
+ type: "start-loading";
10
+ } | {
11
+ type: "loaded";
12
+ data: T[];
13
+ offset: number;
14
+ totalSize: number;
15
+ } | {
16
+ type: "error";
17
+ error: Error;
18
+ } | {
19
+ type: "set-visible";
20
+ region: RowRegion;
21
+ } | {
22
+ type: "update-data";
23
+ changes: Spec<T[]>;
24
+ } | {
25
+ type: "reset";
26
+ };
27
+ interface RowRegion {
28
+ rowIndexStart: number;
29
+ rowIndexEnd: number;
30
+ }
31
+ interface QueryConfig {
32
+ columns?: string | string[];
33
+ count?: "exact" | "estimated";
34
+ limit?: number;
35
+ offset?: number;
36
+ order?: PostgrestOrder<any>;
37
+ after?: any;
38
+ fullTextSearch?: string;
39
+ filter?: (query: PostgrestFilterBuilder<any, any, any>) => PostgrestFilterBuilder<any, any, any>;
40
+ }
41
+ type LazyLoaderOptions = Omit<QueryConfig, "count" | "offset" | "limit"> & {
42
+ chunkSize?: number;
43
+ sortKey?: string;
44
+ filter?: (query: PostgrestFilterBuilder<any, any, any>) => PostgrestFilterBuilder<any, any, any>;
45
+ };
46
+ export declare function usePostgRESTLazyLoader(endpoint: string, table: string, config?: LazyLoaderOptions): {
47
+ data: unknown[];
48
+ loading: boolean;
49
+ onScroll: ((visibleCells: RowRegion) => void) & import('underscore').Cancelable;
50
+ dispatch: import('react').Dispatch<LazyLoaderAction<unknown>>;
51
+ client: PostgrestQueryBuilder<{
52
+ PostgrestVersion: "12";
53
+ }, any, any, string, unknown>;
54
+ };
55
+ export {};
@@ -0,0 +1,189 @@
1
+ import { useAsyncEffect } from "@macrostrat/ui-components";
2
+ import { debounce } from "underscore";
3
+ import { useMemo, useReducer, useRef, useCallback } from "react";
4
+ import update from "immutability-helper";
5
+ import { PostgrestClient } from "@supabase/postgrest-js";
6
+ function adjustArraySize(arr, newSize) {
7
+ if (newSize == null || arr.length === newSize) {
8
+ return arr;
9
+ } else if (arr.length > newSize) {
10
+ arr = arr.slice(0, newSize);
11
+ }
12
+ return [...arr, ...Array(newSize - arr.length).fill(null)];
13
+ }
14
+ function lazyLoadingReducer(state, action) {
15
+ console.log(action);
16
+ switch (action.type) {
17
+ case "start-loading":
18
+ return {
19
+ ...state,
20
+ loading: true,
21
+ initialized: true
22
+ };
23
+ case "set-visible":
24
+ return {
25
+ ...state,
26
+ visibleRegion: action.region
27
+ };
28
+ case "update-data":
29
+ return {
30
+ ...state,
31
+ loading: false,
32
+ data: update(state.data, action.changes)
33
+ };
34
+ case "loaded":
35
+ let data = adjustArraySize(state.data, action.totalSize);
36
+ data = [
37
+ ...data.slice(0, action.offset),
38
+ ...action.data,
39
+ ...data.slice(action.offset + action.data.length)
40
+ ];
41
+ return {
42
+ ...state,
43
+ data,
44
+ loading: false
45
+ };
46
+ case "reset":
47
+ return {
48
+ data: [],
49
+ loading: false,
50
+ error: null,
51
+ visibleRegion: { rowIndexStart: 0, rowIndexEnd: 0 },
52
+ initialized: false
53
+ };
54
+ case "error":
55
+ return {
56
+ ...state,
57
+ error: action.error,
58
+ loading: false
59
+ };
60
+ default:
61
+ return state;
62
+ }
63
+ }
64
+ function buildQuery(client, config) {
65
+ const { columns = "*", count } = config;
66
+ const opts = { count };
67
+ console.log("config", config);
68
+ let cols;
69
+ if (Array.isArray(columns)) {
70
+ cols = columns.join(", ");
71
+ } else {
72
+ cols = columns ?? "*";
73
+ }
74
+ let query = client.select(cols, opts);
75
+ if (config.filter) {
76
+ query = config.filter(query);
77
+ }
78
+ console.log("query", query.url.search);
79
+ if (config.order != null) {
80
+ const { key: orderKey, ...rest } = config.order;
81
+ query = query.order(orderKey, rest);
82
+ if (config.after != null) {
83
+ const op = rest.ascending ?? true ? "gt" : "lt";
84
+ query = query[op](orderKey, config.after);
85
+ }
86
+ }
87
+ if (config.limit != null) {
88
+ if (config.offset != null) {
89
+ query = query.range(config.offset, config.offset + config.limit - 1);
90
+ console.log(`Random seek from ${config.offset}, this will be slow`);
91
+ } else {
92
+ query = query.limit(config.limit);
93
+ }
94
+ }
95
+ return query;
96
+ }
97
+ function _loadMoreData(client, config, state, dispatch) {
98
+ const rowIndex = indexOfFirstNullInRegion(state.data, state.visibleRegion);
99
+ if (state.loading || rowIndex == null) {
100
+ if (state.initialized) {
101
+ return;
102
+ }
103
+ }
104
+ const { chunkSize = 100, ...rest } = config;
105
+ const sortKey = config.order?.key ?? "id";
106
+ let cfg = {
107
+ ...rest,
108
+ limit: chunkSize,
109
+ offset: null
110
+ };
111
+ const isInitialQuery = !state.initialized;
112
+ if (isInitialQuery) {
113
+ cfg.count = "exact";
114
+ }
115
+ if (!isInitialQuery) {
116
+ cfg.after = state.data[rowIndex - 1]?.[sortKey];
117
+ if (cfg.after == null) {
118
+ cfg.offset = rowIndex;
119
+ }
120
+ }
121
+ dispatch({ type: "start-loading" });
122
+ const query = buildQuery(client, cfg);
123
+ query.then((res) => {
124
+ console.log(res);
125
+ const { data, count } = res;
126
+ dispatch({
127
+ type: "loaded",
128
+ data,
129
+ offset: rowIndex,
130
+ totalSize: count
131
+ });
132
+ });
133
+ }
134
+ const loadMoreData = debounce(_loadMoreData, 100);
135
+ function usePostgRESTLazyLoader(endpoint, table, config = {}) {
136
+ const initialState = {
137
+ data: [],
138
+ loading: false,
139
+ error: null,
140
+ visibleRegion: { rowIndexStart: 0, rowIndexEnd: 0 },
141
+ initialized: false
142
+ };
143
+ const client = useMemo(() => {
144
+ return new PostgrestClient(endpoint).from(table);
145
+ }, [endpoint, table]);
146
+ const [state, dispatch] = useReducer(lazyLoadingReducer, initialState);
147
+ const { data, loading } = state;
148
+ useAsyncEffect(async () => {
149
+ loadMoreData(client, config, state, dispatch);
150
+ }, [
151
+ data,
152
+ state.visibleRegion.rowIndexStart,
153
+ state.visibleRegion.rowIndexEnd
154
+ ]);
155
+ const ref = useRef(null);
156
+ const onScroll = useCallback(
157
+ debounce((visibleCells) => {
158
+ if (visibleCells.rowIndexEnd == ref.current?.rowIndexEnd && visibleCells.rowIndexStart == ref.current?.rowIndexStart) {
159
+ return;
160
+ }
161
+ console.log("Visible cells changed", visibleCells);
162
+ dispatch({
163
+ type: "set-visible",
164
+ region: visibleCells
165
+ });
166
+ ref.current = visibleCells;
167
+ }, 500),
168
+ [dispatch]
169
+ );
170
+ return {
171
+ data,
172
+ loading,
173
+ onScroll,
174
+ dispatch,
175
+ client
176
+ };
177
+ }
178
+ function indexOfFirstNullInRegion(data, region) {
179
+ for (let i = region.rowIndexStart; i < region.rowIndexEnd; i++) {
180
+ if (data[i] == null) {
181
+ return i;
182
+ }
183
+ }
184
+ return null;
185
+ }
186
+ export {
187
+ usePostgRESTLazyLoader
188
+ };
189
+ //# sourceMappingURL=data-loaders.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"data-loaders.js","sources":["../../src/postgrest-table/data-loaders.ts"],"sourcesContent":["/** Lazy loading of data from a PostgREST endpoint */\n\nimport { useAsyncEffect } from \"@macrostrat/ui-components\";\nimport { debounce } from \"underscore\";\nimport { useCallback, useMemo, useReducer, useRef, useEffect } from \"react\";\nimport update, { Spec } from \"immutability-helper\";\n\ninterface ChunkIndex {\n startRow: number;\n endRow: number;\n lastValue: any;\n}\n\nimport {\n PostgrestClient,\n PostgrestQueryBuilder,\n PostgrestFilterBuilder,\n} from \"@supabase/postgrest-js\";\n\ninterface LazyLoaderState<T> {\n data: (T | null)[];\n loading: boolean;\n error: Error | null;\n visibleRegion: RowRegion;\n initialized: boolean;\n}\n\nexport interface PostgrestOrder<T> {\n key: string;\n ascending?: boolean;\n nullsFirst?: boolean;\n}\n\ntype LazyLoaderAction<T> =\n | { type: \"start-loading\" }\n | { type: \"loaded\"; data: T[]; offset: number; totalSize: number }\n | { type: \"error\"; error: Error }\n | { type: \"set-visible\"; region: RowRegion }\n | { type: \"update-data\"; changes: Spec<T[]> }\n | { type: \"reset\" };\n\nfunction adjustArraySize<T>(arr: T[], newSize: number) {\n if (newSize == null || arr.length === newSize) {\n return arr;\n } else if (arr.length > newSize) {\n // Trim the array\n arr = arr.slice(0, newSize);\n }\n return [...arr, ...Array(newSize - arr.length).fill(null)];\n}\n\nfunction lazyLoadingReducer<T>(\n state: LazyLoaderState<T>,\n action: LazyLoaderAction<T>,\n): LazyLoaderState<T> {\n console.log(action);\n switch (action.type) {\n case \"start-loading\":\n return {\n ...state,\n loading: true,\n initialized: true,\n };\n case \"set-visible\":\n return {\n ...state,\n visibleRegion: action.region,\n };\n case \"update-data\":\n return {\n ...state,\n loading: false,\n data: update(state.data, action.changes),\n };\n case \"loaded\":\n let data = adjustArraySize(state.data, action.totalSize);\n data = [\n ...data.slice(0, action.offset),\n ...action.data,\n ...data.slice(action.offset + action.data.length),\n ];\n\n return {\n ...state,\n data,\n loading: false,\n };\n\n case \"reset\":\n return {\n data: [],\n loading: false,\n error: null,\n visibleRegion: { rowIndexStart: 0, rowIndexEnd: 0 },\n initialized: false,\n };\n case \"error\":\n return {\n ...state,\n error: action.error,\n loading: false,\n };\n default:\n return state;\n }\n}\n\ninterface RowRegion {\n rowIndexStart: number;\n rowIndexEnd: number;\n}\n\nenum LoadDirection {\n \"up\",\n \"down\",\n}\n\nfunction overlapsNulls(data: any[], region: RowRegion) {\n for (let i = region.rowIndexStart; i < region.rowIndexEnd; i++) {\n if (data[i] == null) {\n return true;\n }\n }\n return false;\n}\n\nfunction distanceToNextNonEmptyRow(\n data: any[],\n start: number,\n direction: LoadDirection,\n limit: number,\n): number {\n let i = start;\n while (i < data.length && i > 0 && limit > 0) {\n if (data[i] != null) {\n return i;\n }\n i += direction === LoadDirection.down ? 1 : -1;\n limit -= 1;\n }\n return i;\n}\n\ninterface QueryConfig {\n columns?: string | string[];\n count?: \"exact\" | \"estimated\";\n limit?: number;\n offset?: number;\n order?: PostgrestOrder<any>;\n after?: any;\n fullTextSearch?: string;\n filter?: (\n query: PostgrestFilterBuilder<any, any, any>,\n ) => PostgrestFilterBuilder<any, any, any>;\n}\n\nfunction buildQuery<T>(\n client: PostgrestQueryBuilder<T, any>,\n config: QueryConfig,\n) {\n const { columns = \"*\", count } = config;\n const opts = { count };\n\n console.log(\"config\", config);\n\n let cols: string;\n if (Array.isArray(columns)) {\n cols = columns.join(\", \");\n } else {\n cols = columns ?? \"*\";\n }\n\n let query = client.select(cols, opts);\n\n if (config.filter) {\n query = config.filter(query);\n }\n console.log(\"query\", query.url.search);\n\n if (config.order != null) {\n const { key: orderKey, ...rest } = config.order;\n query = query.order(orderKey, rest);\n if (config.after != null) {\n const op = (rest.ascending ?? true) ? \"gt\" : \"lt\";\n query = query[op](orderKey, config.after);\n }\n }\n if (config.limit != null) {\n if (config.offset != null) {\n query = query.range(config.offset, config.offset + config.limit - 1);\n console.log(`Random seek from ${config.offset}, this will be slow`);\n } else {\n query = query.limit(config.limit);\n }\n }\n return query;\n}\n\nfunction _loadMoreData<T>(\n client: PostgrestQueryBuilder<T, any>,\n config: QueryConfig & { chunkSize: number },\n state: LazyLoaderState<T>,\n dispatch: any,\n) {\n const rowIndex = indexOfFirstNullInRegion(state.data, state.visibleRegion);\n if (state.loading || rowIndex == null) {\n if (state.initialized) {\n return;\n }\n }\n\n const { chunkSize = 100, ...rest } = config;\n\n const sortKey = config.order?.key ?? \"id\";\n\n let cfg: QueryConfig = {\n ...rest,\n limit: chunkSize,\n offset: null,\n };\n\n // Allows random seeking\n const isInitialQuery = !state.initialized;\n if (isInitialQuery) {\n cfg.count = \"exact\";\n }\n\n // This only works for forward queries\n if (!isInitialQuery) {\n cfg.after = state.data[rowIndex - 1]?.[sortKey];\n if (cfg.after == null) {\n cfg.offset = rowIndex;\n }\n }\n\n dispatch({ type: \"start-loading\" });\n\n const query = buildQuery(client, cfg);\n\n query.then((res) => {\n console.log(res);\n const { data, count } = res;\n dispatch({\n type: \"loaded\",\n data,\n offset: rowIndex,\n totalSize: count,\n });\n });\n}\n\n// Ensure only one data load is in progress at a time\nconst loadMoreData = debounce(_loadMoreData, 100);\n\ntype LazyLoaderOptions = Omit<QueryConfig, \"count\" | \"offset\" | \"limit\"> & {\n chunkSize?: number;\n sortKey?: string;\n filter?: (\n query: PostgrestFilterBuilder<any, any, any>,\n ) => PostgrestFilterBuilder<any, any, any>;\n};\n\nexport function usePostgRESTLazyLoader(\n endpoint: string,\n table: string,\n config: LazyLoaderOptions = {},\n) {\n const initialState: LazyLoaderState<any> = {\n data: [],\n loading: false,\n error: null,\n visibleRegion: { rowIndexStart: 0, rowIndexEnd: 0 },\n initialized: false,\n };\n\n const client = useMemo(() => {\n return new PostgrestClient(endpoint).from(table);\n }, [endpoint, table]);\n\n const [state, dispatch] = useReducer(lazyLoadingReducer, initialState);\n const { data, loading } = state;\n\n useAsyncEffect(async () => {\n loadMoreData(client, config, state, dispatch);\n }, [\n data,\n state.visibleRegion.rowIndexStart,\n state.visibleRegion.rowIndexEnd,\n ]);\n\n // Reference to hold onto the scroll position\n const ref = useRef(null);\n\n const onScroll = useCallback(\n debounce((visibleCells: RowRegion) => {\n if (\n visibleCells.rowIndexEnd == ref.current?.rowIndexEnd &&\n visibleCells.rowIndexStart == ref.current?.rowIndexStart\n ) {\n return;\n }\n console.log(\"Visible cells changed\", visibleCells);\n dispatch({\n type: \"set-visible\",\n region: visibleCells,\n });\n ref.current = visibleCells;\n }, 500),\n [dispatch],\n );\n\n return {\n data,\n loading,\n onScroll,\n dispatch,\n client,\n };\n}\n\nfunction getRowIndexToLoadFrom<T>(\n data: (T | null)[],\n visibleRegion: RowRegion,\n chunkSize: number,\n) {\n return indexOfFirstNullInRegion(data, visibleRegion);\n}\n\nfunction indexOfFirstNullInRegion(\n data: any[],\n region: RowRegion,\n): number | null {\n for (let i = region.rowIndexStart; i < region.rowIndexEnd; i++) {\n if (data[i] == null) {\n return i;\n }\n }\n return null;\n}\n"],"names":[],"mappings":"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"}