Merge branch 'main' into feat/add-more-icons

hyperweb-io · Oct 28, 2023 · 22e0d5c · 22e0d5c
2 parents 5481840 + dd9a246
commit 22e0d5c
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 7 deletions.
diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.11.8](https://github.com/cosmology-tech/interchain-ui/compare/@interchain-ui/[email protected]...@interchain-ui/[email protected]) (2023-10-26)
+
+**Note:** Version bump only for package @interchain-ui/react
+
+## [1.11.7](https://github.com/cosmology-tech/interchain-ui/compare/@interchain-ui/[email protected]...@interchain-ui/[email protected]) (2023-10-25)
+
+**Note:** Version bump only for package @interchain-ui/react
+
+## [1.11.6](https://github.com/cosmology-tech/interchain-ui/compare/@interchain-ui/[email protected]...@interchain-ui/[email protected]) (2023-10-25)
+
+**Note:** Version bump only for package @interchain-ui/react
+
 ## [1.11.5](https://github.com/cosmology-tech/interchain-ui/compare/@interchain-ui/[email protected]...@interchain-ui/[email protected]) (2023-10-23)
 
 ### Bug Fixes

diff --git a/packages/react/package.json b/packages/react/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@interchain-ui/react",
-  "version": "1.11.5",
+  "version": "1.11.8",
   "description": "UI building blocks for Interchain builders",
   "author": "yyyyaaa <[email protected]>",
   "homepage": "https://github.com/cosmology-tech/ui-kit/tree/main/packages/react#readme",

diff --git a/packages/vue/CHANGELOG.md b/packages/vue/CHANGELOG.md
@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [1.2.6](https://github.com/cosmology-tech/interchain-ui/compare/@interchain-ui/[email protected]...@interchain-ui/[email protected]) (2023-10-26)
+
+**Note:** Version bump only for package @interchain-ui/vue
+
+## [1.2.5](https://github.com/cosmology-tech/interchain-ui/compare/@interchain-ui/[email protected]...@interchain-ui/[email protected]) (2023-10-25)
+
+**Note:** Version bump only for package @interchain-ui/vue
+
+## [1.2.4](https://github.com/cosmology-tech/interchain-ui/compare/@interchain-ui/[email protected]...@interchain-ui/[email protected]) (2023-10-25)
+
+**Note:** Version bump only for package @interchain-ui/vue
+
 ## [1.2.3](https://github.com/cosmology-tech/interchain-ui/compare/@interchain-ui/[email protected]...@interchain-ui/[email protected]) (2023-10-23)
 
 ### Bug Fixes

diff --git a/packages/vue/package.json b/packages/vue/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@interchain-ui/vue",
-  "version": "1.2.3",
+  "version": "1.2.6",
   "type": "module",
   "description": "UI building blocks for Interchain builders",
   "author": "yyyyaaa <[email protected]>",

diff --git a/src/styles/rainbow-sprinkles.css.ts b/src/styles/rainbow-sprinkles.css.ts
@@ -56,7 +56,7 @@ const responsiveProperties = defineProperties({
     maxWidth: true,
     maxHeight: true,
     borderRadius: themeVars.radii,
-    fontFamily: themeVars.font,
+    fontFamily: true,
     fontSize: themeVars.fontSize,
     lineHeight: themeVars.lineHeight,
     textAlign: true,
@@ -110,6 +110,7 @@ const responsiveProperties = defineProperties({
     minHeight: allSpace,
     maxWidth: allSpace,
     maxHeight: allSpace,
+    fontFamily: themeVars.font,
   },
   shorthands: {
     p: ["padding"],

diff --git a/src/ui/text/text.css.ts b/src/ui/text/text.css.ts
@@ -6,11 +6,13 @@ import { themeVars } from "../../styles/themes.css";
 const variant = {
   body: style({
     fontSize: themeVars.fontSize.sm,
+    color: themeVars.colors.text,
     fontWeight: themeVars.fontWeight.normal,
     lineHeight: themeVars.lineHeight.normal,
   }),
   heading: style({
     fontSize: themeVars.fontSize.md,
+    color: themeVars.colors.text,
     fontWeight: themeVars.fontWeight.semibold,
     lineHeight: themeVars.lineHeight.tall,
   }),

diff --git a/src/ui/text/text.helper.ts b/src/ui/text/text.helper.ts
@@ -3,18 +3,22 @@ import { Sprinkles } from "../../styles/rainbow-sprinkles.css";
 export type Variant = "body" | "heading";
 export type TextTransform = "ellipsis" | "underline" | "none";
 
-export function getVariantStyles(variant: Variant): Sprinkles {
+export function getVariantStyles(
+  variant: Variant,
+  customFontFamily?: Sprinkles["fontFamily"]
+): Sprinkles {
   if (variant === "body") {
     return {
-      fontFamily: "$body",
+      fontFamily: customFontFamily ?? "$body",
       fontSize: "$sm",
       fontWeight: "$normal",
       lineHeight: "$normal",
     };
   }
+
   if (variant === "heading") {
     return {
-      fontFamily: "$body",
+      fontFamily: customFontFamily ?? "$body",
       fontSize: "$md",
       fontWeight: "$semibold",
       lineHeight: "$tall",

diff --git a/src/ui/text/text.lite.tsx b/src/ui/text/text.lite.tsx
@@ -19,7 +19,7 @@ export default function Text(props: TextProps) {
       {...props.attributes}
       {...props.domAttributes}
       as={props.as}
-      {...getVariantStyles(props.variant ?? "body")}
+      {...getVariantStyles(props.variant ?? "body", props.fontFamily)}
       {...getTextTransformStyles({
         ellipsis: props.ellipsis,
         underline: props.underline,

diff --git a/src/ui/text/text.types.tsx b/src/ui/text/text.types.tsx
@@ -16,6 +16,7 @@ export interface TextProps extends BaseComponentProps {
     | "p"
     | "span";
   color?: Sprinkles["color"];
+  fontFamily?: Sprinkles["fontFamily"];
   fontSize?: Sprinkles["fontSize"];
   fontWeight?: Sprinkles["fontWeight"];
   letterSpacing?: Sprinkles["letterSpacing"];