dry-ux 1.43.0 → 1.45.0

package/dist/error/ErrorBoundary.d.ts

@@ -1,13 +1,22 @@
 import * as React from "react";
-export declare class ErrorBoundary extends React.Component<{
-    fallback?: JSX.Element;
+export interface IErrorBoundaryProps {
+    errorHandler?: (error?: Error, info?: React.ErrorInfo) => void;
+    onErrorCallback?: (error?: Error) => void;
+    rethrowError?: boolean;
+    fallback?: (error: Error, resetError: () => void) => JSX.Element;
     children: JSX.Element;
-}, {
-    hasError: boolean;
-}> {
-    constructor(props: any);
-    static getDerivedStateFromError(error: any): {
-        hasError: boolean;
+}
+interface IErrorBoundaryInnerState {
+    error: Error | null;
+}
+export declare class ErrorBoundary extends React.PureComponent<IErrorBoundaryProps, IErrorBoundaryInnerState> {
+    constructor(props: IErrorBoundaryProps);
+    static getDerivedStateFromError(error: Error): {
+        error: Error;
     };
-    render(): JSX.Element & React.ReactNode;
+    componentDidCatch(error: Error, info: React.ErrorInfo): void;
+    render: () => JSX.Element & React.ReactNode;
+    private handleError;
+    private resetError;
 }
+export {};

package/dist/error/ErrorBoundary.js

@@ -3,19 +3,43 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ErrorBoundary = void 0;
 const React = require("react");
 const ErrorScreen_1 = require("./ErrorScreen");
-class ErrorBoundary extends React.Component {
+class ErrorBoundary extends React.PureComponent {
     constructor(props) {
         super(props);
-        this.state = { hasError: false };
+        this.render = () => {
+            const { children, fallback = null } = this.props;
+            const { error } = this.state;
+            if (error) {
+                return fallback ? fallback(error, this.resetError.bind(this)) : React.createElement(ErrorScreen_1.ErrorScreen, null);
+            }
+            return children;
+        };
+        this.handleError = (error, info) => {
+            const { errorHandler, onErrorCallback, rethrowError } = this.props;
+            if (onErrorCallback) {
+                onErrorCallback(error);
+            }
+            if (errorHandler) {
+                errorHandler(error, info);
+                if (rethrowError) {
+                    throw error;
+                }
+                return;
+            }
+            if (rethrowError) {
+                throw error;
+            }
+        };
+        this.state = { error: null };
     }
     static getDerivedStateFromError(error) {
-        return { hasError: true };
+        return { error };
     }
-    render() {
-        if (this.state.hasError) {
-            return this.props.fallback || React.createElement(ErrorScreen_1.ErrorScreen, null);
-        }
-        return this.props.children;
+    componentDidCatch(error, info) {
+        this.handleError(error, info);
+    }
+    resetError() {
+        this.setState({ error: null });
     }
 }
 exports.ErrorBoundary = ErrorBoundary;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dry-ux",
-  "version": "1.43.0",
+  "version": "1.45.0",
   "description": "",
   "main": "dist/index",
   "scripts": {