@xyo-network/react-error 2.64.0-rc.7 → 2.64.1

package/dist/browser/index.js

@@ -1,3 +1,118 @@
-export * from "./components";
-export * from "./contexts";
+// src/components/ErrorBoundary/ThrownErrorBoundary.tsx
+import { ModuleErrorSchema } from "@xyo-network/payload-model";
+import { Component } from "react";
+
+// src/components/ErrorRender/ErrorAlert.tsx
+import { ExitToApp as ExitIcon } from "@mui/icons-material";
+import { Alert, AlertTitle, Typography } from "@mui/material";
+import { ButtonEx } from "@xylabs/react-button";
+import { jsx, jsxs } from "react/jsx-runtime";
+var ErrorAlert = ({ onCancel, error, errorContext, ...props }) => {
+  return /* @__PURE__ */ jsxs(Alert, { severity: "error", ...props, children: [
+    /* @__PURE__ */ jsx(AlertTitle, { children: "Whoops! Something went wrong" }),
+    errorContext ? /* @__PURE__ */ jsx(Typography, { variant: "caption", my: 0.5, lineHeight: "1", display: "block", children: errorContext }) : null,
+    /* @__PURE__ */ jsx(Typography, { variant: "caption", mr: 0.5, fontWeight: "bold", children: "Error:" }),
+    /* @__PURE__ */ jsx(Typography, { variant: "caption", children: error?.message }),
+    onCancel ? /* @__PURE__ */ jsx(ButtonEx, { variant: "outlined", size: "small", onClick: onCancel, position: "absolute", style: { right: 8, top: 8 }, children: /* @__PURE__ */ jsx(ExitIcon, { fontSize: "small" }) }) : null
+  ] });
+};
+
+// src/components/ErrorRender/Render.tsx
+import { FlexCol } from "@xylabs/react-flexbox";
+import { useEffect } from "react";
+import { useLocation } from "react-router-dom";
+import { Fragment, jsx as jsx2 } from "react/jsx-runtime";
+var ErrorRender = ({
+  onCancel,
+  error,
+  noErrorDisplay = false,
+  customError = null,
+  children,
+  errorContext,
+  ...props
+}) => {
+  const location = useLocation();
+  useEffect(() => {
+    location.state = {
+      from: {
+        pathname: window.location.pathname
+      }
+    };
+  }, [location]);
+  if (error) {
+    return /* @__PURE__ */ jsx2(FlexCol, { alignItems: "stretch", ...props, children: noErrorDisplay ? customError : /* @__PURE__ */ jsx2(FlexCol, { alignItems: "center", ...props, children: /* @__PURE__ */ jsx2(ErrorAlert, { error, errorContext, onCancel }) }) });
+  } else {
+    return /* @__PURE__ */ jsx2(Fragment, { children }) ?? null;
+  }
+};
+
+// src/components/ErrorBoundary/ThrownErrorBoundary.tsx
+import { jsx as jsx3 } from "react/jsx-runtime";
+var ThrownErrorBoundary = class _ThrownErrorBoundary extends Component {
+  state = {
+    xyoError: void 0
+  };
+  static getDerivedStateFromError(error) {
+    return { hasError: true, xyoError: _ThrownErrorBoundary.normalizeError(error) };
+  }
+  static normalizeError(error) {
+    return error.schema === ModuleErrorSchema ? error : { message: error.message, schema: ModuleErrorSchema, sources: [] };
+  }
+  componentDidCatch(error, errorInfo) {
+    const { rethrow, rollbar } = this.props;
+    const { xyoError } = this.state;
+    rollbar?.error(error);
+    console.error("Error:", xyoError, errorInfo);
+    if (rethrow) {
+      throw error;
+    }
+  }
+  render() {
+    const { xyoError } = this.state;
+    const { children, boundaryName, errorComponent } = this.props;
+    if (xyoError) {
+      if (errorComponent) {
+        return errorComponent(xyoError);
+      }
+      return /* @__PURE__ */ jsx3(ErrorRender, { error: xyoError, errorContext: `${boundaryName} Boundary` });
+    }
+    return children;
+  }
+};
+
+// src/contexts/ErrorReporter/Provider.tsx
+import { useEffect as useEffect2, useState } from "react";
+
+// src/contexts/ErrorReporter/Context.ts
+import { createContext } from "react";
+var ErrorReporterContext = createContext({});
+
+// src/contexts/ErrorReporter/Provider.tsx
+import { jsx as jsx4 } from "react/jsx-runtime";
+var ErrorReporterProvider = ({ children, rollbar }) => {
+  const [rollbarInstance, setRollBarInstance] = useState();
+  useEffect2(() => {
+    if (rollbarInstance) {
+      setRollBarInstance(rollbarInstance);
+    }
+  }, [rollbar, rollbarInstance]);
+  return /* @__PURE__ */ jsx4(ErrorReporterContext.Provider, { value: { rollbar }, children });
+};
+
+// src/contexts/ErrorReporter/useRollbar.tsx
+import { useContext } from "react";
+var useRollbar = () => {
+  const context = useContext(ErrorReporterContext);
+  if (context === void 0) {
+    console.warn("useRollbar must be used within a ErrorReporterContext");
+  }
+  return context ?? {};
+};
+export {
+  ErrorAlert,
+  ErrorRender,
+  ErrorReporterProvider,
+  ThrownErrorBoundary,
+  useRollbar
+};
 //# sourceMappingURL=index.js.map

