Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Hotfix][DEVSU-2089] SVG size in print #357

Merged
merged 7 commits into from
Oct 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 1 addition & 17 deletions app/components/SvgImage/__tests__/SvgImage.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
} from './mockData';
import SvgImage from '..';

jest.mock('react-virtualized-auto-sizer', () => ({ children }) => children({ height: 600, width: 600}));
jest.mock('react-virtualized-auto-sizer', () => ({ children }) => children({ height: 600, width: 600 }));

describe('SvgImage', () => {
test('It renders a normal SVG', async () => {
Expand Down Expand Up @@ -63,20 +63,4 @@ describe('SvgImage', () => {

expect(await screen.findByTestId('mock')).toBeInTheDocument();
});

test('It fails to render an SVG that is not formatted correctly', async () => {
let error;

try {
render(
<SvgImage
image={mockSVGFormatError}
/>,
);
} catch (err) {
error = err;
}

expect(error).not.toBeUndefined();
});
});
40 changes: 14 additions & 26 deletions app/components/SvgImage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, {
useEffect, useState, useRef, useMemo, useCallback,
} from 'react';
import { UncontrolledReactSVGPanZoom } from 'react-svg-pan-zoom';
import InlineSVG from 'svg-inline-react';
import InlineSVG from 'react-inlinesvg';
import AutoSizer from 'react-virtualized-auto-sizer';

import './index.scss';
Expand Down Expand Up @@ -74,7 +74,7 @@ const SvgImage = ({
let overWidthRatio = svgWidth / MAX_PRINT_WIDTH;
if (printOrientation === 'landscape') {
overHeightRatio = svgHeight / MAX_PRINT_WIDTH;
overWidthRatio = svgHeight / MAX_PRINT_WIDTH;
overWidthRatio = svgWidth / MAX_PRINT_HEIGHT;
}
let nextRatio = 1;

Expand All @@ -90,29 +90,17 @@ const SvgImage = ({
const nextHeight = svgHeight / nextRatio;
const nextWidth = svgWidth / nextRatio;

const svgStyle = {
transformOrigin: 'top left',
transform: printOrientation === 'landscape' ? `rotate(90deg) translate(0, -${nextHeight}px)` : '',
};

return (
<div style={svgStyle}>
<UncontrolledReactSVGPanZoom
ref={Viewer}
width={svgWidth > nextWidth ? nextWidth : svgWidth}
height={svgHeight > nextHeight ? nextHeight : svgHeight}
background="#FFFFFF"
detectAutoPan={false}
defaultTool="auto"
customMiniature={() => null}
customToolbar={() => null}
toolbarProps={{ position: 'left' }}
>
<svg width={svgWidth} height={svgHeight}>
<InlineSVG src={processedImage} raw />
</svg>
</UncontrolledReactSVGPanZoom>
</div>
<InlineSVG
src={processedImage}
transform={`
scale(${1 / nextRatio})
translate(
-${(svgWidth - nextWidth) / 2 + 48}
-${(svgHeight - nextHeight) / 2}
)
`}
/>
);
}
return (
Expand All @@ -128,11 +116,11 @@ const SvgImage = ({
detectAutoPan={false}
defaultTool="auto"
customMiniature={() => null}
customToolbar={isPrint ? () => null : undefined}
customToolbar={undefined}
toolbarProps={{ position: 'left' }}
>
<svg width={svgWidth} height={svgHeight}>
<InlineSVG src={processedImage} raw />
<InlineSVG src={processedImage} />
</svg>
</UncontrolledReactSVGPanZoom>
);
Expand Down
38 changes: 36 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"private": true,
"name": "ipr-client",
"version": "6.22.0",
"version": "6.22.1",
"keywords": [],
"license": "GPL-3.0",
"sideEffects": false,
Expand Down Expand Up @@ -127,6 +127,7 @@
"react-chartjs-2": "~3.3.0",
"react-dom": "~17.0.2",
"react-hook-form": "^7.40.0",
"react-inlinesvg": "^4.0.5",
"react-jss": "~10.6.0",
"react-quill": "~2.0.0",
"react-router-dom": "~5.1.2",
Expand Down
Loading