@stack-spot/portal-components 2.1.0 → 2.1.1
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/CHANGELOG.md +8 -0
- package/dist/components/form/Select.d.ts.map +1 -1
- package/dist/components/form/Select.js +4 -3
- package/dist/components/form/Select.js.map +1 -1
- package/dist/context/notification/LazyNotificationList.d.ts.map +1 -1
- package/dist/context/notification/LazyNotificationList.js +10 -2
- package/dist/context/notification/LazyNotificationList.js.map +1 -1
- package/dist/context/notification/hooks.d.ts +1 -1
- package/dist/context/notification/hooks.d.ts.map +1 -1
- package/dist/context/notification/hooks.js +15 -9
- package/dist/context/notification/hooks.js.map +1 -1
- package/package.json +1 -1
- package/src/components/form/Select.tsx +5 -4
- package/src/context/notification/LazyNotificationList.ts +10 -2
- package/src/context/notification/hooks.ts +14 -10
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## [2.1.1](https://github.com/stack-spot/portal-commons/compare/portal-components@v2.1.0...portal-components@v2.1.1) (2024-07-17)
|
|
4
|
+
|
|
5
|
+
|
|
6
|
+
### Bug Fixes
|
|
7
|
+
|
|
8
|
+
* notification bugs ([53f1199](https://github.com/stack-spot/portal-commons/commit/53f1199e8ed058a536888c5a242e600bd1728f86))
|
|
9
|
+
* notification bugs ([53f1199](https://github.com/stack-spot/portal-commons/commit/53f1199e8ed058a536888c5a242e600bd1728f86))
|
|
10
|
+
|
|
3
11
|
## [2.1.0](https://github.com/stack-spot/portal-commons/compare/portal-components@v2.0.3...portal-components@v2.1.0) (2024-07-16)
|
|
4
12
|
|
|
5
13
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Select.d.ts","sourceRoot":"","sources":["../../../src/components/form/Select.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAqD,MAAM,OAAO,CAAA;AAG9F,UAAU,eAAe,CAAC,CAAC,CAAE,SAAQ,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC;IACrG;;OAEG;IACH,KAAK,EAAE,CAAC,GAAG,SAAS,CAAC;IACrB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,OAAO,EAAE,CAAC,EAAE,CAAC;IACb;;;;;;;;;OASG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,EAAE,SAAS,CAAC,KAAK,MAAM,CAAC,CAAC;IAClE;;;;;;;;;OASG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,EAAE,SAAS,CAAC,KAAK,MAAM,CAAC,CAAC;IAClE;;;OAGG;IACH,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,SAAS,KAAK,IAAI,CAAC;IACzC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,mBAAmB,CAAC,CAAC,CAAE,SAAQ,eAAe,CAAC,CAAC,CAAC;IACzD,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,mBAAmB,CAAC,CAAC,CAAE,SAAQ,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC;IAC3E,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,KAAK,EAAE,CAAC,CAAC;IACT,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;CAC9B;AAED,KAAK,WAAW,CAAC,CAAC,IAAI,mBAAmB,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAA;AAkHrE;;;;;;;GAOG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,EACxB,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,QAAY,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,KAAK,EAC3H,EAAE,WAAW,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"Select.d.ts","sourceRoot":"","sources":["../../../src/components/form/Select.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAqD,MAAM,OAAO,CAAA;AAG9F,UAAU,eAAe,CAAC,CAAC,CAAE,SAAQ,IAAI,CAAC,mBAAmB,CAAC,iBAAiB,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC;IACrG;;OAEG;IACH,KAAK,EAAE,CAAC,GAAG,SAAS,CAAC;IACrB;;;;OAIG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;OAEG;IACH,OAAO,EAAE,CAAC,EAAE,CAAC;IACb;;;;;;;;;OASG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,EAAE,SAAS,CAAC,KAAK,MAAM,CAAC,CAAC;IAClE;;;;;;;;;OASG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,EAAE,SAAS,CAAC,KAAK,MAAM,CAAC,CAAC;IAClE;;;OAGG;IACH,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,GAAG,SAAS,KAAK,IAAI,CAAC;IACzC;;;OAGG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,UAAU,mBAAmB,CAAC,CAAC,CAAE,SAAQ,eAAe,CAAC,CAAC,CAAC;IACzD,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,mBAAmB,CAAC,CAAC,CAAE,SAAQ,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC;IAC3E,WAAW,CAAC,EAAE,SAAS,CAAC;IACxB,KAAK,EAAE,CAAC,CAAC;IACT,QAAQ,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;CAC9B;AAED,KAAK,WAAW,CAAC,CAAC,IAAI,mBAAmB,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAA;AAkHrE;;;;;;;GAOG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,EACxB,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,QAAY,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,KAAK,EAC3H,EAAE,WAAW,CAAC,CAAC,CAAC,2CA2EhB"}
|
|
@@ -118,13 +118,14 @@ const FakeOption = ({ value, label, onChange }) => (_jsx("li", { className: "opt
|
|
|
118
118
|
export function Select({ onChange, options, value, emptyOption, renderLabel, renderValue, maxItems = 6, onFocus, onBlur, style, className, ...props }) {
|
|
119
119
|
const [open, setOpen] = useState(false);
|
|
120
120
|
const [focused, setFocused] = useState(false);
|
|
121
|
-
const
|
|
121
|
+
const fakeSelectRef = useRef(null);
|
|
122
122
|
const onChangeOption = useCallback((event) => {
|
|
123
123
|
const value = options.find(o => renderProperty(o, renderValue) === event.target.value);
|
|
124
124
|
onChange(value);
|
|
125
|
+
setOpen(false);
|
|
125
126
|
}, []);
|
|
126
127
|
const onClickOutside = useCallback((event) => {
|
|
127
|
-
if (
|
|
128
|
+
if (fakeSelectRef.current && !fakeSelectRef.current.contains(event.target))
|
|
128
129
|
setOpen(false);
|
|
129
130
|
}, []);
|
|
130
131
|
const [htmlOptions, fakeOptions] = useMemo(() => options.reduce(([opts, fake], o) => {
|
|
@@ -156,6 +157,6 @@ export function Select({ onChange, options, value, emptyOption, renderLabel, ren
|
|
|
156
157
|
}, onBlur: (ev) => {
|
|
157
158
|
setFocused(false);
|
|
158
159
|
onBlur?.(ev);
|
|
159
|
-
}, children: [emptyOption === undefined ? null : _jsx("option", { value: "", selected: !value, children: emptyOption }), htmlOptions] }), _jsxs("div", { className: listToClass(['fake-select', open && 'open', focused && 'focused']), "aria-hidden": true, children: [_jsxs("div", {
|
|
160
|
+
}, children: [emptyOption === undefined ? null : _jsx("option", { value: "", selected: !value, children: emptyOption }), htmlOptions] }), _jsxs("div", { ref: fakeSelectRef, className: listToClass(['fake-select', open && 'open', focused && 'focused']), "aria-hidden": true, children: [_jsxs("div", { className: "current-value", onClick: () => setOpen(!open), children: [_jsx(Text, { className: "clipped-text", children: getCurrentLabel() }), _jsx(IconBox, { className: "arrow", children: _jsx(ChevronDown, {}) })] }), _jsxs("ul", { className: "options", style: { height: `${height}px` }, children: [emptyOption === undefined ? null : _jsx(FakeOption, { value: "", label: emptyOption, onChange: onChangeOption }), fakeOptions] })] })] }));
|
|
160
161
|
}
|
|
161
162
|
//# sourceMappingURL=Select.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Select.js","sourceRoot":"","sources":["../../../src/components/form/Select.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,cAAc,CAAA;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,0BAA0B,CAAA;AAC7D,OAAO,EAAuB,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAC9F,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AA+D1C,MAAM,aAAa,GAAG,EAAE,CAAA;AACxB,MAAM,mBAAmB,GAAG,CAAC,CAAA;AAE7B,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAuB;;;;;;;;;;;;;;;;;;wBAkB3B,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;;;wBAGtB,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;;;;;;;0BAOpB,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;8BACpB,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;oBAgDlC,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,SAAS,GAAG,aAAa,GAAG,mBAAmB;;;kBAGpE,aAAa;;;;;gCAKC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;;;;8BAIxB,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;;;;;CAKnD,CAAA;AAED,SAAS,cAAc,CAAC,MAAW,EAAE,QAAa;IAChD,IAAI,CAAC,QAAQ;QAAE,OAAO,GAAG,MAAM,IAAI,EAAE,EAAE,CAAA;IACvC,OAAO,OAAO,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,GAAG,MAAM,IAAI,EAAE,EAAE,CAAC,CAAA;AACpG,CAAC;AAED,MAAM,UAAU,GAAG,CACjB,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAA8F,EACtH,EAAE,CAAC,CACH,aAAI,SAAS,EAAC,QAAQ,EAAC,OAAO,EAAE,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,CAAC,YACnE,KAAC,IAAI,IAAC,SAAS,EAAC,cAAc,YAAE,KAAK,GAAQ,GAC1C,CACN,CAAA;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,MAAM,CAAI,EACxB,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,GAAG,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,KAAK,EAC3G;IACf,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IACvC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IAC7C,MAAM,aAAa,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAA;IAElD,MAAM,cAAc,GAAG,WAAW,CAAC,CAAC,KAAoC,EAAE,EAAE;QAC1E,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,EAAE,WAAW,CAAC,KAAK,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;QACtF,QAAQ,CAAC,KAAM,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"Select.js","sourceRoot":"","sources":["../../../src/components/form/Select.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LazyNotificationList.d.ts","sourceRoot":"","sources":["../../../src/context/notification/LazyNotificationList.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAC3E,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAElH,UAAU,iBAAiB;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,CAAC,OAAO,EAAE,wBAAwB,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IACjE,OAAO,CAAC,EAAE,wBAAwB,CAAC;CACpC;AAED,qBAAa,oBAAoB;;IAC/B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,qBAAqB,EAAE,CAAK;IACnC,OAAO,CAAC,IAAI,CAAK;IACjB,OAAO,CAAC,KAAK,CAAI;IACjB,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA4D;IACjF,OAAO,CAAC,SAAS,CAAiC;IAClD,OAAO,CAAC,YAAY,CAA2B;gBAEnC,EAAE,EAAE,EAAE,IAAI,EAAE,OAAY,EAAE,EAAE,iBAAiB;IAMzD,OAAO,CAAC,MAAM;IAuBR,YAAY,CAAC,OAAO,EAAE,wBAAwB;
|
|
1
|
+
{"version":3,"file":"LazyNotificationList.d.ts","sourceRoot":"","sources":["../../../src/context/notification/LazyNotificationList.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAE,MAAM,qCAAqC,CAAA;AAC3E,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAElH,UAAU,iBAAiB;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,CAAC,OAAO,EAAE,wBAAwB,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;IACjE,OAAO,CAAC,EAAE,wBAAwB,CAAC;CACpC;AAED,qBAAa,oBAAoB;;IAC/B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;IACnB,KAAK,EAAE,qBAAqB,EAAE,CAAK;IACnC,OAAO,CAAC,IAAI,CAAK;IACjB,OAAO,CAAC,KAAK,CAAI;IACjB,OAAO,CAAC,OAAO,CAA0B;IACzC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAA4D;IACjF,OAAO,CAAC,SAAS,CAAiC;IAClD,OAAO,CAAC,YAAY,CAA2B;gBAEnC,EAAE,EAAE,EAAE,IAAI,EAAE,OAAY,EAAE,EAAE,iBAAiB;IAMzD,OAAO,CAAC,MAAM;IAuBR,YAAY,CAAC,OAAO,EAAE,wBAAwB;IAsBpD,QAAQ;IAKR,OAAO;IAIP,SAAS,CAAC,QAAQ,EAAE,wBAAwB;IAO5C,MAAM,CAAC,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC;IAY1C,IAAI;CAGL"}
|
|
@@ -65,12 +65,18 @@ export class LazyNotificationList {
|
|
|
65
65
|
this.listeners.forEach(l => l(this.items, hasMore));
|
|
66
66
|
}
|
|
67
67
|
async applyFilters(filters) {
|
|
68
|
+
try {
|
|
69
|
+
await this.currentFetch;
|
|
70
|
+
}
|
|
71
|
+
catch {
|
|
72
|
+
/* empty: this error will be treated by the function who actually triggered `currentFetch`. We just need to make sure we wait until
|
|
73
|
+
it ends before making new requests. */
|
|
74
|
+
}
|
|
68
75
|
const prevPage = this.page;
|
|
69
76
|
const prevFilters = this.filters;
|
|
70
77
|
this.filters = filters;
|
|
71
78
|
this.page = -1;
|
|
72
79
|
try {
|
|
73
|
-
await this.currentFetch;
|
|
74
80
|
this.currentFetch = __classPrivateFieldGet(this, _LazyNotificationList_instances, "m", _LazyNotificationList_loadMore).call(this, true);
|
|
75
81
|
await this.currentFetch;
|
|
76
82
|
}
|
|
@@ -97,7 +103,9 @@ export class LazyNotificationList {
|
|
|
97
103
|
this.items.forEach(i => i.committed = readStatusMap.get(i.id) ?? i.committed);
|
|
98
104
|
if (this.filters.committed !== undefined) {
|
|
99
105
|
this.items = this.items.filter(i => i.committed === this.filters.committed);
|
|
100
|
-
// if the filtered list has one item or less, we update the list with the backend so it can show more items
|
|
106
|
+
// if the filtered list has one item or less, we update the list with the backend so it can show more items.
|
|
107
|
+
// we can't use loadMore in this case because the page 2 would now skip some items. We'd need the backend to implement a cursor
|
|
108
|
+
// interface.
|
|
101
109
|
if (this.items.length <= 1)
|
|
102
110
|
this.applyFilters(this.filters);
|
|
103
111
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LazyNotificationList.js","sourceRoot":"","sources":["../../../src/context/notification/LazyNotificationList.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAUrC,MAAM,OAAO,oBAAoB;IAU/B,YAAY,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,GAAG,EAAE,EAAqB;;QAThD;;;;;WAAU;QACnB;;;;mBAAiC,EAAE;WAAA;QAC3B;;;;mBAAO,CAAC,CAAC;WAAA;QACT;;;;mBAAQ,CAAC;WAAA;QACT;;;;;WAAiC;QACxB;;;;;WAAgE;QACzE;;;;mBAAwC,EAAE;WAAA;QAC1C;;;;;WAAuC;QAG7C,IAAI,CAAC,EAAE,GAAG,EAAE,CAAA;QACZ,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;IACxB,CAAC;IAEO,MAAM;QACZ,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,EAAE,CAAA;QAC9B,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAA;IACrD,CAAC;IAoBD,KAAK,CAAC,YAAY,CAAC,OAAiC;QAClD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAA;QAC1B,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAA;QAChC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,CAAA;QACd,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"LazyNotificationList.js","sourceRoot":"","sources":["../../../src/context/notification/LazyNotificationList.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ export declare function useNotificationList(initialFilters?: LoadNotificationsFi
|
|
|
3
3
|
status: "loading" | "error" | "startup" | "idle";
|
|
4
4
|
items: import("../../notifications.js").StackspotNotification[];
|
|
5
5
|
hasMore: boolean;
|
|
6
|
-
loadMore: () => Promise<void
|
|
6
|
+
loadMore: () => Promise<void> | undefined;
|
|
7
7
|
refresh: () => Promise<void>;
|
|
8
8
|
applyFilters: (newFilters: LoadNotificationsFilters) => Promise<void>;
|
|
9
9
|
filters: LoadNotificationsFilters;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../../src/context/notification/hooks.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../../src/context/notification/hooks.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,wBAAwB,EAAE,MAAM,SAAS,CAAA;AAElD,wBAAgB,mBAAmB,CAAC,cAAc,GAAE,wBAA6B;;;;;;+BA0B3B,wBAAwB;;;EAuC7E;AAED,wBAAgB,sBAAsB,YAWrC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { useCallback,
|
|
1
|
+
import { useCallback, useRef, useState } from 'react';
|
|
2
2
|
import { useManualRender } from '../../hooks/manual-render.js';
|
|
3
3
|
import { useEffectOnce } from '../../hooks/use-effect-once.js';
|
|
4
4
|
import { useNotificationController } from './context.js';
|
|
@@ -8,12 +8,13 @@ export function useNotificationList(initialFilters = {}) {
|
|
|
8
8
|
const error = useRef();
|
|
9
9
|
const controller = useNotificationController();
|
|
10
10
|
const [filters, setFilters] = useState(initialFilters);
|
|
11
|
-
const list =
|
|
11
|
+
const list = useRef();
|
|
12
12
|
useEffectOnce(() => {
|
|
13
13
|
async function start() {
|
|
14
|
-
list.
|
|
14
|
+
list.current = controller.createLazyNotificationList(initialFilters);
|
|
15
|
+
list.current.subscribe(repaint);
|
|
15
16
|
try {
|
|
16
|
-
await list.loadMore();
|
|
17
|
+
await list.current?.loadMore();
|
|
17
18
|
setStatus('idle');
|
|
18
19
|
}
|
|
19
20
|
catch (e) {
|
|
@@ -22,9 +23,14 @@ export function useNotificationList(initialFilters = {}) {
|
|
|
22
23
|
}
|
|
23
24
|
}
|
|
24
25
|
start();
|
|
25
|
-
return () =>
|
|
26
|
+
return () => {
|
|
27
|
+
if (list.current)
|
|
28
|
+
controller.destroyLazyNotificationList(list.current.id);
|
|
29
|
+
};
|
|
26
30
|
});
|
|
27
31
|
const applyFilters = useCallback(async (newFilters) => {
|
|
32
|
+
if (!list.current)
|
|
33
|
+
return;
|
|
28
34
|
setStatus('loading');
|
|
29
35
|
// since we're inside a useCallback, we don't have direct access to the current value of "filters". The only way we can access this
|
|
30
36
|
// value is from the function "setFilters". But "setFilters" run async. For this reason, we wait the function to run and retrieve the
|
|
@@ -38,7 +44,7 @@ export function useNotificationList(initialFilters = {}) {
|
|
|
38
44
|
});
|
|
39
45
|
});
|
|
40
46
|
try {
|
|
41
|
-
await list.applyFilters(next);
|
|
47
|
+
await list.current.applyFilters(next);
|
|
42
48
|
setStatus('idle');
|
|
43
49
|
error.current = undefined;
|
|
44
50
|
}
|
|
@@ -55,9 +61,9 @@ export function useNotificationList(initialFilters = {}) {
|
|
|
55
61
|
}, []);
|
|
56
62
|
return {
|
|
57
63
|
status,
|
|
58
|
-
items: list.items,
|
|
59
|
-
hasMore: list.hasMore(),
|
|
60
|
-
loadMore: () => list.loadMore(),
|
|
64
|
+
items: list.current?.items ?? [],
|
|
65
|
+
hasMore: list.current?.hasMore() ?? false,
|
|
66
|
+
loadMore: () => list.current?.loadMore(),
|
|
61
67
|
refresh: () => applyFilters(filters),
|
|
62
68
|
applyFilters,
|
|
63
69
|
filters,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../../src/context/notification/hooks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../../src/context/notification/hooks.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -190,15 +190,16 @@ export function Select<T>({
|
|
|
190
190
|
}: SelectProps<T>) {
|
|
191
191
|
const [open, setOpen] = useState(false)
|
|
192
192
|
const [focused, setFocused] = useState(false)
|
|
193
|
-
const
|
|
193
|
+
const fakeSelectRef = useRef<HTMLDivElement>(null)
|
|
194
194
|
|
|
195
195
|
const onChangeOption = useCallback((event: { target: { value: string } }) => {
|
|
196
196
|
const value = options.find(o => renderProperty(o, renderValue) === event.target.value)
|
|
197
197
|
onChange(value!)
|
|
198
|
+
setOpen(false)
|
|
198
199
|
}, [])
|
|
199
200
|
|
|
200
201
|
const onClickOutside = useCallback((event: MouseEvent) => {
|
|
201
|
-
if (
|
|
202
|
+
if (fakeSelectRef.current && !fakeSelectRef.current.contains(event.target as Node)) setOpen(false)
|
|
202
203
|
}, [])
|
|
203
204
|
|
|
204
205
|
const [htmlOptions, fakeOptions] = useMemo(
|
|
@@ -249,8 +250,8 @@ export function Select<T>({
|
|
|
249
250
|
{emptyOption === undefined ? null : <option value="" selected={!value}>{emptyOption}</option>}
|
|
250
251
|
{htmlOptions}
|
|
251
252
|
</select>
|
|
252
|
-
<div className={listToClass(['fake-select', open && 'open', focused && 'focused'])} aria-hidden>
|
|
253
|
-
<div
|
|
253
|
+
<div ref={fakeSelectRef} className={listToClass(['fake-select', open && 'open', focused && 'focused'])} aria-hidden>
|
|
254
|
+
<div className="current-value" onClick={() => setOpen(!open)}>
|
|
254
255
|
<Text className="clipped-text">{getCurrentLabel()}</Text>
|
|
255
256
|
<IconBox className="arrow"><ChevronDown /></IconBox>
|
|
256
257
|
</div>
|
|
@@ -48,12 +48,18 @@ export class LazyNotificationList {
|
|
|
48
48
|
}
|
|
49
49
|
|
|
50
50
|
async applyFilters(filters: LoadNotificationsFilters) {
|
|
51
|
+
try {
|
|
52
|
+
await this.currentFetch
|
|
53
|
+
} catch {
|
|
54
|
+
/* empty: this error will be treated by the function who actually triggered `currentFetch`. We just need to make sure we wait until
|
|
55
|
+
it ends before making new requests. */
|
|
56
|
+
}
|
|
51
57
|
const prevPage = this.page
|
|
52
58
|
const prevFilters = this.filters
|
|
53
59
|
this.filters = filters
|
|
54
60
|
this.page = -1
|
|
55
61
|
try {
|
|
56
|
-
|
|
62
|
+
|
|
57
63
|
this.currentFetch = this.#loadMore(true)
|
|
58
64
|
await this.currentFetch
|
|
59
65
|
} catch (error) {
|
|
@@ -83,7 +89,9 @@ export class LazyNotificationList {
|
|
|
83
89
|
this.items.forEach(i => i.committed = readStatusMap.get(i.id) ?? i.committed)
|
|
84
90
|
if (this.filters.committed !== undefined) {
|
|
85
91
|
this.items = this.items.filter(i => i.committed === this.filters.committed)
|
|
86
|
-
// if the filtered list has one item or less, we update the list with the backend so it can show more items
|
|
92
|
+
// if the filtered list has one item or less, we update the list with the backend so it can show more items.
|
|
93
|
+
// we can't use loadMore in this case because the page 2 would now skip some items. We'd need the backend to implement a cursor
|
|
94
|
+
// interface.
|
|
87
95
|
if (this.items.length <= 1) this.applyFilters(this.filters)
|
|
88
96
|
}
|
|
89
97
|
this.notify()
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import { useCallback,
|
|
1
|
+
import { useCallback, useRef, useState } from 'react'
|
|
2
2
|
import { useManualRender } from '../../hooks/manual-render'
|
|
3
3
|
import { useEffectOnce } from '../../hooks/use-effect-once'
|
|
4
4
|
import { useNotificationController } from './context'
|
|
5
|
+
import { LazyNotificationList } from './LazyNotificationList'
|
|
5
6
|
import { LoadNotificationsFilters } from './types'
|
|
6
7
|
|
|
7
8
|
export function useNotificationList(initialFilters: LoadNotificationsFilters = {}) {
|
|
@@ -10,25 +11,28 @@ export function useNotificationList(initialFilters: LoadNotificationsFilters = {
|
|
|
10
11
|
const error = useRef<any>()
|
|
11
12
|
const controller = useNotificationController()
|
|
12
13
|
const [filters, setFilters] = useState(initialFilters)
|
|
13
|
-
const list =
|
|
14
|
+
const list = useRef<LazyNotificationList | undefined>()
|
|
14
15
|
|
|
15
16
|
useEffectOnce(() => {
|
|
16
17
|
async function start() {
|
|
17
|
-
list.
|
|
18
|
+
list.current = controller.createLazyNotificationList(initialFilters)
|
|
19
|
+
list.current.subscribe(repaint)
|
|
18
20
|
try {
|
|
19
|
-
await list.loadMore()
|
|
21
|
+
await list.current?.loadMore()
|
|
20
22
|
setStatus('idle')
|
|
21
23
|
} catch (e) {
|
|
22
24
|
setStatus('error')
|
|
23
25
|
error.current = e
|
|
24
26
|
}
|
|
25
27
|
}
|
|
26
|
-
|
|
27
28
|
start()
|
|
28
|
-
return () =>
|
|
29
|
+
return () => {
|
|
30
|
+
if (list.current) controller.destroyLazyNotificationList(list.current.id)
|
|
31
|
+
}
|
|
29
32
|
})
|
|
30
33
|
|
|
31
34
|
const applyFilters = useCallback(async (newFilters: LoadNotificationsFilters) => {
|
|
35
|
+
if (!list.current) return
|
|
32
36
|
setStatus('loading')
|
|
33
37
|
// since we're inside a useCallback, we don't have direct access to the current value of "filters". The only way we can access this
|
|
34
38
|
// value is from the function "setFilters". But "setFilters" run async. For this reason, we wait the function to run and retrieve the
|
|
@@ -42,7 +46,7 @@ export function useNotificationList(initialFilters: LoadNotificationsFilters = {
|
|
|
42
46
|
})
|
|
43
47
|
})
|
|
44
48
|
try {
|
|
45
|
-
await list.applyFilters(next)
|
|
49
|
+
await list.current.applyFilters(next)
|
|
46
50
|
setStatus('idle')
|
|
47
51
|
error.current = undefined
|
|
48
52
|
} catch (e) {
|
|
@@ -58,9 +62,9 @@ export function useNotificationList(initialFilters: LoadNotificationsFilters = {
|
|
|
58
62
|
|
|
59
63
|
return {
|
|
60
64
|
status,
|
|
61
|
-
items: list.items,
|
|
62
|
-
hasMore: list.hasMore(),
|
|
63
|
-
loadMore: () => list.loadMore(),
|
|
65
|
+
items: list.current?.items ?? [],
|
|
66
|
+
hasMore: list.current?.hasMore() ?? false,
|
|
67
|
+
loadMore: () => list.current?.loadMore(),
|
|
64
68
|
refresh: () => applyFilters(filters),
|
|
65
69
|
applyFilters,
|
|
66
70
|
filters,
|