@ornikar/kitt-universal 29.4.1-canary.cbb5dfd9b37cae9e4b2943cbcdd994e53c1d96d8.0 → 29.4.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -3,12 +3,12 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
- ## [29.4.1-canary.cbb5dfd9b37cae9e4b2943cbcdd994e53c1d96d8.0](https://github.com/ornikar/kitt/compare/@ornikar/kitt-universal@29.4.0...@ornikar/kitt-universal@29.4.1-canary.cbb5dfd9b37cae9e4b2943cbcdd994e53c1d96d8.0) (2025-10-29)
6
+ ## [29.4.1](https://github.com/ornikar/kitt/compare/@ornikar/kitt-universal@29.4.0...@ornikar/kitt-universal@29.4.1) (2025-10-29)
7
7
 
8
8
 
9
9
  ### Bug Fixes
10
10
 
11
- * typo variant resolver ([6483b41](https://github.com/ornikar/kitt/commit/6483b41395de666f40c20e1237cde74fb365e586))
11
+ * **kitt-u/typography:** variants resolver [no-issue] ([#2738](https://github.com/ornikar/kitt/issues/2738)) ([dd3e67a](https://github.com/ornikar/kitt/commit/dd3e67a883f16e740710d34186a72d1e413cc9b7))
12
12
 
13
13
 
14
14
 
@@ -18,6 +18,7 @@ export type TypographyType = TypographyHeadingType | TypographyBodyType | Typogr
18
18
  type TypographyVariant = 'regular' | 'semibold' | 'bold';
19
19
  export declare function useTypographyColor(): ExtendedTypographyColor;
20
20
  export declare function useTypographyAncestorType(): TypographyBreakpointType | null;
21
+ export declare function useTypographyAncestorVariant(): TypographyVariant | undefined;
21
22
  declare const TypographyDefaultColorContext: React.Context<ExtendedTypographyColor | undefined>;
22
23
  export type TypographyBreakpointType = Partial<KittResponsiveProp<TypographyType>>;
23
24
  type NativeBaseTextPropsAcceptedProps = Pick<ITextProps, keyof Except<TextProps, 'accessibilityRole'> | 'textAlign' | 'textTransform' | 'underline' | 'strikeThrough' | NativeBaseAcceptedFlexboxProps> & Pick<TextStyle, 'cursor' | 'transitionProperty' | 'transitionDuration' | 'transitionTimingFunction'>;
@@ -1 +1 @@
1
- {"version":3,"file":"Typography.d.ts","sourceRoot":"","sources":["../../../src/typography/Typography.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Typography.d.ts","sourceRoot":"","sources":["../../../src/typography/Typography.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,IAAI,IAAI,MAAM,EAAS,MAAM,aAAa,CAAC;AACpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AAEjF,OAAO,KAAK,EAAE,UAAU,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACvD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzD,OAAO,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE7D,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,6CAA6C,CAAC;AAElG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAS3D,MAAM,MAAM,eAAe,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC;AAGhE,MAAM,MAAM,uBAAuB,GAAG,eAAe,GAAG,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,GAAG,MAAM,CAAC;AAElG,MAAM,MAAM,qBAAqB,GAAG,WAAW,KAAK,GAAG,IAAI,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,IAAI,GAAG,KAAK,EAAE,CAAC;AAC/F,MAAM,MAAM,kBAAkB,GAAG,QAAQ,IAAI,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,IAAI,EAAE,CAAC;AACzE,MAAM,MAAM,mBAAmB,GAAG,SAAS,OAAO,GAAG,QAAQ,GAAG,OAAO,EAAE,CAAC;AAC1E,MAAM,MAAM,yBAAyB,GAAG,gBAAgB,MAAM,GAAG,KAAK,GAAG,IAAI,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,IAAI,EAAE,CAAC;AAEzG,MAAM,MAAM,cAAc,GACtB,qBAAqB,GACrB,kBAAkB,GAClB,mBAAmB,GACnB,yBAAyB,CAAC;AAC9B,KAAK,iBAAiB,GAAG,SAAS,GAAG,UAAU,GAAG,MAAM,CAAC;AAazD,wBAAgB,kBAAkB,IAAI,uBAAuB,CAE5D;AAED,wBAAgB,yBAAyB,IAAI,wBAAwB,GAAG,IAAI,CAE3E;AAED,wBAAgB,4BAA4B,IAAI,iBAAiB,GAAG,SAAS,CAE5E;AAED,QAAA,MAAM,6BAA6B,oDAAgE,CAAC;AAMpG,MAAM,MAAM,wBAAwB,GAAG,OAAO,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC,CAAC;AAEnF,KAAK,gCAAgC,GAAG,IAAI,CAC1C,UAAU,EACR,MAAM,MAAM,CAAC,SAAS,EAAE,mBAAmB,CAAC,GAC5C,WAAW,GACX,eAAe,GACf,WAAW,GACX,eAAe,GACf,8BAA8B,CACjC,GACC,IAAI,CAAC,SAAS,EAAE,QAAQ,GAAG,oBAAoB,GAAG,oBAAoB,GAAG,0BAA0B,CAAC,CAAC;AAOvG,MAAM,WAAW,eACf,SAAQ,wBAAwB,EAC9B,gCAAgC,EAChC,IAAI,CAAC,aAAa,CAAC,gCAAgC,CAAC,EAAE,UAAU,GAAG,MAAM,GAAG,MAAM,CAAC;IACrF,IAAI,CAAC,EAAE,wBAAwB,CAAC;IAEhC,iBAAiB,EAAE,WAAW,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC,GAAG,WAAW,GAAG,IAAI,CAAC;IACpF,2EAA2E;IAC3E,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAC5B,iGAAiG;IACjG,KAAK,CAAC,EAAE,uBAAuB,CAAC;IAChC,QAAQ,EAAE,SAAS,CAAC;CACrB;AACD,MAAM,MAAM,uCAAuC,GAAG,MAAM,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAC;AAEnG,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,wBAAwB,GAAG,UAAU,CAAC,UAAU,CAAC,CAqB/F;AAwGD,KAAK,mBAAmB,GAAG,KAAK,CAAC,yBAAyB,CACxD,eAAe,GAAG,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,OAAO,MAAM,CAAC,CAAC,CACjE,GAAG;IACF,eAAe,EAAE,OAAO,6BAA6B,CAAC,QAAQ,CAAC;IAC/D,IAAI,EAAE,OAAO,cAAc,CAAC;IAC5B,SAAS,EAAE,OAAO,mBAAmB,CAAC;IACtC,OAAO,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC;IAC1C,OAAO,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC;IAC1C,OAAO,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC;IAC1C,OAAO,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC;IAC1C,OAAO,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC;IAC1C,OAAO,EAAE,UAAU,CAAC,OAAO,aAAa,CAAC,CAAC;CAC3C,CAAC;AAuFF,MAAM,MAAM,mBAAmB,GAAG,WAAW,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAC;AACpF,QAAA,MAAM,cAAc;;;;cArOR,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iCAuOnB,CAAC;AAEH,QAAA,MAAM,mBAAmB;;;;cAzOb,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iCA4OnB,CAAC;AAEH,MAAM,MAAM,sBAAsB,GAAG,uCAAuC,CAAC;AAE7E,QAAA,MAAM,aAAa,UACV,MAAM,gBAEC,sBAAsB,CAAC,MAAM,CAAC,KAC3C,GAAG,sBAAsB,CAO3B,CAAC;AAEF,QAAA,MAAM,UAAU,qBAAwC,CAAC;AAWzD,OAAO,EAAE,UAAU,EAAE,CAAC"}
@@ -3069,6 +3069,7 @@ const getTypographyTypeWithAncestorValue = (type, typographyTypeInContext) => {
3069
3069
  const _excluded$R = ["accessibilityRole", "base", "small", "medium", "large", "wide", "type", "variant", "color"];
3070
3070
  const TypographyFamilyContext = /*#__PURE__*/createContext(null);
3071
3071
  const TypographyTypeContext = /*#__PURE__*/createContext(null);
3072
+ const TypographyVariantContext = /*#__PURE__*/createContext(undefined);
3072
3073
  const TypographyColorContext = /*#__PURE__*/createContext('black');
3073
3074
  function useTypographyColor() {
3074
3075
  return useContext(TypographyColorContext);
@@ -3195,22 +3196,34 @@ const TypographyBase = /*#__PURE__*/forwardRef((_ref, ref) => {
3195
3196
  } = _ref,
3196
3197
  otherProps = _objectWithoutProperties(_ref, _excluded$R);
3197
3198
  const sx = useSx();
3199
+
3200
+ // ancestors
3198
3201
  const typographyFamilyInContext = useContext(TypographyFamilyContext);
3199
3202
  const typographyTypeInContext = useContext(TypographyTypeContext);
3200
- const defaultColor = useTypographyDefaultColor();
3203
+ const typographyVariantInContext = useContext(TypographyVariantContext);
3204
+
3205
+ // family
3201
3206
  const hasTypographyAncestor = typographyFamilyInContext !== null;
3202
3207
  const typographyType = getTypographyTypeWithAncestorValue(type, typographyTypeInContext);
3203
3208
  const baseOrDefaultToBody = (_typographyType$base = typographyType.base) !== null && _typographyType$base !== void 0 ? _typographyType$base : 'body-m';
3204
3209
  const typographyFamily = getTypographyFamilyWithAncestorValue(baseOrDefaultToBody, typographyFamilyInContext);
3210
+
3211
+ // size
3205
3212
  const fontSizeForNativeBase = createNativeBaseFontSize(_objectSpread(_objectSpread({}, type), {}, {
3206
3213
  base: baseOrDefaultToBody
3207
3214
  }));
3215
+
3216
+ // weight
3217
+
3208
3218
  const {
3209
3219
  webFontWeight,
3210
3220
  nativeFontFamily
3211
3221
  } = getUniversalFontWeight(_objectSpread(_objectSpread({}, type), {}, {
3212
3222
  base: baseOrDefaultToBody
3213
- }), variant, typographyFamily);
3223
+ }), !variant && typographyType === typographyTypeInContext ? typographyVariantInContext : variant, typographyFamily);
3224
+
3225
+ // color
3226
+ const defaultColor = useTypographyDefaultColor();
3214
3227
  const currentColor = !color && !hasTypographyAncestor ? defaultColor : color;
3215
3228
  const currentColorValue = getTypographyColorValue(currentColor);
3216
3229
  const colorStyles = sx({
@@ -3233,11 +3246,14 @@ const TypographyBase = /*#__PURE__*/forwardRef((_ref, ref) => {
3233
3246
  fontFamily: nativeFontFamily,
3234
3247
  textTransform: typographyFamily === 'contentCaps' ? 'uppercase' : undefined
3235
3248
  }, colorStyles), otherProps));
3236
- const content = baseOrDefaultToBody ? /*#__PURE__*/jsx(TypographyFamilyContext.Provider, {
3237
- value: typographyFamily,
3238
- children: /*#__PURE__*/jsx(TypographyTypeContext.Provider, {
3239
- value: typographyType,
3240
- children: text
3249
+ const content = baseOrDefaultToBody ? /*#__PURE__*/jsx(TypographyVariantContext.Provider, {
3250
+ value: variant,
3251
+ children: /*#__PURE__*/jsx(TypographyFamilyContext.Provider, {
3252
+ value: typographyFamily,
3253
+ children: /*#__PURE__*/jsx(TypographyTypeContext.Provider, {
3254
+ value: typographyType,
3255
+ children: text
3256
+ })
3241
3257
  })
3242
3258
  }) : text;
3243
3259
  return color ? /*#__PURE__*/jsx(TypographyColorContext.Provider, {