diff --git a/package-lock.json b/package-lock.json index 8685c5c6..4c424461 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "@railmapgen/rmg-palette-resources": "^3.0.1", "@railmapgen/rmg-runtime": "^12.0.0", "@railmapgen/rmg-translate": "^3.4.1", - "@railmapgen/svg-assets": "^7.0.0", + "@railmapgen/svg-assets": "^8.0.1", "@reduxjs/toolkit": "^2.7.0", "ag-grid-community": "^33.2.4", "ag-grid-react": "^33.2.4", @@ -2812,12 +2812,13 @@ "license": "GPL-3.0-only" }, "node_modules/@railmapgen/svg-assets": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@railmapgen/svg-assets/-/svg-assets-7.0.0.tgz", - "integrity": "sha512-DZv+lBE7euEWrlY3M83nYr9VfNyTu6ZpGAWjAAG5fXhDOwHh9JrDpvPi4LE5/WT1lAPhx9Dec0R3I70BZH9nVA==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@railmapgen/svg-assets/-/svg-assets-8.0.1.tgz", + "integrity": "sha512-RtVBpxgXwZSWLKSDUE8ia7fLfR0PoPu2MduEHk7NIkm9azHyoRrHSDmgPhC0FyY9N5NqNOnMa80UhVLcMKm7aw==", "license": "GPL-3.0-only", "dependencies": { - "@railmapgen/rmg-palette-resources": "^3.0.1" + "@railmapgen/rmg-palette-resources": "^3.0.1", + "clsx": "^2.1.1" }, "peerDependencies": { "react": ">=18" @@ -4380,6 +4381,15 @@ "node": ">= 16" } }, + "node_modules/clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, "node_modules/color-convert": { "version": "2.0.1", "dev": true, @@ -11384,11 +11394,12 @@ "integrity": "sha512-WliNlAv8YIF6BXLfSwFdNGIPzvoRz7KL0CYTC/eTznSnLGqNnwbGsI+MpcwnkJMaq/KpqGVRPCzqhN+eZgZkng==" }, "@railmapgen/svg-assets": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/@railmapgen/svg-assets/-/svg-assets-7.0.0.tgz", - "integrity": "sha512-DZv+lBE7euEWrlY3M83nYr9VfNyTu6ZpGAWjAAG5fXhDOwHh9JrDpvPi4LE5/WT1lAPhx9Dec0R3I70BZH9nVA==", + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/@railmapgen/svg-assets/-/svg-assets-8.0.1.tgz", + "integrity": "sha512-RtVBpxgXwZSWLKSDUE8ia7fLfR0PoPu2MduEHk7NIkm9azHyoRrHSDmgPhC0FyY9N5NqNOnMa80UhVLcMKm7aw==", "requires": { - "@railmapgen/rmg-palette-resources": "^3.0.1" + "@railmapgen/rmg-palette-resources": "^3.0.1", + "clsx": "^2.1.1" } }, "@reduxjs/toolkit": { @@ -12375,6 +12386,11 @@ "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==", "dev": true }, + "clsx": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", + "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==" + }, "color-convert": { "version": "2.0.1", "dev": true, diff --git a/package.json b/package.json index 722b098c..83c07a03 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "@railmapgen/rmg-palette-resources": "^3.0.1", "@railmapgen/rmg-runtime": "^12.0.0", "@railmapgen/rmg-translate": "^3.4.1", - "@railmapgen/svg-assets": "^7.0.0", + "@railmapgen/svg-assets": "^8.0.1", "@reduxjs/toolkit": "^2.7.0", "ag-grid-community": "^33.2.4", "ag-grid-react": "^33.2.4", diff --git a/src/svgs/gzmtr/info-gzmtr.tsx b/src/svgs/gzmtr/info-gzmtr.tsx index b6a71cf5..1fd50e59 100644 --- a/src/svgs/gzmtr/info-gzmtr.tsx +++ b/src/svgs/gzmtr/info-gzmtr.tsx @@ -80,7 +80,7 @@ const InfoGZMTR = () => { lineNum={lineNumber} stnNum={curStnInfo.num} strokeColour={theme[2]} - textClassName="rmg-name__zh" + classNames={{ digits: 'rmg-font__en' }} transform={ post2022 ? `translate(${transforms.stationNumberPost2022.x},${transforms.stationNumberPost2022.y})` diff --git a/src/svgs/gzmtr/main-gzmtr.tsx b/src/svgs/gzmtr/main-gzmtr.tsx index 2f9ee307..71a64935 100644 --- a/src/svgs/gzmtr/main-gzmtr.tsx +++ b/src/svgs/gzmtr/main-gzmtr.tsx @@ -201,9 +201,8 @@ const MainGZMTR = () => { enName={lineName[1]} foregroundColour={'var(--rmg-theme-fg)' as MonoColour} backgroundColour={'var(--rmg-theme-colour)' as ColourHex} - zhClassName="rmg-name__zh" - enClassName="rmg-name__en" spanDigits={spanLineNum} + classNames={{ digits: 'rmg-font__en', zh: 'rmg-font__zh', en: 'rmg-font__en' }} /> diff --git a/src/svgs/gzmtr/runin/via-station.tsx b/src/svgs/gzmtr/runin/via-station.tsx index 4d6b4f2c..f2f85e63 100644 --- a/src/svgs/gzmtr/runin/via-station.tsx +++ b/src/svgs/gzmtr/runin/via-station.tsx @@ -45,10 +45,9 @@ const ViaStation = forwardRef(function ViaStation( enName={lines[0].name[1]} backgroundColour={lines[0].theme?.[2] ?? '#aaa'} foregroundColour={lines[0].theme?.[3] ?? MonoColour.white} - zhClassName="rmg-name__zh" - enClassName="rmg-name__en" spanDigits transform={`translate(27,-8.5)scale(0.75)`} + classNames={{ digits: 'rmg-font__en', zh: 'rmg-font__zh', en: 'rmg-font__en' }} /> )} diff --git a/src/svgs/gzmtr/station.tsx b/src/svgs/gzmtr/station.tsx index 8994559c..bc3c5afe 100644 --- a/src/svgs/gzmtr/station.tsx +++ b/src/svgs/gzmtr/station.tsx @@ -80,7 +80,7 @@ export default function Station(props: Props) { lineNum={lineNumber} stnNum={stnInfo.num} strokeColour={theme[2]} - textClassName="rmg-name__zh" + classNames={{ digits: 'rmg-name__zh' }} passed={stnState === -1} alwaysShowColouredBorder={loop} bolderBorder @@ -152,10 +152,9 @@ const IntBoxs = (props: IntGroupProps & React.SVGProps) => { enName={info.name[1]} foregroundColour={info.theme?.[3] ?? MonoColour.white} backgroundColour={info.theme?.[2] ?? '#aaaaaa'} - zhClassName="rmg-font__zh" - enClassName="rmg-font__en" passed={stnState === -1} spanDigits={spanDigits} + classNames={{ digits: 'rmg-font__en', zh: 'rmg-font__zh', en: 'rmg-font__en' }} /> ))}