Skip to content

The easy-to-use open source Business Intelligence and Embedded Analytics tool that lets everyone work with data :bar_chart:

Fix margins when printing documents with charts (#74234)

Anderson911fe173f2bc
diff --git a/frontend/src/metabase/common/components/ExplicitSize/ExplicitSize.tsx b/frontend/src/metabase/common/components/ExplicitSize/ExplicitSize.tsx
index a43ddf0326c..0eba8c266bd 100644
--- a/frontend/src/metabase/common/components/ExplicitSize/ExplicitSize.tsx
+++ b/frontend/src/metabase/common/components/ExplicitSize/ExplicitSize.tsx
@@ -239,6 +239,13 @@ export function ExplicitSize<T>({
const box = entry.borderBoxSize?.[0];
width = box ? box.inlineSize : entry.contentRect.width;
height = box ? box.blockSize : entry.contentRect.height;
+ } else if (
+ this._printMediaQuery?.matches &&
+ element instanceof HTMLElement
+ ) {
+ /* Print layout dimensions must exclude browser zoom transforms. */
+ width = element.offsetWidth;
+ height = element.offsetHeight;
} else {
const rect = element.getBoundingClientRect();
width = rect.width;
diff --git a/frontend/src/metabase/common/components/ExplicitSize/ExplicitSize.unit.spec.tsx b/frontend/src/metabase/common/components/ExplicitSize/ExplicitSize.unit.spec.tsx
index d12747183cf..aab73cfcd5f 100644
--- a/frontend/src/metabase/common/components/ExplicitSize/ExplicitSize.unit.spec.tsx
+++ b/frontend/src/metabase/common/components/ExplicitSize/ExplicitSize.unit.spec.tsx
@@ -1,6 +1,7 @@
import { act, render, screen } from "@testing-library/react";
import { forwardRef } from "react";
+import { createMockMediaQueryList } from "__support__/ui";
import resizeObserver from "metabase/utils/resize-observer";
import { ExplicitSize } from "./ExplicitSize";
@@ -114,6 +115,7 @@ describe("ExplicitSize", () => {
afterEach(() => {
jest.useRealTimers();
+ jest.restoreAllMocks();
});
it("should pass the size from resize observer entries to the wrapped component", () => {
@@ -157,6 +159,26 @@ describe("ExplicitSize", () => {
expect(screen.getByTestId("sized")).toHaveTextContent("400x868");
});
+ it("should use untransformed layout dimensions while printing (#74181)", () => {
+ jest
+ .spyOn(window, "matchMedia")
+ .mockReturnValue(createMockMediaQueryList({ matches: true }));
+
+ render(<SizedComponent />);
+ const element = screen.getByTestId("sized");
+ Object.defineProperties(element, {
+ offsetWidth: { value: 400 },
+ offsetHeight: { value: 300 },
+ });
+ jest
+ .spyOn(element, "getBoundingClientRect")
+ .mockReturnValue(new DOMRect(0, 0, 200, 150));
+
+ triggerResize(element, { target: document.body });
+
+ expect(screen.getByTestId("sized")).toHaveTextContent("400x300");
+ });
+
it("should measure a child that renders content only after mount and pass it non-null dimensions (metabase#51926)", () => {
// Regression test for the pivot table rendering blank until resized.
// PivotTable returns null on its first render, so there is no element for
diff --git a/frontend/src/metabase/documents/components/DocumentHeader.module.css b/frontend/src/metabase/documents/components/DocumentHeader.module.css
index 34ae883e6de..78e5962f2cb 100644
--- a/frontend/src/metabase/documents/components/DocumentHeader.module.css
+++ b/frontend/src/metabase/documents/components/DocumentHeader.module.css
@@ -1,3 +1,16 @@
+.documentHeader {
+ align-items: flex-start;
+ background-color: var(--mb-color-background-primary);
+ gap: var(--mantine-spacing-md);
+ justify-content: space-between;
+ margin-bottom: var(--mantine-spacing-md);
+ margin-inline: auto;
+ margin-top: var(--mantine-spacing-xl);
+ max-width: 56.25rem;
+ padding-top: var(--mantine-spacing-xl);
+ width: 100%;
+}
+
.titleInput {
border: none !important;
padding: 0 !important;
@@ -18,3 +31,10 @@
background-color: var(--mb-color-background_surface-hover);
}
}
+
+@media print {
+ .documentHeader {
+ max-width: none;
+ margin-inline: 0;
+ }
+}
diff --git a/frontend/src/metabase/documents/components/DocumentHeader.tsx b/frontend/src/metabase/documents/components/DocumentHeader.tsx
index f6aff082ac1..f0a6a5050b4 100644
--- a/frontend/src/metabase/documents/components/DocumentHeader.tsx
+++ b/frontend/src/metabase/documents/components/DocumentHeader.tsx
@@ -118,17 +118,7 @@ export const DocumentHeader = ({
);
return (
- <Flex
- justify="space-between"
- align="flex-start"
- gap="1rem"
- mt="xl"
- pt="xl"
- pb="1rem"
- maw={900}
- mx="auto"
- w="100%"
- >
+ <Flex className={S.documentHeader}>
<Flex direction="column" className={S.titleContainer}>
<TextInput
aria-label={t`Document Title`}
diff --git a/frontend/src/metabase/documents/components/DocumentPage.module.css b/frontend/src/metabase/documents/components/DocumentPage.module.css
index b4639067bbb..b0a394c6a20 100644
--- a/frontend/src/metabase/documents/components/DocumentPage.module.css
+++ b/frontend/src/metabase/documents/components/DocumentPage.module.css
@@ -47,16 +47,18 @@
}
}
+ .mainContent {
+ padding: 0;
+ }
+
.documentContainer {
position: absolute;
visibility: visible;
top: 0;
right: 0;
z-index: 1000;
-
- .header {
- padding: 0;
- }
+ padding: 0;
+ margin-inline: 0;
:global(.node-metabot),
:global(.node-cardEmbed),
diff --git a/frontend/src/metabase/documents/components/Editor/Editor.module.css b/frontend/src/metabase/documents/components/Editor/Editor.module.css
index 8c1e035740f..9678926ef80 100644
--- a/frontend/src/metabase/documents/components/Editor/Editor.module.css
+++ b/frontend/src/metabase/documents/components/Editor/Editor.module.css
@@ -25,6 +25,13 @@
line-height: 1.5;
}
+@media print {
+ .editorContent :global(.ProseMirror) {
+ margin-inline: 0;
+ max-width: none;
+ }
+}
+
/* Apply typography styles only to elements NOT inside .editor-style-boundary */
.editorContent
:global(.ProseMirror)
diff --git a/frontend/src/metabase/visualizations/components/EChartsRenderer/EChartsRenderer.tsx b/frontend/src/metabase/visualizations/components/EChartsRenderer/EChartsRenderer.tsx
index a47ba319508..60c8a7db2b2 100644
--- a/frontend/src/metabase/visualizations/components/EChartsRenderer/EChartsRenderer.tsx
+++ b/frontend/src/metabase/visualizations/components/EChartsRenderer/EChartsRenderer.tsx
@@ -56,6 +56,26 @@ export const EChartsRenderer = forwardRef<HTMLDivElement, EChartsRendererProps>(
chartRef.current?.dispose();
});
+ useEffect(() => {
+ const printMediaQuery = window.matchMedia("print");
+ const resizeForPrint = () => {
+ const chartElement = chartElemRef.current;
+ if (!chartElement) {
+ return;
+ }
+
+ chartRef.current?.resize({
+ width: chartElement.offsetWidth,
+ height: chartElement.offsetHeight,
+ });
+ };
+
+ printMediaQuery.addEventListener("change", resizeForPrint);
+ return () => {
+ printMediaQuery.removeEventListener("change", resizeForPrint);
+ };
+ }, []);
+
useUpdateEffect(() => {
chartRef.current?.setOption(option, notMerge);
}, [option]);
diff --git a/frontend/src/metabase/visualizations/components/EChartsRenderer/EChartsRenderer.unit.spec.tsx b/frontend/src/metabase/visualizations/components/EChartsRenderer/EChartsRenderer.unit.spec.tsx
new file mode 100644
index 00000000000..eb891264b9a
--- /dev/null
+++ b/frontend/src/metabase/visualizations/components/EChartsRenderer/EChartsRenderer.unit.spec.tsx
@@ -0,0 +1,38 @@
+import { act, render, screen } from "@testing-library/react";
+import type { EChartsType } from "echarts/core";
+
+import { createMockMediaQueryList } from "__support__/ui";
+
+import { EChartsRenderer } from "./EChartsRenderer";
+
+describe("EChartsRenderer", () => {
+ afterEach(() => {
+ jest.restoreAllMocks();
+ });
+
+ it("should resize synchronously when print media changes (#74181)", () => {
+ const printMediaTarget = new EventTarget();
+ const printMediaQuery = createMockMediaQueryList({
+ addEventListener:
+ printMediaTarget.addEventListener.bind(printMediaTarget),
+ removeEventListener:
+ printMediaTarget.removeEventListener.bind(printMediaTarget),
+ });
+ jest.spyOn(window, "matchMedia").mockReturnValue(printMediaQuery);
+ const onInit = jest.fn<void, [EChartsType]>();
+
+ render(
+ <EChartsRenderer option={{}} width={300} height={200} onInit={onInit} />,
+ );
+ const chartElement = screen.getByTestId("chart-container");
+ Object.defineProperties(chartElement, {
+ offsetWidth: { value: 400 },
+ offsetHeight: { value: 250 },
+ });
+
+ act(() => printMediaTarget.dispatchEvent(new Event("change")));
+
+ expect(onInit.mock.lastCall?.[0].getWidth()).toBe(400);
+ expect(onInit.mock.lastCall?.[0].getHeight()).toBe(250);
+ });
+});