@bloom-housing/ui-components 12.0.17 → 12.0.18

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.
@@ -50,16 +50,9 @@ var AgTable = function (_a) {
50
50
  components: gridComponents,
51
51
  suppressNoRowsOverlay: data.loading,
52
52
  };
53
- // update table items order on sort change
54
- var initialLoadOnSort = useRef(false);
55
53
  var onSortChange = useCallback(function (columns) {
56
54
  if (!setSort)
57
55
  return;
58
- // prevent multiple fetch on initial render
59
- if (!initialLoadOnSort.current) {
60
- initialLoadOnSort.current = true;
61
- return;
62
- }
63
56
  var sortedColumns = columns.filter(function (col) { return !!col.sort; });
64
57
  setSort(function () {
65
58
  return sortedColumns === null || sortedColumns === void 0 ? void 0 : sortedColumns.map(function (col) {
@@ -104,12 +97,27 @@ var AgTable = function (_a) {
104
97
  var columnStateJSON = JSON.stringify(columnState);
105
98
  sessionStorage.setItem(columnStateLsKey, columnStateJSON);
106
99
  };
100
+ var initialLoadOnSort = useRef(false);
107
101
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
108
102
  var onGridReady = function (params) {
103
+ var _a;
109
104
  setGridColumnApi(params.columnApi);
110
105
  if (selectConfig === null || selectConfig === void 0 ? void 0 : selectConfig.setGridApi) {
111
106
  selectConfig.setGridApi(params.api);
112
107
  }
108
+ // sort data on initial load if sort field present
109
+ if (!initialLoadOnSort.current) {
110
+ initialLoadOnSort.current = true;
111
+ var initialSortColumn = columns.find(function (item) { return item === null || item === void 0 ? void 0 : item.sort; });
112
+ if (initialSortColumn && setSort && initialSortColumn.field) {
113
+ setSort([
114
+ {
115
+ orderBy: initialSortColumn.field,
116
+ orderDir: ((_a = initialSortColumn.sort) === null || _a === void 0 ? void 0 : _a.toUpperCase()) || "asc",
117
+ },
118
+ ]);
119
+ }
120
+ }
113
121
  };
114
122
  return (React.createElement("div", { className: "ag-theme-alpine ag-theme-bloom ".concat(className || "") },
115
123
  React.createElement("div", { className: "flex justify-between flex-col md:flex-row ".concat(showSearch || headerContent ? "mb-4" : "") },
@@ -1 +1 @@
1
- {"version":3,"file":"AgTable.js","sourceRoot":"","sources":["../../../src/tables/AgTable.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AgTable.js","sourceRoot":"","sources":["../../../src/tables/AgTable.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@bloom-housing/ui-components",
3
- "version": "12.0.17",
3
+ "version": "12.0.18",
4
4
  "author": "Sean Albert <sean.albert@exygy.com>",
5
5
  "description": "Shared user interface components for Bloom affordable housing system",
6
6
  "homepage": "https://github.com/bloom-housing/ui-components",
@@ -133,19 +133,10 @@ const AgTable = ({
133
133
  suppressNoRowsOverlay: data.loading,
134
134
  }
135
135
 
136
- // update table items order on sort change
137
- const initialLoadOnSort = useRef<boolean>(false)
138
-
139
136
  const onSortChange = useCallback(
140
137
  (columns: ColumnState[]) => {
141
138
  if (!setSort) return
142
139
 
143
- // prevent multiple fetch on initial render
144
- if (!initialLoadOnSort.current) {
145
- initialLoadOnSort.current = true
146
- return
147
- }
148
-
149
140
  const sortedColumns = columns.filter((col) => !!col.sort)
150
141
 
151
142
  setSort(() =>
@@ -197,12 +188,28 @@ const AgTable = ({
197
188
  sessionStorage.setItem(columnStateLsKey, columnStateJSON)
198
189
  }
199
190
 
191
+ const initialLoadOnSort = useRef<boolean>(false)
192
+
200
193
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
201
194
  const onGridReady = (params: any) => {
202
195
  setGridColumnApi(params.columnApi)
203
196
  if (selectConfig?.setGridApi) {
204
197
  selectConfig.setGridApi(params.api)
205
198
  }
199
+
200
+ // sort data on initial load if sort field present
201
+ if (!initialLoadOnSort.current) {
202
+ initialLoadOnSort.current = true
203
+ const initialSortColumn = columns.find((item: ColDef) => item?.sort) as ColDef
204
+ if (initialSortColumn && setSort && initialSortColumn.field) {
205
+ setSort([
206
+ {
207
+ orderBy: initialSortColumn.field,
208
+ orderDir: initialSortColumn.sort?.toUpperCase() || "asc",
209
+ },
210
+ ])
211
+ }
212
+ }
206
213
  }
207
214
 
208
215
  return (