@panneau/core 3.0.45 → 3.0.113

package/es/contexts.js

@@ -13,8 +13,9 @@ import { loadGoogleApi, loadGoogleMaps } from '@folklore/services';
 import { useIntl } from 'react-intl';
 import { getDisplayName } from '@panneau/core/utils';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
-import { useUrlGenerator, useLocation } from '@folklore/routes';
+import { useUrlGenerator } from '@folklore/routes';
 export { RoutesContext, RoutesProvider, useRoutes, useUrlGenerator } from '@folklore/routes';
+import { useLocation } from 'wouter';
 import { TrackingContext, TrackingContainer } from '@folklore/tracking';
 export { TrackingContext } from '@folklore/tracking';
 
@@ -341,14 +342,12 @@ var panneauDefinition = PropTypes.shape({
   intl: intl
   // intl,
 });
-
 var definition = PropTypes.shape({
   name: PropTypes.string
   // resources,
   // routes,
   // intl,
 });
-
 var item = PropTypes.shape({
   id: PropTypes.string.isRequired
 });
@@ -476,7 +475,6 @@ var propTypes$a = {
   children: PropTypes.node.isRequired,
   apiKey: PropTypes.string // .isRequired,
 };
-
 var defaultProps$a = {
   apiKey: null
 };
@@ -817,7 +815,6 @@ var propTypes$4 = {
   children: PropTypes.node.isRequired,
   container: PropTypes.object // eslint-disable-line
 };
-
 var defaultProps$4 = {
   container: null
 };
@@ -903,7 +900,6 @@ var propTypes$3 = {
   children: PropTypes.node.isRequired,
   container: PropTypes.object // eslint-disable-line
 };
-
 var defaultProps$3 = {
   container: null
 };

package/es/hooks.js

@@ -953,14 +953,17 @@ var useResourceUrlGenerator = function useResourceUrlGenerator() {
 var useResourceUrlGenerator$1 = useResourceUrlGenerator;
 
 var useResourceQuery = function useResourceQuery() {
-  var initialValues = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+  var initialBaseQuery = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
   var paginated = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+  var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
+    _ref$forceInitialQuer = _ref.forceInitialQuery,
+    forceInitialQuery = _ref$forceInitialQuer === void 0 ? false : _ref$forceInitialQuer;
   var initialQuery = useMemo(function () {
     return paginated ? _objectSpread({
       page: 1,
       count: 10
-    }, initialValues) : initialValues || null;
-  }, [paginated, initialValues]);
+    }, initialBaseQuery) : initialBaseQuery || null;
+  }, [paginated, initialBaseQuery]);
   var _useState = useState(initialQuery),
     _useState2 = _slicedToArray(_useState, 2),
     query = _useState2[0],
@@ -978,8 +981,12 @@ var useResourceQuery = function useResourceQuery() {
       var val = newQuery[key];
       return val !== null ? _objectSpread(_objectSpread({}, currentQuery), {}, _defineProperty({}, key, val)) : currentQuery;
     }, null) : null;
-    setQuery(finalQuery);
-  }, [query, setQuery]);
+    if (forceInitialQuery) {
+      setQuery(_objectSpread(_objectSpread({}, initialBaseQuery || null), finalQuery || null));
+    } else {
+      setQuery(finalQuery);
+    }
+  }, [query, setQuery, initialBaseQuery, forceInitialQuery]);
   var onQueryReset = useCallback(function () {
     setQuery(initialQuery);
   }, [initialQuery, setQuery]);

package/es/index.js

@@ -7,8 +7,8 @@ import ReactIs from 'react-is';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import isArray from 'lodash/isArray';
 import uniqBy from 'lodash/uniqBy';
+import _callSuper from '@babel/runtime/helpers/callSuper';
 import _inherits from '@babel/runtime/helpers/inherits';
-import _createSuper from '@babel/runtime/helpers/createSuper';
 import EventEmitter from 'wolfy87-eventemitter';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import isObject from 'lodash/isObject';
