brew-js-react 0.2.3 → 0.2.6

package/dist/brew-js-react.js

@@ -181,6 +181,7 @@ __webpack_require__.d(src_namespaceObject, {
   "isViewMatched": () => (isViewMatched),
   "linkTo": () => (linkTo),
   "makeTranslation": () => (makeTranslation),
+  "matchView": () => (matchView),
   "navigateTo": () => (navigateTo),
   "redirectTo": () => (redirectTo),
   "registerView": () => (registerView),
@@ -243,8 +244,10 @@ var _lib$util = external_commonjs_zeta_dom_commonjs2_zeta_dom_amd_zeta_dom_root_
     any = _lib$util.any,
     single = _lib$util.single,
     kv = _lib$util.kv,
+    fill = _lib$util.fill,
     pick = _lib$util.pick,
     exclude = _lib$util.exclude,
+    mapObject = _lib$util.mapObject,
     mapGet = _lib$util.mapGet,
     mapRemove = _lib$util.mapRemove,
     arrRemove = _lib$util.arrRemove,
@@ -261,6 +264,7 @@ var _lib$util = external_commonjs_zeta_dom_commonjs2_zeta_dom_amd_zeta_dom_root_
     setImmediateOnce = _lib$util.setImmediateOnce,
     throwNotFunction = _lib$util.throwNotFunction,
     errorWithCode = _lib$util.errorWithCode,
+    isErrorWithCode = _lib$util.isErrorWithCode,
     util_keys = _lib$util.keys,
     values = _lib$util.values,
     util_hasOwnProperty = _lib$util.hasOwnProperty,
@@ -513,6 +517,19 @@ var animateIn = external_commonjs_brew_js_commonjs2_brew_js_amd_brew_js_root_bre
 
 ;// CONCATENATED MODULE: ./src/include/brew-js/anim.js
 
+;// CONCATENATED MODULE: ./tmp/brew-js/util/path.js
+
+var setBaseUrl = external_commonjs_brew_js_commonjs2_brew_js_amd_brew_js_root_brew_.setBaseUrl,
+    combinePath = external_commonjs_brew_js_commonjs2_brew_js_amd_brew_js_root_brew_.combinePath,
+    normalizePath = external_commonjs_brew_js_commonjs2_brew_js_amd_brew_js_root_brew_.normalizePath,
+    removeQueryAndHash = external_commonjs_brew_js_commonjs2_brew_js_amd_brew_js_root_brew_.removeQueryAndHash,
+    withBaseUrl = external_commonjs_brew_js_commonjs2_brew_js_amd_brew_js_root_brew_.withBaseUrl,
+    toAbsoluteUrl = external_commonjs_brew_js_commonjs2_brew_js_amd_brew_js_root_brew_.toAbsoluteUrl,
+    toRelativeUrl = external_commonjs_brew_js_commonjs2_brew_js_amd_brew_js_root_brew_.toRelativeUrl,
+    isSubPathOf = external_commonjs_brew_js_commonjs2_brew_js_amd_brew_js_root_brew_.isSubPathOf;
+
+;// CONCATENATED MODULE: ./src/include/brew-js/util/path.js
+
 ;// CONCATENATED MODULE: ./src/view.js
 
 
@@ -522,38 +539,30 @@ var animateIn = external_commonjs_brew_js_commonjs2_brew_js_amd_brew_js_root_bre
 
 
 
+
 var view_root = zeta_dom_dom.root;
 var routeMap = new Map();
 var usedParams = {};
+var sortedViews = [];
 var StateContext = /*#__PURE__*/external_commonjs_react_commonjs2_react_amd_react_root_React_.createContext(Object.freeze({
   active: true
 }));
-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.isForceUpdate = true;
-      self.forceUpdate();
-    }
-  });
+  external_commonjs_react_commonjs2_react_amd_react_root_React_.Component.apply(this, arguments);
+  this.stateId = history.state;
 }
 
 definePrototype(ViewContainer, external_commonjs_react_commonjs2_react_amd_react_root_React_.Component, {
   componentDidMount: function componentDidMount() {
-    this.mounted = true;
+    /** @type {any} */
+    var self = this;
+    self.componentWillUnmount = combineFn(watch(app_app.route, function () {
+      self.setActive(self.getViewComponent() === self.currentViewComponent);
+    }), app_app.on('beforepageload', function () {
+      self.stateId = history.state;
+      self.forceUpdate();
+    }));
   },
   componentDidCatch: function componentDidCatch(error) {
     zeta_dom_dom.emit('error', this.parentElement || view_root, {
@@ -563,22 +572,32 @@ definePrototype(ViewContainer, external_commonjs_react_commonjs2_react_amd_react
   render: function render() {
     /** @type {any} */
     var self = this;
-    var resolve;
-    var promise = new Promise(function (_resolve) {
-      resolve = _resolve;
-    });
+
+    if (history.state !== self.stateId) {
+      return self.lastChild || null;
+    }
+
     var V = self.getViewComponent();
 
+    if (V) {
+      // ensure the current path actually corresponds to the matched view
+      // when some views are not included in the list of allowed views
+      var targetPath = linkTo(V, getCurrentParams(V, true));
+
+      if (targetPath !== removeQueryAndHash(app_app.path)) {
+        app_app.navigate(targetPath, true);
+      }
+    }
+
     if (V && V !== self.currentViewComponent) {
-      self.currentViewComponent = V;
+      var prevElement = self.currentElement;
 
-      if (self.currentView && self.currentElement) {
-        var prevPath = self.currentPath;
-        var prevElement = self.currentElement;
+      if (prevElement) {
+        self.setActive(false);
         self.prevView = self.currentView;
         self.currentElement = undefined;
         app_app.emit('pageleave', prevElement, {
-          pathname: prevPath
+          pathname: self.currentPath
         }, true);
         animateOut(prevElement, 'show').then(function () {
           self.prevView = undefined;
@@ -586,11 +605,17 @@ definePrototype(ViewContainer, external_commonjs_react_commonjs2_react_amd_react
         });
       }
 
-      var providerProps = {
-        key: routeMap.get(V).id,
-        value: {}
+      var resolve;
+      var promise = new Promise(function (resolve_) {
+        resolve = resolve_;
+      });
+      var state = {
+        view: V
       };
-      var view = /*#__PURE__*/external_commonjs_react_commonjs2_react_amd_react_root_React_.createElement(StateContext.Provider, providerProps, /*#__PURE__*/external_commonjs_react_commonjs2_react_amd_react_root_React_.createElement(ViewStateContainer, null, /*#__PURE__*/external_commonjs_react_commonjs2_react_amd_react_root_React_.createElement(V, {
+      var view = /*#__PURE__*/external_commonjs_react_commonjs2_react_amd_react_root_React_.createElement(StateContext.Provider, {
+        key: routeMap.get(V).id,
+        value: state
+      }, /*#__PURE__*/external_commonjs_react_commonjs2_react_amd_react_root_React_.createElement(ViewStateContainer, null, /*#__PURE__*/external_commonjs_react_commonjs2_react_amd_react_root_React_.createElement(V, {
         rootProps: self.props.rootProps,
         onComponentLoaded: function onComponentLoaded(element) {
           self.currentElement = element;
@@ -604,51 +629,33 @@ definePrototype(ViewContainer, external_commonjs_react_commonjs2_react_amd_react
           });
         }
       })));
-      defineGetterProperty(providerProps.value, 'active', function () {
-        return self.currentView === view;
+      extend(self, {
+        currentPath: app_app.path,
+        currentView: view,
+        currentViewComponent: V,
+        setActive: defineObservableProperty(state, 'active', true, true)
       });
-      self.currentPath = app_app.path;
-      self.currentView = view;
-    } else {
-      if (self.isForceUpdate) {
-        self.isForceUpdate = false;
-        app_app.emit('pageenter', self.currentElement, {
-          pathname: app_app.path
-        }, true);
-      }
-
-      resolve();
+      notifyAsync(self.parentElement || view_root, promise);
     }
 
-    notifyAsync(self.parentElement || view_root, promise);
-    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);
+    var child = /*#__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);
+    self.lastChild = child;
+    return child;
   },
   getViewComponent: function getViewComponent() {
     var props = this.props;
-    var matched = any(props.views, isViewMatched) || props.defaultView;
-
-    if (history.state === stateId) {
-      // ensure the current path actually corresponds to the matched view
-      // when some views are not included in the list of allowed views
-      var targetPath = linkTo(matched, getCurrentParams(matched, true));
-
-      if (targetPath !== app_app.path) {
-        app_app.navigate(targetPath, true);
-        return;
-      }
-    }
-
-    return matched;
+    return any(props.views, isViewMatched) || props.defaultView;
   }
 });
 
-function getCurrentParams(view, includeAll) {
+function getCurrentParams(view, includeAll, params) {
   var state = routeMap.get(view);
 
   if (!state.maxParams) {
+    var matchers = exclude(state.matchers, ['remainingSegments']);
     var matched = map(app_app.routes, function (v) {
       var route = app_app.parseRoute(v);
-      var matched = route.length && !any(state.matchers, function (v, i) {
+      var matched = route.length && !any(matchers, function (v, i) {
         var pos = route.params[i];
         return (v ? !(pos >= 0) : pos < route.minLength) || !isFunction(v) && !route.match(i, v);
       });
@@ -657,8 +664,8 @@ function getCurrentParams(view, includeAll) {
 
     if (matched[1]) {
       matched = grep(matched, function (v) {
-        return !any(v.params, function (v, i) {
-          return usedParams[i] && !state.matchers[i];
+        return !single(v.params, function (v, i) {
+          return usedParams[i] && !matchers[i];
         });
       });
     }
@@ -674,19 +681,41 @@ function getCurrentParams(view, includeAll) {
     }
   }
 
-  return pick(app_app.route, includeAll ? state.maxParams : state.minParams);
+  return pick(params || app_app.route, includeAll ? state.maxParams : state.minParams);
 }
 
-function useViewContainerState() {
-  return external_commonjs_react_commonjs2_react_amd_react_root_React_.useContext(StateContext);
+function sortViews(a, b) {
+  return (routeMap.get(b) || {}).matchCount - (routeMap.get(a) || {}).matchCount;
 }
-function isViewMatched(view) {
+
+function matchViewParams(view, route) {
   var params = routeMap.get(view);
-  return !!params && false === any(params.matchers, function (v, i) {
-    var value = app_app.route[i] || '';
+  return !!params && !single(params.matchers, function (v, i) {
+    var value = route[i] || '';
     return isFunction(v) ? !v(value) : (v || '') !== value;
   });
 }
+
+function useViewContainerState() {
+  return external_commonjs_react_commonjs2_react_amd_react_root_React_.useContext(StateContext);
+}
+function isViewMatched(view) {
+  return matchViewParams(view, app_app.route);
+}
+function matchView(path, views) {
+  var route = app_app.route;
+
+  if (typeof path === 'string') {
+    route = route.parse(path);
+  } else {
+    views = path;
+  }
+
+  views = views ? makeArray(views).sort(sortViews) : sortedViews;
+  return any(views, function (v) {
+    return matchViewParams(v, route);
+  }) || undefined;
+}
 function registerView(factory, routeParams) {
   var Component = function Component(props) {
     var state = (0,external_zeta_dom_react_.useAsync)(factory);
@@ -718,15 +747,15 @@ function registerView(factory, routeParams) {
       return typeof v === 'string';
     })
   });
+  sortedViews.push(Component);
+  sortedViews.sort(sortViews);
   return Component;
 }
 function renderView() {
   var views = makeArray(arguments);
   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;
-  });
+  views.sort(sortViews);
   return /*#__PURE__*/external_commonjs_react_commonjs2_react_amd_react_root_React_.createElement(ViewContainer, {
     rootProps: rootProps,
     views: views,
@@ -740,7 +769,7 @@ function linkTo(view, params) {
     return '/';
   }
 
-  var newParams = extend(getCurrentParams(view), params, state.params);
+  var newParams = extend(getCurrentParams(view), getCurrentParams(view, true, params), state.params);
   return app_app.route.getPath(newParams);
 }
 function navigateTo(view, params) {
@@ -763,7 +792,8 @@ function getCurrentStates() {
   return states[history.state] || (states[history.state] = {});
 }
 
-function ViewState(value) {
+function ViewState(key, value) {
+  this.key = key;
   this.value = value;
 }
 
@@ -802,9 +832,13 @@ function useRouteParam(name, defaultValue) {
     var setValue = function setValue() {
       var current = route[name] || '';
 
-      if (container.active && current !== ref.current) {
-        ref.current = current;
-        forceUpdate({});
+      if (current !== ref.current) {
+        if (container.active) {
+          ref.current = current;
+          forceUpdate({});
+        } else {
+          watch(container, 'active', setValue);
+        }
       }
     }; // route parameter might be changed after state initialization and before useEffect hook is called
 
@@ -845,20 +879,21 @@ function ViewStateContainer(props) {
     return {
       getState: function getState(uniqueId, key) {
         var cur = getCurrentStates();
-        var state = cache[uniqueId] || (cache[uniqueId] = new ViewState(cur[key] && cur[key].value));
+        var state = cache[uniqueId] || (cache[uniqueId] = new ViewState(key, cur[key] && cur[key].value));
 
         if (container.active) {
           var stateId = state.stateId;
 
-          if (stateId && stateId !== history.state) {
+          if (stateId && (stateId !== history.state || key !== state.key)) {
             var newValue = cur[key] && cur[key].value;
             emitter.emit('popstate', state, {
               newValue: newValue
             }); // detach value in previous history state from current one
 
-            var previous = new ViewState(state.value);
-            states[stateId][key] = previous;
+            var previous = new ViewState(state.key, state.value);
+            states[stateId][previous.key] = previous;
             state.value = newValue;
+            state.key = key;
           }
 
           state.stateId = history.state;
@@ -1067,6 +1102,7 @@ function StatefulMixin() {
   Mixin.call(this);
 
   _(this, {
+    elements: new WeakSet(),
     states: {},
     prefix: '',
     counter: 0
@@ -1099,8 +1135,9 @@ definePrototype(StatefulMixin, Mixin, {
     var self = this;
     var state = self.state;
     return function (current) {
-      if (current && current !== state.element) {
-        state.element = current;
+      state.element = current;
+
+      if (current && setAdd(_(self).elements, current)) {
         self.initElement(current, state);
       }
     };
@@ -1122,11 +1159,10 @@ definePrototype(StatefulMixin, Mixin, {
     var self = this;
     var clone = inherit(Object.getPrototypeOf(self), self);
 
-    _(clone, {
-      states: _(self).states,
+    _(clone, extend({}, _(self), {
       prefix: randomId() + '.',
       counter: 0
-    });
+    }));
 
     return clone;
   },
@@ -1313,18 +1349,6 @@ definePrototype(ErrorHandlerMixin, StatefulMixin, {
     });
   }
 });
-;// CONCATENATED MODULE: ./tmp/brew-js/var.js
-
-var getVarScope = undefined.getVarScope,
-    setVar = undefined.setVar,
-    declareVar = undefined.declareVar,
-    resetVar = undefined.resetVar,
-    getVar = undefined.getVar,
-    evaluate = undefined.evaluate,
-    evalAttr = undefined.evalAttr;
-
-;// CONCATENATED MODULE: ./src/include/brew-js/var.js
-
 ;// CONCATENATED MODULE: ./src/mixins/FlyoutToggleMixin.js
 
 
@@ -1353,9 +1377,8 @@ definePrototype(FlyoutToggleMixin, ClassNameMixin, {
 
 
 
-
 var FlyoutMixinSuper = ClassNameMixin.prototype;
-var varname = '__flyout' + randomId();
+var valueMap = new WeakMap();
 var flyoutMixinCounter = 0;
 function FlyoutMixin() {
   var self = this;
@@ -1396,7 +1419,9 @@ definePrototype(FlyoutMixin, ClassNameMixin, {
     });
   },
   open: function open(value) {
-    return openFlyout(this.elements()[0], kv(varname, value));
+    var element = this.elements()[0];
+    valueMap.set(element, value);
+    return openFlyout(element);
   },
   close: function close(value) {
     return closeFlyout(this.elements()[0], value);
@@ -1405,7 +1430,7 @@ definePrototype(FlyoutMixin, ClassNameMixin, {
     var element = this.elements()[0];
     return this.onToggleState(function (opened) {
       if (opened) {
-        return callback(getVar(element, varname));
+        return callback(valueMap.get(element));
       }
     });
   },
@@ -1421,7 +1446,6 @@ definePrototype(FlyoutMixin, ClassNameMixin, {
 
     if (!element.id) {
       element.id = 'flyout-' + ++flyoutMixinCounter;
-      declareVar(element, varname, undefined);
     }
 
     app_app.on(element, {