@panneau/core 3.0.45 → 3.0.101
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/es/hooks.js +12 -5
- package/lib/hooks.js +12 -5
- package/package.json +2 -2
package/es/hooks.js
CHANGED
|
@@ -953,14 +953,17 @@ var useResourceUrlGenerator = function useResourceUrlGenerator() {
|
|
|
953
953
|
var useResourceUrlGenerator$1 = useResourceUrlGenerator;
|
|
954
954
|
|
|
955
955
|
var useResourceQuery = function useResourceQuery() {
|
|
956
|
-
var
|
|
956
|
+
var initialBaseQuery = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
|
|
957
957
|
var paginated = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
|
|
958
|
+
var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
|
|
959
|
+
_ref$forceInitialQuer = _ref.forceInitialQuery,
|
|
960
|
+
forceInitialQuery = _ref$forceInitialQuer === void 0 ? false : _ref$forceInitialQuer;
|
|
958
961
|
var initialQuery = useMemo(function () {
|
|
959
962
|
return paginated ? _objectSpread({
|
|
960
963
|
page: 1,
|
|
961
964
|
count: 10
|
|
962
|
-
},
|
|
963
|
-
}, [paginated,
|
|
965
|
+
}, initialBaseQuery) : initialBaseQuery || null;
|
|
966
|
+
}, [paginated, initialBaseQuery]);
|
|
964
967
|
var _useState = useState(initialQuery),
|
|
965
968
|
_useState2 = _slicedToArray(_useState, 2),
|
|
966
969
|
query = _useState2[0],
|
|
@@ -978,8 +981,12 @@ var useResourceQuery = function useResourceQuery() {
|
|
|
978
981
|
var val = newQuery[key];
|
|
979
982
|
return val !== null ? _objectSpread(_objectSpread({}, currentQuery), {}, _defineProperty({}, key, val)) : currentQuery;
|
|
980
983
|
}, null) : null;
|
|
981
|
-
|
|
982
|
-
|
|
984
|
+
if (forceInitialQuery) {
|
|
985
|
+
setQuery(_objectSpread(_objectSpread({}, initialBaseQuery || null), finalQuery || null));
|
|
986
|
+
} else {
|
|
987
|
+
setQuery(finalQuery);
|
|
988
|
+
}
|
|
989
|
+
}, [query, setQuery, initialBaseQuery, forceInitialQuery]);
|
|
983
990
|
var onQueryReset = useCallback(function () {
|
|
984
991
|
setQuery(initialQuery);
|
|
985
992
|
}, [initialQuery, setQuery]);
|
package/lib/hooks.js
CHANGED
|
@@ -988,14 +988,17 @@ var useResourceUrlGenerator = function useResourceUrlGenerator() {
|
|
|
988
988
|
var useResourceUrlGenerator$1 = useResourceUrlGenerator;
|
|
989
989
|
|
|
990
990
|
var useResourceQuery = function useResourceQuery() {
|
|
991
|
-
var
|
|
991
|
+
var initialBaseQuery = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
|
|
992
992
|
var paginated = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
|
|
993
|
+
var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
|
|
994
|
+
_ref$forceInitialQuer = _ref.forceInitialQuery,
|
|
995
|
+
forceInitialQuery = _ref$forceInitialQuer === void 0 ? false : _ref$forceInitialQuer;
|
|
993
996
|
var initialQuery = react.useMemo(function () {
|
|
994
997
|
return paginated ? _objectSpread__default["default"]({
|
|
995
998
|
page: 1,
|
|
996
999
|
count: 10
|
|
997
|
-
},
|
|
998
|
-
}, [paginated,
|
|
1000
|
+
}, initialBaseQuery) : initialBaseQuery || null;
|
|
1001
|
+
}, [paginated, initialBaseQuery]);
|
|
999
1002
|
var _useState = react.useState(initialQuery),
|
|
1000
1003
|
_useState2 = _slicedToArray__default["default"](_useState, 2),
|
|
1001
1004
|
query = _useState2[0],
|
|
@@ -1013,8 +1016,12 @@ var useResourceQuery = function useResourceQuery() {
|
|
|
1013
1016
|
var val = newQuery[key];
|
|
1014
1017
|
return val !== null ? _objectSpread__default["default"](_objectSpread__default["default"]({}, currentQuery), {}, _defineProperty__default["default"]({}, key, val)) : currentQuery;
|
|
1015
1018
|
}, null) : null;
|
|
1016
|
-
|
|
1017
|
-
|
|
1019
|
+
if (forceInitialQuery) {
|
|
1020
|
+
setQuery(_objectSpread__default["default"](_objectSpread__default["default"]({}, initialBaseQuery || null), finalQuery || null));
|
|
1021
|
+
} else {
|
|
1022
|
+
setQuery(finalQuery);
|
|
1023
|
+
}
|
|
1024
|
+
}, [query, setQuery, initialBaseQuery, forceInitialQuery]);
|
|
1018
1025
|
var onQueryReset = react.useCallback(function () {
|
|
1019
1026
|
setQuery(initialQuery);
|
|
1020
1027
|
}, [initialQuery, setQuery]);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@panneau/core",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.101",
|
|
4
4
|
"description": "",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"javascript"
|
|
@@ -111,5 +111,5 @@
|
|
|
111
111
|
"publishConfig": {
|
|
112
112
|
"access": "public"
|
|
113
113
|
},
|
|
114
|
-
"gitHead": "
|
|
114
|
+
"gitHead": "4b7d319add0a27e37a8243e7334e3befc3954fc0"
|
|
115
115
|
}
|