Merge version_1 into main

Merge version_1 into main
This commit was merged in pull request #2.
This commit is contained in:
2026-03-12 19:14:29 +00:00

View File

@@ -1,51 +1,60 @@
"use client";
import { memo } from "react";
import useSvgTextLogo from "./useSvgTextLogo";
import { cls } from "@/lib/utils";
import React from 'react';
interface SvgTextLogoProps {
logoText: string;
adjustHeightFactor?: number;
verticalAlign?: "top" | "center";
text: string;
className?: string;
fontSize?: number;
fontFamily?: string;
fontWeight?: number | string;
letterSpacing?: number;
dominantBaseline?: 'auto' | 'middle' | 'hanging' | 'ideographic' | 'text-top' | 'text-bottom';
textAnchor?: 'start' | 'middle' | 'end';
}
const SvgTextLogo = memo<SvgTextLogoProps>(function SvgTextLogo({
logoText,
adjustHeightFactor,
verticalAlign = "top",
className = "",
}) {
const { svgRef, textRef, viewBox, aspectRatio } = useSvgTextLogo(logoText, false, adjustHeightFactor);
const SvgTextLogo: React.FC<SvgTextLogoProps> = ({
text,
className = '',
fontSize = 48,
fontFamily = 'sans-serif',
fontWeight = 700,
letterSpacing = 0,
dominantBaseline = 'middle',
textAnchor = 'middle',
}) => {
// Calculate approximate text width for viewBox
const charWidth = fontSize * 0.6;
const textWidth = text.length * charWidth + letterSpacing * (text.length - 1);
const padding = fontSize * 0.5;
const viewBoxWidth = textWidth + padding * 2;
const viewBoxHeight = fontSize * 1.5;
const xPos = viewBoxWidth / 2;
const yPos = viewBoxHeight / 2;
return (
<svg
ref={svgRef}
viewBox={viewBox}
className={cls("w-full", className)}
style={{ aspectRatio: aspectRatio }}
preserveAspectRatio="none"
viewBox={`0 0 ${viewBoxWidth} ${viewBoxHeight}`}
width={viewBoxWidth}
height={viewBoxHeight}
className={className}
xmlns="http://www.w3.org/2000/svg"
role="img"
aria-label={`${logoText} logo`}
aria-label={`Logo: ${text}`}
>
<text
ref={textRef}
x="0"
y={verticalAlign === "center" ? "50%" : "0"}
className="font-bold fill-current"
style={{
fontSize: "20px",
letterSpacing: "-0.02em",
dominantBaseline: verticalAlign === "center" ? "middle" : "text-before-edge"
}}
x={xPos}
y={yPos}
fontSize={fontSize}
fontFamily={fontFamily}
fontWeight={fontWeight}
letterSpacing={letterSpacing}
dominantBaseline={dominantBaseline}
textAnchor={textAnchor}
fill="currentColor"
>
{logoText}
{text}
</text>
</svg>
);
});
};
SvgTextLogo.displayName = "SvgTextLogo";
export default SvgTextLogo;
export default SvgTextLogo;