@@ -118,14 +118,12 @@ var panneauDefinition = PropTypes$1.shape({
   intl: intl
   // intl,
 });
-
 var definition = PropTypes$1.shape({
   name: PropTypes$1.string
   // resources,
   // routes,
   // intl,
 });
-
 var item = PropTypes$1.shape({
   id: PropTypes$1.string.isRequired
 });
@@ -386,11 +384,10 @@ var DefinitionsManager$1 = DefinitionsManager;
 
 var EventsManager = /*#__PURE__*/function (_EventEmitter) {
   _inherits(EventsManager, _EventEmitter);
-  var _super = _createSuper(EventsManager);
   function EventsManager(element) {
     var _this;
     _classCallCheck(this, EventsManager);
-    _this = _super.call(this);
+    _this = _callSuper(this, EventsManager);
     _this.element = element;
     _this.events = {};
     _this.listeners = {};
@@ -449,10 +446,9 @@ var EventsManager$1 = EventsManager;
 
 var FieldsManager$2 = /*#__PURE__*/function (_DefinitionsManager) {
   _inherits(FieldsManager, _DefinitionsManager);
-  var _super = _createSuper(FieldsManager);
   function FieldsManager() {
     _classCallCheck(this, FieldsManager);
-    return _super.apply(this, arguments);
+    return _callSuper(this, FieldsManager, arguments);
   }
   return _createClass(FieldsManager);
 }(DefinitionsManager$1);
@@ -578,10 +574,9 @@ var FontsParser$1 = FontsParser;
 
 var FieldsManager = /*#__PURE__*/function (_ComponentsManager) {
   _inherits(FieldsManager, _ComponentsManager);
-  var _super = _createSuper(FieldsManager);
   function FieldsManager() {
     _classCallCheck(this, FieldsManager);
-    return _super.apply(this, arguments);
+    return _callSuper(this, FieldsManager, arguments);
   }
   return _createClass(FieldsManager);
 }(ComponentsManager$1);
@@ -807,12 +802,11 @@ var _excluded = ["value"],
   _excluded2 = ["value"];
 var Tracking = /*#__PURE__*/function (_BaseTracking) {
   _inherits(Tracking, _BaseTracking);
-  var _super = _createSuper(Tracking);
   function Tracking() {
     var _this;
     var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     _classCallCheck(this, Tracking);
-    _this = _super.call(this, opts);
+    _this = _callSuper(this, Tracking, [opts]);
     var _this$options$variabl = _this.options.variables,
       variables = _this$options$variabl === void 0 ? null : _this$options$variabl;
     _this.variables = null;

package/lib/contexts.js

@@ -18,6 +18,7 @@ var reactIntl = require('react-intl');
 var utils = require('@panneau/core/utils');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 var routes$1 = require('@folklore/routes');
+var wouter = require('wouter');
 var tracking = require('@folklore/tracking');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -356,14 +357,12 @@ var panneauDefinition = PropTypes__default["default"].shape({
   intl: intl
   // intl,
 });
-
 var definition = PropTypes__default["default"].shape({
   name: PropTypes__default["default"].string
   // resources,
   // routes,
   // intl,
 });
-
 var item = PropTypes__default["default"].shape({
   id: PropTypes__default["default"].string.isRequired
 });
@@ -491,7 +490,6 @@ var propTypes$a = {
   children: PropTypes__default["default"].node.isRequired,
   apiKey: PropTypes__default["default"].string // .isRequired,
 };
-
 var defaultProps$a = {
   apiKey: null
 };
@@ -832,7 +830,6 @@ var propTypes$4 = {
   children: PropTypes__default["default"].node.isRequired,
   container: PropTypes__default["default"].object // eslint-disable-line
 };
-
 var defaultProps$4 = {
   container: null
 };
@@ -918,7 +915,6 @@ var propTypes$3 = {
   children: PropTypes__default["default"].node.isRequired,
   container: PropTypes__default["default"].object // eslint-disable-line
 };
-
 var defaultProps$3 = {
   container: null
 };
@@ -1087,7 +1083,7 @@ ResourceProvider.defaultProps = defaultProps$1;
 
 var useRoutePush = function useRoutePush() {
   var url = routes$1.useUrlGenerator();
-  var _useLocation = routes$1.useLocation(),
+  var _useLocation = wouter.useLocation(),
     _useLocation2 = _slicedToArray__default["default"](_useLocation, 2),
     navigate = _useLocation2[1];
   var push = React.useCallback(function (route, data) {
@@ -1109,7 +1105,7 @@ var useRoutePush = function useRoutePush() {
 };
 var useRouteBack = function useRouteBack() {
   var url = routes$1.useUrlGenerator();
-  var _useLocation3 = routes$1.useLocation(),
+  var _useLocation3 = wouter.useLocation(),
     _useLocation4 = _slicedToArray__default["default"](_useLocation3, 2),
     navigate = _useLocation4[1];
   var back = React.useCallback(function () {

package/lib/hooks.js

@@ -988,14 +988,17 @@ var useResourceUrlGenerator = function useResourceUrlGenerator() {
 var useResourceUrlGenerator$1 = useResourceUrlGenerator;
 
 var useResourceQuery = function useResourceQuery() {
-  var initialValues = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
+  var initialBaseQuery = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : null;
   var paginated = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
+  var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
+    _ref$forceInitialQuer = _ref.forceInitialQuery,
+    forceInitialQuery = _ref$forceInitialQuer === void 0 ? false : _ref$forceInitialQuer;
   var initialQuery = react.useMemo(function () {
     return paginated ? _objectSpread__default["default"]({
       page: 1,
       count: 10
-    }, initialValues) : initialValues || null;
-  }, [paginated, initialValues]);
+    }, initialBaseQuery) : initialBaseQuery || null;
+  }, [paginated, initialBaseQuery]);
   var _useState = react.useState(initialQuery),
     _useState2 = _slicedToArray__default["default"](_useState, 2),
     query = _useState2[0],
@@ -1013,8 +1016,12 @@ var useResourceQuery = function useResourceQuery() {
       var val = newQuery[key];
       return val !== null ? _objectSpread__default["default"](_objectSpread__default["default"]({}, currentQuery), {}, _defineProperty__default["default"]({}, key, val)) : currentQuery;
     }, null) : null;
-    setQuery(finalQuery);
-  }, [query, setQuery]);
+    if (forceInitialQuery) {
+      setQuery(_objectSpread__default["default"](_objectSpread__default["default"]({}, initialBaseQuery || null), finalQuery || null));
+    } else {
+      setQuery(finalQuery);
+    }
+  }, [query, setQuery, initialBaseQuery, forceInitialQuery]);
   var onQueryReset = react.useCallback(function () {
     setQuery(initialQuery);
   }, [initialQuery, setQuery]);

package/lib/index.js

@@ -11,8 +11,8 @@ var ReactIs = require('react-is');
 var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
 var isArray = require('lodash/isArray');
 var uniqBy = require('lodash/uniqBy');
+var _callSuper = require('@babel/runtime/helpers/callSuper');
 var _inherits = require('@babel/runtime/helpers/inherits');
-var _createSuper = require('@babel/runtime/helpers/createSuper');
 var EventEmitter = require('wolfy87-eventemitter');
 var _objectWithoutProperties = require('@babel/runtime/helpers/objectWithoutProperties');
 var isObject = require('lodash/isObject');
@@ -30,8 +30,8 @@ var ReactIs__default = /*#__PURE__*/_interopDefaultLegacy(ReactIs);
 var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
 var isArray__default = /*#__PURE__*/_interopDefaultLegacy(isArray);
 var uniqBy__default = /*#__PURE__*/_interopDefaultLegacy(uniqBy);
+var _callSuper__default = /*#__PURE__*/_interopDefaultLegacy(_callSuper);
 var _inherits__default = /*#__PURE__*/_interopDefaultLegacy(_inherits);
-var _createSuper__default = /*#__PURE__*/_interopDefaultLegacy(_createSuper);
 var EventEmitter__default = /*#__PURE__*/_interopDefaultLegacy(EventEmitter);
 var _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
 var isObject__default = /*#__PURE__*/_interopDefaultLegacy(isObject);
@@ -140,14 +140,12 @@ var panneauDefinition = PropTypes__default["default"].shape({
   intl: intl
   // intl,
 });
-
 var definition = PropTypes__default["default"].shape({
   name: PropTypes__default["default"].string
   // resources,
   // routes,
   // intl,
 });
-
 var item = PropTypes__default["default"].shape({
   id: PropTypes__default["default"].string.isRequired
 });
@@ -408,11 +406,10 @@ var DefinitionsManager$1 = DefinitionsManager;
 
 var EventsManager = /*#__PURE__*/function (_EventEmitter) {
   _inherits__default["default"](EventsManager, _EventEmitter);
-  var _super = _createSuper__default["default"](EventsManager);
   function EventsManager(element) {
     var _this;
     _classCallCheck__default["default"](this, EventsManager);
-    _this = _super.call(this);
+    _this = _callSuper__default["default"](this, EventsManager);
     _this.element = element;
     _this.events = {};
     _this.listeners = {};
@@ -471,10 +468,9 @@ var EventsManager$1 = EventsManager;
 
 var FieldsManager$2 = /*#__PURE__*/function (_DefinitionsManager) {
   _inherits__default["default"](FieldsManager, _DefinitionsManager);
-  var _super = _createSuper__default["default"](FieldsManager);
   function FieldsManager() {
     _classCallCheck__default["default"](this, FieldsManager);
-    return _super.apply(this, arguments);
+    return _callSuper__default["default"](this, FieldsManager, arguments);
   }
   return _createClass__default["default"](FieldsManager);
 }(DefinitionsManager$1);
@@ -600,10 +596,9 @@ var FontsParser$1 = FontsParser;
 
 var FieldsManager = /*#__PURE__*/function (_ComponentsManager) {
   _inherits__default["default"](FieldsManager, _ComponentsManager);
-  var _super = _createSuper__default["default"](FieldsManager);
   function FieldsManager() {
     _classCallCheck__default["default"](this, FieldsManager);
-    return _super.apply(this, arguments);
+    return _callSuper__default["default"](this, FieldsManager, arguments);
   }
   return _createClass__default["default"](FieldsManager);
 }(ComponentsManager$1);
@@ -829,12 +824,11 @@ var _excluded = ["value"],
   _excluded2 = ["value"];
 var Tracking = /*#__PURE__*/function (_BaseTracking) {
   _inherits__default["default"](Tracking, _BaseTracking);
-  var _super = _createSuper__default["default"](Tracking);
   function Tracking() {
     var _this;
     var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     _classCallCheck__default["default"](this, Tracking);
-    _this = _super.call(this, opts);
+    _this = _callSuper__default["default"](this, Tracking, [opts]);
     var _this$options$variabl = _this.options.variables,
       variables = _this$options$variabl === void 0 ? null : _this$options$variabl;
     _this.variables = null;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/core",
-    "version": "3.0.45",
+    "version": "3.0.113",
     "description": "",
     "keywords": [
         "javascript"
@@ -81,7 +81,7 @@
         "@babel/runtime": "^7.12.5",
         "@folklore/fetch": "^0.1.16",
         "@folklore/forms": "^0.0.22",
-        "@folklore/routes": "^0.2.6",
+        "@folklore/routes": "^0.2.18",
         "@folklore/services": "^0.1.24",
         "@folklore/tracking": "^0.0.16",
         "@fortawesome/fontawesome-svg-core": "^1.2.35",
@@ -106,10 +106,10 @@
         "tinycolor2": "^1.4.2",
         "webfontloader": "^1.6.28",
         "wolfy87-eventemitter": "^5.2.9",
-        "wouter": "^2.11.0"
+        "wouter": "^3.0.0"
     },
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "03d2e24744a998a43327aad373158ca162f19af3"
+    "gitHead": "a59fb00eb93cc259b4c2b6c3e6f3645f3d1b019f"
 }