brew-js-react 0.1.10 → 0.2.1

package/dist/brew-js-react.js

@@ -175,6 +175,7 @@ __webpack_require__.d(src_namespaceObject, {
   "Mixin": () => (Mixin),
   "ScrollableMixin": () => (ScrollableMixin),
   "StatefulMixin": () => (StatefulMixin),
+  "ViewStateContainer": () => (ViewStateContainer),
   "createDialog": () => (createDialog),
   "default": () => (src),
   "isViewMatched": () => (isViewMatched),
@@ -195,7 +196,9 @@ __webpack_require__.d(src_namespaceObject, {
   "useMixin": () => (useMixin),
   "useMixinRef": () => (useMixinRef),
   "useRouteParam": () => (useRouteParam),
-  "useScrollableMixin": () => (useScrollableMixin)
+  "useRouteState": () => (useRouteState),
+  "useScrollableMixin": () => (useScrollableMixin),
+  "useViewContainerState": () => (useViewContainerState)
 });
 
 // EXTERNAL MODULE: external {"commonjs":"brew-js","commonjs2":"brew-js","amd":"brew-js","root":"brew"}
@@ -222,6 +225,7 @@ var external_commonjs_zeta_dom_commonjs2_zeta_dom_amd_zeta_dom_root_zeta_ = __we
 
 var _lib$util = external_commonjs_zeta_dom_commonjs2_zeta_dom_amd_zeta_dom_root_zeta_.util,
     noop = _lib$util.noop,
+    pipe = _lib$util.pipe,
     either = _lib$util.either,
     is = _lib$util.is,
     isUndefinedOrNull = _lib$util.isUndefinedOrNull,
@@ -457,6 +461,8 @@ function Dialog(props) {
   }, [dialog]);
   return /*#__PURE__*/external_commonjs_react_dom_commonjs2_react_dom_amd_react_dom_root_ReactDOM_.createPortal(props.children, dialog.root);
 }
+// EXTERNAL MODULE: external "zeta-dom-react"
+var external_zeta_dom_react_ = __webpack_require__(103);
 ;// CONCATENATED MODULE: ./tmp/brew-js/defaults.js
 
 var defaults_defaultExport = external_commonjs_brew_js_commonjs2_brew_js_amd_brew_js_root_brew_.defaults;
@@ -475,10 +481,216 @@ install('react', function (app_) {
   app_app = app_;
 });
 brew_js_defaults.react = true;
