brew-js-react 0.2.2 → 0.2.5

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,7 +264,8 @@ 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,
-    keys = _lib$util.keys,
+    isErrorWithCode = _lib$util.isErrorWithCode,
+    util_keys = _lib$util.keys,
     values = _lib$util.values,
     util_hasOwnProperty = _lib$util.hasOwnProperty,
     getOwnPropertyDescriptors = _lib$util.getOwnPropertyDescriptors,
@@ -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,9 +539,11 @@ 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
 }));
@@ -545,6 +564,7 @@ function ViewContainer() {
 
   self.componentWillUnmount = app_app.on('navigate', function () {
     if (self.mounted && self.getViewComponent()) {
+      self.isForceUpdate = true;
       self.forceUpdate();
     }
   });
@@ -587,7 +607,9 @@ definePrototype(ViewContainer, external_commonjs_react_commonjs2_react_amd_react
 
       var providerProps = {
         key: routeMap.get(V).id,
-        value: {}
+        value: {
+          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, {
         rootProps: self.props.rootProps,
@@ -609,9 +631,13 @@ definePrototype(ViewContainer, external_commonjs_react_commonjs2_react_amd_react
       self.currentPath = app_app.path;
       self.currentView = view;
     } else {
-      app_app.emit('pageenter', self.currentElement, {
-        pathname: app_app.path
-      }, true);
+      if (self.isForceUpdate) {
+        self.isForceUpdate = false;
+        app_app.emit('pageenter', self.currentElement, {
+          pathname: app_app.path
+        }, true);
+      }
+
       resolve();
     }
 
@@ -620,19 +646,90 @@ definePrototype(ViewContainer, external_commonjs_react_commonjs2_react_amd_react
   },
   getViewComponent: function getViewComponent() {
     var props = this.props;
-    return any(props.views, isViewMatched) || history.state === stateId && void redirectTo(props.defaultView);
+    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 !== removeQueryAndHash(app_app.path)) {
+        app_app.navigate(targetPath, true);
+      }
+    }
+
+    return matched;
   }
 });
-function useViewContainerState() {
-  return external_commonjs_react_commonjs2_react_amd_react_root_React_.useContext(StateContext);
+
+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(matchers, function (v, i) {
+        var pos = route.params[i];
+        return (v ? !(pos >= 0) : pos < route.minLength) || !isFunction(v) && !route.match(i, v);
+      });
+      return matched ? route : null;
+    });
+
+    if (matched[1]) {
+      matched = grep(matched, function (v) {
+        return !single(v.params, function (v, i) {
+          return usedParams[i] && !matchers[i];
+        });
+      });
+    }
+
+    if (matched[0]) {
+      var last = matched.slice(-1)[0];
+      state.maxParams = util_keys(extend.apply(0, [{}].concat(matched.map(function (v) {
+        return v.params;
+      }))));
+      state.minParams = map(last.params, function (v, i) {
+        return state.params[i] || v >= last.minLength ? null : i;
+      });
+    }
+  }
+
+  return pick(params || app_app.route, includeAll ? state.maxParams : state.minParams);
 }