package/dist/browser/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts"],"sourcesContent":["export * from './components'\nexport * from './contexts'\n"],"mappings":"AAAA,cAAc;AACd,cAAc;","names":[]}
+{"version":3,"sources":["../../src/components/ErrorBoundary/ThrownErrorBoundary.tsx","../../src/components/ErrorRender/ErrorAlert.tsx","../../src/components/ErrorRender/Render.tsx","../../src/contexts/ErrorReporter/Provider.tsx","../../src/contexts/ErrorReporter/Context.ts","../../src/contexts/ErrorReporter/useRollbar.tsx"],"sourcesContent":["import { ModuleError, ModuleErrorSchema } from '@xyo-network/payload-model'\nimport { Component, ErrorInfo, ReactNode } from 'react'\nimport Rollbar from 'rollbar'\n\nimport { ErrorRender } from '../ErrorRender'\n\nexport interface ThrownErrorBoundaryProps {\n  boundaryName?: string\n  children: ReactNode\n  errorComponent?: (e: ModuleError, boundaryName?: string) => ReactNode\n  rethrow?: boolean\n  rollbar?: Rollbar\n}\n\nexport interface ThrownErrorBoundaryState {\n  xyoError?: ModuleError\n}\n\nexport class ThrownErrorBoundary extends Component<ThrownErrorBoundaryProps, ThrownErrorBoundaryState> {\n  public override state: ThrownErrorBoundaryState = {\n    xyoError: undefined,\n  }\n\n  static getDerivedStateFromError(error: Error) {\n    return { hasError: true, xyoError: ThrownErrorBoundary.normalizeError(error) } as ThrownErrorBoundaryState\n  }\n\n  public static normalizeError(error: Error | ModuleError): ModuleError {\n    return (\n      (error as ModuleError).schema === ModuleErrorSchema ? error : { message: error.message, schema: ModuleErrorSchema, sources: [] }\n    ) as ModuleError\n  }\n\n  public override componentDidCatch(error: Error, errorInfo: ErrorInfo) {\n    const { rethrow, rollbar } = this.props\n    const { xyoError } = this.state\n\n    rollbar?.error(error)\n\n    console.error('Error:', xyoError, errorInfo)\n    if (rethrow) {\n      throw error\n    }\n  }\n\n  public override render() {\n    const { xyoError } = this.state\n    const { children, boundaryName, errorComponent } = this.props\n    if (xyoError) {\n      if (errorComponent) {\n        return errorComponent(xyoError)\n      }\n      return <ErrorRender error={xyoError} errorContext={`${boundaryName} Boundary`} />\n    }\n\n    return children\n  }\n}\n","import { ExitToApp as ExitIcon } from '@mui/icons-material'\nimport { Alert, AlertProps, AlertTitle, Typography } from '@mui/material'\nimport { ButtonEx } from '@xylabs/react-button'\nimport { ModuleError } from '@xyo-network/payload-model'\n\nexport interface ErrorAlertProps extends AlertProps {\n  error?: ModuleError | Error\n  errorContext?: string\n  onCancel?: () => void\n}\n\nexport const ErrorAlert: React.FC<ErrorAlertProps> = ({ onCancel, error, errorContext, ...props }) => {\n  return (\n    <Alert severity=\"error\" {...props}>\n      <AlertTitle>Whoops! Something went wrong</AlertTitle>\n      {errorContext ? (\n        <Typography variant=\"caption\" my={0.5} lineHeight=\"1\" display=\"block\">\n          {errorContext}\n        </Typography>\n      ) : null}\n      <Typography variant=\"caption\" mr={0.5} fontWeight=\"bold\">\n        Error:\n      </Typography>\n      <Typography variant=\"caption\">{error?.message}</Typography>\n      {onCancel ? (\n        <ButtonEx variant=\"outlined\" size=\"small\" onClick={onCancel} position=\"absolute\" style={{ right: 8, top: 8 }}>\n          <ExitIcon fontSize=\"small\" />\n        </ButtonEx>\n      ) : null}\n    </Alert>\n  )\n}\n","import { FlexCol } from '@xylabs/react-flexbox'\nimport { useEffect } from 'react'\nimport { useLocation } from 'react-router-dom'\n\nimport { ErrorAlert } from './ErrorAlert'\nimport { ErrorRenderProps } from './Props'\n\nexport const ErrorRender: React.FC<ErrorRenderProps> = ({\n  onCancel,\n  error,\n  noErrorDisplay = false,\n  customError = null,\n  children,\n  errorContext,\n  ...props\n}) => {\n  const location = useLocation()\n  useEffect(() => {\n    // ensure we end up at the same place we are now after logging in\n    location.state = {\n      from: {\n        pathname: window.location.pathname,\n      },\n    }\n  }, [location])\n\n  if (error) {\n    return (\n      <FlexCol alignItems=\"stretch\" {...props}>\n        {noErrorDisplay ? (\n          customError\n        ) : (\n          <FlexCol alignItems=\"center\" {...props}>\n            <ErrorAlert error={error} errorContext={errorContext} onCancel={onCancel} />\n          </FlexCol>\n        )}\n      </FlexCol>\n    )\n  } else {\n    return <>{children}</> ?? null\n  }\n}\n","import { WithChildren } from '@xylabs/react-shared'\nimport { useEffect, useState } from 'react'\nimport Rollbar from 'rollbar'\n\nimport { ErrorReporterContext } from './Context'\n\nexport interface ErrorReporterProviderProps {\n  rollbar: Rollbar\n}\n\nconst ErrorReporterProvider: React.FC<WithChildren<ErrorReporterProviderProps>> = ({ children, rollbar }) => {\n  const [rollbarInstance, setRollBarInstance] = useState<Rollbar>()\n\n  useEffect(() => {\n    if (rollbarInstance) {\n      setRollBarInstance(rollbarInstance)\n    }\n  }, [rollbar, rollbarInstance])\n\n  return <ErrorReporterContext.Provider value={{ rollbar }}>{children}</ErrorReporterContext.Provider>\n}\n\nexport { ErrorReporterProvider }\n","import { createContext } from 'react'\n\nimport { ErrorReporterContextState } from './State'\n\nexport const ErrorReporterContext = createContext<ErrorReporterContextState>({})\n","import { useContext } from 'react'\n\nimport { ErrorReporterContext } from './Context'\n\nconst useRollbar = () => {\n  const context = useContext(ErrorReporterContext)\n  if (context === undefined) {\n    console.warn('useRollbar must be used within a ErrorReporterContext')\n  }\n\n  return context ?? {}\n}\n\nexport { useRollbar }\n"],"mappings":"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","names":["jsx","jsx","useEffect","jsx","useEffect"]}