brew-js-react 0.2.1 → 0.2.4

package/dialog.js

@@ -1,8 +1,9 @@
 import React, { useEffect, useState } from "react";
 import ReactDOM from "react-dom";
-import { always, either, extend, noop } from "./include/zeta-dom/util.js";
+import { always, catchAsync, either, extend, noop, pipe, resolve } from "./include/zeta-dom/util.js";
 import { containsOrEquals, removeNode } from "./include/zeta-dom/domUtil.js";
 import dom from "./include/zeta-dom/dom.js";
+import { lock } from "./include/zeta-dom/domLock.js";
 import { closeFlyout, openFlyout } from "./include/brew-js/domAction.js";
 
 /**
@@ -42,14 +43,19 @@ export function createDialog(props) {
                 dom.setModal(root);
             }
             if (props.onRender) {
-                ReactDOM.render(React.createElement(props.onRender, extend({ closeDialog }, props)), root);
+                var dialogProps = extend({}, props, {
+                    closeDialog: function (value) {
+                        var promise = resolve((props.onCommit || pipe)(value));
+                        catchAsync(lock(dom.activeElement, promise));
+                        promise.then(closeDialog);
+                    }
+                });
+                ReactDOM.render(React.createElement(props.onRender, dialogProps), root);
             }
-
             promise = openFlyout(root);
             always(promise, function () {
                 promise = null;
             });
-            promise.then(props.onCommit);
             (props.onOpen || noop)(root);
             return promise;
         }

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),
@@ -261,7 +262,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,
-    keys = _lib$util.keys,
+    util_keys = _lib$util.keys,
     values = _lib$util.values,
     util_hasOwnProperty = _lib$util.hasOwnProperty,
     getOwnPropertyDescriptors = _lib$util.getOwnPropertyDescriptors,
@@ -276,6 +277,7 @@ var _lib$util = external_commonjs_zeta_dom_commonjs2_zeta_dom_amd_zeta_dom_root_
     watchOnce = _lib$util.watchOnce,
     watchable = _lib$util.watchable,
     inherit = _lib$util.inherit,
+    freeze = _lib$util.freeze,
     deepFreeze = _lib$util.deepFreeze,
     iequal = _lib$util.iequal,
     randomId = _lib$util.randomId,
@@ -363,6 +365,17 @@ var _lib$dom = external_commonjs_zeta_dom_commonjs2_zeta_dom_amd_zeta_dom_root_z
 
 
 /* harmony default export */ const zeta_dom_dom = (dom);
+;// 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/domAction.js
 
 var addAsyncAction = external_commonjs_brew_js_commonjs2_brew_js_amd_brew_js_root_brew_.addAsyncAction,
@@ -378,6 +391,7 @@ var addAsyncAction = external_commonjs_brew_js_commonjs2_brew_js_amd_brew_js_roo
 
 
 
+
 /**
  * @param {Partial<import("./dialog").DialogOptions<any>>} props
  */