-function isViewMatched(view) {
+
+function sortViews(a, b) {
+  return (routeMap.get(b) || {}).matchCount - (routeMap.get(a) || {}).matchCount;
+}
+
+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);
@@ -658,21 +755,21 @@ function registerView(factory, routeParams) {
   });
   routeMap.set(Component, {
     id: randomId(),
-    matchCount: keys(routeParams).length,
+    matchCount: util_keys(routeParams).length,
     matchers: routeParams,
     params: pick(routeParams, function (v) {
       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,
@@ -680,19 +777,13 @@ function renderView() {
   });
 }
 function linkTo(view, params) {
-  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];
-    }
+  var state = routeMap.get(view);
+
+  if (!state) {
+    return '/';
   }
 
+  var newParams = extend(getCurrentParams(view), getCurrentParams(view, true, params), state.params);
   return app_app.route.getPath(newParams);
 }
 function navigateTo(view, params) {
@@ -715,7 +806,8 @@ function getCurrentStates() {
   return states[history.state] || (states[history.state] = {});
 }
 
-function ViewState(value) {
+function ViewState(key, value) {
+  this.key = key;
   this.value = value;
 }
 
@@ -797,20 +889,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;
@@ -918,7 +1011,10 @@ function makeTranslation(resources, defaultLang) {
   return {
     translate: cache[''],
     getTranslation: getTranslationCallback,
-    useTranslation: useTranslation
+    useTranslation: useTranslation,
+    keys: function keys(prefix) {
+      return util_keys(resources[defaultLang][prefix] || empty);
+    }
   };
 }
 ;// CONCATENATED MODULE: ./src/mixins/StaticAttributeMixin.js
@@ -1016,6 +1112,7 @@ function StatefulMixin() {
   Mixin.call(this);
 
   _(this, {
+    elements: new WeakSet(),
     states: {},
     prefix: '',
     counter: 0
@@ -1048,8 +1145,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);
       }
     };
@@ -1068,13 +1166,13 @@ definePrototype(StatefulMixin, Mixin, {
   },
   initElement: function initElement(element, state) {},
   clone: function clone() {
-    var clone = inherit(Object.getPrototypeOf(this));
+    var self = this;
+    var clone = inherit(Object.getPrototypeOf(self), self);
 
-    _(clone, {
-      states: _(this).states,
+    _(clone, extend({}, _(self), {
       prefix: randomId() + '.',
       counter: 0
-    });
+    }));
 
     return clone;
   },
@@ -1143,11 +1241,6 @@ definePrototype(ClassNameMixin, StatefulMixin, {
       }
     });
   },
-  clone: function clone() {
-    return extend(ClassNameMixinSuper.clone.call(this), {
-      classNames: this.classNames
-    });
-  },
   onClassNameUpdated: function onClassNameUpdated(element, prevState, state) {}
 });
 ;// CONCATENATED MODULE: ./src/mixins/AnimateMixin.js
@@ -1275,16 +1368,17 @@ function FlyoutToggleMixin(mixin) {
   this.flyoutMixin = mixin;
 }
 definePrototype(FlyoutToggleMixin, ClassNameMixin, {
+  open: function open(value) {
+    return this.flyoutMixin.open(value);
+  },
+  close: function close(value) {
+    return this.flyoutMixin.close(value);
+  },
   getCustomAttributes: function getCustomAttributes() {
     var element = this.flyoutMixin.elements()[0];
     return extend({}, FlyoutToggleMixinSuper.getCustomAttributes.call(this), {
       'toggle': element && '#' + element.id
     });
-  },
-  clone: function clone() {
-    return extend(FlyoutToggleMixinSuper.clone.call(this), {
-      flyoutMixin: this.flyoutMixin
-    });
   }
 });
 ;// CONCATENATED MODULE: ./src/mixins/FlyoutMixin.js
@@ -1292,11 +1386,13 @@ definePrototype(FlyoutToggleMixin, ClassNameMixin, {
 
 
 
+
 var FlyoutMixinSuper = ClassNameMixin.prototype;
+var valueMap = new WeakMap();
 var flyoutMixinCounter = 0;
 function FlyoutMixin() {
   var self = this;
-  ClassNameMixin.call(self, ['open', 'closing', 'tweening-in', 'tweening-out']);
+  ClassNameMixin.call(self, ['open', 'closing', 'visible', 'tweening-in', 'tweening-out']);
   self.modal = false;
   self.tabThrough = false;
   self.isFlyoutOpened = false;
@@ -1332,10 +1428,19 @@ definePrototype(FlyoutMixin, ClassNameMixin, {
       'animate-out': ''
     });
   },
+  open: function open(value) {
+    var element = this.elements()[0];
+    valueMap.set(element, value);
+    return openFlyout(element);
+  },
+  close: function close(value) {
+    return closeFlyout(this.elements()[0], value);
+  },
   onOpen: function onOpen(callback) {
+    var element = this.elements()[0];
     return this.onToggleState(function (opened) {
       if (opened) {
-        return callback();
+        return callback(valueMap.get(element));
       }
     });
   },