Skip to content

Commit f3a6f5b

Browse files
authored
Merge pull request #824 from Iterable/emb-ootb/master
Emb ootb/master
2 parents 2abe457 + 93232f5 commit f3a6f5b

43 files changed

Lines changed: 3687 additions & 171 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

example/ios/Podfile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,20 @@ target 'ReactNativeSdkExample' do
3333
:mac_catalyst_enabled => false,
3434
# :ccache_enabled => true
3535
)
36+
37+
38+
## Temporary workaround for Xcode 26.4
39+
installer.pods_project.targets.each do |target|
40+
target.build_configurations.each do |config|
41+
# fmt/base.h unconditionally redefines FMT_USE_CONSTEVAL based on __cplusplus,
42+
# so preprocessor defines are overwritten. The reliable fix is to compile fmt
43+
# in C++17 mode: FMT_CPLUSPLUS (201703L) < 201709L → FMT_USE_CONSTEVAL = 0.
44+
# All other pods stay in C++20 (React-perflogger needs std::unordered_map::contains).
45+
if target.name == 'fmt'
46+
config.build_settings['CLANG_CXX_LANGUAGE_STANDARD'] = 'c++17'
47+
end
48+
49+
end
50+
end
3651
end
3752
end

example/ios/ReactNativeSdkExample.xcodeproj/project.pbxproj

Lines changed: 48 additions & 44 deletions
Large diffs are not rendered by default.

example/ios/ReactNativeSdkExample.xcodeproj/xcshareddata/xcschemes/ReactNativeSdkExample.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1210"
3+
LastUpgradeVersion = "2640"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

example/src/components/Embedded/Embedded.styles.ts

Lines changed: 106 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,131 @@
11
import { StyleSheet } from 'react-native';
2-
import { button, buttonText, container, hr, link, input, title, subtitle } from '../../constants';
3-
import { utilityColors, backgroundColors } from '../../constants/styles/colors';
2+
import {
3+
backgroundColors,
4+
button,
5+
buttonText,
6+
colors,
7+
container,
8+
hr,
9+
input,
10+
modalButton,
11+
modalButtons,
12+
modalContent,
13+
modalOverlay,
14+
subtitle,
15+
title,
16+
utilityColors
17+
} from '../../constants';
418

519
const styles = StyleSheet.create({
620
button,
721
buttonText,
8-
container,
22+
compactUtilityButton: {
23+
...button,
24+
paddingVertical: 8,
25+
},
26+
compactUtilityButtonText: {
27+
...buttonText,
28+
fontSize: 12,
29+
lineHeight: 17,
30+
},
31+
container:{
32+
...container,
33+
marginHorizontal: 0,
34+
marginTop: 0,
35+
paddingHorizontal: 0,
36+
},
37+
embeddedHr: {
38+
...hr,
39+
marginVertical: 12,
40+
},
941
embeddedSection: {
1042
display: 'flex',
1143
flexDirection: 'column',
1244
gap: 16,
1345
paddingHorizontal: 16,
1446
},
15-
embeddedTitle: {
16-
fontSize: 16,
17-
fontWeight: 'bold',
18-
lineHeight: 20,
47+
inputContainer: {
48+
marginVertical: 10,
1949
},
20-
embeddedTitleContainer: {
21-
display: 'flex',
50+
jsonEditor: {
51+
...input,
52+
fontSize: 12,
53+
height: 220,
54+
},
55+
modalButton,
56+
modalButtons,
57+
modalContent,
58+
modalOverlay,
59+
placementIdsInput: {
60+
...input,
61+
flex: 1,
62+
marginBottom: 0,
63+
minWidth: 72,
64+
},
65+
placementIdsLabel: {
66+
flexShrink: 1,
67+
fontSize: 14,
68+
},
69+
placementIdsRow: {
70+
alignItems: 'center',
2271
flexDirection: 'row',
72+
gap: 8,
73+
marginBottom: 8,
2374
},
24-
hr,
25-
inputContainer: {
26-
marginVertical: 10,
75+
sessionButtonHalf: {
76+
flex: 1,
77+
},
78+
sessionButtonsRow: {
79+
flexDirection: 'row',
80+
gap: 8,
81+
marginBottom: 8,
2782
},
28-
link,
2983
subtitle: { ...subtitle, textAlign: 'center' },
3084
text: { textAlign: 'center' },
3185
textInput: input,
3286
title: { ...title, textAlign: 'center' },
3387
utilitySection: {
3488
paddingHorizontal: 16,
3589
},
90+
viewTypeButton: {
91+
alignItems: 'center',
92+
borderColor: colors.brandCyan,
93+
borderRadius: 8,
94+
borderWidth: 2,
95+
flex: 1,
96+
paddingHorizontal: 8,
97+
paddingVertical: 7,
98+
},
99+
viewTypeButtonSelected: {
100+
backgroundColor: colors.brandCyan,
101+
},
102+
viewTypeButtonText: {
103+
color: colors.brandCyan,
104+
fontSize: 12,
105+
fontWeight: '600',
106+
},
107+
viewTypeButtonTextSelected: {
108+
color: colors.backgroundPrimary,
109+
},
110+
viewTypeButtons: {
111+
flex: 1,
112+
flexDirection: 'row',
113+
gap: 8,
114+
justifyContent: 'space-around',
115+
minWidth: 0,
116+
},
117+
viewTypeLabel: {
118+
flexShrink: 0,
119+
fontSize: 13,
120+
fontWeight: '600',
121+
},
122+
viewTypeSelector: {
123+
alignItems: 'center',
124+
flexDirection: 'row',
125+
flexWrap: 'wrap',
126+
gap: 8,
127+
marginVertical: 12,
128+
},
36129
warningContainer: {
37130
backgroundColor: backgroundColors.backgroundWarningSubtle,
38131
borderLeftColor: utilityColors.warning100,

0 commit comments

Comments
 (0)