@olenbetong/appframe-ds 1.7.2 → 1.9.0

package/src/layout/DialogMotion.css

@@ -1,79 +1,79 @@
-/*
- * One open and close motion for every centred modal: Designsystemet's Dialog (the filter builder,
- * the site search, the report launcher and any app's own dialogs) and anything else that opts in
- * with the `ob-dialog-motion` class (the chrome's app menu, which is a plain <dialog>).
- *
- * Designsystemet animates the opening with keyframes only, 300 ms, and nothing on close. This
- * replaces that with transitions, so the close plays the same motion in reverse:
- *   - @starting-style gives the first frame after showModal() something to transition from;
- *   - `display` and `overlay` transition with `allow-discrete`, which keeps the dialog in the top
- *     layer until the fade out has finished after close().
- * Browsers without `overlay` (Firefox, Safari at the time of writing) still animate the opening
- * and close without the fade; nothing breaks.
- *
- * A dialog only fades out when it is closed with close() and stays mounted. One that React
- * removes on close disappears at once.
- *
- * Reduced motion keeps a short fade and drops the movement.
- */
-
-:root {
-	--ob-dialog-enter-duration: 180ms;
-	--ob-dialog-exit-duration: 140ms;
-	--ob-dialog-offset: 1rem;
-}
-
-@media (prefers-reduced-motion: reduce) {
-	:root {
-		--ob-dialog-offset: 0;
-	}
-}
-
-.ds-dialog:is(:not([data-placement]), [data-placement="center"]),
-.ob-dialog-motion {
-	opacity: 0;
-	translate: 0 var(--ob-dialog-offset);
-	transition-property: opacity, translate, overlay, display;
-	transition-duration: var(--ob-dialog-exit-duration);
-	transition-timing-function: ease-in;
-	transition-behavior: allow-discrete;
-
-	&[open] {
-		opacity: 1;
-		translate: 0 0;
-		/* Designsystemet's keyframes would play on top of the transition. */
-		animation: none;
-		transition-duration: var(--ob-dialog-enter-duration);
-		transition-timing-function: ease-out;
-
-		/*
-		 * Nested so it has exactly this rule's selector. A separate @starting-style rule for
-		 * `.ob-dialog-motion[open]` is less specific than this one, whose `:is()` takes the
-		 * specificity of `.ds-dialog:is(...)`, and loses to it: the dialog then has no
-		 * starting frame and appears without the transition.
-		 */
-		@starting-style {
-			opacity: 0;
-			translate: 0 var(--ob-dialog-offset);
-		}
-	}
-
-	&::backdrop {
-		opacity: 0;
-		animation: none;
-		transition-property: opacity, overlay, display;
-		transition-duration: var(--ob-dialog-exit-duration);
-		transition-timing-function: ease-in;
-		transition-behavior: allow-discrete;
-	}
-
-	&[open]::backdrop {
-		opacity: 1;
-		transition-duration: var(--ob-dialog-enter-duration);
-		transition-timing-function: ease-out;
-
-		@starting-style {
-			opacity: 0;
-		}
-	}
-}
+/*
+ * One open and close motion for every centred modal: Designsystemet's Dialog (the filter builder,
+ * the site search, the report launcher and any app's own dialogs) and anything else that opts in
+ * with the `ob-dialog-motion` class (the chrome's app menu, which is a plain <dialog>).
+ *
+ * Designsystemet animates the opening with keyframes only, 300 ms, and nothing on close. This
+ * replaces that with transitions, so the close plays the same motion in reverse:
+ *   - @starting-style gives the first frame after showModal() something to transition from;
+ *   - `display` and `overlay` transition with `allow-discrete`, which keeps the dialog in the top
+ *     layer until the fade out has finished after close().
+ * Browsers without `overlay` (Firefox, Safari at the time of writing) still animate the opening
+ * and close without the fade; nothing breaks.
+ *
+ * A dialog only fades out when it is closed with close() and stays mounted. One that React
+ * removes on close disappears at once.
+ *
+ * Reduced motion keeps a short fade and drops the movement.
+ */
+
+:root {
+	--ob-dialog-enter-duration: 180ms;
+	--ob-dialog-exit-duration: 140ms;
+	--ob-dialog-offset: 1rem;
+}
+
+@media (prefers-reduced-motion: reduce) {
+	:root {
+		--ob-dialog-offset: 0;
+	}
+}
+
+.ds-dialog:is(:not([data-placement]), [data-placement="center"]),
+.ob-dialog-motion {
+	opacity: 0;
+	translate: 0 var(--ob-dialog-offset);
+	transition-property: opacity, translate, overlay, display;
+	transition-duration: var(--ob-dialog-exit-duration);
+	transition-timing-function: ease-in;
+	transition-behavior: allow-discrete;
+
+	&[open] {
+		opacity: 1;
+		translate: 0 0;
+		/* Designsystemet's keyframes would play on top of the transition. */
+		animation: none;
+		transition-duration: var(--ob-dialog-enter-duration);
+		transition-timing-function: ease-out;
+
+		/*
+		 * Nested so it has exactly this rule's selector. A separate @starting-style rule for
+		 * `.ob-dialog-motion[open]` is less specific than this one, whose `:is()` takes the
+		 * specificity of `.ds-dialog:is(...)`, and loses to it: the dialog then has no
+		 * starting frame and appears without the transition.
+		 */
+		@starting-style {
+			opacity: 0;
+			translate: 0 var(--ob-dialog-offset);
+		}
+	}
+
+	&::backdrop {
+		opacity: 0;
+		animation: none;
+		transition-property: opacity, overlay, display;
+		transition-duration: var(--ob-dialog-exit-duration);
+		transition-timing-function: ease-in;
+		transition-behavior: allow-discrete;
+	}
+
+	&[open]::backdrop {
+		opacity: 1;
+		transition-duration: var(--ob-dialog-enter-duration);
+		transition-timing-function: ease-out;
+
+		@starting-style {
+			opacity: 0;
+		}
+	}
+}