+;// CONCATENATED MODULE: ./tmp/zeta-dom/domLock.js
+
+var domLock_lib$dom = external_commonjs_zeta_dom_commonjs2_zeta_dom_amd_zeta_dom_root_zeta_.dom,
+    lock = domLock_lib$dom.lock,
+    locked = domLock_lib$dom.locked,
+    cancelLock = domLock_lib$dom.cancelLock,
+    notifyAsync = domLock_lib$dom.notifyAsync,
+    preventLeave = domLock_lib$dom.preventLeave;
+
+;// CONCATENATED MODULE: ./src/include/zeta-dom/domLock.js
+
+;// CONCATENATED MODULE: ./tmp/brew-js/anim.js
+
+var animateIn = external_commonjs_brew_js_commonjs2_brew_js_amd_brew_js_root_brew_.animateIn,
+    animateOut = external_commonjs_brew_js_commonjs2_brew_js_amd_brew_js_root_brew_.animateOut,
+    addAnimateIn = external_commonjs_brew_js_commonjs2_brew_js_amd_brew_js_root_brew_.addAnimateIn,
+    addAnimateOut = external_commonjs_brew_js_commonjs2_brew_js_amd_brew_js_root_brew_.addAnimateOut;
+
+;// CONCATENATED MODULE: ./src/include/brew-js/anim.js
+
+;// CONCATENATED MODULE: ./src/view.js
+
+
+
+
+
+
+
+
+var view_root = zeta_dom_dom.root;
+var routeMap = new Map();
+var usedParams = {};
+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.forceUpdate();
+    }
+  });
+}
+
+definePrototype(ViewContainer, external_commonjs_react_commonjs2_react_amd_react_root_React_.Component, {
+  componentDidMount: function componentDidMount() {
+    this.mounted = true;
+  },
+  componentDidCatch: function componentDidCatch(error) {
+    zeta_dom_dom.emit('error', this.parentElement || view_root, {
+      error: error
+    }, true);
+  },
+  render: function render() {
+    /** @type {any} */
+    var self = this;
+    var resolve;
+    var promise = new Promise(function (_resolve) {
+      resolve = _resolve;
+    });
+    var V = self.getViewComponent();
+
+    if (V && V !== self.currentViewComponent) {
+      self.currentViewComponent = V;
+
+      if (self.currentView && self.currentElement) {
+        self.prevView = self.currentView;
+        self.prevElement = self.currentElement;
+        self.currentElement = undefined;
+        animateOut(self.prevElement, 'show').then(function () {
+          self.prevElement = undefined;
+          self.prevView = undefined;
+          self.forceUpdate();
+        });
+      }
+
+      var providerProps = {
+        key: routeMap.get(V).id,
+        value: {}
+      };
+      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,
+        onComponentLoaded: function onComponentLoaded(element) {
+          self.currentElement = element;
+          self.parentElement = element.parentElement;
+          util_setImmediate(function () {
+            resolve();
+            return animateIn(element, 'show');
+          });
+        }
+      })));
+      defineGetterProperty(providerProps.value, 'active', function () {
+        return self.currentView === view;
+      });
+      self.currentView = view;
+    } else {
+      resolve();
+    }
+
+    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);
+  },
+  getViewComponent: function getViewComponent() {
+    var props = this.props;
+    return any(props.views, isViewMatched) || history.state === stateId && void redirectTo(props.defaultView);
+  }
+});
+function useViewContainerState() {
+  return external_commonjs_react_commonjs2_react_amd_react_root_React_.useContext(StateContext);
+}
+function isViewMatched(view) {
+  var params = routeMap.get(view);
+  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 state = (0,external_zeta_dom_react_.useAsync)(factory);
+    var ref = (0,external_commonjs_react_commonjs2_react_amd_react_root_React_.useRef)();
+
+    if (state[0] || state[1].error) {
+      (props.onComponentLoaded || noop)(ref.current);
+    }
+
+    return /*#__PURE__*/external_commonjs_react_commonjs2_react_amd_react_root_React_.createElement('div', extend({}, props.rootProps, {
+      ref: ref,
+      children: state[0] && /*#__PURE__*/external_commonjs_react_commonjs2_react_amd_react_root_React_.createElement(state[0]["default"])
+    }));
+  };
+
+  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 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) {
+  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));
+}
+function redirectTo(view, params) {
+  return app_app.navigate(linkTo(view, params), true);
+}
 ;// CONCATENATED MODULE: ./src/hooks.js
 
 
 
+
+
+var states = {};
+
+function getCurrentStates() {
+  return states[history.state] || (states[history.state] = {});
+}
+
 function useAppReady() {
   var sReady = (0,external_commonjs_react_commonjs2_react_amd_react_root_React_.useState)(false);
   var ready = sReady[0],
@@ -491,24 +703,75 @@ 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 container = useViewContainerState();
+  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, function (value) {
+        util_setImmediate(function () {
+          if (container.active) {
+            setValue(value);
+          }
+        });
+      });
+    }
+
+    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 || '';
 }
-// EXTERNAL MODULE: external "zeta-dom-react"
-var external_zeta_dom_react_ = __webpack_require__(103);
+function useRouteState(key, defaultValue) {
+  var container = useViewContainerState();
+  var cur = getCurrentStates();
+  var state = (0,external_commonjs_react_commonjs2_react_amd_react_root_React_.useState)(key in cur ? cur[key] : defaultValue);
+
+  if (container.active) {
+    cur[key] = state[0];
+  }
+
+  return state;
+}
+function ViewStateContainer(props) {
+  var container = useViewContainerState();
+  var provider = (0,external_commonjs_react_commonjs2_react_amd_react_root_React_.useState)(function () {
+    var cache = {};
+    return {
+      getState: function getState(uniqueId, key) {
+        var cur = getCurrentStates();
+        var state = cache[uniqueId] || (cache[uniqueId] = {
+          value: cur[key] && cur[key].value,
+          get: function get() {
+            return state.value;
+          },
+          set: function set(value) {
+            state.value = value;
+          }
+        });
+
+        if (container.active) {
+          cur[key] = state;
+        }
+
+        return state;
+      }
+    };
+  })[0];
+  return /*#__PURE__*/(0,external_commonjs_react_commonjs2_react_amd_react_root_React_.createElement)(external_zeta_dom_react_.ViewStateProvider, {
+    value: provider
+  }, props.children);
+}
 // EXTERNAL MODULE: ./src/include/external/waterpipe.js
 var waterpipe = __webpack_require__(43);
 ;// CONCATENATED MODULE: ./src/i18n.js
