brew-js-react 0.5.3 → 0.5.4

package/mixins/ClassNameMixin.js

@@ -1,6 +1,6 @@
-import { definePrototype, each, equal, extend, fill } from "../include/zeta-dom/util.js";
-import { setClass } from "../include/zeta-dom/domUtil.js";
-import { watchOwnAttributes } from "../include/zeta-dom/observe.js";
+import { definePrototype, each, equal, extend, fill } from "zeta-dom/util";
+import { setClass } from "zeta-dom/domUtil";
+import { watchOwnAttributes } from "zeta-dom/observe";
 import StatefulMixin from "./StatefulMixin.js";
 
 function checkState(self, element, state, fireEvent) {

package/mixins/ClassNameToggleMixin.js

@@ -1,5 +1,5 @@
-import { definePrototype, each, extend, isPlainObject, kv } from "../include/zeta-dom/util.js";
-import { setClass } from "../include/zeta-dom/domUtil.js";
+import { definePrototype, each, extend, isPlainObject, kv } from "zeta-dom/util";
+import { setClass } from "zeta-dom/domUtil";
 import StatefulMixin from "./StatefulMixin.js";
 
 export default function ClassNameToggleMixin() {

package/mixins/FlyoutMixin.d.ts

@@ -22,6 +22,11 @@ export interface FlyoutMixinOptions {
      * Default is `true` if source element is not an text input element.
      */
     initialFocus?: boolean | string;
+    /**
+     * Whether the flyout should be closed when flyout, or source element if given, loses focus.
+     * Default is `true` if flyout is not dismissible by swipe gesture.
+     */
+    closeOnBlur?: boolean;
 }
 
 /**
@@ -84,9 +89,10 @@ export default class FlyoutMixin extends ClassNameMixin {
     /**
      * Opens the flyout.
      * @param state Value to be sent to listener added by {@link FlyoutMixin.onOpen}.
+     * @param source Source element that triggered the flyout.
      * @returns A promise that resolves when the flyout is being closed.
      */
-    open(state?: any): Promise<any>;
+    open(state?: any, source?: Element): Promise<any>;
     /**
      * Closes the flyout.
      * @param state Value to be sent to the promise returned by {@link FlyoutMixin.open}.

package/mixins/FlyoutMixin.js

@@ -1,5 +1,5 @@
-import { definePrototype, extend, makeArray } from "../include/zeta-dom/util.js";
-import { closeFlyout, openFlyout } from "../include/brew-js/domAction.js";
+import { definePrototype, extend, makeArray, pick } from "zeta-dom/util";
+import { closeFlyout, isFlyoutOpen, openFlyout } from "brew-js/domAction";
 import { app } from "../app.js";
 import ClassNameMixin from "./ClassNameMixin.js";
 import FlyoutToggleMixin from "./FlyoutToggleMixin.js";
@@ -20,14 +20,16 @@ export default function FlyoutMixin() {
     self.onDispose(function () {
         self.isFlyoutOpened = false;
         self.visible = false;
+        self.toggle.dispose();
     });
 }
 
 definePrototype(FlyoutMixin, ClassNameMixin, {
-    get flyoutOptions() {
-        var options = {};
-        if (this.initialFocus !== undefined) {
-            options.focus = this.initialFocus;
+    getOptions: function () {
+        var self = this;
+        var options = pick(self, ['closeOnBlur']);
+        if (self.initialFocus !== undefined) {
+            options.focus = self.initialFocus;
         }
         return options;
     },
@@ -54,10 +56,12 @@ definePrototype(FlyoutMixin, ClassNameMixin, {
             'animate-out': ''
         });
     },
-    open: function (value) {
+    open: function (value, source) {
         var element = this.elements()[0];
-        valueMap.set(element, value);
-        return openFlyout(element, null, this.flyoutOptions);
+        if (!isFlyoutOpen(element)) {
+            valueMap.set(element, value);
+        }
+        return openFlyout(element, source, this.getOptions());
     },
     close: function (value) {
         return closeFlyout(this.elements()[0], value);
@@ -90,7 +94,11 @@ definePrototype(FlyoutMixin, ClassNameMixin, {
     },
     onClassNameUpdated: function (element, prevState, state) {
         var self = this;
+        var isFlyoutOpened = isFlyoutOpen(element);
+        if (!isFlyoutOpened) {
+            valueMap.delete(element);
+        }
         self.visible = state.open;
-        self.isFlyoutOpened = state.open && !state.closing && !state['tweening-out'];
+        self.isFlyoutOpened = isFlyoutOpened;
     }
 });

package/mixins/FlyoutToggleMixin.d.ts

@@ -10,9 +10,10 @@ export default class FlyoutToggleMixin extends ClassNameMixin {
     /**
      * Opens the associated flyout.
      * @param state Value to be sent to listener added by {@link FlyoutMixin.onOpen}.
+     * @param source Source element that triggered the flyout.
      * @returns A promise that resolves when the flyout is being closed.
      */
-    open(state?: any): Promise<any>;
+    open(state?: any, source?: Element): Promise<any>;
     /**
      * Closes the associated flyout.
      * @param state Value to be sent to the promise returned by {@link FlyoutMixin.open}.

package/mixins/FlyoutToggleMixin.js

@@ -1,6 +1,6 @@
-import dom from "../include/zeta-dom/dom.js";
-import { definePrototype } from "../include/zeta-dom/util.js";
-import { toggleFlyout } from "../include/brew-js/domAction.js";
+import dom from "zeta-dom/dom";
+import { definePrototype } from "zeta-dom/util";
+import { toggleFlyout } from "brew-js/domAction";
 import ClassNameMixin from "./ClassNameMixin.js";
 
 const FlyoutToggleMixinSuper = ClassNameMixin.prototype;
@@ -11,8 +11,8 @@ export default function FlyoutToggleMixin(mixin) {
 }
 
 definePrototype(FlyoutToggleMixin, ClassNameMixin, {
-    open: function (value) {
-        return this.flyoutMixin.open(value);
+    open: function (value, source) {
+        return this.flyoutMixin.open(value, source);
     },
     close: function (value) {
         return this.flyoutMixin.close(value);
@@ -21,7 +21,7 @@ definePrototype(FlyoutToggleMixin, ClassNameMixin, {
         var self = this;
         FlyoutToggleMixinSuper.initElement.call(self, element, state);
         self.onDispose(dom.on(element, 'click', function () {
-            toggleFlyout(self.flyoutMixin.elements()[0], element, self.flyoutMixin.flyoutOptions);
+            toggleFlyout(self.flyoutMixin.elements()[0], element, self.flyoutMixin.getOptions());
         }));
     }
 });

package/mixins/FocusStateMixin.js

@@ -1,6 +1,6 @@
-import { definePrototype } from "../include/zeta-dom/util.js";
-import { setClass } from "../include/zeta-dom/domUtil.js";
-import dom from "../include/zeta-dom/dom.js";
+import { definePrototype } from "zeta-dom/util";
+import { setClass } from "zeta-dom/domUtil";
+import dom from "zeta-dom/dom";
 import StatefulMixin from "./StatefulMixin.js";
 
 const FocusStateMixinSuper = StatefulMixin.prototype;

package/mixins/LoadingStateMixin.js

@@ -1,7 +1,7 @@
-import { any, definePrototype } from "../include/zeta-dom/util.js";
-import { getClass } from "../include/zeta-dom/domUtil.js";
-import { subscribeAsync } from "../include/zeta-dom/domLock.js";
-import { getDirectiveComponent } from "../include/brew-js/directive.js";
+import { any, definePrototype } from "zeta-dom/util";
+import { getClass } from "zeta-dom/domUtil";
+import { subscribeAsync } from "zeta-dom/domLock";
+import { getDirectiveComponent } from "brew-js/directive";
 import ClassNameMixin from "./ClassNameMixin.js";
 
 const LoadingStateMixinSuper = ClassNameMixin.prototype;

package/mixins/Mixin.js

@@ -1,5 +1,5 @@
 import { classNames } from "zeta-dom-react";
-import { combineFn, define, definePrototype, each, extend, makeArray, noop, watchable } from "../include/zeta-dom/util.js";
+import { combineFn, define, definePrototype, each, extend, makeArray, noop, watchable } from "zeta-dom/util";
 import StaticAttributeMixin from "./StaticAttributeMixin.js";
 
 export default function Mixin() {

package/mixins/ScrollIntoViewMixin.js

@@ -1,5 +1,5 @@
-import { definePrototype, equal, extend, setImmediateOnce } from "../include/zeta-dom/util.js";
-import { scrollIntoView } from "../include/zeta-dom/domUtil.js";
+import { definePrototype, equal, extend, setImmediateOnce } from "zeta-dom/util";
+import { scrollIntoView } from "zeta-dom/domUtil";
 import StatefulMixin from "./StatefulMixin.js";
 
 export default function ScrollIntoViewMixin() {

package/mixins/ScrollableMixin.js

@@ -1,5 +1,5 @@
-import { defineHiddenProperty, definePrototype, each, extend } from "../include/zeta-dom/util.js";
-import { getDirectiveComponent } from "../include/brew-js/directive.js";
+import { defineHiddenProperty, definePrototype, each, extend } from "zeta-dom/util";
+import { getDirectiveComponent } from "brew-js/directive";
 import { app } from "../app.js";
 import Mixin from "./Mixin.js";
 import ClassNameMixin from "./ClassNameMixin.js";

package/mixins/StatefulMixin.js

@@ -1,4 +1,4 @@
-import { combineFn, createPrivateStore, definePrototype, extend, keys, map, pipe, watch } from "../include/zeta-dom/util.js";
+import { combineFn, createPrivateStore, definePrototype, extend, keys, map, pipe, watch } from "zeta-dom/util";
 import Mixin from "./Mixin.js";
 
 const _ = createPrivateStore();

package/mixins/StaticAttributeMixin.js

@@ -1,4 +1,4 @@
-import { definePrototype, extend, isPlainObject, kv } from "../include/zeta-dom/util.js";
+import { definePrototype, extend, isPlainObject, kv } from "zeta-dom/util";
 import Mixin from "./Mixin.js";
 
 export default function StaticAttributeMixin(name, value) {

package/mixins/UnmanagedClassNameMixin.js

@@ -1,4 +1,4 @@
-import { definePrototype, makeArray } from "../include/zeta-dom/util.js";
+import { definePrototype, makeArray } from "zeta-dom/util";
 import ClassNameMixin from "./ClassNameMixin.js";
 
 export default function UnmanagedClassNameMixin() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "brew-js-react",
-  "version": "0.5.3",
+  "version": "0.5.4",
   "description": "",
   "type": "module",
   "main": "index.js",
@@ -27,21 +27,17 @@
     "@babel/preset-env": "^7.16.11",
     "@babel/preset-react": "^7.16.7",
     "@jest/globals": "^26.6.2",
+    "@misonou/build-utils": "^1.1.2",
     "@misonou/test-utils": "^1.0.3",
     "@testing-library/dom": "^8.11.3",
     "@testing-library/react": "^12.1.2",
     "@testing-library/react-hooks": "^7.0.2",
     "@types/jest": "^26.0.15",
-    "babel-loader": "^8.2.1",
-    "clean-webpack-plugin": "^4.0.0",
+    "babel-loader": "^9.1.3",
     "cross-env": "^7.0.2",
-    "glob": "^7.2.0",
     "jest": "^27.0.6",
     "jest-environment-jsdom": "^27.4.6",
-    "ncp": "^2.0.0",
-    "regenerator-runtime": "^0.13.9",
-    "webpack": "^5.3.0",
-    "webpack-cli": "^4.1.0"
+    "regenerator-runtime": "^0.13.9"
   },
   "sideEffects": [
     "./src/app.js"

package/view.js

@@ -1,11 +1,11 @@
 import React from "react";
 import { useAsync } from "zeta-dom-react";
-import dom from "./include/zeta-dom/dom.js";
-import { notifyAsync } from "./include/zeta-dom/domLock.js";
-import { ZetaEventContainer } from "./include/zeta-dom/events.js";
-import { any, arrRemove, catchAsync, combineFn, createPrivateStore, defineObservableProperty, defineOwnProperty, definePrototype, each, exclude, executeOnce, extend, freeze, grep, isFunction, isThenable, isUndefinedOrNull, keys, makeArray, map, noop, pick, randomId, resolveAll, setImmediate, single, throwNotFunction, watch } from "./include/zeta-dom/util.js";
-import { animateIn, animateOut } from "./include/brew-js/anim.js";
-import { removeQueryAndHash } from "./include/brew-js/util/path.js";
+import dom from "zeta-dom/dom";
+import { notifyAsync } from "zeta-dom/domLock";
+import { ZetaEventContainer } from "zeta-dom/events";
+import { any, arrRemove, catchAsync, combineFn, createPrivateStore, defineObservableProperty, defineOwnProperty, definePrototype, each, exclude, executeOnce, extend, freeze, grep, isFunction, isThenable, isUndefinedOrNull, keys, makeArray, map, noop, pick, randomId, resolveAll, setImmediate, single, throwNotFunction, watch } from "zeta-dom/util";
+import { animateIn, animateOut } from "brew-js/anim";
+import { removeQueryAndHash } from "brew-js/util/path";
 import { app, onAppInit } from "./app.js";
 import { ViewStateContainer } from "./hooks.js";
 

package/include/brew-js/anim.js

@@ -1 +0,0 @@
-export * from "brew-js/anim";

package/include/brew-js/app.js

@@ -1,3 +0,0 @@
-import brew from "brew-js/app";
-export * from "brew-js/app";
-export default brew;

package/include/brew-js/defaults.js

@@ -1,2 +0,0 @@
-import defaults from "brew-js/defaults";
-export default defaults;

package/include/brew-js/directive.js

@@ -1 +0,0 @@
-export * from "brew-js/directive";

package/include/brew-js/domAction.js

@@ -1 +0,0 @@
-export * from "brew-js/domAction";

package/include/brew-js/extension/router.js

@@ -1 +0,0 @@
-export * from "brew-js/extension/router";

package/include/brew-js/util/path.js

@@ -1 +0,0 @@
-export * from "brew-js/util/path";

package/include/brew-js/var.js

@@ -1 +0,0 @@
-export * from "brew-js/var";

package/include/external/jquery.js

@@ -1,3 +0,0 @@
-// @ts-nocheck
-import jQuery from "jquery";
-export default jQuery;

package/include/external/react-dom-client.js

@@ -1,4 +0,0 @@
-// @ts-nocheck
-import ReactDOMClient from "@misonou/react-dom-client";
-/** @type {import("react-dom/client")} */
-export default ReactDOMClient;

package/include/external/waterpipe.js

@@ -1,3 +0,0 @@
-// @ts-nocheck
-import waterpipe from "waterpipe";
-export default waterpipe;

package/include/zeta-dom/cssUtil.js

@@ -1 +0,0 @@
-export * from "zeta-dom/cssUtil";

package/include/zeta-dom/dom.js

@@ -1,3 +0,0 @@
-import dom from "zeta-dom/dom";
-export * from "zeta-dom/dom";
-export default dom;

package/include/zeta-dom/domLock.js

@@ -1 +0,0 @@
-export * from "zeta-dom/domLock";

package/include/zeta-dom/domUtil.js

@@ -1 +0,0 @@
-export * from "zeta-dom/domUtil";

package/include/zeta-dom/events.js

@@ -1 +0,0 @@
-export { ZetaEventContainer } from "zeta-dom/events";

package/include/zeta-dom/observe.js

@@ -1 +0,0 @@
-export * from "zeta-dom/observe";

package/include/zeta-dom/util.js

@@ -1 +0,0 @@
-export * from "zeta-dom/util";