package/src/layout/ErrorBoundary.tsx

@@ -1,162 +1,162 @@
-import "./ErrorBoundary.css";
-
-import type { DataObject } from "@olenbetong/appframe-data";
-import { useError } from "@olenbetong/appframe-react";
-
-import { Component, useEffect } from "react";
-import { useAsyncError, useRouteError } from "react-router";
-
-import { PageContainer } from "./PageContainer.js";
-import { getLocalizedString } from "../i18n.js";
-
-function parseError(error: unknown) {
-	let message = "Unspecified error";
-	let stackTrace: string | null = null;
-	let title: string = getLocalizedString("Unexpected application error");
-
-	if (typeof error === "string") {
-		message = error;
-	} else if (error && typeof error === "object") {
-		const err = error as any;
-		if (err.status) {
-			title = `${err.status} ${err.statusText}`;
-			message = err.message ?? "";
-		} else if (err.message) {
-			message = err.message;
-			if (err.type) {
-				message = `${err.type}: ${message}`;
-			}
-		} else {
-			message = String(error);
-		}
-
-		if (err.stack || err.stackTrace) {
-			stackTrace = err.stack ?? err.stackTrace;
-		}
-	}
-
-	return { message, stackTrace, title };
-}
-
-// ── AppErrorBoundary ──────────────────────────────────────────────────────────
-
-export type AppErrorBoundaryProps = {
-	children?: React.ReactNode;
-	message?: string | ((error: unknown) => string);
-	imgSrc?: string;
-	image?: React.ReactNode;
-};
-
-type AppErrorBoundaryState = {
-	hasError: boolean;
-	error: unknown;
-};
-
-export class AppErrorBoundary extends Component<AppErrorBoundaryProps, AppErrorBoundaryState> {
-	constructor(props: AppErrorBoundaryProps) {
-		super(props);
-		this.state = { hasError: false, error: null };
-	}
-
-	static getDerivedStateFromError(error: unknown): AppErrorBoundaryState {
-		return { hasError: true, error };
-	}
-
-	componentDidCatch(error: unknown, errorInfo: unknown) {
-		console.error(error, errorInfo);
-	}
-
-	render(): React.ReactNode {
-		if (this.state.hasError) {
-			const { imgSrc, message, image } = this.props;
-			const { message: errorMessage } = parseError(this.state.error);
-			const customMessage = typeof message === "function" ? message(this.state.error) : message;
-
-			return (
-				<div className="AppErrorBoundary-root">
-					<div className="AppErrorBoundary-inner">
-						{image ?? (
-							<img
-								alt=""
-								src={imgSrc ?? "/file/site/graphic/error-broken-robot.svg"}
-								className="AppErrorBoundary-image"
-							/>
-						)}
-						<h1 className="AppErrorBoundary-title">{getLocalizedString("Something went terribly wrong!")}</h1>
-						<div className="AppErrorBoundary-alert">{errorMessage}</div>
-						<p className="AppErrorBoundary-message">
-							{customMessage ??
-								getLocalizedString(
-									"Sometimes it is enough to simply refresh the page. If the error persists, contact the IT department.",
-								)}
-						</p>
-						<button type="button" className="AppErrorBoundary-reload" onClick={() => window.location.reload()}>
-							{getLocalizedString("Refresh page")}
-						</button>
-					</div>
-				</div>
-			);
-		}
-
-		return this.props.children;
-	}
-}
-
-// ── ErrorAlertFallback ────────────────────────────────────────────────────────
-
-export type ErrorAlertFallbackProps = {
-	error: unknown;
-	className?: string;
-};
-
-export function ErrorAlertFallback({ error, className }: ErrorAlertFallbackProps) {
-	const message = error instanceof Error ? error.message : String(error);
-
-	return (
-		<div className={`ErrorAlertFallback-root${className ? ` ${className}` : ""}`}>
-			<div className="ErrorAlertFallback-content">
-				<p className="ErrorAlertFallback-title">{getLocalizedString("An error occured. Try refreshing the page")}</p>
-				<p>{message}</p>
-			</div>
-			<button type="button" className="ErrorAlertFallback-reload" onClick={() => window.location.reload()}>
-				{getLocalizedString("Reload page")}
-			</button>
-		</div>
-	);
-}
-
-// ── RouteErrorPage ────────────────────────────────────────────────────────────
-
-export function RouteErrorPage() {
-	const error = useRouteError();
-	const { message, stackTrace, title } = parseError(error);
-
-	useEffect(() => {
-		(globalThis as any).af?.common?.logError?.(error);
-	}, [error]);
-
-	return (
-		<PageContainer className="flow">
-			<h1>{title}</h1>
-			{message && <p>{message}</p>}
-			{stackTrace && <pre className="RouteErrorPage-stack">{stackTrace}</pre>}
-		</PageContainer>
-	);
-}
-
-// ── AsyncErrorAlert ───────────────────────────────────────────────────────────
-
-export function AsyncErrorAlert() {
-	const error = useAsyncError();
-	const message = typeof error === "string" ? error : (error as any)?.message;
-
-	return <div className="ErrorAlertFallback-root">{message}</div>;
-}
-
-// ── DataObjectErrorAlert ──────────────────────────────────────────────────────
-
-export function DataObjectErrorAlert({ dataObject }: { dataObject: DataObject<any> }) {
-	const error = useError(dataObject);
-
-	return error ? <div className="ErrorAlertFallback-root">{error}</div> : null;
-}
+import "./ErrorBoundary.css";
+
+import type { DataObject } from "@olenbetong/appframe-data";
+import { useError } from "@olenbetong/appframe-react";
+
+import { Component, useEffect } from "react";
+import { useAsyncError, useRouteError } from "react-router";
+
+import { PageContainer } from "./PageContainer.js";
+import { getLocalizedString } from "../i18n.js";
+
+function parseError(error: unknown) {
+	let message = "Unspecified error";
+	let stackTrace: string | null = null;
+	let title: string = getLocalizedString("Unexpected application error");
+
+	if (typeof error === "string") {
+		message = error;
+	} else if (error && typeof error === "object") {
+		const err = error as any;
+		if (err.status) {
+			title = `${err.status} ${err.statusText}`;
+			message = err.message ?? "";
+		} else if (err.message) {
+			message = err.message;
+			if (err.type) {
+				message = `${err.type}: ${message}`;
+			}
+		} else {
+			message = String(error);
+		}
+
+		if (err.stack || err.stackTrace) {
+			stackTrace = err.stack ?? err.stackTrace;
+		}
+	}
+
+	return { message, stackTrace, title };
+}
+
+// ── AppErrorBoundary ──────────────────────────────────────────────────────────
+
+export type AppErrorBoundaryProps = {
+	children?: React.ReactNode;
+	message?: string | ((error: unknown) => string);
+	imgSrc?: string;
+	image?: React.ReactNode;
+};
+
+type AppErrorBoundaryState = {
+	hasError: boolean;
+	error: unknown;
+};
+
+export class AppErrorBoundary extends Component<AppErrorBoundaryProps, AppErrorBoundaryState> {
+	constructor(props: AppErrorBoundaryProps) {
+		super(props);
+		this.state = { hasError: false, error: null };
+	}
+
+	static getDerivedStateFromError(error: unknown): AppErrorBoundaryState {
+		return { hasError: true, error };
+	}
+
+	componentDidCatch(error: unknown, errorInfo: unknown) {
+		console.error(error, errorInfo);
+	}
+
+	render(): React.ReactNode {
+		if (this.state.hasError) {
+			const { imgSrc, message, image } = this.props;
+			const { message: errorMessage } = parseError(this.state.error);
+			const customMessage = typeof message === "function" ? message(this.state.error) : message;
+
+			return (
+				<div className="AppErrorBoundary-root">
+					<div className="AppErrorBoundary-inner">
+						{image ?? (
+							<img
+								alt=""
+								src={imgSrc ?? "/file/site/graphic/error-broken-robot.svg"}
+								className="AppErrorBoundary-image"
+							/>
+						)}
+						<h1 className="AppErrorBoundary-title">{getLocalizedString("Something went terribly wrong!")}</h1>
+						<div className="AppErrorBoundary-alert">{errorMessage}</div>
+						<p className="AppErrorBoundary-message">
+							{customMessage ??
+								getLocalizedString(
+									"Sometimes it is enough to simply refresh the page. If the error persists, contact the IT department.",
+								)}
+						</p>
+						<button type="button" className="AppErrorBoundary-reload" onClick={() => window.location.reload()}>
+							{getLocalizedString("Refresh page")}
+						</button>
+					</div>
+				</div>
+			);
+		}
+
+		return this.props.children;
+	}
+}
+
+// ── ErrorAlertFallback ────────────────────────────────────────────────────────
+
+export type ErrorAlertFallbackProps = {
+	error: unknown;
+	className?: string;
+};
+
+export function ErrorAlertFallback({ error, className }: ErrorAlertFallbackProps) {
+	const message = error instanceof Error ? error.message : String(error);
+
+	return (
+		<div className={`ErrorAlertFallback-root${className ? ` ${className}` : ""}`}>
+			<div className="ErrorAlertFallback-content">
+				<p className="ErrorAlertFallback-title">{getLocalizedString("An error occured. Try refreshing the page")}</p>
+				<p>{message}</p>
+			</div>
+			<button type="button" className="ErrorAlertFallback-reload" onClick={() => window.location.reload()}>
+				{getLocalizedString("Reload page")}
+			</button>
+		</div>
+	);
+}
+
+// ── RouteErrorPage ────────────────────────────────────────────────────────────
+
+export function RouteErrorPage() {
+	const error = useRouteError();
+	const { message, stackTrace, title } = parseError(error);
+
+	useEffect(() => {
+		(globalThis as any).af?.common?.logError?.(error);
+	}, [error]);
+
+	return (
+		<PageContainer className="flow">
+			<h1>{title}</h1>
+			{message && <p>{message}</p>}
+			{stackTrace && <pre className="RouteErrorPage-stack">{stackTrace}</pre>}
+		</PageContainer>
+	);
+}
+
+// ── AsyncErrorAlert ───────────────────────────────────────────────────────────
+
+export function AsyncErrorAlert() {
+	const error = useAsyncError();
+	const message = typeof error === "string" ? error : (error as any)?.message;
+
+	return <div className="ErrorAlertFallback-root">{message}</div>;
+}
+
+// ── DataObjectErrorAlert ──────────────────────────────────────────────────────
+
+export function DataObjectErrorAlert({ dataObject }: { dataObject: DataObject<any> }) {
+	const error = useError(dataObject);
+
+	return error ? <div className="ErrorAlertFallback-root">{error}</div> : null;
+}

