@oxyhq/bloom 0.29.4 → 0.29.6
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/lib/commonjs/typography/index.js +4 -5
- package/lib/commonjs/typography/index.js.map +1 -1
- package/lib/commonjs/typography/styled-text.js +12 -19
- package/lib/commonjs/typography/styled-text.js.map +1 -1
- package/lib/module/typography/index.js +5 -6
- package/lib/module/typography/index.js.map +1 -1
- package/lib/module/typography/styled-text.js +12 -19
- package/lib/module/typography/styled-text.js.map +1 -1
- package/lib/typescript/commonjs/typography/index.d.ts.map +1 -1
- package/lib/typescript/commonjs/typography/styled-text.d.ts +1 -6
- package/lib/typescript/commonjs/typography/styled-text.d.ts.map +1 -1
- package/lib/typescript/module/typography/index.d.ts.map +1 -1
- package/lib/typescript/module/typography/styled-text.d.ts +1 -6
- package/lib/typescript/module/typography/styled-text.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/typography/index.tsx +4 -6
- package/src/typography/styled-text.ts +11 -28
|
@@ -65,14 +65,13 @@ const TextComponent = function Text({
|
|
|
65
65
|
colors
|
|
66
66
|
} = (0, _useTheme.useTheme)();
|
|
67
67
|
const InteropText = (0, _styledText.getInteropText)();
|
|
68
|
-
const
|
|
69
|
-
const resolvedClassName = interopActive && className?.trim() ? className : undefined;
|
|
68
|
+
const trimmedClassName = className?.trim() ? className : undefined;
|
|
70
69
|
return /*#__PURE__*/(0, _jsxRuntime.jsx)(InteropText, {
|
|
71
70
|
...rest,
|
|
72
|
-
...(
|
|
73
|
-
className:
|
|
71
|
+
...(trimmedClassName ? {
|
|
72
|
+
className: trimmedClassName
|
|
74
73
|
} : {}),
|
|
75
|
-
style: (0, _defaults.mergeTypographyStyle)(
|
|
74
|
+
style: (0, _defaults.mergeTypographyStyle)(trimmedClassName, {
|
|
76
75
|
...DEFAULT_TEXT_TYPOGRAPHY,
|
|
77
76
|
color: colors.text
|
|
78
77
|
}, SANS_FONT_FAMILY, style),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_useTheme","_tokens","_defaults","_styledText","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","fontFamilyStyle","kind","Platform","OS","fontFamily","SANS_FONT_FAMILY","DISPLAY_FONT_FAMILY","DEFAULT_TEXT_TYPOGRAPHY","fontSize","TextComponent","Text","children","style","className","rest","colors","useTheme","InteropText","getInteropText","
|
|
1
|
+
{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_useTheme","_tokens","_defaults","_styledText","_jsxRuntime","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","fontFamilyStyle","kind","Platform","OS","fontFamily","SANS_FONT_FAMILY","DISPLAY_FONT_FAMILY","DEFAULT_TEXT_TYPOGRAPHY","fontSize","TextComponent","Text","children","style","className","rest","colors","useTheme","InteropText","getInteropText","trimmedClassName","trim","undefined","jsx","mergeTypographyStyle","color","text","exports","Span","memo","displayName","HEADING_TYPOGRAPHY","fontWeight","createHeadingElement","level","HeadingElement","extraProps","role","headingBase","H1","H2","H3","H4","H5","H6","DEFAULT_PARAGRAPH_TYPOGRAPHY","lineHeight","P","paragraphDefaults","typographyDefaultsWhenNoClassName"],"sourceRoot":"../../../src","sources":["typography/index.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -6,31 +6,24 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
exports.getInteropText = getInteropText;
|
|
7
7
|
exports.hasTypographyClassNameInterop = hasTypographyClassNameInterop;
|
|
8
8
|
var _reactNative = require("react-native");
|
|
9
|
-
var
|
|
10
|
-
const getNativeWind = (0, _lazyRequire.lazyRequire)('nativewind');
|
|
11
|
-
let interopText = _reactNative.Text;
|
|
12
|
-
|
|
9
|
+
var _reactNativeCss = require("react-native-css");
|
|
13
10
|
/**
|
|
14
|
-
* RN `Text` wired for NativeWind `className` → `style` interop
|
|
15
|
-
*
|
|
16
|
-
*
|
|
11
|
+
* RN `Text` wired for NativeWind `className` → `style` interop.
|
|
12
|
+
*
|
|
13
|
+
* Import `styled` from Bloom's direct dependency `react-native-css` — not via
|
|
14
|
+
* lazy `require('nativewind')`. Metro cannot reliably bundle dynamic requires
|
|
15
|
+
* from published `@oxyhq/bloom/lib`, so the 0.29.4 lazy path left interop
|
|
16
|
+
* inactive at runtime and Bloom defaults (fontSize 13) overrode hero utilities.
|
|
17
17
|
*/
|
|
18
|
+
const interopText = (0, _reactNativeCss.styled)(_reactNative.Text, {
|
|
19
|
+
className: 'style'
|
|
20
|
+
});
|
|
18
21
|
function getInteropText() {
|
|
19
|
-
if (interopText !== _reactNative.Text) {
|
|
20
|
-
return interopText;
|
|
21
|
-
}
|
|
22
|
-
const nativewind = getNativeWind();
|
|
23
|
-
if (nativewind?.styled) {
|
|
24
|
-
interopText = nativewind.styled(_reactNative.Text, {
|
|
25
|
-
className: 'style'
|
|
26
|
-
});
|
|
27
|
-
}
|
|
28
22
|
return interopText;
|
|
29
23
|
}
|
|
30
24
|
|
|
31
|
-
/** True when className interop is active (
|
|
25
|
+
/** True when className interop is active (always — react-native-css is a direct dep). */
|
|
32
26
|
function hasTypographyClassNameInterop() {
|
|
33
|
-
|
|
34
|
-
return interopText !== _reactNative.Text;
|
|
27
|
+
return true;
|
|
35
28
|
}
|
|
36
29
|
//# sourceMappingURL=styled-text.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_reactNative","require","
|
|
1
|
+
{"version":3,"names":["_reactNative","require","_reactNativeCss","interopText","styled","RNText","className","getInteropText","hasTypographyClassNameInterop"],"sourceRoot":"../../../src","sources":["typography/styled-text.ts"],"mappings":";;;;;;;AACA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AAIA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAME,WAAgC,GAAG,IAAAC,sBAAM,EAACC,iBAAM,EAAE;EAAEC,SAAS,EAAE;AAAQ,CAAC,CAAC;AAExE,SAASC,cAAcA,CAAA,EAAwB;EACpD,OAAOJ,WAAW;AACpB;;AAEA;AACO,SAASK,6BAA6BA,CAAA,EAAY;EACvD,OAAO,IAAI;AACb","ignoreList":[]}
|
|
@@ -5,7 +5,7 @@ import { Platform } from 'react-native';
|
|
|
5
5
|
import { useTheme } from "../theme/use-theme.js";
|
|
6
6
|
import { fontFamilies } from "../fonts/tokens.js";
|
|
7
7
|
import { mergeTypographyStyle, typographyDefaultsWhenNoClassName } from "./defaults.js";
|
|
8
|
-
import { getInteropText
|
|
8
|
+
import { getInteropText } from "./styled-text.js";
|
|
9
9
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
10
10
|
/**
|
|
11
11
|
* Platform-aware font-family value. On web we resolve to the CSS custom
|
|
@@ -52,14 +52,13 @@ const TextComponent = function Text({
|
|
|
52
52
|
colors
|
|
53
53
|
} = useTheme();
|
|
54
54
|
const InteropText = getInteropText();
|
|
55
|
-
const
|
|
56
|
-
const resolvedClassName = interopActive && className?.trim() ? className : undefined;
|
|
55
|
+
const trimmedClassName = className?.trim() ? className : undefined;
|
|
57
56
|
return /*#__PURE__*/_jsx(InteropText, {
|
|
58
57
|
...rest,
|
|
59
|
-
...(
|
|
60
|
-
className:
|
|
58
|
+
...(trimmedClassName ? {
|
|
59
|
+
className: trimmedClassName
|
|
61
60
|
} : {}),
|
|
62
|
-
style: mergeTypographyStyle(
|
|
61
|
+
style: mergeTypographyStyle(trimmedClassName, {
|
|
63
62
|
...DEFAULT_TEXT_TYPOGRAPHY,
|
|
64
63
|
color: colors.text
|
|
65
64
|
}, SANS_FONT_FAMILY, style),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","memo","Platform","useTheme","fontFamilies","mergeTypographyStyle","typographyDefaultsWhenNoClassName","getInteropText","
|
|
1
|
+
{"version":3,"names":["React","memo","Platform","useTheme","fontFamilies","mergeTypographyStyle","typographyDefaultsWhenNoClassName","getInteropText","jsx","_jsx","fontFamilyStyle","kind","OS","fontFamily","SANS_FONT_FAMILY","DISPLAY_FONT_FAMILY","DEFAULT_TEXT_TYPOGRAPHY","fontSize","TextComponent","Text","children","style","className","rest","colors","InteropText","trimmedClassName","trim","undefined","color","text","displayName","Span","HEADING_TYPOGRAPHY","fontWeight","createHeadingElement","level","HeadingElement","extraProps","role","headingBase","H1","H2","H3","H4","H5","H6","DEFAULT_PARAGRAPH_TYPOGRAPHY","lineHeight","P","paragraphDefaults"],"sourceRoot":"../../../src","sources":["typography/index.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -1,31 +1,24 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import { Text as RNText } from 'react-native';
|
|
4
|
-
import {
|
|
5
|
-
const getNativeWind = lazyRequire('nativewind');
|
|
6
|
-
let interopText = RNText;
|
|
7
|
-
|
|
4
|
+
import { styled } from 'react-native-css';
|
|
8
5
|
/**
|
|
9
|
-
* RN `Text` wired for NativeWind `className` → `style` interop
|
|
10
|
-
*
|
|
11
|
-
*
|
|
6
|
+
* RN `Text` wired for NativeWind `className` → `style` interop.
|
|
7
|
+
*
|
|
8
|
+
* Import `styled` from Bloom's direct dependency `react-native-css` — not via
|
|
9
|
+
* lazy `require('nativewind')`. Metro cannot reliably bundle dynamic requires
|
|
10
|
+
* from published `@oxyhq/bloom/lib`, so the 0.29.4 lazy path left interop
|
|
11
|
+
* inactive at runtime and Bloom defaults (fontSize 13) overrode hero utilities.
|
|
12
12
|
*/
|
|
13
|
+
const interopText = styled(RNText, {
|
|
14
|
+
className: 'style'
|
|
15
|
+
});
|
|
13
16
|
export function getInteropText() {
|
|
14
|
-
if (interopText !== RNText) {
|
|
15
|
-
return interopText;
|
|
16
|
-
}
|
|
17
|
-
const nativewind = getNativeWind();
|
|
18
|
-
if (nativewind?.styled) {
|
|
19
|
-
interopText = nativewind.styled(RNText, {
|
|
20
|
-
className: 'style'
|
|
21
|
-
});
|
|
22
|
-
}
|
|
23
17
|
return interopText;
|
|
24
18
|
}
|
|
25
19
|
|
|
26
|
-
/** True when className interop is active (
|
|
20
|
+
/** True when className interop is active (always — react-native-css is a direct dep). */
|
|
27
21
|
export function hasTypographyClassNameInterop() {
|
|
28
|
-
|
|
29
|
-
return interopText !== RNText;
|
|
22
|
+
return true;
|
|
30
23
|
}
|
|
31
24
|
//# sourceMappingURL=styled-text.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["Text","RNText","
|
|
1
|
+
{"version":3,"names":["Text","RNText","styled","interopText","className","getInteropText","hasTypographyClassNameInterop"],"sourceRoot":"../../../src","sources":["typography/styled-text.ts"],"mappings":";;AACA,SAASA,IAAI,IAAIC,MAAM,QAAwB,cAAc;AAC7D,SAASC,MAAM,QAAQ,kBAAkB;AAIzC;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,MAAMC,WAAgC,GAAGD,MAAM,CAACD,MAAM,EAAE;EAAEG,SAAS,EAAE;AAAQ,CAAC,CAAC;AAE/E,OAAO,SAASC,cAAcA,CAAA,EAAwB;EACpD,OAAOF,WAAW;AACpB;;AAEA;AACA,OAAO,SAASG,6BAA6BA,CAAA,EAAY;EACvD,OAAO,IAAI;AACb","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/typography/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAe,MAAM,OAAO,CAAC;AACpC,OAAO,EACL,KAAK,SAAS,IAAI,WAAW,EAG9B,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAI/C,MAAM,MAAM,SAAS,GAAG,WAAW,GAAG;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/typography/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAe,MAAM,OAAO,CAAC;AACpC,OAAO,EACL,KAAK,SAAS,IAAI,WAAW,EAG9B,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAI/C,MAAM,MAAM,SAAS,GAAG,WAAW,GAAG;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAwDF,eAAO,MAAM,IAAI,sEArB4D,SAAS,6CAqB/C,CAAC;AAGxC,OAAO,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC;AA6BxB,eAAO,MAAM,EAAE,qBAAqC,CAAC;AAErD,eAAO,MAAM,EAAE,qBAAqC,CAAC;AAErD,eAAO,MAAM,EAAE,qBAAqC,CAAC;AAErD,eAAO,MAAM,EAAE,qBAAqC,CAAC;AAErD,eAAO,MAAM,EAAE,qBAAqC,CAAC;AAErD,eAAO,MAAM,EAAE,qBAAqC,CAAC;AAQrD,wBAAgB,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,EAAE,SAAS,2CAezD;yBAfe,CAAC;;;AAkBjB,OAAO,EAAE,YAAY,EAAE,CAAC"}
|
|
@@ -3,13 +3,8 @@ import { type TextProps } from 'react-native';
|
|
|
3
3
|
type StyledTextComponent = ComponentType<TextProps & {
|
|
4
4
|
className?: string;
|
|
5
5
|
}>;
|
|
6
|
-
/**
|
|
7
|
-
* RN `Text` wired for NativeWind `className` → `style` interop when
|
|
8
|
-
* `nativewind` is installed in the consumer. Falls back to plain `RNText`
|
|
9
|
-
* otherwise (className is ignored upstream).
|
|
10
|
-
*/
|
|
11
6
|
export declare function getInteropText(): StyledTextComponent;
|
|
12
|
-
/** True when className interop is active (
|
|
7
|
+
/** True when className interop is active (always — react-native-css is a direct dep). */
|
|
13
8
|
export declare function hasTypographyClassNameInterop(): boolean;
|
|
14
9
|
export {};
|
|
15
10
|
//# sourceMappingURL=styled-text.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"styled-text.d.ts","sourceRoot":"","sources":["../../../../src/typography/styled-text.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAkB,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"styled-text.d.ts","sourceRoot":"","sources":["../../../../src/typography/styled-text.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAkB,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAG9D,KAAK,mBAAmB,GAAG,aAAa,CAAC,SAAS,GAAG;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAY7E,wBAAgB,cAAc,IAAI,mBAAmB,CAEpD;AAED,yFAAyF;AACzF,wBAAgB,6BAA6B,IAAI,OAAO,CAEvD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/typography/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAe,MAAM,OAAO,CAAC;AACpC,OAAO,EACL,KAAK,SAAS,IAAI,WAAW,EAG9B,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAI/C,MAAM,MAAM,SAAS,GAAG,WAAW,GAAG;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/typography/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAe,MAAM,OAAO,CAAC;AACpC,OAAO,EACL,KAAK,SAAS,IAAI,WAAW,EAG9B,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAI/C,MAAM,MAAM,SAAS,GAAG,WAAW,GAAG;IACpC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAwDF,eAAO,MAAM,IAAI,sEArB4D,SAAS,6CAqB/C,CAAC;AAGxC,OAAO,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC;AA6BxB,eAAO,MAAM,EAAE,qBAAqC,CAAC;AAErD,eAAO,MAAM,EAAE,qBAAqC,CAAC;AAErD,eAAO,MAAM,EAAE,qBAAqC,CAAC;AAErD,eAAO,MAAM,EAAE,qBAAqC,CAAC;AAErD,eAAO,MAAM,EAAE,qBAAqC,CAAC;AAErD,eAAO,MAAM,EAAE,qBAAqC,CAAC;AAQrD,wBAAgB,CAAC,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,EAAE,SAAS,2CAezD;yBAfe,CAAC;;;AAkBjB,OAAO,EAAE,YAAY,EAAE,CAAC"}
|
|
@@ -3,13 +3,8 @@ import { type TextProps } from 'react-native';
|
|
|
3
3
|
type StyledTextComponent = ComponentType<TextProps & {
|
|
4
4
|
className?: string;
|
|
5
5
|
}>;
|
|
6
|
-
/**
|
|
7
|
-
* RN `Text` wired for NativeWind `className` → `style` interop when
|
|
8
|
-
* `nativewind` is installed in the consumer. Falls back to plain `RNText`
|
|
9
|
-
* otherwise (className is ignored upstream).
|
|
10
|
-
*/
|
|
11
6
|
export declare function getInteropText(): StyledTextComponent;
|
|
12
|
-
/** True when className interop is active (
|
|
7
|
+
/** True when className interop is active (always — react-native-css is a direct dep). */
|
|
13
8
|
export declare function hasTypographyClassNameInterop(): boolean;
|
|
14
9
|
export {};
|
|
15
10
|
//# sourceMappingURL=styled-text.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"styled-text.d.ts","sourceRoot":"","sources":["../../../../src/typography/styled-text.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAkB,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"styled-text.d.ts","sourceRoot":"","sources":["../../../../src/typography/styled-text.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAkB,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;AAG9D,KAAK,mBAAmB,GAAG,aAAa,CAAC,SAAS,GAAG;IAAE,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAAC;AAY7E,wBAAgB,cAAc,IAAI,mBAAmB,CAEpD;AAED,yFAAyF;AACzF,wBAAgB,6BAA6B,IAAI,OAAO,CAEvD"}
|
package/package.json
CHANGED
package/src/typography/index.tsx
CHANGED
|
@@ -8,7 +8,7 @@ import {
|
|
|
8
8
|
import { useTheme } from '../theme/use-theme';
|
|
9
9
|
import { fontFamilies } from '../fonts/tokens';
|
|
10
10
|
import { mergeTypographyStyle, typographyDefaultsWhenNoClassName } from './defaults';
|
|
11
|
-
import { getInteropText
|
|
11
|
+
import { getInteropText } from './styled-text';
|
|
12
12
|
|
|
13
13
|
export type TextProps = RNTextProps & {
|
|
14
14
|
className?: string;
|
|
@@ -50,16 +50,14 @@ const DEFAULT_TEXT_TYPOGRAPHY: TextStyle = {
|
|
|
50
50
|
const TextComponent = function Text({ children, style, className, ...rest }: TextProps) {
|
|
51
51
|
const { colors } = useTheme();
|
|
52
52
|
const InteropText = getInteropText();
|
|
53
|
-
const
|
|
54
|
-
|
|
55
|
-
const resolvedClassName = interopActive && className?.trim() ? className : undefined;
|
|
53
|
+
const trimmedClassName = className?.trim() ? className : undefined;
|
|
56
54
|
|
|
57
55
|
return (
|
|
58
56
|
<InteropText
|
|
59
57
|
{...rest}
|
|
60
|
-
{...(
|
|
58
|
+
{...(trimmedClassName ? { className: trimmedClassName } : {})}
|
|
61
59
|
style={mergeTypographyStyle(
|
|
62
|
-
|
|
60
|
+
trimmedClassName,
|
|
63
61
|
{ ...DEFAULT_TEXT_TYPOGRAPHY, color: colors.text },
|
|
64
62
|
SANS_FONT_FAMILY,
|
|
65
63
|
style,
|
|
@@ -1,41 +1,24 @@
|
|
|
1
1
|
import type { ComponentType } from 'react';
|
|
2
2
|
import { Text as RNText, type TextProps } from 'react-native';
|
|
3
|
-
|
|
4
|
-
import { lazyRequire } from '../utils/lazy-require';
|
|
3
|
+
import { styled } from 'react-native-css';
|
|
5
4
|
|
|
6
5
|
type StyledTextComponent = ComponentType<TextProps & { className?: string }>;
|
|
7
6
|
|
|
8
|
-
type NativeWindModule = {
|
|
9
|
-
styled: (
|
|
10
|
-
component: typeof RNText,
|
|
11
|
-
mapping?: { className: 'style' },
|
|
12
|
-
) => StyledTextComponent;
|
|
13
|
-
};
|
|
14
|
-
|
|
15
|
-
const getNativeWind = lazyRequire<NativeWindModule>('nativewind');
|
|
16
|
-
|
|
17
|
-
let interopText: StyledTextComponent = RNText;
|
|
18
|
-
|
|
19
7
|
/**
|
|
20
|
-
* RN `Text` wired for NativeWind `className` → `style` interop
|
|
21
|
-
*
|
|
22
|
-
*
|
|
8
|
+
* RN `Text` wired for NativeWind `className` → `style` interop.
|
|
9
|
+
*
|
|
10
|
+
* Import `styled` from Bloom's direct dependency `react-native-css` — not via
|
|
11
|
+
* lazy `require('nativewind')`. Metro cannot reliably bundle dynamic requires
|
|
12
|
+
* from published `@oxyhq/bloom/lib`, so the 0.29.4 lazy path left interop
|
|
13
|
+
* inactive at runtime and Bloom defaults (fontSize 13) overrode hero utilities.
|
|
23
14
|
*/
|
|
24
|
-
|
|
25
|
-
if (interopText !== RNText) {
|
|
26
|
-
return interopText;
|
|
27
|
-
}
|
|
28
|
-
|
|
29
|
-
const nativewind = getNativeWind();
|
|
30
|
-
if (nativewind?.styled) {
|
|
31
|
-
interopText = nativewind.styled(RNText, { className: 'style' });
|
|
32
|
-
}
|
|
15
|
+
const interopText: StyledTextComponent = styled(RNText, { className: 'style' });
|
|
33
16
|
|
|
17
|
+
export function getInteropText(): StyledTextComponent {
|
|
34
18
|
return interopText;
|
|
35
19
|
}
|
|
36
20
|
|
|
37
|
-
/** True when className interop is active (
|
|
21
|
+
/** True when className interop is active (always — react-native-css is a direct dep). */
|
|
38
22
|
export function hasTypographyClassNameInterop(): boolean {
|
|
39
|
-
|
|
40
|
-
return interopText !== RNText;
|
|
23
|
+
return true;
|
|
41
24
|
}
|