brew-js-react 0.1.8 → 0.1.11

package/dist/brew-js-react.js

@@ -195,6 +195,7 @@ __webpack_require__.d(src_namespaceObject, {
   "useMixin": () => (useMixin),
   "useMixinRef": () => (useMixinRef),
   "useRouteParam": () => (useRouteParam),
+  "useRouteState": () => (useRouteState),
   "useScrollableMixin": () => (useScrollableMixin)
 });
 
@@ -249,10 +250,14 @@ var _lib$util = external_commonjs_zeta_dom_commonjs2_zeta_dom_amd_zeta_dom_root_
     combineFn = _lib$util.combineFn,
     executeOnce = _lib$util.executeOnce,
     createPrivateStore = _lib$util.createPrivateStore,
+    util_setTimeout = _lib$util.setTimeout,
     setTimeoutOnce = _lib$util.setTimeoutOnce,
+    util_setInterval = _lib$util.setInterval,
+    setIntervalSafe = _lib$util.setIntervalSafe,
     util_setImmediate = _lib$util.setImmediate,
     setImmediateOnce = _lib$util.setImmediateOnce,
     throwNotFunction = _lib$util.throwNotFunction,
+    errorWithCode = _lib$util.errorWithCode,
     keys = _lib$util.keys,
     values = _lib$util.values,
     util_hasOwnProperty = _lib$util.hasOwnProperty,
@@ -293,7 +298,6 @@ var _lib$util = external_commonjs_zeta_dom_commonjs2_zeta_dom_amd_zeta_dom_root_
 var domUtil_lib$util = external_commonjs_zeta_dom_commonjs2_zeta_dom_amd_zeta_dom_root_zeta_.util,
     domReady = domUtil_lib$util.domReady,
     tagName = domUtil_lib$util.tagName,
-    domUtil_is = domUtil_lib$util.is,
     isVisible = domUtil_lib$util.isVisible,
     matchSelector = domUtil_lib$util.matchSelector,
     comparePosition = domUtil_lib$util.comparePosition,
@@ -320,11 +324,6 @@ var domUtil_lib$util = external_commonjs_zeta_dom_commonjs2_zeta_dom_amd_zeta_do
     getContentRect = domUtil_lib$util.getContentRect,
     scrollBy = domUtil_lib$util.scrollBy,
     scrollIntoView = domUtil_lib$util.scrollIntoView,
-    createRange = domUtil_lib$util.createRange,
-    rangeIntersects = domUtil_lib$util.rangeIntersects,
-    rangeEquals = domUtil_lib$util.rangeEquals,
-    rangeCovers = domUtil_lib$util.rangeCovers,
-    compareRangePosition = domUtil_lib$util.compareRangePosition,
     makeSelection = domUtil_lib$util.makeSelection,
     getRect = domUtil_lib$util.getRect,
     getRects = domUtil_lib$util.getRects,
@@ -354,6 +353,7 @@ var _lib$dom = external_commonjs_zeta_dom_commonjs2_zeta_dom_amd_zeta_dom_root_z
     releaseModal = _lib$dom.releaseModal,
     retainFocus = _lib$dom.retainFocus,
     releaseFocus = _lib$dom.releaseFocus,
+    iterateFocusPath = _lib$dom.iterateFocusPath,
     dom_focus = _lib$dom.focus;
 
 ;// CONCATENATED MODULE: ./src/include/zeta-dom/dom.js
@@ -480,6 +480,7 @@ brew_js_defaults.react = true;
 
 
 