package/src/layout/PageContainer.css

@@ -1,48 +1,48 @@
-@media screen {
-	.ObPageContainer-root {
-		max-height: 100%;
-		overflow: auto;
-		height: auto;
-	}
-
-	.ObPageContainer-root.ObPageContainer-fullHeight {
-		height: 100%;
-	}
-
-	.ObPageContainer-inner {
-		--ob-page-container-gutter: 1rem;
-
-		margin-left: 0;
-		height: auto;
-		padding: 1rem var(--ob-page-container-gutter);
-		box-sizing: border-box;
-		max-width: 100%;
-	}
-
-	.ObPageContainer-fullHeight .ObPageContainer-inner {
-		height: 100%;
-	}
-
-	/* The content width on the Page.Block scale (rem for a 14px root); the gutters come on top. */
-	.ObPageContainer-inner.ObPageContainer-text {
-		max-width: calc(41rem + 2 * var(--ob-page-container-gutter));
-	}
-
-	.ObPageContainer-inner.ObPageContainer-md {
-		max-width: calc(55rem + 2 * var(--ob-page-container-gutter));
-	}
-
-	.ObPageContainer-inner.ObPageContainer-lg {
-		max-width: calc(73rem + 2 * var(--ob-page-container-gutter));
-	}
-
-	.ObPageContainer-inner.ObPageContainer-xl {
-		max-width: calc(110rem + 2 * var(--ob-page-container-gutter));
-	}
-}
-
-@media screen and (min-width: 600px) {
-	.ObPageContainer-inner {
-		--ob-page-container-gutter: 1.5rem;
-	}
-}
+@media screen {
+	.ObPageContainer-root {
+		max-height: 100%;
+		overflow: auto;
+		height: auto;
+	}
+
+	.ObPageContainer-root.ObPageContainer-fullHeight {
+		height: 100%;
+	}
+
+	.ObPageContainer-inner {
+		--ob-page-container-gutter: 1rem;
+
+		margin-left: 0;
+		height: auto;
+		padding: 1rem var(--ob-page-container-gutter);
+		box-sizing: border-box;
+		max-width: 100%;
+	}
+
+	.ObPageContainer-fullHeight .ObPageContainer-inner {
+		height: 100%;
+	}
+
+	/* The content width on the Page.Block scale (rem for a 14px root); the gutters come on top. */
+	.ObPageContainer-inner.ObPageContainer-text {
+		max-width: calc(41rem + 2 * var(--ob-page-container-gutter));
+	}
+
+	.ObPageContainer-inner.ObPageContainer-md {
+		max-width: calc(55rem + 2 * var(--ob-page-container-gutter));
+	}
+
+	.ObPageContainer-inner.ObPageContainer-lg {
+		max-width: calc(73rem + 2 * var(--ob-page-container-gutter));
+	}
+
+	.ObPageContainer-inner.ObPageContainer-xl {
+		max-width: calc(110rem + 2 * var(--ob-page-container-gutter));
+	}
+}
+
+@media screen and (min-width: 600px) {
+	.ObPageContainer-inner {
+		--ob-page-container-gutter: 1.5rem;
+	}
+}

