@evlop/commons 1.0.226 → 1.0.227
Sign up to get free protection for your applications and to get access to all the features.
|
@@ -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;AAKxC,aAAK,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,MAAM,CAAC;IACd,CAAC,GAAG,EAAC,MAAM,GAAG,GAAG,CAAC;CACrB;AAED,aAAK,IAAI,GAAG,UAAU,GAAG,MAAM,CAAC;AAIhC,eAAO,MAAM,aAAa,WAAa,MAAM,GAAG,iBAAiB,YAAa,iBAAiB,KAAI,IAgHlG,CAAC"}
|
|
1
|
+
{"version":3,"file":"useDataSource.d.ts","sourceRoot":"","sources":["../../../src/hooks/useDataSource.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAKxC,aAAK,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,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,CAAC,GAAG,EAAC,MAAM,GAAG,GAAG,CAAC;CACrB;AAED,aAAK,IAAI,GAAG,UAAU,GAAG,MAAM,CAAC;AAIhC,eAAO,MAAM,aAAa,WAAa,MAAM,GAAG,iBAAiB,YAAa,iBAAiB,KAAI,IAgHlG,CAAC"}
|
|
@@ -11,7 +11,7 @@ const classes_1 = require("../classes");
|
|
|
11
11
|
const reducers_1 = require("../reducers");
|
|
12
12
|
const useScope_1 = require("./useScope");
|
|
13
13
|
const useTemplate_1 = __importDefault(require("./useTemplate"));
|
|
14
|
-
const defaultDatasourceOptions = { memoize: true };
|
|
14
|
+
const defaultDatasourceOptions = { memoize: true, isReady: true };
|
|
15
15
|
const useDataSource = (source, options) => {
|
|
16
16
|
const dispatch = react_redux_1.useDispatch();
|
|
17
17
|
const template = useTemplate_1.default();
|
|
@@ -31,7 +31,7 @@ const useDataSource = (source, options) => {
|
|
|
31
31
|
const templatedValues = lodash_1.reduce(paramNames, (acc, paramName) => (Object.assign(Object.assign({}, acc), { [paramName]: template(lodash_1.get(_dataSourceOptions, paramName)) })), {});
|
|
32
32
|
return lodash_1.defaults(templatedValues, _dataSourceOptions);
|
|
33
33
|
}, [scope, template, dataSourceName, dataSource, _dataSourceOptions]);
|
|
34
|
-
const { memoize } = dataSourceOptions;
|
|
34
|
+
const { memoize, isReady } = dataSourceOptions;
|
|
35
35
|
const key = dataSource && dataSource.keyExtractor(dataSourceOptions, { scope, dispatch });
|
|
36
36
|
const currentValue = react_redux_1.useSelector(state => state.dataSource.data[key]);
|
|
37
37
|
const loadData = react_1.useCallback((params) => {
|
|
@@ -74,12 +74,12 @@ const useDataSource = (source, options) => {
|
|
|
74
74
|
});
|
|
75
75
|
}, [loadData, dataSourceOptions, scope, key]);
|
|
76
76
|
react_1.useEffect(() => {
|
|
77
|
-
if (dataSourceName === 'scope' || dataSourceName === 'static')
|
|
77
|
+
if (dataSourceName === 'scope' || dataSourceName === 'static' || !isReady)
|
|
78
78
|
return;
|
|
79
79
|
if (!currentValue || !memoize) {
|
|
80
80
|
loadData();
|
|
81
81
|
}
|
|
82
|
-
}, [dataSourceName, key, memoize]);
|
|
82
|
+
}, [dataSourceName, key, memoize, isReady]);
|
|
83
83
|
const value = react_1.useMemo(() => {
|
|
84
84
|
if (dataSourceName === 'scope' || dataSourceName === 'static')
|
|
85
85
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useDataSource.js","sourceRoot":"","sources":["../../../src/hooks/useDataSource.tsx"],"names":[],"mappings":";;;;;;AAAA,mCAAiG;AACjG,iCAAwD;AACxD,6CAAuD;AACvD,wCAAwC;AACxC,0CAAmK;AACnK,yCAAsC;AACtC,gEAAwC;
|
|
1
|
+
{"version":3,"file":"useDataSource.js","sourceRoot":"","sources":["../../../src/hooks/useDataSource.tsx"],"names":[],"mappings":"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"}
|