+var states = {};
 function useAppReady() {
   var sReady = (0,external_commonjs_react_commonjs2_react_amd_react_root_React_.useState)(false);
   var ready = sReady[0],
@@ -492,22 +493,34 @@ function useAppReady() {
   return ready;
 }
 function useRouteParam(name, defaultValue) {
-  var sValue = (0,external_commonjs_react_commonjs2_react_amd_react_root_React_.useState)(app_app.route[name]);
+  var route = app_app.route;
+  var sValue = (0,external_commonjs_react_commonjs2_react_amd_react_root_React_.useState)(route[name]);
   var value = sValue[0],
       setValue = sValue[1];
   (0,external_commonjs_react_commonjs2_react_amd_react_root_React_.useEffect)(function () {
-    var current = app_app.route[name]; // route parameter might be changed after state initialization and before useEffect hook is called
+    var current = route[name]; // route parameter might be changed after state initialization and before useEffect hook is called
 
     setValue(current);
-    return app_app.route.watch(name, setValue);
+
+    if (name in route) {
+      return route.watch(name, setValue);
+    }
+
+    console.error('Route parameter ' + name + ' does not exist');
   }, [name, defaultValue]);
 
   if (!value && defaultValue !== undefined) {
-    app_app.navigate(app_app.route.getPath(extend({}, app_app.route, kv(name, defaultValue))), true);
+    app_app.navigate(route.getPath(extend({}, route, kv(name, defaultValue))), true);
   }
 
   return value || '';
 }
+function useRouteState(key, defaultValue) {
+  var cur = states[history.state] || (states[history.state] = {});
+  var state = (0,external_commonjs_react_commonjs2_react_amd_react_root_React_.useState)(key in cur ? cur[key] : defaultValue);
+  cur[key] = state[0];
+  return state;
+}
 // EXTERNAL MODULE: external "zeta-dom-react"
 var external_zeta_dom_react_ = __webpack_require__(103);
 // EXTERNAL MODULE: ./src/include/external/waterpipe.js
@@ -572,28 +585,29 @@ function makeTranslation(resources, defaultLang) {
     return getTranslation(prefix, name, data, noEncode) || key;
   }
 
-  function useTranslation() {
+  function getTranslationCallback() {
     var prefix = makeArray(arguments);
-    var language = useLanguage();
-    var t = translate;
-
-    if (prefix[0]) {
-      var key = prefix.join(' ');
-      t = cache[key] || (cache[key] = createCallback(function (key, data, noEncode) {
-        return single(prefix, function (v) {
-          return getTranslation(v, key, data, noEncode);
-        }) || key;
-      }));
-    }
+    var key = prefix.join(' ');
+    return cache[key] || (cache[key] = createCallback(function (key, data, noEncode) {
+      return single(prefix, function (v) {
+        return getTranslation(v, key, data, noEncode);
+      }) || key;
+    }));
+  }
 
+  function useTranslation() {
+    var language = useLanguage();
+    var t = getTranslationCallback.apply(0, arguments);
     return {
       language: language,
       t: t
     };
   }
 
+  cache[''] = createCallback(translate);
   return {
-    translate: createCallback(translate),
+    translate: cache[''],
+    getTranslation: getTranslationCallback,
     useTranslation: useTranslation
   };
 }
@@ -1240,12 +1254,22 @@ var animateIn = external_commonjs_brew_js_commonjs2_brew_js_amd_brew_js_root_bre
 
 
 var routeMap = new Map();
+var usedParams = {};
+var stateId;
 
 function ViewContainer() {
   /** @type {any} */
   var self = this;
   external_commonjs_react_commonjs2_react_amd_react_root_React_.Component.apply(self, arguments);
   self.mounted = false;
+
+  if (!stateId) {
+    stateId = history.state;
+    app_app.on('navigate', function () {
+      stateId = history.state;
+    });
+  }
+
   self.componentWillUnmount = app_app.on('navigate', function () {
     if (self.mounted && self.getViewComponent()) {
       self.forceUpdate();
@@ -1277,8 +1301,8 @@ definePrototype(ViewContainer, external_commonjs_react_commonjs2_react_amd_react
       }
 
       self.currentView = /*#__PURE__*/external_commonjs_react_commonjs2_react_amd_react_root_React_.createElement(V, {
-        key: app_app.route.view,
-        rootProps: exclude(self.props, ['views']),
+        key: routeMap.get(V).id,
+        rootProps: self.props.rootProps,
         onComponentLoaded: function onComponentLoaded(element) {
           self.currentElement = element;
           util_setImmediate(function () {
@@ -1291,17 +1315,19 @@ definePrototype(ViewContainer, external_commonjs_react_commonjs2_react_amd_react
     return /*#__PURE__*/external_commonjs_react_commonjs2_react_amd_react_root_React_.createElement(external_commonjs_react_commonjs2_react_amd_react_root_React_.Fragment, null, self.prevView, self.currentView);
   },
   getViewComponent: function getViewComponent() {
-    var views = this.props.views;
-    return any(views, isViewMatched) || void redirectTo(views[0]);
+    var props = this.props;
+    return any(props.views, isViewMatched) || history.state === stateId && void redirectTo(props.defaultView);
   }
 });
 function isViewMatched(view) {
   var params = routeMap.get(view);
-  return !!params && equal(params, pick(app_app.route, keys(params)));
+  return !!params && false === any(params.matchers, function (v, i) {
+    var value = app_app.route[i] || '';
+    return isFunction(v) ? !v(value) : (v || '') !== value;
+  });
 }
 function registerView(factory, routeParams) {
   var Component = function Component(props) {
-    var childProps = exclude(props, ['rootProps', 'onComponentLoaded']);
     var Component = (0,external_zeta_dom_react_.useAsync)(factory)[0];
     return /*#__PURE__*/external_commonjs_react_commonjs2_react_amd_react_root_React_.createElement('div', extend({}, props.rootProps, {
       ref: function ref(element) {
@@ -1309,27 +1335,56 @@ function registerView(factory, routeParams) {
           (props.onComponentLoaded || noop)(element);
         }
       },
-      children: Component && /*#__PURE__*/external_commonjs_react_commonjs2_react_amd_react_root_React_.createElement(Component["default"], childProps)
+      children: Component && /*#__PURE__*/external_commonjs_react_commonjs2_react_amd_react_root_React_.createElement(Component["default"])
     }));
   };
 
-  routeMap.set(Component, routeParams);
+  routeParams = extend({}, routeParams);
+  each(routeParams, function (i, v) {
+    usedParams[i] = true;
+
+    if (v instanceof RegExp) {
+      routeParams[i] = v.test.bind(v);
+    }
+  });
+  routeMap.set(Component, {
+    id: randomId(),
+    matchCount: keys(routeParams).length,
+    matchers: routeParams,
+    params: pick(routeParams, function (v) {
+      return typeof v === 'string';
+    })
+  });
   return Component;
 }
 function renderView() {
   var views = makeArray(arguments);
-  var props;
-
-  if (views[0] && typeof views[0] !== 'function') {
-    props = views.shift();
-  }
-
-  return /*#__PURE__*/external_commonjs_react_commonjs2_react_amd_react_root_React_.createElement(ViewContainer, extend({}, props, {
-    views: views
-  }));
+  var rootProps = isFunction(views[0]) ? {} : views.shift();
+  var defaultView = views[0];
+  views.sort(function (a, b) {
+    return (routeMap.get(b) || {}).matchCount - (routeMap.get(a) || {}).matchCount;
+  });
+  return /*#__PURE__*/external_commonjs_react_commonjs2_react_amd_react_root_React_.createElement(ViewContainer, {
+    rootProps: rootProps,
+    views: views,
+    defaultView: defaultView
+  });
 }
 function linkTo(view, params) {
-  return app_app.route.getPath(extend({}, app_app.route, params, routeMap.get(view)));
+  var viewParams = (routeMap.get(view) || {}).params;
+  var newParams = {};
+
+  for (var i in app_app.route) {
+    if (viewParams && i in viewParams) {
+      newParams[i] = viewParams[i];
+    } else if (params && i in params) {
+      newParams[i] = params[i];
+    } else if (!usedParams[i]) {
+      newParams[i] = app_app.route[i];
+    }
+  }
+
+  return app_app.route.getPath(newParams);
 }
 function navigateTo(view, params) {
   return app_app.navigate(linkTo(view, params));