@@ -387,7 +401,7 @@ function createDialog(props) {
   var closing = false;
   var promise;
 
-  function closeDialog(value) {
+  function _closeDialog(value) {
     if (!closing) {
       closing = true;
       closeFlyout(root, value).then(function () {
@@ -404,7 +418,7 @@ function createDialog(props) {
 
   return {
     root: root,
-    close: closeDialog,
+    close: _closeDialog,
     open: function open() {
       if (promise) {
         return promise;
@@ -420,16 +434,20 @@ function createDialog(props) {
       }
 
       if (props.onRender) {
-        external_commonjs_react_dom_commonjs2_react_dom_amd_react_dom_root_ReactDOM_.render( /*#__PURE__*/external_commonjs_react_commonjs2_react_amd_react_root_React_.createElement(props.onRender, extend({
-          closeDialog: closeDialog
-        }, props)), root);
+        var dialogProps = extend({}, props, {
+          closeDialog: function closeDialog(value) {
+            var promise = resolve((props.onCommit || pipe)(value));
+            catchAsync(lock(zeta_dom_dom.activeElement, promise));
+            promise.then(_closeDialog);
+          }
+        });
+        external_commonjs_react_dom_commonjs2_react_dom_amd_react_dom_root_ReactDOM_.render( /*#__PURE__*/external_commonjs_react_commonjs2_react_amd_react_root_React_.createElement(props.onRender, dialogProps), root);
       }
 
       promise = openFlyout(root);
       always(promise, function () {
         promise = null;
       });
-      promise.then(props.onCommit);
       (props.onOpen || noop)(root);
       return promise;
     }
@@ -463,6 +481,12 @@ function Dialog(props) {
 }
 // EXTERNAL MODULE: external "zeta-dom-react"
 var external_zeta_dom_react_ = __webpack_require__(103);
+;// CONCATENATED MODULE: ./tmp/zeta-dom/events.js
+
+var ZetaEventContainer = external_commonjs_zeta_dom_commonjs2_zeta_dom_amd_zeta_dom_root_zeta_.EventContainer;
+
+;// CONCATENATED MODULE: ./src/include/zeta-dom/events.js
+
 ;// CONCATENATED MODULE: ./tmp/brew-js/defaults.js
 
 var defaults_defaultExport = external_commonjs_brew_js_commonjs2_brew_js_amd_brew_js_root_brew_.defaults;
@@ -481,17 +505,6 @@ 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,
@@ -513,6 +526,7 @@ 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
 }));
@@ -533,6 +547,7 @@ function ViewContainer() {
 
   self.componentWillUnmount = app_app.on('navigate', function () {
     if (self.mounted && self.getViewComponent()) {
+      self.isForceUpdate = true;
       self.forceUpdate();
     }
   });
@@ -560,11 +575,14 @@ definePrototype(ViewContainer, external_commonjs_react_commonjs2_react_amd_react
       self.currentViewComponent = V;
 
       if (self.currentView && self.currentElement) {
+        var prevPath = self.currentPath;
+        var prevElement = self.currentElement;
         self.prevView = self.currentView;
-        self.prevElement = self.currentElement;
         self.currentElement = undefined;
-        animateOut(self.prevElement, 'show').then(function () {
-          self.prevElement = undefined;
+        app_app.emit('pageleave', prevElement, {
+          pathname: prevPath
+        }, true);
+        animateOut(prevElement, 'show').then(function () {
           self.prevView = undefined;
           self.forceUpdate();
         });
@@ -572,7 +590,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,
@@ -581,15 +601,26 @@ definePrototype(ViewContainer, external_commonjs_react_commonjs2_react_amd_react
           self.parentElement = element.parentElement;
           util_setImmediate(function () {
             resolve();
-            return animateIn(element, 'show');
+            animateIn(element, 'show');
+            app_app.emit('pageenter', element, {
+              pathname: app_app.path
+            }, true);
           });
         }
       })));
       defineGetterProperty(providerProps.value, 'active', function () {
         return self.currentView === view;
       });
+      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();
     }
 
@@ -598,19 +629,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 !== 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);
@@ -636,21 +738,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,
@@ -658,19 +760,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) {
@@ -685,12 +781,32 @@ function redirectTo(view, params) {
 
 
 
+
+var emitter = new ZetaEventContainer();
 var states = {};
 
 function getCurrentStates() {
   return states[history.state] || (states[history.state] = {});
 }
 
+function ViewState(value) {
+  this.value = value;
+}
+
+definePrototype(ViewState, {
+  get: function get() {
+    return this.value;
+  },
+  set: function set(value) {
+    this.value = value;
+  },
+  onPopState: function onPopState(callback) {
+    throwNotFunction(callback);
+    return emitter.add(this, 'popstate', function (e) {
+      callback.call(this, e.newValue);
+    });
+  }
+});
 function useAppReady() {
   var sReady = (0,external_commonjs_react_commonjs2_react_amd_react_root_React_.useState)(false);
   var ready = sReady[0],
@@ -705,32 +821,37 @@ function useAppReady() {
 function useRouteParam(name, defaultValue) {
   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];
+  var value = route[name] || '';
+  var ref = (0,external_commonjs_react_commonjs2_react_amd_react_root_React_.useRef)(value);
+  var forceUpdate = (0,external_commonjs_react_commonjs2_react_amd_react_root_React_.useState)()[1];
   (0,external_commonjs_react_commonjs2_react_amd_react_root_React_.useEffect)(function () {
-    var current = route[name]; // route parameter might be changed after state initialization and before useEffect hook is called
+    var setValue = function setValue() {
+      var current = route[name] || '';
+
+      if (container.active && current !== ref.current) {
+        ref.current = current;
+        forceUpdate({});
+      }
+    }; // route parameter might be changed after state initialization and before useEffect hook is called
+
 
-    setValue(current);
+    setValue();
 
     if (name in route) {
-      return route.watch(name, function (value) {
-        util_setImmediate(function () {
-          if (container.active) {
-            setValue(value);
-          }
-        });
+      return route.watch(name, function () {
+        setImmediateOnce(setValue);
       });
     }
 
     console.error('Route parameter ' + name + ' does not exist');
   }, [name, defaultValue]);
+  ref.current = value;
 
   if (!value && defaultValue !== undefined) {
     app_app.navigate(route.getPath(extend({}, route, kv(name, defaultValue))), true);
   }
 
-  return value || '';
+  return value;
 }
 function useRouteState(key, defaultValue) {
   var container = useViewContainerState();
@@ -750,17 +871,23 @@ function ViewStateContainer(props) {
     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;
-          }
-        });
+        var state = cache[uniqueId] || (cache[uniqueId] = new ViewState(cur[key] && cur[key].value));
 
         if (container.active) {
+          var stateId = state.stateId;
+
+          if (stateId && stateId !== history.state) {
+            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;
+            state.value = newValue;
+          }
+
+          state.stateId = history.state;
           cur[key] = state;
         }
 
@@ -865,7 +992,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
@@ -895,7 +1025,8 @@ definePrototype(Mixin, {
   },
   getCustomAttributes: function getCustomAttributes() {
     return {};
-  }
+  },
+  dispose: function dispose() {}
 });
 watchable(Mixin.prototype);
 util_define(Mixin, {
@@ -1014,15 +1145,23 @@ 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,
+      states: _(self).states,
       prefix: randomId() + '.',
       counter: 0
     });
 
     return clone;
+  },
+  dispose: function dispose() {
+    var states = _(this).states;
+
+    each(states, function (i, v) {
+      delete states[i];
+    });
   }
 });
 ;// CONCATENATED MODULE: ./src/mixins/ClassNameMixin.js
@@ -1082,11 +1221,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
@@ -1162,19 +1296,13 @@ definePrototype(AnimateSequenceMixin, AnimateMixin, {
     });
   }
 });