package/src/layout/PageContainer.tsx

@@ -1,41 +1,41 @@
-import "./PageContainer.css";
-
-import clsx from "clsx";
-import type React from "react";
-
-export type PageContainerMaxWidth = "xs" | "sm" | "md" | "lg" | "xl" | false;
-
-export type PageContainerProps = React.HTMLAttributes<HTMLDivElement> & {
-	fullHeight?: boolean;
-	/**
-	 * Predefined max-width of the content, on the `Page.Block` scale (`xs`/`sm` 41rem,
-	 * `md` 55rem, `lg` 73rem, `xl` 110rem, plus the gutters). The content stays against the
-	 * leading edge, as the MUI-era `PageContainer` did; `Page.Block`/`Container` centre it.
-	 * @default max-width: 100%
-	 */
-	maxWidth?: PageContainerMaxWidth;
-};
-
-const maxWidthClassName: Record<Exclude<PageContainerMaxWidth, false>, string> = {
-	xs: "ObPageContainer-text",
-	sm: "ObPageContainer-text",
-	md: "ObPageContainer-md",
-	lg: "ObPageContainer-lg",
-	xl: "ObPageContainer-xl",
-};
-
-/**
- * @deprecated Use `Page.Block` instead. `maxWidth` mapping: `xs`/`sm` →
- * `width="text"`, `md` → `"md"`, `lg` → `"lg"`, `xl` → `"xl"`, `false` → omit
- * `width`. Replace `fullHeight` with `<Page layout="app">` and
- * `<Page.Block grow overflow="auto">`.
- */
-export function PageContainer({ children, className, fullHeight, maxWidth, ...props }: PageContainerProps) {
-	return (
-		<div className={clsx("ObPageContainer-root", fullHeight && "ObPageContainer-fullHeight")}>
-			<div className={clsx("ObPageContainer-inner", maxWidth && maxWidthClassName[maxWidth], className)} {...props}>
-				{children}
-			</div>
-		</div>
-	);
-}
+import "./PageContainer.css";
+
+import clsx from "clsx";
+import type React from "react";
+
+export type PageContainerMaxWidth = "xs" | "sm" | "md" | "lg" | "xl" | false;
+
+export type PageContainerProps = React.HTMLAttributes<HTMLDivElement> & {
+	fullHeight?: boolean;
+	/**
+	 * Predefined max-width of the content, on the `Page.Block` scale (`xs`/`sm` 41rem,
+	 * `md` 55rem, `lg` 73rem, `xl` 110rem, plus the gutters). The content stays against the
+	 * leading edge, as the MUI-era `PageContainer` did; `Page.Block`/`Container` centre it.
+	 * @default max-width: 100%
+	 */
+	maxWidth?: PageContainerMaxWidth;
+};
+
+const maxWidthClassName: Record<Exclude<PageContainerMaxWidth, false>, string> = {
+	xs: "ObPageContainer-text",
+	sm: "ObPageContainer-text",
+	md: "ObPageContainer-md",
+	lg: "ObPageContainer-lg",
+	xl: "ObPageContainer-xl",
+};
+
+/**
+ * @deprecated Use `Page.Block` instead. `maxWidth` mapping: `xs`/`sm` →
+ * `width="text"`, `md` → `"md"`, `lg` → `"lg"`, `xl` → `"xl"`, `false` → omit
+ * `width`. Replace `fullHeight` with `<Page layout="app">` and
+ * `<Page.Block grow overflow="auto">`.
+ */
+export function PageContainer({ children, className, fullHeight, maxWidth, ...props }: PageContainerProps) {
+	return (
+		<div className={clsx("ObPageContainer-root", fullHeight && "ObPageContainer-fullHeight")}>
+			<div className={clsx("ObPageContainer-inner", maxWidth && maxWidthClassName[maxWidth], className)} {...props}>
+				{children}
+			</div>
+		</div>
+	);
+}