react-native 0.67.1 → 0.67.4
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/Libraries/Components/Switch/Switch.js +2 -1
- package/Libraries/Core/ReactNativeVersion.js +1 -1
- package/Libraries/Text/TextInput/Multiline/RCTUITextView.m +1 -29
- package/Libraries/Text/TextInput/RCTBaseTextInputView.m +2 -0
- package/React/Base/RCTVersion.m +1 -1
- package/React/Fabric/Mounting/ComponentViews/TextInput/RCTTextInputComponentView.mm +4 -2
- package/ReactAndroid/gradle.properties +2 -2
- package/ReactAndroid/src/main/java/com/facebook/react/ReactRootView.java +7 -3
- package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java +1 -1
- package/ReactAndroid/src/main/java/com/facebook/react/views/text/ReactTextShadowNode.java +0 -5
- package/ReactAndroid/src/main/third-party/java/okhttp/BUCK +4 -4
- package/ReactCommon/cxxreact/ReactNativeVersion.h +1 -1
- package/android/com/facebook/react/react-native/{0.67.1/react-native-0.67.1.aar → 0.67.4/react-native-0.67.4.aar} +0 -0
- package/android/com/facebook/react/react-native/0.67.4/react-native-0.67.4.aar.md5 +1 -0
- package/android/com/facebook/react/react-native/0.67.4/react-native-0.67.4.aar.sha1 +1 -0
- package/android/com/facebook/react/react-native/0.67.4/react-native-0.67.4.aar.sha256 +1 -0
- package/android/com/facebook/react/react-native/0.67.4/react-native-0.67.4.aar.sha512 +1 -0
- package/android/com/facebook/react/react-native/{0.67.1/react-native-0.67.1.module → 0.67.4/react-native-0.67.4.module} +19 -19
- package/android/com/facebook/react/react-native/0.67.4/react-native-0.67.4.module.md5 +1 -0
- package/android/com/facebook/react/react-native/0.67.4/react-native-0.67.4.module.sha1 +1 -0
- package/android/com/facebook/react/react-native/0.67.4/react-native-0.67.4.module.sha256 +1 -0
- package/android/com/facebook/react/react-native/0.67.4/react-native-0.67.4.module.sha512 +1 -0
- package/android/com/facebook/react/react-native/{0.67.1/react-native-0.67.1.pom → 0.67.4/react-native-0.67.4.pom} +3 -3
- package/android/com/facebook/react/react-native/0.67.4/react-native-0.67.4.pom.md5 +1 -0
- package/android/com/facebook/react/react-native/0.67.4/react-native-0.67.4.pom.sha1 +1 -0
- package/android/com/facebook/react/react-native/0.67.4/react-native-0.67.4.pom.sha256 +1 -0
- package/android/com/facebook/react/react-native/0.67.4/react-native-0.67.4.pom.sha512 +1 -0
- package/android/com/facebook/react/react-native/maven-metadata.xml +4 -4
- package/android/com/facebook/react/react-native/maven-metadata.xml.md5 +1 -1
- package/android/com/facebook/react/react-native/maven-metadata.xml.sha1 +1 -1
- package/android/com/facebook/react/react-native/maven-metadata.xml.sha256 +1 -1
- package/android/com/facebook/react/react-native/maven-metadata.xml.sha512 +1 -1
- package/jest/mockModal.js +2 -2
- package/package.json +1 -1
- package/scripts/find-node.sh +6 -2
- package/scripts/react_native_pods.rb +2 -1
- package/template/Gemfile.lock +6 -6
- package/template/package.json +1 -1
- package/android/com/facebook/react/react-native/0.67.1/react-native-0.67.1.aar.md5 +0 -1
- package/android/com/facebook/react/react-native/0.67.1/react-native-0.67.1.aar.sha1 +0 -1
- package/android/com/facebook/react/react-native/0.67.1/react-native-0.67.1.aar.sha256 +0 -1
- package/android/com/facebook/react/react-native/0.67.1/react-native-0.67.1.aar.sha512 +0 -1
- package/android/com/facebook/react/react-native/0.67.1/react-native-0.67.1.module.md5 +0 -1
- package/android/com/facebook/react/react-native/0.67.1/react-native-0.67.1.module.sha1 +0 -1
- package/android/com/facebook/react/react-native/0.67.1/react-native-0.67.1.module.sha256 +0 -1
- package/android/com/facebook/react/react-native/0.67.1/react-native-0.67.1.module.sha512 +0 -1
- package/android/com/facebook/react/react-native/0.67.1/react-native-0.67.1.pom.md5 +0 -1
- package/android/com/facebook/react/react-native/0.67.1/react-native-0.67.1.pom.sha1 +0 -1
- package/android/com/facebook/react/react-native/0.67.1/react-native-0.67.1.pom.sha256 +0 -1
- package/android/com/facebook/react/react-native/0.67.1/react-native-0.67.1.pom.sha512 +0 -1
|
@@ -170,7 +170,8 @@ const SwitchWithForwardedRef: React.AbstractComponent<
|
|
|
170
170
|
// that the update should be ignored and we should stick with the value
|
|
171
171
|
// that we have in JS.
|
|
172
172
|
const jsValue = value === true;
|
|
173
|
-
const shouldUpdateNativeSwitch =
|
|
173
|
+
const shouldUpdateNativeSwitch =
|
|
174
|
+
native.value != null && native.value !== jsValue;
|
|
174
175
|
if (
|
|
175
176
|
shouldUpdateNativeSwitch &&
|
|
176
177
|
nativeSwitchRef.current?.setNativeProps != null
|
|
@@ -147,21 +147,7 @@ static UIColor *defaultPlaceholderColor()
|
|
|
147
147
|
|
|
148
148
|
- (void)setAttributedText:(NSAttributedString *)attributedText
|
|
149
149
|
{
|
|
150
|
-
|
|
151
|
-
// when entering complex input languages such as Chinese, Korean or Japanese.
|
|
152
|
-
// see: https://github.com/facebook/react-native/issues/19339
|
|
153
|
-
|
|
154
|
-
// We try to avoid calling this method as much as we can.
|
|
155
|
-
// If the text has changed, there is nothing we can do.
|
|
156
|
-
if (![super.attributedText.string isEqualToString:attributedText.string]) {
|
|
157
|
-
[super setAttributedText:attributedText];
|
|
158
|
-
} else {
|
|
159
|
-
// But if the text is preserved, we just copying the attributes from the source string.
|
|
160
|
-
if (![super.attributedText isEqualToAttributedString:attributedText]) {
|
|
161
|
-
[self copyTextAttributesFrom:attributedText];
|
|
162
|
-
}
|
|
163
|
-
}
|
|
164
|
-
|
|
150
|
+
[super setAttributedText:attributedText];
|
|
165
151
|
[self textDidChange];
|
|
166
152
|
}
|
|
167
153
|
|
|
@@ -311,18 +297,4 @@ static UIColor *defaultPlaceholderColor()
|
|
|
311
297
|
|
|
312
298
|
#pragma mark - Utility Methods
|
|
313
299
|
|
|
314
|
-
- (void)copyTextAttributesFrom:(NSAttributedString *)sourceString
|
|
315
|
-
{
|
|
316
|
-
[self.textStorage beginEditing];
|
|
317
|
-
|
|
318
|
-
NSTextStorage *textStorage = self.textStorage;
|
|
319
|
-
[sourceString enumerateAttributesInRange:NSMakeRange(0, sourceString.length)
|
|
320
|
-
options:NSAttributedStringEnumerationReverse
|
|
321
|
-
usingBlock:^(NSDictionary<NSAttributedStringKey,id> * _Nonnull attrs, NSRange range, BOOL * _Nonnull stop) {
|
|
322
|
-
[textStorage setAttributes:attrs range:range];
|
|
323
|
-
}];
|
|
324
|
-
|
|
325
|
-
[self.textStorage endEditing];
|
|
326
|
-
}
|
|
327
|
-
|
|
328
300
|
@end
|
|
@@ -104,6 +104,7 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
|
|
|
104
104
|
// Similarly, when the user is in the middle of inputting some text in Japanese/Chinese, there will be styling on the
|
|
105
105
|
// text that we should disregard. See https://developer.apple.com/documentation/uikit/uitextinput/1614489-markedtextrange?language=objc
|
|
106
106
|
// for more info.
|
|
107
|
+
// Also, updating the attributed text while inputting Korean language will break input mechanism.
|
|
107
108
|
// If the user added an emoji, the system adds a font attribute for the emoji and stores the original font in NSOriginalFont.
|
|
108
109
|
// Lastly, when entering a password, etc., there will be additional styling on the field as the native text view
|
|
109
110
|
// handles showing the last character for a split second.
|
|
@@ -116,6 +117,7 @@ RCT_NOT_IMPLEMENTED(- (instancetype)initWithFrame:(CGRect)frame)
|
|
|
116
117
|
|
|
117
118
|
BOOL shouldFallbackToBareTextComparison =
|
|
118
119
|
[self.backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"dictation"] ||
|
|
120
|
+
[self.backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"ko-KR"] ||
|
|
119
121
|
self.backedTextInputView.markedTextRange ||
|
|
120
122
|
self.backedTextInputView.isSecureTextEntry ||
|
|
121
123
|
fontHasBeenUpdatedBySystem;
|
package/React/Base/RCTVersion.m
CHANGED
|
@@ -580,8 +580,9 @@ using namespace facebook::react;
|
|
|
580
580
|
// the settings on a dictation.
|
|
581
581
|
// Similarly, when the user is in the middle of inputting some text in Japanese/Chinese, there will be styling on the
|
|
582
582
|
// text that we should disregard. See
|
|
583
|
-
// https://developer.apple.com/documentation/uikit/uitextinput/1614489-markedtextrange?language=objc for more info.
|
|
584
|
-
//
|
|
583
|
+
// https://developer.apple.com/documentation/uikit/uitextinput/1614489-markedtextrange?language=objc for more info.
|
|
584
|
+
// Also, updating the attributed text while inputting Korean language will break input mechanism.
|
|
585
|
+
// If the user added an emoji, the system adds a font attribute for the emoji and stores the original font in
|
|
585
586
|
// NSOriginalFont. Lastly, when entering a password, etc., there will be additional styling on the field as the native
|
|
586
587
|
// text view handles showing the last character for a split second.
|
|
587
588
|
__block BOOL fontHasBeenUpdatedBySystem = false;
|
|
@@ -596,6 +597,7 @@ using namespace facebook::react;
|
|
|
596
597
|
|
|
597
598
|
BOOL shouldFallbackToBareTextComparison =
|
|
598
599
|
[_backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"dictation"] ||
|
|
600
|
+
[_backedTextInputView.textInputMode.primaryLanguage isEqualToString:@"ko-KR"] ||
|
|
599
601
|
_backedTextInputView.markedTextRange || _backedTextInputView.isSecureTextEntry || fontHasBeenUpdatedBySystem;
|
|
600
602
|
|
|
601
603
|
if (shouldFallbackToBareTextComparison) {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
VERSION_NAME=0.67.
|
|
1
|
+
VERSION_NAME=0.67.4
|
|
2
2
|
GROUP=com.facebook.react
|
|
3
3
|
|
|
4
4
|
POM_NAME=ReactNative
|
|
@@ -12,7 +12,7 @@ JUNIT_VERSION=4.12
|
|
|
12
12
|
|
|
13
13
|
ANDROIDX_TEST_VERSION=1.1.0
|
|
14
14
|
FRESCO_VERSION=2.5.0
|
|
15
|
-
OKHTTP_VERSION=4.9.
|
|
15
|
+
OKHTTP_VERSION=4.9.2
|
|
16
16
|
SO_LOADER_VERSION=0.10.1
|
|
17
17
|
|
|
18
18
|
BOOST_VERSION=1_63_0
|
|
@@ -26,6 +26,7 @@ import android.view.Surface;
|
|
|
26
26
|
import android.view.View;
|
|
27
27
|
import android.view.ViewGroup;
|
|
28
28
|
import android.view.ViewTreeObserver;
|
|
29
|
+
import android.view.WindowInsets;
|
|
29
30
|
import android.view.WindowManager;
|
|
30
31
|
import android.widget.FrameLayout;
|
|
31
32
|
import androidx.annotation.Nullable;
|
|
@@ -775,9 +776,12 @@ public class ReactRootView extends FrameLayout implements RootView, ReactRoot {
|
|
|
775
776
|
getRootView().getWindowVisibleDisplayFrame(mVisibleViewArea);
|
|
776
777
|
int notchHeight = 0;
|
|
777
778
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
|
|
778
|
-
|
|
779
|
-
if (
|
|
780
|
-
|
|
779
|
+
WindowInsets insets = getRootView().getRootWindowInsets();
|
|
780
|
+
if (insets != null) {
|
|
781
|
+
DisplayCutout displayCutout = insets.getDisplayCutout();
|
|
782
|
+
if (displayCutout != null) {
|
|
783
|
+
notchHeight = displayCutout.getSafeInsetTop();
|
|
784
|
+
}
|
|
781
785
|
}
|
|
782
786
|
}
|
|
783
787
|
final int heightDiff =
|
|
@@ -343,11 +343,6 @@ public class ReactTextShadowNode extends ReactBaseTextShadowNode {
|
|
|
343
343
|
mJustificationMode);
|
|
344
344
|
uiViewOperationQueue.enqueueUpdateExtraData(getReactTag(), reactTextUpdate);
|
|
345
345
|
}
|
|
346
|
-
|
|
347
|
-
if (mAdjustsFontSizeToFit) {
|
|
348
|
-
// Nodes with `adjustsFontSizeToFit` enabled need to be remeasured on every relayout.
|
|
349
|
-
markUpdated();
|
|
350
|
-
}
|
|
351
346
|
}
|
|
352
347
|
|
|
353
348
|
@ReactProp(name = "onTextLayout")
|
|
@@ -30,8 +30,8 @@ rn_prebuilt_jar(
|
|
|
30
30
|
|
|
31
31
|
fb_native.remote_file(
|
|
32
32
|
name = "okhttp3-binary.jar",
|
|
33
|
-
sha1 = "
|
|
34
|
-
url = "mvn:com.squareup.okhttp3:okhttp:jar:4.9.
|
|
33
|
+
sha1 = "5302714ee9320b64cf65ed865e5f65981ef9ba46",
|
|
34
|
+
url = "mvn:com.squareup.okhttp3:okhttp:jar:4.9.2",
|
|
35
35
|
)
|
|
36
36
|
|
|
37
37
|
rn_prebuilt_jar(
|
|
@@ -41,6 +41,6 @@ rn_prebuilt_jar(
|
|
|
41
41
|
|
|
42
42
|
fb_native.remote_file(
|
|
43
43
|
name = "okhttp3-urlconnection-binary.jar",
|
|
44
|
-
sha1 = "
|
|
45
|
-
url = "mvn:com.squareup.okhttp3:okhttp-urlconnection:jar:4.9.
|
|
44
|
+
sha1 = "3b9e64d3d56370bc7488ed8b336d17a8013cb336",
|
|
45
|
+
url = "mvn:com.squareup.okhttp3:okhttp-urlconnection:jar:4.9.2",
|
|
46
46
|
)
|
|
Binary file
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
bd1e9f69a51a0ca75bdd629b4a07b058
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
ccd12912be0c8ec6a033da9b58fae97e040d7853
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
3efa9f0bf3f193e85556a780d66780e4c4f6203d5398838faff78f6cf0f7db79
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
910606a396e1606349d06ccdb60f6da5e68e40a1e48f9a339e2dcce2bbb6bc5f95e36a6e32f1879e3cf79486ddfd34e065803b473a39f614a8e1a512eb0b5aa3
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
"component": {
|
|
4
4
|
"group": "com.facebook.react",
|
|
5
5
|
"module": "react-native",
|
|
6
|
-
"version": "0.67.
|
|
6
|
+
"version": "0.67.4",
|
|
7
7
|
"attributes": {
|
|
8
8
|
"org.gradle.status": "release"
|
|
9
9
|
}
|
|
@@ -104,14 +104,14 @@
|
|
|
104
104
|
"group": "com.squareup.okhttp3",
|
|
105
105
|
"module": "okhttp",
|
|
106
106
|
"version": {
|
|
107
|
-
"requires": "4.9.
|
|
107
|
+
"requires": "4.9.2"
|
|
108
108
|
}
|
|
109
109
|
},
|
|
110
110
|
{
|
|
111
111
|
"group": "com.squareup.okhttp3",
|
|
112
112
|
"module": "okhttp-urlconnection",
|
|
113
113
|
"version": {
|
|
114
|
-
"requires": "4.9.
|
|
114
|
+
"requires": "4.9.2"
|
|
115
115
|
}
|
|
116
116
|
},
|
|
117
117
|
{
|
|
@@ -131,13 +131,13 @@
|
|
|
131
131
|
],
|
|
132
132
|
"files": [
|
|
133
133
|
{
|
|
134
|
-
"name": "react-native-0.67.
|
|
135
|
-
"url": "react-native-0.67.
|
|
136
|
-
"size":
|
|
137
|
-
"sha512": "
|
|
138
|
-
"sha256": "
|
|
139
|
-
"sha1": "
|
|
140
|
-
"md5": "
|
|
134
|
+
"name": "react-native-0.67.4.aar",
|
|
135
|
+
"url": "react-native-0.67.4.aar",
|
|
136
|
+
"size": 17805019,
|
|
137
|
+
"sha512": "910606a396e1606349d06ccdb60f6da5e68e40a1e48f9a339e2dcce2bbb6bc5f95e36a6e32f1879e3cf79486ddfd34e065803b473a39f614a8e1a512eb0b5aa3",
|
|
138
|
+
"sha256": "3efa9f0bf3f193e85556a780d66780e4c4f6203d5398838faff78f6cf0f7db79",
|
|
139
|
+
"sha1": "ccd12912be0c8ec6a033da9b58fae97e040d7853",
|
|
140
|
+
"md5": "bd1e9f69a51a0ca75bdd629b4a07b058"
|
|
141
141
|
}
|
|
142
142
|
]
|
|
143
143
|
},
|
|
@@ -231,14 +231,14 @@
|
|
|
231
231
|
"group": "com.squareup.okhttp3",
|
|
232
232
|
"module": "okhttp",
|
|
233
233
|
"version": {
|
|
234
|
-
"requires": "4.9.
|
|
234
|
+
"requires": "4.9.2"
|
|
235
235
|
}
|
|
236
236
|
},
|
|
237
237
|
{
|
|
238
238
|
"group": "com.squareup.okhttp3",
|
|
239
239
|
"module": "okhttp-urlconnection",
|
|
240
240
|
"version": {
|
|
241
|
-
"requires": "4.9.
|
|
241
|
+
"requires": "4.9.2"
|
|
242
242
|
}
|
|
243
243
|
},
|
|
244
244
|
{
|
|
@@ -258,13 +258,13 @@
|
|
|
258
258
|
],
|
|
259
259
|
"files": [
|
|
260
260
|
{
|
|
261
|
-
"name": "react-native-0.67.
|
|
262
|
-
"url": "react-native-0.67.
|
|
263
|
-
"size":
|
|
264
|
-
"sha512": "
|
|
265
|
-
"sha256": "
|
|
266
|
-
"sha1": "
|
|
267
|
-
"md5": "
|
|
261
|
+
"name": "react-native-0.67.4.aar",
|
|
262
|
+
"url": "react-native-0.67.4.aar",
|
|
263
|
+
"size": 17805019,
|
|
264
|
+
"sha512": "910606a396e1606349d06ccdb60f6da5e68e40a1e48f9a339e2dcce2bbb6bc5f95e36a6e32f1879e3cf79486ddfd34e065803b473a39f614a8e1a512eb0b5aa3",
|
|
265
|
+
"sha256": "3efa9f0bf3f193e85556a780d66780e4c4f6203d5398838faff78f6cf0f7db79",
|
|
266
|
+
"sha1": "ccd12912be0c8ec6a033da9b58fae97e040d7853",
|
|
267
|
+
"md5": "bd1e9f69a51a0ca75bdd629b4a07b058"
|
|
268
268
|
}
|
|
269
269
|
]
|
|
270
270
|
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
eed06ac285081301749c620777490dbe
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
29b6c41720031031b85bbdffee56e2926ddc3a87
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
e62abd7a7b05ea0f0b889680a64e0a2c56e419e2fcfbaccfc9453f1338912695
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
f7557cb6ead36e65473a42a46b3fbd0a758ca4ed1259c280e60cf8757d6347fe86b1909111b73f085b7a8d3443e21785675d1bc552c4c591b7d8da60f78b52ab
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
<modelVersion>4.0.0</modelVersion>
|
|
10
10
|
<groupId>com.facebook.react</groupId>
|
|
11
11
|
<artifactId>react-native</artifactId>
|
|
12
|
-
<version>0.67.
|
|
12
|
+
<version>0.67.4</version>
|
|
13
13
|
<packaging>aar</packaging>
|
|
14
14
|
<name>ReactNative</name>
|
|
15
15
|
<description>A framework for building native apps with React</description>
|
|
@@ -102,13 +102,13 @@
|
|
|
102
102
|
<dependency>
|
|
103
103
|
<groupId>com.squareup.okhttp3</groupId>
|
|
104
104
|
<artifactId>okhttp</artifactId>
|
|
105
|
-
<version>4.9.
|
|
105
|
+
<version>4.9.2</version>
|
|
106
106
|
<scope>compile</scope>
|
|
107
107
|
</dependency>
|
|
108
108
|
<dependency>
|
|
109
109
|
<groupId>com.squareup.okhttp3</groupId>
|
|
110
110
|
<artifactId>okhttp-urlconnection</artifactId>
|
|
111
|
-
<version>4.9.
|
|
111
|
+
<version>4.9.2</version>
|
|
112
112
|
<scope>compile</scope>
|
|
113
113
|
</dependency>
|
|
114
114
|
<dependency>
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
8e3b28a2c0d6df5ef840970a159467d7
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
8c5f0d5b23b0baba55a5637406b29231be95bf9f
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
ea76f56802867e4cd0062645cde51b2517ed4766a3d4e9936ebf1c926fc0be3f
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
642ed845bd691c51c6b6967fd0463856f1c2df9889035c3bddcba33b2ce81dd71305c841f414fd1e3073aeb48a52a17b81c9a6acc1507dd42e26130d5f14b349
|
|
@@ -3,11 +3,11 @@
|
|
|
3
3
|
<groupId>com.facebook.react</groupId>
|
|
4
4
|
<artifactId>react-native</artifactId>
|
|
5
5
|
<versioning>
|
|
6
|
-
<latest>0.67.
|
|
7
|
-
<release>0.67.
|
|
6
|
+
<latest>0.67.4</latest>
|
|
7
|
+
<release>0.67.4</release>
|
|
8
8
|
<versions>
|
|
9
|
-
<version>0.67.
|
|
9
|
+
<version>0.67.4</version>
|
|
10
10
|
</versions>
|
|
11
|
-
<lastUpdated>
|
|
11
|
+
<lastUpdated>20220318005840</lastUpdated>
|
|
12
12
|
</versioning>
|
|
13
13
|
</metadata>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
d4555b4b03747d01a21a1c7748caed94
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
d3afaaa71a47a5a8cd9474e52844e10c2ca848a0
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
41994f69fe977c31167e66b07d64ad93c6f3e8625093d233bf3c5880cb123397
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
b9456797fe65a9e86425488fdf300b70521719fb342a4de059c055719d65975a26caca027977cb9f9c0e0d7bb3c1712370b29dd5ce19554e252e96b026adc92e
|
package/jest/mockModal.js
CHANGED
|
@@ -13,11 +13,11 @@
|
|
|
13
13
|
'use strict';
|
|
14
14
|
|
|
15
15
|
const React = require('react');
|
|
16
|
-
|
|
16
|
+
import typeof Modal from '../Libraries/Modal/Modal';
|
|
17
17
|
|
|
18
18
|
function mockModal(BaseComponent: $FlowFixMe) {
|
|
19
19
|
class ModalMock extends BaseComponent {
|
|
20
|
-
render(): React.Element<
|
|
20
|
+
render(): React.Element<Modal> {
|
|
21
21
|
return (
|
|
22
22
|
<BaseComponent {...this.props}>
|
|
23
23
|
{this.props.visible !== true ? null : this.props.children}
|
package/package.json
CHANGED
package/scripts/find-node.sh
CHANGED
|
@@ -19,12 +19,16 @@ fi
|
|
|
19
19
|
# Define NVM_DIR and source the nvm.sh setup script
|
|
20
20
|
[ -z "$NVM_DIR" ] && export NVM_DIR="$HOME/.nvm"
|
|
21
21
|
|
|
22
|
+
# Source nvm with '--no-use' and then `nvm use` to respect .nvmrc
|
|
23
|
+
# See: https://github.com/nvm-sh/nvm/issues/2053
|
|
22
24
|
if [[ -s "$HOME/.nvm/nvm.sh" ]]; then
|
|
23
25
|
# shellcheck source=/dev/null
|
|
24
|
-
. "$HOME/.nvm/nvm.sh"
|
|
26
|
+
. "$HOME/.nvm/nvm.sh" --no-use
|
|
27
|
+
nvm use 2> /dev/null || nvm use default
|
|
25
28
|
elif [[ -x "$(command -v brew)" && -s "$(brew --prefix nvm)/nvm.sh" ]]; then
|
|
26
29
|
# shellcheck source=/dev/null
|
|
27
|
-
. "$(brew --prefix nvm)/nvm.sh"
|
|
30
|
+
. "$(brew --prefix nvm)/nvm.sh" --no-use
|
|
31
|
+
nvm use 2> /dev/null || nvm use default
|
|
28
32
|
fi
|
|
29
33
|
|
|
30
34
|
# Set up the nodenv node version manager if present
|
|
@@ -393,5 +393,6 @@ def __apply_Xcode_12_5_M1_post_install_workaround(installer)
|
|
|
393
393
|
# "Time.h:52:17: error: typedef redefinition with different types"
|
|
394
394
|
# We need to make a patch to RCT-Folly - remove the `__IPHONE_OS_VERSION_MIN_REQUIRED` check.
|
|
395
395
|
# See https://github.com/facebook/flipper/issues/834 for more details.
|
|
396
|
-
|
|
396
|
+
time_header = "#{Pod::Config.instance.installation_root.to_s}/Pods/RCT-Folly/folly/portability/Time.h"
|
|
397
|
+
`sed -i -e $'s/ && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_10_0)//' #{time_header}`
|
|
397
398
|
end
|
package/template/Gemfile.lock
CHANGED
|
@@ -3,7 +3,7 @@ GEM
|
|
|
3
3
|
specs:
|
|
4
4
|
CFPropertyList (3.0.5)
|
|
5
5
|
rexml
|
|
6
|
-
activesupport (6.1.
|
|
6
|
+
activesupport (6.1.5)
|
|
7
7
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
|
8
8
|
i18n (>= 1.6, < 2)
|
|
9
9
|
minitest (>= 5.1)
|
|
@@ -16,10 +16,10 @@ GEM
|
|
|
16
16
|
json (>= 1.5.1)
|
|
17
17
|
atomos (0.1.3)
|
|
18
18
|
claide (1.1.0)
|
|
19
|
-
cocoapods (1.11.
|
|
19
|
+
cocoapods (1.11.3)
|
|
20
20
|
addressable (~> 2.8)
|
|
21
21
|
claide (>= 1.0.2, < 2.0)
|
|
22
|
-
cocoapods-core (= 1.11.
|
|
22
|
+
cocoapods-core (= 1.11.3)
|
|
23
23
|
cocoapods-deintegrate (>= 1.0.3, < 2.0)
|
|
24
24
|
cocoapods-downloader (>= 1.4.0, < 2.0)
|
|
25
25
|
cocoapods-plugins (>= 1.0.0, < 2.0)
|
|
@@ -34,7 +34,7 @@ GEM
|
|
|
34
34
|
nap (~> 1.0)
|
|
35
35
|
ruby-macho (>= 1.0, < 3.0)
|
|
36
36
|
xcodeproj (>= 1.21.0, < 2.0)
|
|
37
|
-
cocoapods-core (1.11.
|
|
37
|
+
cocoapods-core (1.11.3)
|
|
38
38
|
activesupport (>= 5.0, < 7)
|
|
39
39
|
addressable (~> 2.8)
|
|
40
40
|
algoliasearch (~> 1.0)
|
|
@@ -63,7 +63,7 @@ GEM
|
|
|
63
63
|
fuzzy_match (2.0.4)
|
|
64
64
|
gh_inspector (1.1.3)
|
|
65
65
|
httpclient (2.8.3)
|
|
66
|
-
i18n (1.
|
|
66
|
+
i18n (1.10.0)
|
|
67
67
|
concurrent-ruby (~> 1.0)
|
|
68
68
|
json (2.6.1)
|
|
69
69
|
minitest (5.15.0)
|
|
@@ -85,7 +85,7 @@ GEM
|
|
|
85
85
|
colored2 (~> 3.1)
|
|
86
86
|
nanaimo (~> 0.3.0)
|
|
87
87
|
rexml (~> 3.2.4)
|
|
88
|
-
zeitwerk (2.5.
|
|
88
|
+
zeitwerk (2.5.4)
|
|
89
89
|
|
|
90
90
|
PLATFORMS
|
|
91
91
|
ruby
|
package/template/package.json
CHANGED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
305b0d8c0acfa99c67563e216253202e
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
99776638316fb1d7ba0cd3f7a3950d934e045b52
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
a175bab26779def1b808e18963925998686d6f0a3e3c7c2381d8381f08cd202a
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
b2034a082707872a96fb32b275a401553d65024b5e28d65c8be05201989d58a3379ccf8ca4f58cf392a947bf34035c70828b466480b7878f5249e2ff3c8a5355
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
8b2995e6e951b25e32c7ea1357a7408d
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
500445e7158cb452ac095c73b2328abcb710b067
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
d033a4bb4fb5ce5dc7dee913fe82e20ecc8a75005f3bef57419fdae4baf30a60
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
9171108183ad41efe77a12ab646df76dd895633089781226cf036f4526a7198e781bfe74e3432d0af794b4dd1d57339616358fee4ccdb54bf8b97d9d690c3e94
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
3a1aa7952952ca62e0bcb315e60124c1
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
fbb5a6f0c6fe40ad1803572de892dd99b3d6e66d
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
bef4960456d5b159b4cb837503923822cd05858e0ac20c5796ff690c7c0d6b98
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
99afe22a931927907ad3de140e2dad230eeb96b6fbac35a359c2f260a30d767f7a65ecef7bd48d9835f86184ddf83014229912684c22a066f97d2813194f4707
|