-;// CONCATENATED MODULE: ./tmp/zeta-dom/events.js
-
-var ZetaEventContainer = external_commonjs_zeta_dom_commonjs2_zeta_dom_amd_zeta_dom_root_zeta_.EventContainer;
-
-;// CONCATENATED MODULE: ./src/include/zeta-dom/events.js
-
 ;// CONCATENATED MODULE: ./src/mixins/ErrorHandlerMixin.js
 
 
 
 
 var ErrorHandlerMixinSuper = StatefulMixin.prototype;
-var emitter = new ZetaEventContainer();
+var ErrorHandlerMixin_emitter = new ZetaEventContainer();
 
 function isErrorMatched(filter, error) {
   if (isFunction(filter)) {
@@ -1194,7 +1322,7 @@ definePrototype(ErrorHandlerMixin, StatefulMixin, {
       filter = null;
     }
 
-    return emitter.add(this, filter ? 'error' : 'default', function (e) {
+    return ErrorHandlerMixin_emitter.add(this, filter ? 'error' : 'default', function (e) {
       if (!filter || isErrorMatched(filter, e.error)) {
         return callback(e.error);
       }
@@ -1207,10 +1335,22 @@ definePrototype(ErrorHandlerMixin, StatefulMixin, {
       var data = {
         error: e.error
       };
-      return emitter.emit('error', self, data) || emitter.emit('default', self, data);
+      return ErrorHandlerMixin_emitter.emit('error', self, data) || ErrorHandlerMixin_emitter.emit('default', self, data);
     });
   }
 });
+;// 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
 
 
@@ -1220,16 +1360,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
@@ -1237,12 +1378,16 @@ definePrototype(FlyoutToggleMixin, ClassNameMixin, {
 
 
 
+
+
 var FlyoutMixinSuper = ClassNameMixin.prototype;
+var varname = '__flyout' + randomId();
 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;
   self.animating = false;
   self.visible = false;
@@ -1268,16 +1413,25 @@ definePrototype(FlyoutMixin, ClassNameMixin, {
       'swipe-dismiss': self.swipeToDismiss
     }, self.modal && {
       'is-modal': ''
+    }, self.tabThrough && {
+      'tab-through': ''
     }, self.effects && {
       'animate-on': 'open',
       'animate-in': self.effects.join(' '),
       'animate-out': ''
     });
   },
+  open: function open(value) {
+    return openFlyout(this.elements()[0], kv(varname, value));
+  },
+  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(getVar(element, varname));
       }
     });
   },
@@ -1293,6 +1447,7 @@ definePrototype(FlyoutMixin, ClassNameMixin, {
 
     if (!element.id) {
       element.id = 'flyout-' + ++flyoutMixinCounter;
+      declareVar(element, varname, undefined);
     }
 
     app_app.on(element, {
@@ -1337,9 +1492,9 @@ definePrototype(FocusStateMixin, StatefulMixin, {
   initElement: function initElement(element, state) {
     FocusStateMixinSuper.initElement.call(this, element, state);
     zeta_dom_dom.on(element, {
-      focusin: function focusin() {
+      focusin: function focusin(e) {
         state.focused = true;
-        setClass(element, 'focused', true);
+        setClass(element, 'focused', e.source);
       },
       focusout: function focusout() {
         state.focused = false;
@@ -1487,9 +1642,13 @@ var useFocusStateMixin = createUseFunction(FocusStateMixin);
 var useLoadingStateMixin = createUseFunction(LoadingStateMixin);
 var useScrollableMixin = createUseFunction(ScrollableMixin);
 function useMixin(ctor) {
-  return (0,external_commonjs_react_commonjs2_react_amd_react_root_React_.useState)(function () {
+  var mixin = (0,external_commonjs_react_commonjs2_react_amd_react_root_React_.useState)(function () {
     return new ctor();
   })[0].reset();
+  (0,external_commonjs_react_commonjs2_react_amd_react_root_React_.useEffect)(function () {
+    return mixin.dispose.bind(mixin);
+  }, []);
+  return mixin;
 }
 function useMixinRef(mixin) {
   return mixin && mixin.getMixin().reset();