@evlop/commons 1.0.311 → 1.0.313
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/dist/cjs/src/hooks/useDataSource.d.ts.map +1 -1
- package/dist/cjs/src/hooks/useDataSource.js +29 -24
- package/dist/cjs/src/hooks/useDataSource.js.map +1 -1
- package/dist/cjs/src/hooks/useTemplate.d.ts.map +1 -1
- package/dist/cjs/src/hooks/useTemplate.js +4 -3
- package/dist/cjs/src/hooks/useTemplate.js.map +1 -1
- package/dist/esm/src/hooks/useDataSource.d.ts.map +1 -1
- package/dist/esm/src/hooks/useDataSource.js +30 -25
- package/dist/esm/src/hooks/useDataSource.js.map +1 -1
- package/dist/esm/src/hooks/useTemplate.d.ts.map +1 -1
- package/dist/esm/src/hooks/useTemplate.js +5 -4
- package/dist/esm/src/hooks/useTemplate.js.map +1 -1
- package/dist/types/src/hooks/useDataSource.d.ts.map +1 -1
- package/dist/types/src/hooks/useTemplate.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useDataSource.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useDataSource.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAMxC,KAAK,cAAc,GAAG,QAAQ,GAAG,YAAY,GAAG,KAAK,GAAG,OAAO,GAAG,GAAG,CAAC;AACtE,UAAU,iBAAiB;IACvB,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAE;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAC9B,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACzC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,CAAC,GAAG,EAAC,MAAM,GAAG,GAAG,CAAC;CACrB;AAED,KAAK,IAAI,GAAG,UAAU,GAAG,MAAM,CAAC;AAIhC,eAAO,MAAM,aAAa,GAAK,QAAQ,MAAM,GAAG,iBAAiB,EAAG,UAAU,iBAAiB,KAAI,
|
|
1
|
+
{"version":3,"file":"useDataSource.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useDataSource.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAMxC,KAAK,cAAc,GAAG,QAAQ,GAAG,YAAY,GAAG,KAAK,GAAG,OAAO,GAAG,GAAG,CAAC;AACtE,UAAU,iBAAiB;IACvB,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAE;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAC9B,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACzC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,CAAC,GAAG,EAAC,MAAM,GAAG,GAAG,CAAC;CACrB;AAED,KAAK,IAAI,GAAG,UAAU,GAAG,MAAM,CAAC;AAIhC,eAAO,MAAM,aAAa,GAAK,QAAQ,MAAM,GAAG,iBAAiB,EAAG,UAAU,iBAAiB,KAAI,IAsJlG,CAAC"}
|
|
@@ -60,26 +60,32 @@ const useDataSource = (source, options) => {
|
|
|
60
60
|
}, [scope, template, dataSourceName, dataSource, _dataSourceOptions]);
|
|
61
61
|
const { memoize, isReady } = dataSourceOptions;
|
|
62
62
|
const key = dataSource && dataSource.keyExtractor(dataSourceOptions, { scope, dispatch });
|
|
63
|
-
|
|
63
|
+
let currentValue = (0, react_redux_1.useSelector)(state => state.dataSource.data[key]);
|
|
64
|
+
if (!isReady)
|
|
65
|
+
currentValue = undefined;
|
|
64
66
|
const loadData = (0, react_1.useCallback)((params) => {
|
|
65
|
-
return
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
67
|
+
return (0, react_1.startTransition)(() => {
|
|
68
|
+
return dispatch({
|
|
69
|
+
type: reducers_1.DATA_SOURCE_LOAD_DATA,
|
|
70
|
+
datasourceName: dataSourceName,
|
|
71
|
+
key,
|
|
72
|
+
options: (0, lodash_1.assign)({}, dataSourceOptions, params),
|
|
73
|
+
scope,
|
|
74
|
+
});
|
|
71
75
|
});
|
|
72
76
|
}, [scope, dispatch, dataSourceOptions, key]);
|
|
73
77
|
const search = (0, react_1.useCallback)((condition, searchQuery) => {
|
|
74
78
|
return loadData({ searchQuery, condition });
|
|
75
79
|
}, [loadData]);
|
|
76
80
|
const loadMore = (0, react_1.useCallback)(() => {
|
|
77
|
-
return
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
81
|
+
return (0, react_1.startTransition)(() => {
|
|
82
|
+
dispatch({
|
|
83
|
+
type: reducers_1.DATA_SOURCE_LOAD_MORE_DATA,
|
|
84
|
+
datasourceName: dataSourceName,
|
|
85
|
+
key,
|
|
86
|
+
options: dataSourceOptions,
|
|
87
|
+
scope,
|
|
88
|
+
});
|
|
83
89
|
});
|
|
84
90
|
}, [dataSourceName, dataSourceOptions, scope, key]);
|
|
85
91
|
const next = (0, react_1.useCallback)(() => {
|
|
@@ -111,18 +117,17 @@ const useDataSource = (source, options) => {
|
|
|
111
117
|
if (dataSourceName === 'scope' || dataSourceName === 'static')
|
|
112
118
|
return;
|
|
113
119
|
if (dataSource?.type === 'Array') {
|
|
114
|
-
|
|
115
|
-
items = Array.isArray(items) ? items : [];
|
|
120
|
+
const items = currentValue?.items ?? [];
|
|
116
121
|
return new classes_1.Collection(items, {
|
|
117
|
-
page:
|
|
118
|
-
pageSize:
|
|
119
|
-
isLoading: typeof currentValue === 'undefined' || (
|
|
120
|
-
isRefreshing:
|
|
121
|
-
hasMore:
|
|
122
|
-
queryString:
|
|
123
|
-
totalPages:
|
|
124
|
-
totalRecords:
|
|
125
|
-
meta:
|
|
122
|
+
page: currentValue?.page ?? 0,
|
|
123
|
+
pageSize: currentValue?.pageSize ?? 20,
|
|
124
|
+
isLoading: typeof currentValue === 'undefined' || (currentValue?.isLoading ?? false),
|
|
125
|
+
isRefreshing: currentValue?.isRefreshing ?? false,
|
|
126
|
+
hasMore: currentValue?.hasMore ?? false,
|
|
127
|
+
queryString: currentValue?.queryString ?? '',
|
|
128
|
+
totalPages: currentValue?.totalPages ?? 0,
|
|
129
|
+
totalRecords: currentValue?.totalRecords ?? 0,
|
|
130
|
+
meta: currentValue?.meta ?? {},
|
|
126
131
|
refresh: loadData,
|
|
127
132
|
search,
|
|
128
133
|
loadMore,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useDataSource.js","sourceRoot":"","sources":["../../../../src/hooks/useDataSource.tsx"],"names":[],"mappings":";;;;;;AAAA,mCAAqI;AACrI,
|
|
1
|
+
{"version":3,"file":"useDataSource.js","sourceRoot":"","sources":["../../../../src/hooks/useDataSource.tsx"],"names":[],"mappings":";;;;;;AAAA,mCAAqI;AACrI,iCAAyE;AACzE,6CAAuD;AACvD,wCAAwC;AACxC,0CAAmK;AACnK,yCAAsC;AACtC,gEAAwC;AACxC,sEAA8C;AAgB9C,MAAM,wBAAwB,GAAgC,EAAC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAC,CAAA;AAErF,MAAM,aAAa,GAAG,CAAE,MAAkC,EAAG,OAA2B,EAAQ,EAAE;IACrG,MAAM,QAAQ,GAAG,IAAA,yBAAW,GAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,IAAA,qBAAW,GAAE,CAAC;IAC/B,MAAM,KAAK,GAAG,IAAA,mBAAQ,GAAE,CAAC;IACzB,MAAM,SAAS,GAAG,IAAA,wBAAc,GAAE,CAAC;IAEnC,MAAM,EAAC,cAAc,EAAE,OAAO,EAAE,kBAAkB,EAAC,GAAG,IAAA,eAAO,EAAC,GAAE,EAAE;QAC9D,IAAG,OAAO,MAAM,KAAK,QAAQ,EAAC,CAAC;YAC3B,OAAO,EAAC,cAAc,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,IAAA,iBAAQ,EAAC,IAAA,aAAI,EAAC,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,wBAAwB,CAAC,EAAE,CAAC;QAC/G,CAAC;aAAK,CAAC;YACH,OAAO,EAAC,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,IAAA,iBAAQ,EAAC,OAAO,EAAE,wBAAwB,CAAC,EAAC,CAAC;QAC1F,CAAC;IACL,CAAC,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAEtB,MAAM,UAAU,GAAgB,IAAA,yBAAW,EAAC,KAAK,CAAA,EAAE,CAAA,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,cAAc,CAAC,CAAC,CAAC;IAEjG,yEAAyE;IACzE,MAAM,iBAAiB,GAAsB,IAAA,eAAO,EAAC,GAAE,EAAE;QACrD,MAAM,UAAU,GAAG,IAAA,mBAAU,EAAC,IAAA,YAAG,EAAC,IAAA,YAAG,EAAC,UAAU,EAAE,sBAAsB,CAAC,EAAE,MAAM,CAAC,CAAC,CAAA;QACnF,MAAM,eAAe,GAAG,IAAA,eAAM,EAAC,UAAU,EAAE,CAAC,GAAG,EAAE,SAAS,EAAC,EAAE;YACzD,IAAI,UAAU,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;YAC/C,IAAI,kBAAkB,GAAG,kBAAkB,CAAC,GAAG,SAAS,UAAU,CAAC,CAAC;YACpE,IAAG,kBAAkB,EAAC,CAAC;gBACnB,IAAG,OAAO,kBAAkB,IAAI,QAAQ,EAAC,CAAC;oBACtC,UAAU,GAAG,QAAQ,CAAC,kBAAkB,CAAC,CAAC;gBAC9C,CAAC;qBAAM,CAAC;oBACJ,kBAAkB,GAAG,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;oBACxD,IAAG,CAAC;wBACA,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,kBAAkB,CAAC,CAAC,CAAC;oBAC1D,CAAC;oBAAC,OAAM,CAAC,EAAC,CAAC,CAAA,CAAC;gBAChB,CAAC;YACL,CAAC;iBAAM,IAAG,UAAU,EAAE,CAAC;gBACnB,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC;YACtC,CAAC;YACD,IAAG,UAAU,IAAI,kBAAkB,CAAC,GAAG,SAAS,WAAW,CAAC,EAAC,CAAC;gBAC1D,IAAG,CAAC;oBACA,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;gBACxC,CAAC;gBAAC,OAAM,CAAC,EAAC,CAAC,CAAA,CAAC;YAChB,CAAC;YAED,OAAO,EAAC,GAAG,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,UAAU,EAAC,CAAA;QAC5C,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,OAAO,IAAA,iBAAQ,EAAC,eAAe,EAAE,kBAAkB,CAAC,CAAC;IACzD,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,UAAU,EAAE,kBAAkB,CAAC,CAAC,CAAC;IAEtE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,iBAAiB,CAAC;IAE/C,MAAM,GAAG,GAAG,UAAU,IAAI,UAAU,CAAC,YAAY,CAAC,iBAAiB,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC1F,IAAI,YAAY,GAAG,IAAA,yBAAW,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAErE,IAAG,CAAC,OAAO;QAAE,YAAY,GAAG,SAAS,CAAC;IAEtC,MAAM,QAAQ,GAAG,IAAA,mBAAW,EAAC,CAAC,MAAY,EAAC,EAAE;QACzC,OAAO,IAAA,uBAAe,EAAC,GAAE,EAAE;YACvB,OAAO,QAAQ,CAAC;gBACZ,IAAI,EAAE,gCAAqB;gBAC3B,cAAc,EAAE,cAAc;gBAC9B,GAAG;gBACH,OAAO,EAAE,IAAA,eAAM,EAAC,EAAE,EAAE,iBAAiB,EAAE,MAAM,CAAC;gBAC9C,KAAK;aACR,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GAAG,CAAC,CAAC,CAAC;IAE9C,MAAM,MAAM,GAAG,IAAA,mBAAW,EAAC,CAAC,SAAS,EAAE,WAAW,EAAC,EAAE;QACjD,OAAO,QAAQ,CAAC,EAAC,WAAW,EAAE,SAAS,EAAC,CAAC,CAAC;IAC9C,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,MAAM,QAAQ,GAAG,IAAA,mBAAW,EAAC,GAAE,EAAE;QAC7B,OAAO,IAAA,uBAAe,EAAC,GAAE,EAAE;YACvB,QAAQ,CAAC;gBACT,IAAI,EAAE,qCAA0B;gBAChC,cAAc,EAAE,cAAc;gBAC9B,GAAG;gBACH,OAAO,EAAE,iBAAiB;gBACtB,KAAK;aACR,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,EAAE,CAAC,cAAc,EAAE,iBAAiB,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;IAEpD,MAAM,IAAI,GAAG,IAAA,mBAAW,EAAC,GAAE,EAAE;QACzB,OAAO,QAAQ,CAAC;YACZ,IAAI,EAAE,0CAA+B;YACrC,cAAc,EAAE,cAAc;YAC9B,GAAG;YACH,OAAO,EAAE,iBAAiB;YAC1B,KAAK;SACR,CAAC,CAAC;IACP,CAAC,EAAE,CAAC,cAAc,EAAE,iBAAiB,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;IAEpD,MAAM,QAAQ,GAAG,IAAA,mBAAW,EAAC,GAAE,EAAE;QAC7B,OAAO,QAAQ,CAAC;YACZ,IAAI,EAAE,8CAAmC;YACzC,cAAc,EAAE,cAAc;YAC9B,GAAG;YACH,OAAO,EAAE,iBAAiB;YAC1B,KAAK;SACR,CAAC,CAAC;IACP,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAiB,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;IAE9C,IAAA,iBAAS,EAAC,GAAE,EAAE;QACV,IAAG,cAAc,KAAK,OAAO,IAAI,cAAc,KAAK,QAAQ,IAAI,CAAC,OAAO;YAAE,OAAO;QACjF,IAAG,CAAC,YAAY,IAAI,CAAC,OAAO,EAAC,CAAC;YAC1B,QAAQ,EAAE,CAAC;QACf,CAAC;IACL,CAAC,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;IAE5C,MAAM,KAAK,GAAG,IAAA,eAAO,EAAO,GAAE,EAAE;QAC5B,IAAG,cAAc,KAAK,OAAO,IAAI,cAAc,KAAK,QAAQ;YAAE,OAAO;QACrE,IAAG,UAAU,EAAE,IAAI,KAAK,OAAO,EAAC,CAAC;YAC7B,MAAM,KAAK,GAAG,YAAY,EAAE,KAAK,IAAI,EAAE,CAAC;YACxC,OAAO,IAAI,oBAAU,CAAC,KAAK,EAAE;gBACzB,IAAI,EAAE,YAAY,EAAE,IAAI,IAAI,CAAC;gBAC7B,QAAQ,EAAE,YAAY,EAAE,QAAQ,IAAI,EAAE;gBACtC,SAAS,EAAE,OAAO,YAAY,KAAK,WAAW,IAAI,CAAC,YAAY,EAAE,SAAS,IAAI,KAAK,CAAC;gBACpF,YAAY,EAAG,YAAY,EAAE,YAAY,IAAI,KAAK;gBAClD,OAAO,EAAE,YAAY,EAAE,OAAO,IAAI,KAAK;gBACvC,WAAW,EAAE,YAAY,EAAE,WAAW,IAAI,EAAE;gBAC5C,UAAU,EAAE,YAAY,EAAE,UAAU,IAAI,CAAC;gBACzC,YAAY,EAAE,YAAY,EAAE,YAAY,IAAI,CAAC;gBAC7C,IAAI,EAAE,YAAY,EAAE,IAAI,IAAI,EAAE;gBAC9B,OAAO,EAAE,QAAQ;gBACjB,MAAM;gBACN,QAAQ;gBACR,IAAI;gBACJ,QAAQ;aACX,CAAC,CAAC;QACP,CAAC;QACD,OAAO,OAAO,YAAY,KAAK,WAAW,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC;IACpF,CAAC,EAAE,CAAC,cAAc,EAAE,YAAY,EAAE,UAAU,CAAC,CAAC,CAAC;IAE/C,MAAM,UAAU,GAAG,IAAA,eAAO,EAAC,GAAE,EAAE;QAC3B,IAAG,cAAc,KAAK,QAAQ;YAAE,OAAO;QAEvC,IAAG,iBAAiB,CAAC,YAAY,EAAC,CAAC;YAC/B,MAAM,cAAc,GAAG,IAAA,kBAAS,EAAC,iBAAiB,CAAC,YAAY,EAAE,CAAC,cAAc,EAAC,EAAE,CAAA,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC;YAC9G,OAAO,IAAA,eAAM,EAAC,EAAE,EAAE,iBAAiB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAC9D,CAAC;QACD,OAAO,iBAAiB,CAAC,IAAI,CAAC;IAClC,CAAC,EAAE,CAAC,iBAAiB,CAAC,IAAI,EAAE,iBAAiB,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC,CAAC;IAExE,QAAO,cAAc,EAAC,CAAC;QACnB,KAAK,QAAQ;YACT,OAAO,UAAU,CAAC;QACtB,KAAK,OAAO;YACR,OAAO,IAAA,YAAG,EAAC,KAAK,EAAE,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAC9C;YACI,OAAO,KAAK,CAAC;IACrB,CAAC;AACL,CAAC,CAAC;AAtJW,QAAA,aAAa,iBAsJxB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useTemplate.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useTemplate.tsx"],"names":[],"mappings":"AAOA,eAAO,MAAM,WAAW,GAAI,iBAAiB,MAAM,
|
|
1
|
+
{"version":3,"file":"useTemplate.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useTemplate.tsx"],"names":[],"mappings":"AAOA,eAAO,MAAM,WAAW,GAAI,iBAAiB,MAAM,QAsBlD,CAAC;AAEF,eAAe,WAAW,CAAC"}
|
|
@@ -10,17 +10,18 @@ const react_1 = require("react");
|
|
|
10
10
|
const useScope_1 = require("./useScope");
|
|
11
11
|
const handlebarsCompile = (0, lodash_1.memoize)((stringValue) => handlebars_min_js_1.default.compile(stringValue, { noEscape: true }));
|
|
12
12
|
const useTemplate = (templateString) => {
|
|
13
|
-
const
|
|
13
|
+
const _scope = (0, useScope_1.useScope)();
|
|
14
|
+
const deferredScope = (0, react_1.useDeferredValue)(_scope);
|
|
14
15
|
const applyTemplate = (0, react_1.useCallback)((stringValue) => {
|
|
15
16
|
if ((0, lodash_1.isString)(stringValue)) {
|
|
16
17
|
try {
|
|
17
18
|
const template = handlebarsCompile(stringValue);
|
|
18
|
-
return template(
|
|
19
|
+
return template(deferredScope, { allowProtoMethodsByDefault: true, allowProtoPropertiesByDefault: true });
|
|
19
20
|
}
|
|
20
21
|
catch (e) { }
|
|
21
22
|
}
|
|
22
23
|
return stringValue;
|
|
23
|
-
}, [
|
|
24
|
+
}, [deferredScope]);
|
|
24
25
|
const finalValue = (0, react_1.useMemo)(() => {
|
|
25
26
|
if (templateString)
|
|
26
27
|
return applyTemplate(templateString);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useTemplate.js","sourceRoot":"","sources":["../../../../src/hooks/useTemplate.tsx"],"names":[],"mappings":";;;;;;AAAA,0FAA2D;AAC3D,mCAA2C;AAC3C,
|
|
1
|
+
{"version":3,"file":"useTemplate.js","sourceRoot":"","sources":["../../../../src/hooks/useTemplate.tsx"],"names":[],"mappings":";;;;;;AAAA,0FAA2D;AAC3D,mCAA2C;AAC3C,iCAA+D;AAC/D,yCAAsC;AAEtC,MAAM,iBAAiB,GAAG,IAAA,gBAAO,EAAC,CAAC,WAAkB,EAAE,EAAE,CAAC,2BAAU,CAAC,OAAO,CAAC,WAAW,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC,CAAA;AAErG,MAAM,WAAW,GAAG,CAAC,cAAuB,EAAC,EAAE;IAElD,MAAM,MAAM,GAAG,IAAA,mBAAQ,GAAE,CAAC;IAC1B,MAAM,aAAa,GAAG,IAAA,wBAAgB,EAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,aAAa,GAAG,IAAA,mBAAW,EAAC,CAAC,WAAmB,EAAC,EAAE;QACrD,IAAG,IAAA,iBAAQ,EAAC,WAAW,CAAC,EAAE,CAAC;YACvB,IAAG,CAAC;gBACA,MAAM,QAAQ,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;gBAChD,OAAO,QAAQ,CAAC,aAAa,EAAE,EAAC,0BAA0B,EAAE,IAAI,EAAE,6BAA6B,EAAE,IAAI,EAAC,CAAC,CAAC;YAC5G,CAAC;YAAC,OAAM,CAAC,EAAC,CAAC,CAAA,CAAC;QAChB,CAAC;QACD,OAAO,WAAW,CAAC;IACvB,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAA;IAEnB,MAAM,UAAU,GAAG,IAAA,eAAO,EAAC,GAAE,EAAE;QAC3B,IAAG,cAAc;YAAE,OAAO,aAAa,CAAC,cAAc,CAAC,CAAC;QACxD,OAAO,cAAc,CAAC;IAC1B,CAAC,EAAE,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;IAEpC,IAAG,cAAc,KAAK,SAAS;QAAE,OAAO,aAAa,CAAC;IAEtD,OAAO,UAAU,CAAC;AACtB,CAAC,CAAC;AAtBW,QAAA,WAAW,eAsBtB;AAEF,kBAAe,mBAAW,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useDataSource.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useDataSource.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAMxC,KAAK,cAAc,GAAG,QAAQ,GAAG,YAAY,GAAG,KAAK,GAAG,OAAO,GAAG,GAAG,CAAC;AACtE,UAAU,iBAAiB;IACvB,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAE;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAC9B,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACzC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,CAAC,GAAG,EAAC,MAAM,GAAG,GAAG,CAAC;CACrB;AAED,KAAK,IAAI,GAAG,UAAU,GAAG,MAAM,CAAC;AAIhC,eAAO,MAAM,aAAa,GAAK,QAAQ,MAAM,GAAG,iBAAiB,EAAG,UAAU,iBAAiB,KAAI,
|
|
1
|
+
{"version":3,"file":"useDataSource.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useDataSource.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAMxC,KAAK,cAAc,GAAG,QAAQ,GAAG,YAAY,GAAG,KAAK,GAAG,OAAO,GAAG,GAAG,CAAC;AACtE,UAAU,iBAAiB;IACvB,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAE;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAC9B,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACzC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,CAAC,GAAG,EAAC,MAAM,GAAG,GAAG,CAAC;CACrB;AAED,KAAK,IAAI,GAAG,UAAU,GAAG,MAAM,CAAC;AAIhC,eAAO,MAAM,aAAa,GAAK,QAAQ,MAAM,GAAG,iBAAiB,EAAG,UAAU,iBAAiB,KAAI,IAsJlG,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { assign, defaults, get, map, mapValues, omit, reduce, sortedUniq } from 'lodash';
|
|
2
|
-
import { useCallback, useEffect, useMemo } from 'react';
|
|
2
|
+
import { startTransition, useCallback, useEffect, useMemo } from 'react';
|
|
3
3
|
import { useDispatch, useSelector } from 'react-redux';
|
|
4
4
|
import { Collection } from '../classes';
|
|
5
5
|
import { DATA_SOURCE_LOAD_DATA, DATA_SOURCE_LOAD_MORE_DATA, DATA_SOURCE_LOAD_NEXT_PAGE_DATA, DATA_SOURCE_LOAD_PREVIOUS_PAGE_DATA } from '../reducers';
|
|
@@ -54,26 +54,32 @@ export const useDataSource = (source, options) => {
|
|
|
54
54
|
}, [scope, template, dataSourceName, dataSource, _dataSourceOptions]);
|
|
55
55
|
const { memoize, isReady } = dataSourceOptions;
|
|
56
56
|
const key = dataSource && dataSource.keyExtractor(dataSourceOptions, { scope, dispatch });
|
|
57
|
-
|
|
57
|
+
let currentValue = useSelector(state => state.dataSource.data[key]);
|
|
58
|
+
if (!isReady)
|
|
59
|
+
currentValue = undefined;
|
|
58
60
|
const loadData = useCallback((params) => {
|
|
59
|
-
return
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
61
|
+
return startTransition(() => {
|
|
62
|
+
return dispatch({
|
|
63
|
+
type: DATA_SOURCE_LOAD_DATA,
|
|
64
|
+
datasourceName: dataSourceName,
|
|
65
|
+
key,
|
|
66
|
+
options: assign({}, dataSourceOptions, params),
|
|
67
|
+
scope,
|
|
68
|
+
});
|
|
65
69
|
});
|
|
66
70
|
}, [scope, dispatch, dataSourceOptions, key]);
|
|
67
71
|
const search = useCallback((condition, searchQuery) => {
|
|
68
72
|
return loadData({ searchQuery, condition });
|
|
69
73
|
}, [loadData]);
|
|
70
74
|
const loadMore = useCallback(() => {
|
|
71
|
-
return
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
75
|
+
return startTransition(() => {
|
|
76
|
+
dispatch({
|
|
77
|
+
type: DATA_SOURCE_LOAD_MORE_DATA,
|
|
78
|
+
datasourceName: dataSourceName,
|
|
79
|
+
key,
|
|
80
|
+
options: dataSourceOptions,
|
|
81
|
+
scope,
|
|
82
|
+
});
|
|
77
83
|
});
|
|
78
84
|
}, [dataSourceName, dataSourceOptions, scope, key]);
|
|
79
85
|
const next = useCallback(() => {
|
|
@@ -105,18 +111,17 @@ export const useDataSource = (source, options) => {
|
|
|
105
111
|
if (dataSourceName === 'scope' || dataSourceName === 'static')
|
|
106
112
|
return;
|
|
107
113
|
if (dataSource?.type === 'Array') {
|
|
108
|
-
|
|
109
|
-
items = Array.isArray(items) ? items : [];
|
|
114
|
+
const items = currentValue?.items ?? [];
|
|
110
115
|
return new Collection(items, {
|
|
111
|
-
page:
|
|
112
|
-
pageSize:
|
|
113
|
-
isLoading: typeof currentValue === 'undefined' ||
|
|
114
|
-
isRefreshing:
|
|
115
|
-
hasMore:
|
|
116
|
-
queryString:
|
|
117
|
-
totalPages:
|
|
118
|
-
totalRecords:
|
|
119
|
-
meta:
|
|
116
|
+
page: currentValue?.page ?? 0,
|
|
117
|
+
pageSize: currentValue?.pageSize ?? 20,
|
|
118
|
+
isLoading: typeof currentValue === 'undefined' || (currentValue?.isLoading ?? false),
|
|
119
|
+
isRefreshing: currentValue?.isRefreshing ?? false,
|
|
120
|
+
hasMore: currentValue?.hasMore ?? false,
|
|
121
|
+
queryString: currentValue?.queryString ?? '',
|
|
122
|
+
totalPages: currentValue?.totalPages ?? 0,
|
|
123
|
+
totalRecords: currentValue?.totalRecords ?? 0,
|
|
124
|
+
meta: currentValue?.meta ?? {},
|
|
120
125
|
refresh: loadData,
|
|
121
126
|
search,
|
|
122
127
|
loadMore,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useDataSource.js","sourceRoot":"","sources":["../../../../src/hooks/useDataSource.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAoB,QAAQ,EAAW,GAAG,EAAQ,GAAG,EAAE,SAAS,EAAE,IAAI,EAAQ,MAAM,EAAO,UAAU,EAAE,MAAM,QAAQ,CAAC;AACrI,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"useDataSource.js","sourceRoot":"","sources":["../../../../src/hooks/useDataSource.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useTemplate.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useTemplate.tsx"],"names":[],"mappings":"AAOA,eAAO,MAAM,WAAW,GAAI,iBAAiB,MAAM,
|
|
1
|
+
{"version":3,"file":"useTemplate.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useTemplate.tsx"],"names":[],"mappings":"AAOA,eAAO,MAAM,WAAW,GAAI,iBAAiB,MAAM,QAsBlD,CAAC;AAEF,eAAe,WAAW,CAAC"}
|
|
@@ -1,20 +1,21 @@
|
|
|
1
1
|
import Handlebars from 'handlebars/dist/handlebars.min.js';
|
|
2
2
|
import { isString, memoize } from 'lodash';
|
|
3
|
-
import { useCallback, useMemo } from 'react';
|
|
3
|
+
import { useCallback, useDeferredValue, useMemo } from 'react';
|
|
4
4
|
import { useScope } from "./useScope";
|
|
5
5
|
const handlebarsCompile = memoize((stringValue) => Handlebars.compile(stringValue, { noEscape: true }));
|
|
6
6
|
export const useTemplate = (templateString) => {
|
|
7
|
-
const
|
|
7
|
+
const _scope = useScope();
|
|
8
|
+
const deferredScope = useDeferredValue(_scope);
|
|
8
9
|
const applyTemplate = useCallback((stringValue) => {
|
|
9
10
|
if (isString(stringValue)) {
|
|
10
11
|
try {
|
|
11
12
|
const template = handlebarsCompile(stringValue);
|
|
12
|
-
return template(
|
|
13
|
+
return template(deferredScope, { allowProtoMethodsByDefault: true, allowProtoPropertiesByDefault: true });
|
|
13
14
|
}
|
|
14
15
|
catch (e) { }
|
|
15
16
|
}
|
|
16
17
|
return stringValue;
|
|
17
|
-
}, [
|
|
18
|
+
}, [deferredScope]);
|
|
18
19
|
const finalValue = useMemo(() => {
|
|
19
20
|
if (templateString)
|
|
20
21
|
return applyTemplate(templateString);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useTemplate.js","sourceRoot":"","sources":["../../../../src/hooks/useTemplate.tsx"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,mCAAmC,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"useTemplate.js","sourceRoot":"","sources":["../../../../src/hooks/useTemplate.tsx"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,mCAAmC,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,MAAM,iBAAiB,GAAG,OAAO,CAAC,CAAC,WAAkB,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,EAAC,QAAQ,EAAE,IAAI,EAAC,CAAC,CAAC,CAAA;AAE5G,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,cAAuB,EAAC,EAAE;IAElD,MAAM,MAAM,GAAG,QAAQ,EAAE,CAAC;IAC1B,MAAM,aAAa,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,aAAa,GAAG,WAAW,CAAC,CAAC,WAAmB,EAAC,EAAE;QACrD,IAAG,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;YACvB,IAAG,CAAC;gBACA,MAAM,QAAQ,GAAG,iBAAiB,CAAC,WAAW,CAAC,CAAC;gBAChD,OAAO,QAAQ,CAAC,aAAa,EAAE,EAAC,0BAA0B,EAAE,IAAI,EAAE,6BAA6B,EAAE,IAAI,EAAC,CAAC,CAAC;YAC5G,CAAC;YAAC,OAAM,CAAC,EAAC,CAAC,CAAA,CAAC;QAChB,CAAC;QACD,OAAO,WAAW,CAAC;IACvB,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,CAAA;IAEnB,MAAM,UAAU,GAAG,OAAO,CAAC,GAAE,EAAE;QAC3B,IAAG,cAAc;YAAE,OAAO,aAAa,CAAC,cAAc,CAAC,CAAC;QACxD,OAAO,cAAc,CAAC;IAC1B,CAAC,EAAE,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC;IAEpC,IAAG,cAAc,KAAK,SAAS;QAAE,OAAO,aAAa,CAAC;IAEtD,OAAO,UAAU,CAAC;AACtB,CAAC,CAAC;AAEF,eAAe,WAAW,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useDataSource.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useDataSource.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAMxC,KAAK,cAAc,GAAG,QAAQ,GAAG,YAAY,GAAG,KAAK,GAAG,OAAO,GAAG,GAAG,CAAC;AACtE,UAAU,iBAAiB;IACvB,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAE;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAC9B,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACzC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,CAAC,GAAG,EAAC,MAAM,GAAG,GAAG,CAAC;CACrB;AAED,KAAK,IAAI,GAAG,UAAU,GAAG,MAAM,CAAC;AAIhC,eAAO,MAAM,aAAa,GAAK,QAAQ,MAAM,GAAG,iBAAiB,EAAG,UAAU,iBAAiB,KAAI,
|
|
1
|
+
{"version":3,"file":"useDataSource.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useDataSource.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAMxC,KAAK,cAAc,GAAG,QAAQ,GAAG,YAAY,GAAG,KAAK,GAAG,OAAO,GAAG,GAAG,CAAC;AACtE,UAAU,iBAAiB;IACvB,IAAI,CAAC,EAAE,cAAc,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAE;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IAC9B,YAAY,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAC;IACzC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,CAAC,GAAG,EAAC,MAAM,GAAG,GAAG,CAAC;CACrB;AAED,KAAK,IAAI,GAAG,UAAU,GAAG,MAAM,CAAC;AAIhC,eAAO,MAAM,aAAa,GAAK,QAAQ,MAAM,GAAG,iBAAiB,EAAG,UAAU,iBAAiB,KAAI,IAsJlG,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useTemplate.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useTemplate.tsx"],"names":[],"mappings":"AAOA,eAAO,MAAM,WAAW,GAAI,iBAAiB,MAAM,
|
|
1
|
+
{"version":3,"file":"useTemplate.d.ts","sourceRoot":"","sources":["../../../../src/hooks/useTemplate.tsx"],"names":[],"mappings":"AAOA,eAAO,MAAM,WAAW,GAAI,iBAAiB,MAAM,QAsBlD,CAAC;AAEF,eAAe,WAAW,CAAC"}
|