Improve performance of auto-viewbox

LitoMore · Sep 11, 2024 · 50422c4 · 50422c4
1 parent 019c0a4
commit 50422c4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/source/icon.ts b/source/icon.ts
@@ -24,13 +24,13 @@ export const getSimpleIcon = (slug?: string) => {
 	return null;
 };
 
-export const getIconSize = (path: string) => {
+export const getIconSize = (path: typeof svgpath) => {
 	const [x0, y0, x1, y1] = svgPathBbox(path);
 	return { width: x1 - x0, height: y1 - y0 };
 };
 
 export const resetIconPosition = (
-	path: string,
+	pathInstance: typeof svgpath,
 	iconWidth: number,
 	iconHeight: number,
 ) => {
@@ -41,8 +41,8 @@ export const resetIconPosition = (
 	const betterViewboxWidth = Math.ceil(actualViewboxWidth);
 	const betterOffset = (betterViewboxWidth - actualViewboxWidth) / 2;
 	const pathRescale = iconWidth > iconHeight
-		? svgpath(path).scale(scale)
-		: svgpath(path);
+		? pathInstance.scale(scale)
+		: pathInstance;
 	const [offsetX, offsetY] = svgPathBbox(pathRescale);
 	const pathReset = pathRescale.translate(
 		-offsetX + betterOffset,
@@ -64,9 +64,10 @@ export const getIconSvg = (
 	let iconSvg = icon.svg;
 
 	if (viewbox === 'auto') {
-		const { width: iconWidth, height: iconHeight } = getIconSize(icon.path);
+		const pathInstance = svgpath(icon.path);
+		const { width: iconWidth, height: iconHeight } = getIconSize(pathInstance);
 		const { path, betterViewboxWidth } = resetIconPosition(
-			icon.path,
+			pathInstance,
 			iconWidth,
 			iconHeight,
 		);

diff --git a/test/viewbox.test.ts b/test/viewbox.test.ts
@@ -1,12 +1,14 @@
 import * as si from 'npm:simple-icons';
+import svgpath from 'svgpath';
 import { getIconSize, resetIconPosition } from '../source/icon.ts';
 
 const checkAutoViewboxPath = (icon: si.SimpleIcon) => {
 	const start = performance.now();
+	const pathInstance = svgpath(icon.path);
 	try {
-		const { width, height } = getIconSize(icon.path);
+		const { width, height } = getIconSize(pathInstance);
 		const { path } = resetIconPosition(
-			icon.path,
+			pathInstance,
 			width,
 			height,
 		);