@panneau/core 2.0.15 → 2.0.34

package/es/contexts.js

@@ -349,6 +349,7 @@ var font = PropTypes.shape({
   // url: PropTypes.string,
 });
 PropTypes.arrayOf(font);
+PropTypes.shape({});
 
 /* eslint-disable react/jsx-props-no-spreading */
 var DefinitionContext = /*#__PURE__*/React.createContext(null);
@@ -1051,8 +1052,9 @@ var useUrlGenerator = function useUrlGenerator() {
     routes = _useContext2.routes,
     basePath = _useContext2.basePath;
   var urlGenerator = useCallback(function (key, data) {
+    // console.log('urlGenerator', basePath, routes, routes[key], data);
     var url = generatePath(routes[key], data);
-    // console.log('urlGenerator', basePath, routes[key], url, data);
+    // console.log('url', url);
     return basePath !== null ? "".concat(basePath.replace(/\/$/, ''), "/").concat(url.replace(/^\//, '')) : url;
   }, [generatePath, routes, basePath]);
   return urlGenerator;
@@ -1065,14 +1067,14 @@ var useRoutePush = function useRoutePush() {
       args[_key - 2] = arguments[_key];
     }
     if (isString(route)) {
-      var _history;
-      (_history = history).push.apply(_history, [url(route, data)].concat(args));
+      navigate.apply(void 0, [url(route, data)].concat(args));
     } else {
       var _ref = route || {},
         _ref$pathname = _ref.pathname,
         pathname = _ref$pathname === void 0 ? null : _ref$pathname,
         _ref$search = _ref.search,
         search = _ref$search === void 0 ? null : _ref$search;
+      // TODO: test this
       navigate.apply(void 0, [{
         pathname: url(pathname, data),
         search: search
@@ -1091,8 +1093,10 @@ var useRouteBack = function useRouteBack() {
 };
 var propTypes$2 = {
   children: PropTypes.node.isRequired,
-  routes: PropTypes.objectOf(PropTypes.string),
-  // .isRequired,
+  routes: PropTypes.objectOf(PropTypes.oneOfType([PropTypes.string, PropTypes.shape({
+    path: PropTypes.string,
+    component: PropTypes.string
+  })])),
   basePath: PropTypes.string
 };
 var defaultProps$2 = {
@@ -1103,11 +1107,15 @@ var RoutesProvider = function RoutesProvider(_ref2) {
   var routes = _ref2.routes,
     basePath = _ref2.basePath,
     children = _ref2.children;
-  return /*#__PURE__*/React.createElement(RoutesContext.Provider, {
-    value: {
+  var value = useMemo(function () {
+    return {
       routes: routes,
       basePath: basePath
-    }
+    };
+  }, [routes, basePath]);
+  // console.log(routes, basePath);
+  return /*#__PURE__*/React.createElement(RoutesContext.Provider, {
+    value: value
   }, children);
 };
 RoutesProvider.propTypes = propTypes$2;

package/es/hooks.js

@@ -879,6 +879,7 @@ var useResourceUrlGenerator = function useResourceUrlGenerator() {
     //     ...finalParams,
     //     resource: id,
     // }));
+    // console.log(finalRouteName, id, finalParams);
     return id !== null ? route("resources.".concat(finalRouteName), _objectSpread(_objectSpread({}, finalParams), {}, {
       resource: id
     })) : null;

package/es/index.js

@@ -164,6 +164,7 @@ var font = PropTypes$1.shape({
   // url: PropTypes.string,
 });
 var fonts = PropTypes$1.arrayOf(font);
+var trackingVariables = PropTypes$1.shape({});
 
 var PropTypes = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -212,7 +213,8 @@ var PropTypes = /*#__PURE__*/Object.freeze({
     breadcrumb: breadcrumb,
     breadcrumbs: breadcrumbs,
     font: font,
-    fonts: fonts
+    fonts: fonts,
+    trackingVariables: trackingVariables
 });
 
 var flattenComponents = function flattenComponents(components) {

package/lib/contexts.js

@@ -384,6 +384,7 @@ var font = PropTypes__default["default"].shape({
   // url: PropTypes.string,
 });
 PropTypes__default["default"].arrayOf(font);
+PropTypes__default["default"].shape({});
 
 /* eslint-disable react/jsx-props-no-spreading */
 var DefinitionContext = /*#__PURE__*/React__default["default"].createContext(null);
@@ -1086,8 +1087,9 @@ var useUrlGenerator = function useUrlGenerator() {
     routes = _useContext2.routes,
     basePath = _useContext2.basePath;
   var urlGenerator = React.useCallback(function (key, data) {
+    // console.log('urlGenerator', basePath, routes, routes[key], data);
     var url = reactRouter.generatePath(routes[key], data);
-    // console.log('urlGenerator', basePath, routes[key], url, data);
+    // console.log('url', url);
     return basePath !== null ? "".concat(basePath.replace(/\/$/, ''), "/").concat(url.replace(/^\//, '')) : url;
   }, [reactRouter.generatePath, routes, basePath]);
   return urlGenerator;
@@ -1100,14 +1102,14 @@ var useRoutePush = function useRoutePush() {
       args[_key - 2] = arguments[_key];
     }
     if (isString__default["default"](route)) {
-      var _history;
-      (_history = history).push.apply(_history, [url(route, data)].concat(args));
+      navigate.apply(void 0, [url(route, data)].concat(args));
     } else {
       var _ref = route || {},
         _ref$pathname = _ref.pathname,
         pathname = _ref$pathname === void 0 ? null : _ref$pathname,
         _ref$search = _ref.search,
         search = _ref$search === void 0 ? null : _ref$search;
+      // TODO: test this
       navigate.apply(void 0, [{
         pathname: url(pathname, data),
         search: search
@@ -1126,8 +1128,10 @@ var useRouteBack = function useRouteBack() {
 };
 var propTypes$2 = {
   children: PropTypes__default["default"].node.isRequired,
-  routes: PropTypes__default["default"].objectOf(PropTypes__default["default"].string),
-  // .isRequired,
+  routes: PropTypes__default["default"].objectOf(PropTypes__default["default"].oneOfType([PropTypes__default["default"].string, PropTypes__default["default"].shape({
+    path: PropTypes__default["default"].string,
+    component: PropTypes__default["default"].string
+  })])),
   basePath: PropTypes__default["default"].string
 };
 var defaultProps$2 = {
@@ -1138,11 +1142,15 @@ var RoutesProvider = function RoutesProvider(_ref2) {
   var routes = _ref2.routes,
     basePath = _ref2.basePath,
     children = _ref2.children;
-  return /*#__PURE__*/React__default["default"].createElement(RoutesContext.Provider, {
-    value: {
+  var value = React.useMemo(function () {
+    return {
       routes: routes,
       basePath: basePath
-    }
+    };
+  }, [routes, basePath]);
+  // console.log(routes, basePath);
+  return /*#__PURE__*/React__default["default"].createElement(RoutesContext.Provider, {
+    value: value
   }, children);
 };
 RoutesProvider.propTypes = propTypes$2;

package/lib/hooks.js

@@ -914,6 +914,7 @@ var useResourceUrlGenerator = function useResourceUrlGenerator() {
     //     ...finalParams,
     //     resource: id,
     // }));
+    // console.log(finalRouteName, id, finalParams);
     return id !== null ? route("resources.".concat(finalRouteName), _objectSpread__default["default"](_objectSpread__default["default"]({}, finalParams), {}, {
       resource: id
     })) : null;

package/lib/index.js

@@ -186,6 +186,7 @@ var font = PropTypes__default["default"].shape({
   // url: PropTypes.string,
 });
 var fonts = PropTypes__default["default"].arrayOf(font);
+var trackingVariables = PropTypes__default["default"].shape({});
 
 var PropTypes = /*#__PURE__*/Object.freeze({
     __proto__: null,
@@ -234,7 +235,8 @@ var PropTypes = /*#__PURE__*/Object.freeze({
     breadcrumb: breadcrumb,
     breadcrumbs: breadcrumbs,
     font: font,
-    fonts: fonts
+    fonts: fonts,
+    trackingVariables: trackingVariables
 });
 
 var flattenComponents = function flattenComponents(components) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@panneau/core",
-    "version": "2.0.15",
+    "version": "2.0.34",
     "description": "",
     "keywords": [
         "javascript"
@@ -114,5 +114,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "7eff06c0b11fc480d1cf437036dbe0e0ef893650"
+    "gitHead": "dade083366e5c16d253387424ff5177d5c943e40"
 }