@@ -531,7 +794,8 @@ if (toPrimitive) {
 
 function createCallback(translate) {
   var callback = function callback(key, data) {
-    return translate(key, data, true);
+    var result = translate(key, data, true);
+    return result !== undefined ? result : key;
   };
 
   return extend(callback, {
@@ -553,46 +817,54 @@ function makeTranslation(resources, defaultLang) {
   var re = new RegExp('^(' + Object.keys(resources[defaultLang]).join('|') + ')\\.');
   var cache = {};
 
-  function getTranslation(prefix, name, data, noEncode) {
-    var str = ((resources[app_app.language] || empty)[prefix] || empty)[name] || ((resources[defaultLang] || empty)[prefix] || empty)[name] || '';
+  function getTranslation(prefix, name, data, noEncode, lang) {
+    var str = ((resources[lang] || empty)[prefix] || empty)[name];
 
-    if (str && (!noEncode || data !== undefined)) {
-      return waterpipe(str, data, {
-        noEncode: noEncode
-      });
+    if (typeof str === 'string') {
+      if (str && (!noEncode || data !== undefined)) {
+        return waterpipe(str, data, {
+          noEncode: noEncode
+        });
+      }
+
+      return str;
     }
 
-    return str;
+    if (lang !== defaultLang) {
+      return getTranslation(prefix, name, data, noEncode, defaultLang);
+    }
   }
 
   function translate(key, data, noEncode) {
     var prefix = re.test(key) ? RegExp.$1 : '';
     var name = prefix ? key.slice(RegExp.lastMatch.length) : key;
-    return getTranslation(prefix, name, data, noEncode) || key;
+    return getTranslation(prefix, name, data, noEncode, app_app.language);
   }
 
-  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) {
+      var lang = app_app.language;
+      return single(prefix, function (v) {
+        return getTranslation(v, key, data, noEncode, lang);
+      });
+    }));
+  }
 
+  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
   };
 }
@@ -1223,160 +1495,6 @@ function useMixinRef(mixin) {
   return mixin && mixin.getMixin().reset();
 }
 
-;// CONCATENATED MODULE: ./tmp/brew-js/anim.js
-
-var animateIn = external_commonjs_brew_js_commonjs2_brew_js_amd_brew_js_root_brew_.animateIn,
-    animateOut = external_commonjs_brew_js_commonjs2_brew_js_amd_brew_js_root_brew_.animateOut,
-    addAnimateIn = external_commonjs_brew_js_commonjs2_brew_js_amd_brew_js_root_brew_.addAnimateIn,
-    addAnimateOut = external_commonjs_brew_js_commonjs2_brew_js_amd_brew_js_root_brew_.addAnimateOut;
-
-;// CONCATENATED MODULE: ./src/include/brew-js/anim.js
-
-;// CONCATENATED MODULE: ./src/view.js
-
-
-
-
-
-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();
-    }
-  });
-}
-
-definePrototype(ViewContainer, external_commonjs_react_commonjs2_react_amd_react_root_React_.Component, {
-  componentDidMount: function componentDidMount() {
-    this.mounted = true;
-  },
-  render: function render() {
-    /** @type {any} */
-    var self = this;
-    var V = self.getViewComponent();
-
-    if (V && V !== self.currentViewComponent) {
-      self.currentViewComponent = V;
-
-      if (self.currentView && self.currentElement) {
-        self.prevView = self.currentView;
-        self.prevElement = self.currentElement;
-        self.currentElement = undefined;
-        animateOut(self.prevElement, 'show').then(function () {
-          self.prevElement = undefined;
-          self.prevView = undefined;
-          self.forceUpdate();
-        });
-      }
-
-      self.currentView = /*#__PURE__*/external_commonjs_react_commonjs2_react_amd_react_root_React_.createElement(V, {
-        key: routeMap.get(V).id,
-        rootProps: self.props.rootProps,
-        onComponentLoaded: function onComponentLoaded(element) {
-          self.currentElement = element;
-          util_setImmediate(function () {
-            return animateIn(element, 'show');
-          });
-        }
-      });
-    }
-
-    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 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 && 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 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) {
-        if (element && Component) {
-          (props.onComponentLoaded || noop)(element);
-        }
-      },
-      children: Component && /*#__PURE__*/external_commonjs_react_commonjs2_react_amd_react_root_React_.createElement(Component["default"])
-    }));
-  };
-
-  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 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) {
-  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));
-}
-function redirectTo(view, params) {
-  return app_app.navigate(linkTo(view, params), true);
-}
 ;// CONCATENATED MODULE: ./src/index.js
 
 /* harmony default export */ const src = (brew_js_app);