vunor 0.2.1 → 0.2.2

package/dist/theme.d.mts

@@ -16,7 +16,7 @@ interface TVunorUnoPresetOpts {
     regular: number;
     dense: number;
   };
-  typography?: Record<TTypographyNames, TTypography | undefined>;
+  typography?: Partial<Record<TTypographyNames, TTypography>>;
   layers?: {
     reverseDark?: boolean;
     reverseLight?: boolean;

package/dist/theme.mjs

@@ -232,18 +232,21 @@ const shortcuts = [
 ];
 //#endregion
 //#region src/theme/shortcuts/btn.ts
+const btnSquare = "size-fingertip px-0";
+const btnRound = "px-fingertip-half rounded-fingertip-half";
 const btn = defineShortcuts({
 	"btn": {
 		"": "h-fingertip flex items-center justify-center px-$m gap-$xs select-none fw-bold tracking-wide relative",
-		"[&.btn-round]:": "px-fingertip-half rounded-fingertip-half",
-		"[&.btn-square]:": "size-fingertip px-0",
+		"[&.btn-round]:": btnRound,
+		"[&.btn-square]:": btnSquare,
 		"[&.btn-round.btn-square]:": "px-0",
 		"disabled:": "opacity-80 cursor-not-allowed",
 		"[&>span]:data-[loading]:": "opacity-0 pointer-events-none",
 		"[&>div:not(.loading-indicator-wrapper)]:data-[loading]:": "opacity-0 pointer-events-none",
 		"[&>.loading-indicator-wrapper]:": "absolute left-0 top-0 right-0 bottom-0 flex items-center justify-center cursor-wait"
 	},
-	"btn-square": { "": "" },
+	"btn-round": { "": btnRound },
+	"btn-square": { "": btnSquare },
 	"btn-label": {
 		"": "lh-1em ellipsis whitespace-nowrap overflow-x-clip overflow-y-visible",
 		"group-[.btn-square]/btn:": "hidden"
@@ -621,6 +624,7 @@ const componentClasses = {
 		"btn",
 		"btn-icon",
 		"btn-label",
+		"btn-square",
 		"c8-flat",
 		"calendar-cell",
 		"calendar-grid-row",
@@ -770,6 +774,7 @@ const componentClasses = {
 		"btn",
 		"btn-icon",
 		"btn-label",
+		"btn-square",
 		"c8-flat",
 		"calendar-cell",
 		"calendar-grid-row",
@@ -843,6 +848,7 @@ const componentClasses = {
 		"btn",
 		"btn-icon",
 		"btn-label",
+		"btn-square",
 		"c8-flat",
 		"calendar-cell",
 		"calendar-grid-row",
@@ -903,6 +909,7 @@ const componentClasses = {
 		"btn",
 		"btn-icon",
 		"btn-label",
+		"btn-square",
 		"c8-flat",
 		"calendar-cell",
 		"calendar-grid-row",
@@ -940,6 +947,7 @@ const componentClasses = {
 		"btn",
 		"btn-icon",
 		"btn-label",
+		"btn-square",
 		"c8-flat",
 		"card",
 		"checkbox",
@@ -1251,6 +1259,7 @@ const componentClasses = {
 	Pagination: [
 		"btn",
 		"btn-icon",
+		"btn-square",
 		"c8-flat",
 		"flex",
 		"gap-1",
@@ -2121,7 +2130,22 @@ const defaultTypography = {
 	"caption": font(400, 600, k$1(-.5), k$1(.5), -.007),
 	"overline": font(400, 600, k$1(-.5), k$1(.5), .0618)
 };
-function buildFontTheme(size, w, wBold, lh, ls, actualFontHeightFactor = 1, actualFontHeightTopBottomRatio = .5) {
+/**
+* Builds the UnoCSS `fontSize` theme entry for one typography level.
+*
+* Takes the whole {@link TTypography} rather than its numeric fields: this
+* function owns the shape of the emitted tuple, so fields that carry no
+* geometry (`font`, `css`) reach the output instead of being dropped at a call
+* site that can only forward numbers.
+*/
+function buildFontTheme(t, defaults) {
+	const size = t.size || 1;
+	const w = t.weight || 400;
+	const wBold = t.boldWeight || 700;
+	const lh = t.height || 1;
+	const ls = t.spacing || 0;
+	const actualFontHeightFactor = t.actualHeightFactor || defaults.actualHeightFactor;
+	const actualFontHeightTopBottomRatio = t.actualHeightTopBottomRatio || defaults.actualHeightTopBottomRatio;
 	const correctedSize = size * actualFontHeightFactor;
 	const m = (lh * size - correctedSize) / size;
 	const half = correctedSize / 2;
@@ -2142,7 +2166,9 @@ function buildFontTheme(size, w, wBold, lh, ls, actualFontHeightFactor = 1, actu
 			"--font-tc": `${-mt}em`,
 			"font-weight": w,
 			"line-height": `${lh}em`,
-			"letter-spacing": `${ls}em`
+			"letter-spacing": `${ls}em`,
+			...t.font && { "font-family": t.font },
+			...t.css
 		}]
 	};
 }
@@ -2246,8 +2272,12 @@ const themeFactory = (opts) => {
 		"line-height": "var(--card-heading-lh)",
 		"letter-spacing": "var(--card-heading-ls)"
 	}] };
-	for (const [name, val] of Object.entries(opts.typography)) if (val?.size) {
-		const ft = buildFontTheme(val.size || 1, val.weight || 400, val.boldWeight || 700, val.height || 1, val.spacing || 0, val.actualHeightFactor || opts.actualFontHeightFactor, val.actualHeightTopBottomRatio || opts.actualFontHeightTopBottomRatio);
+	for (const [name, val] of Object.entries(opts.typography)) {
+		if (!val) continue;
+		const ft = buildFontTheme(val, {
+			actualHeightFactor: opts.actualFontHeightFactor,
+			actualHeightTopBottomRatio: opts.actualFontHeightTopBottomRatio
+		});
 		fontSize[name] = ft.theme;
 		spacing[name] = `${ft.size}em`;
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vunor",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "files": [
     "dist"
   ],