brew-js-react 0.7.0 → 0.7.1

package/mixins/Mixin.d.ts

@@ -5,7 +5,7 @@ import StaticAttributeMixin from "./StaticAttributeMixin";
 export type MixinProps<T extends Element, M> = MixinDefaultProps<T> & UnionToIntersection<M extends CustomAttributeProvider<infer P> ? P : never>;
 
 type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
-type MixinTypes<T extends unknown[]> = Extract<Zeta.ArrayMember<T>, CustomAttributeProvider>;
+type MixinTypes<T extends readonly unknown[]> = Extract<Zeta.ArrayMember<T>, CustomAttributeProvider>;
 
 interface MixinDefaultProps<T extends Element> {
     ref: React.RefCallback<T>;

package/mixins/StaticAttributeMixin.d.ts

@@ -15,5 +15,6 @@ export default class StaticAttributeMixin<P = {}> extends Mixin {
      * Applies custom attributes to element.
      * @private It is used internally by mixins and is declared for type inference.
      */
+    // @ts-ignore
     getCustomAttributes(): P;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "brew-js-react",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "description": "",
   "type": "module",
   "main": "index.js",
@@ -28,13 +28,12 @@
     "@babel/preset-react": "^7.16.7",
     "@jest/globals": "^26.6.2",
     "@misonou/build-utils": "^1.3.1",
-    "@misonou/test-utils": "^1.0.3",
+    "@misonou/test-utils": "^1.4.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": "^9.1.3",
-    "check-dts": "^0.8.2",
     "cross-env": "^7.0.2",
     "expect-type": "^0.20.0",
     "jest": "^27.0.6",

package/view.d.ts

@@ -98,7 +98,14 @@ export class ViewContext implements Zeta.ZetaEventDispatcher<ViewContextEventMap
      * @param event Name of the event.
      * @param handler A callback function to be fired when the specified event is triggered.
      */
-    on<E extends keyof ViewContextEventMap>(event: E, handler: Zeta.ZetaEventHandler<E, ViewContextEventMap, ViewContext>): Zeta.UnregisterCallback;
+    on<E extends Zeta.StringKeyOf<ViewContextEventMap>>(event: E, handler: Zeta.ZetaEventHandler<E, ViewContextEventMap, ViewContext>): Zeta.UnregisterCallback;
+
+    /**
+     * Adds an event handler to a specific event.
+     * @param event Name of the event.
+     * @param handler A callback function to be fired when the specified event is triggered.
+     */
+    on<E extends Zeta.HintedStringKeyOf<ViewContextEventMap>>(event: E, handler: Zeta.ZetaEventHandler<Zeta.WhitespaceDelimited<E>, ViewContextEventMap, ViewContext>): Zeta.UnregisterCallback;
 }
 
 export interface ViewProps<S = {}> {

package/view.js

@@ -105,11 +105,13 @@ definePrototype(ErrorBoundary, Component, {
         var context = self.props.context;
         if (!context.container) {
             setImmediate(function () {
-                extend(self, createAsyncScope(context.container));
-                dom.on(context.container, 'error', function (e) {
-                    return emitter.emit(e, context, { error: e.error }, false);
-                });
-                self.forceUpdate();
+                if (!self.errorHandler) {
+                    extend(self, createAsyncScope(context.container));
+                    dom.on(context.container, 'error', function (e) {
+                        return emitter.emit(e, context, { error: e.error }, false);
+                    });
+                    self.forceUpdate();
+                }
             });
             return null;
         }
@@ -312,7 +314,7 @@ function createViewComponent(factory) {
     }
     return function fn(props) {
         var children = promise || factory(props.viewProps);
-        if (isThenable(children)) {
+        if (promise || isThenable(children)) {
             promise = children;
             catchAsync(promise);
         } else {
@@ -320,8 +322,8 @@ function createViewComponent(factory) {
             return children;
         }
         var component = useAsync(function () {
-            return promise.then(null, function (error) {
-                promise = null;
+            promise = true;
+            return (isThenable(children) || factory()).then(null, function (error) {
                 props.onError(error);
             });
         })[0];