@react-native-styled-system/core 1.2.0 → 1.2.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.
|
@@ -54,14 +54,14 @@ const useSx = (props, {
|
|
|
54
54
|
sx: mergedSx,
|
|
55
55
|
styleType
|
|
56
56
|
});
|
|
57
|
-
const composedStyle = !mergedSxStyle ? props?.style : props?.style ?
|
|
57
|
+
const composedStyle = !mergedSxStyle ? props?.style : props?.style ? [mergedSxStyle, props.style] : mergedSxStyle;
|
|
58
58
|
if (_jsUtil.is.function(transform)) {
|
|
59
59
|
const transformedSx = transform(_reactNative.StyleSheet.flatten(composedStyle));
|
|
60
|
-
const ret =
|
|
60
|
+
const ret = [composedStyle, (0, _propsToThemedStyle.propsToThemedStyle)({
|
|
61
61
|
theme,
|
|
62
62
|
sx: transformedSx,
|
|
63
63
|
styleType
|
|
64
|
-
})
|
|
64
|
+
})];
|
|
65
65
|
if (cache) {
|
|
66
66
|
return (0, _StyleHash.getCachedStyle)(ret);
|
|
67
67
|
} else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_reactNative","_jsUtil","_SxProps","_useStableCallback","_mutateShortcutPropToOriginalKeys","_printWarning","_StyleHash","_StyledSystemProvider","_propsToThemedStyle","defaultUseSxOptions","styleType","useSx","props","theme","optionTheme","transform","fallback","cache","styledSystemContext","useContext","StyledSystemContext","getStyle","useStableCallback","skip","is","function","propsToThemedStyle","sx","printWarning","mergedSx","mutateShortcutPropToOriginalKeys","mergedSxStyle","composedStyle","style","
|
|
1
|
+
{"version":3,"names":["_react","require","_reactNative","_jsUtil","_SxProps","_useStableCallback","_mutateShortcutPropToOriginalKeys","_printWarning","_StyleHash","_StyledSystemProvider","_propsToThemedStyle","defaultUseSxOptions","styleType","useSx","props","theme","optionTheme","transform","fallback","cache","styledSystemContext","useContext","StyledSystemContext","getStyle","useStableCallback","skip","is","function","propsToThemedStyle","sx","printWarning","mergedSx","mutateShortcutPropToOriginalKeys","mergedSxStyle","composedStyle","style","transformedSx","StyleSheet","flatten","ret","getCachedStyle","filteredProps","useMemo","_viewStylePropList","forEach","keyName","_textStylePropList","exports"],"sourceRoot":"../../../src","sources":["hook/useSx.ts"],"mappings":"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","ignoreList":[]}
|
package/lib/module/hook/useSx.js
CHANGED
|
@@ -48,14 +48,14 @@ export const useSx = (props, {
|
|
|
48
48
|
sx: mergedSx,
|
|
49
49
|
styleType
|
|
50
50
|
});
|
|
51
|
-
const composedStyle = !mergedSxStyle ? props?.style : props?.style ?
|
|
51
|
+
const composedStyle = !mergedSxStyle ? props?.style : props?.style ? [mergedSxStyle, props.style] : mergedSxStyle;
|
|
52
52
|
if (is.function(transform)) {
|
|
53
53
|
const transformedSx = transform(StyleSheet.flatten(composedStyle));
|
|
54
|
-
const ret =
|
|
54
|
+
const ret = [composedStyle, propsToThemedStyle({
|
|
55
55
|
theme,
|
|
56
56
|
sx: transformedSx,
|
|
57
57
|
styleType
|
|
58
|
-
})
|
|
58
|
+
})];
|
|
59
59
|
if (cache) {
|
|
60
60
|
return getCachedStyle(ret);
|
|
61
61
|
} else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useContext","useMemo","StyleSheet","is","_textStylePropList","_viewStylePropList","useStableCallback","mutateShortcutPropToOriginalKeys","printWarning","getCachedStyle","StyledSystemContext","propsToThemedStyle","defaultUseSxOptions","styleType","useSx","props","theme","optionTheme","transform","fallback","cache","styledSystemContext","getStyle","skip","function","sx","mergedSx","mergedSxStyle","composedStyle","style","
|
|
1
|
+
{"version":3,"names":["useContext","useMemo","StyleSheet","is","_textStylePropList","_viewStylePropList","useStableCallback","mutateShortcutPropToOriginalKeys","printWarning","getCachedStyle","StyledSystemContext","propsToThemedStyle","defaultUseSxOptions","styleType","useSx","props","theme","optionTheme","transform","fallback","cache","styledSystemContext","getStyle","skip","function","sx","mergedSx","mergedSxStyle","composedStyle","style","transformedSx","flatten","ret","filteredProps","forEach","keyName"],"sourceRoot":"../../../src","sources":["hook/useSx.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSx.d.ts","sourceRoot":"","sources":["../../../../src/hook/useSx.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAIpE,OAAO,KAAK,EAAe,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAElE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAMvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAGlE,KAAK,KAAK,GAAG;IAAE,KAAK,CAAC,EAAE,SAAS,CAAC,GAAG,CAAC,CAAA;CAAE,GAAG,WAAW,CAAC;AAEtD,MAAM,MAAM,cAAc,GAAG,CAAC,KAAK,EAAE,SAAS,KAAK,WAAW,CAAC;AAC/D,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;AACpD,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,SAAS,CAAC,EAAE,cAAc,CAAC;IAC3B,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,KAAK,qEACR,CAAC,GAAG,IAAI,mEAOb,YAAY;oBAIwB,UAAU,CAAC,CAAC,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"useSx.d.ts","sourceRoot":"","sources":["../../../../src/hook/useSx.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAIpE,OAAO,KAAK,EAAe,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAElE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAMvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAGlE,KAAK,KAAK,GAAG;IAAE,KAAK,CAAC,EAAE,SAAS,CAAC,GAAG,CAAC,CAAA;CAAE,GAAG,WAAW,CAAC;AAEtD,MAAM,MAAM,cAAc,GAAG,CAAC,KAAK,EAAE,SAAS,KAAK,WAAW,CAAC;AAC/D,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;AACpD,MAAM,MAAM,YAAY,GAAG;IACzB,KAAK,CAAC,EAAE,UAAU,CAAC;IACnB,SAAS,CAAC,EAAE,eAAe,CAAC;IAC5B,SAAS,CAAC,EAAE,cAAc,CAAC;IAC3B,QAAQ,CAAC,EAAE,aAAa,CAAC;IACzB,KAAK,CAAC,EAAE,OAAO,CAAC;CACjB,CAAC;AAEF,eAAO,MAAM,KAAK,qEACR,CAAC,GAAG,IAAI,mEAOb,YAAY;oBAIwB,UAAU,CAAC,CAAC,GAAG,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoEhE,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@react-native-styled-system/core",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.1",
|
|
4
4
|
"description": "React Native Styled System",
|
|
5
5
|
"main": "lib/commonjs/index.js",
|
|
6
6
|
"types": "lib/typescript/src/index.d.ts",
|
|
@@ -67,5 +67,5 @@
|
|
|
67
67
|
"**/*.test.*"
|
|
68
68
|
]
|
|
69
69
|
},
|
|
70
|
-
"gitHead": "
|
|
70
|
+
"gitHead": "b8feacc50e72c139be6d7a68de6cb6cfce54c67e"
|
|
71
71
|
}
|
package/src/hook/useSx.ts
CHANGED
|
@@ -72,16 +72,13 @@ export const useSx = <S extends ViewStyle = ViewStyle, P extends Props = Props>(
|
|
|
72
72
|
const composedStyle = !mergedSxStyle
|
|
73
73
|
? props?.style
|
|
74
74
|
: props?.style
|
|
75
|
-
?
|
|
75
|
+
? [mergedSxStyle, props.style]
|
|
76
76
|
: mergedSxStyle;
|
|
77
77
|
|
|
78
78
|
if (is.function(transform)) {
|
|
79
79
|
const transformedSx = transform(StyleSheet.flatten(composedStyle));
|
|
80
80
|
|
|
81
|
-
const ret =
|
|
82
|
-
composedStyle,
|
|
83
|
-
propsToThemedStyle({ theme, sx: transformedSx, styleType }),
|
|
84
|
-
);
|
|
81
|
+
const ret = [composedStyle, propsToThemedStyle({ theme, sx: transformedSx, styleType })];
|
|
85
82
|
|
|
86
83
|
if (cache) {
|
|
87
84
|
return getCachedStyle(ret);
|