mirror of
https://github.com/facebook/react-native.git
synced 2025-11-01 09:14:26 +00:00
Compare commits
12
Commits
0.49-stable
...
v0.33.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
620ecbde6e | ||
|
|
42e73d893f | ||
|
|
c18d1dfd7d | ||
|
|
d7241975c4 | ||
|
|
4be85575c0 | ||
|
|
4f070e8b64 | ||
|
|
dafe9fc24e | ||
|
|
5e8b95c815 | ||
|
|
be8c9b8d23 | ||
|
|
7de770abda | ||
|
|
5501869e3a | ||
|
|
fadd5dc98b |
@@ -788,6 +788,7 @@ class AnimatedValue extends AnimatedWithChildren {
|
||||
}
|
||||
|
||||
this.__nativeAnimatedValueListener.remove();
|
||||
this.__nativeAnimatedValueListener = null;
|
||||
NativeAnimatedAPI.stopListeningToAnimatedNodeValue(this.__getNativeTag());
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -4,7 +4,7 @@ package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
|
||||
|
||||
Pod::Spec.new do |s|
|
||||
s.name = "React"
|
||||
s.version = package['version']
|
||||
s.version = "0.33.1"
|
||||
s.summary = package['description']
|
||||
s.description = <<-DESC
|
||||
React Native apps are built using the React JS
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#import "RCTJSStackFrame.h"
|
||||
#import "RCTLog.h"
|
||||
|
||||
#import "RCTUtils.h"
|
||||
|
||||
static NSRegularExpression *RCTJSStackFrameRegex()
|
||||
{
|
||||
@@ -41,11 +41,11 @@ static NSRegularExpression *RCTJSStackFrameRegex()
|
||||
- (NSDictionary *)toDictionary
|
||||
{
|
||||
return @{
|
||||
@"methodName": self.methodName,
|
||||
@"file": self.file,
|
||||
@"lineNumber": @(self.lineNumber),
|
||||
@"column": @(self.column)
|
||||
};
|
||||
@"methodName": RCTNullIfNil(self.methodName),
|
||||
@"file": RCTNullIfNil(self.file),
|
||||
@"lineNumber": @(self.lineNumber),
|
||||
@"column": @(self.column)
|
||||
};
|
||||
}
|
||||
|
||||
+ (instancetype)stackFrameWithLine:(NSString *)line
|
||||
|
||||
@@ -175,7 +175,7 @@ RCT_EXPORT_MODULE()
|
||||
return _sendIdleEvents || _timers.count > 0;
|
||||
}
|
||||
|
||||
- (void)didUpdateFrame:(__unused RCTFrameUpdate *)update
|
||||
- (void)didUpdateFrame:(RCTFrameUpdate *)update
|
||||
{
|
||||
NSDate *nextScheduledTarget = [NSDate distantFuture];
|
||||
NSMutableArray<NSNumber *> *timersToCall = [NSMutableArray new];
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
VERSION_NAME=1000.0.0-master
|
||||
VERSION_NAME=0.33.1
|
||||
GROUP=com.facebook.react
|
||||
|
||||
POM_NAME=ReactNative
|
||||
|
||||
+4
-4
@@ -21,13 +21,13 @@ public class ReactContentSizeChangedEvent extends Event<ReactTextChangedEvent> {
|
||||
|
||||
public static final String EVENT_NAME = "topContentSizeChange";
|
||||
|
||||
private int mContentWidth;
|
||||
private int mContentHeight;
|
||||
private float mContentWidth;
|
||||
private float mContentHeight;
|
||||
|
||||
public ReactContentSizeChangedEvent(
|
||||
int viewId,
|
||||
int contentSizeWidth,
|
||||
int contentSizeHeight) {
|
||||
float contentSizeWidth,
|
||||
float contentSizeHeight) {
|
||||
super(viewId);
|
||||
mContentWidth = contentSizeWidth;
|
||||
mContentHeight = contentSizeHeight;
|
||||
|
||||
+4
-4
@@ -23,15 +23,15 @@ public class ReactTextChangedEvent extends Event<ReactTextChangedEvent> {
|
||||
public static final String EVENT_NAME = "topChange";
|
||||
|
||||
private String mText;
|
||||
private int mContentWidth;
|
||||
private int mContentHeight;
|
||||
private float mContentWidth;
|
||||
private float mContentHeight;
|
||||
private int mEventCount;
|
||||
|
||||
public ReactTextChangedEvent(
|
||||
int viewId,
|
||||
String text,
|
||||
int contentSizeWidth,
|
||||
int contentSizeHeight,
|
||||
float contentSizeWidth,
|
||||
float contentSizeHeight,
|
||||
int eventCount) {
|
||||
super(viewId);
|
||||
mText = text;
|
||||
|
||||
+5
-5
@@ -578,8 +578,8 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
|
||||
new ReactTextChangedEvent(
|
||||
mEditText.getId(),
|
||||
s.toString(),
|
||||
(int) PixelUtil.toDIPFromPixel(contentWidth),
|
||||
(int) PixelUtil.toDIPFromPixel(contentHeight),
|
||||
PixelUtil.toDIPFromPixel(contentWidth),
|
||||
PixelUtil.toDIPFromPixel(contentHeight),
|
||||
mEditText.incrementAndGetEventCounter()));
|
||||
|
||||
mEventDispatcher.dispatchEvent(
|
||||
@@ -671,7 +671,7 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
|
||||
contentWidth = mEditText.getCompoundPaddingLeft() + mEditText.getLayout().getWidth() +
|
||||
mEditText.getCompoundPaddingRight();
|
||||
contentHeight = mEditText.getCompoundPaddingTop() + mEditText.getLayout().getHeight() +
|
||||
mEditText.getCompoundPaddingTop();
|
||||
mEditText.getCompoundPaddingBottom();
|
||||
}
|
||||
|
||||
if (contentWidth != mPreviousContentWidth || contentHeight != mPreviousContentHeight) {
|
||||
@@ -681,8 +681,8 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
|
||||
mEventDispatcher.dispatchEvent(
|
||||
new ReactContentSizeChangedEvent(
|
||||
mEditText.getId(),
|
||||
(int) PixelUtil.toDIPFromPixel(contentWidth),
|
||||
(int) PixelUtil.toDIPFromPixel(contentHeight)));
|
||||
PixelUtil.toDIPFromPixel(contentWidth),
|
||||
PixelUtil.toDIPFromPixel(contentHeight)));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -78,7 +78,8 @@ void ProxyExecutor::loadApplicationScript(
|
||||
loadApplicationScript(
|
||||
m_executor.get(),
|
||||
jni::make_jstring(sourceURL).get());
|
||||
executeJSCallWithProxy(m_executor.get(), "flushedQueue", std::vector<folly::dynamic>());
|
||||
// We can get pending calls here to native but the queue will be drained when
|
||||
// we launch the application.
|
||||
}
|
||||
|
||||
void ProxyExecutor::setJSModulesUnbundle(std::unique_ptr<JSModulesUnbundle>) {
|
||||
|
||||
@@ -110,8 +110,16 @@ prebuilt_jar(
|
||||
visibility = ['//ReactAndroid/...',],
|
||||
)
|
||||
|
||||
remote_file(
|
||||
# This new rule will make the .jar file appear in the "right" location,
|
||||
# though that may change in the future
|
||||
export_file(
|
||||
name = 'robolectric-android-all-binary-jar',
|
||||
src = ':robolectric-android-all-binary-remote-jar',
|
||||
out = 'android-all-4.1.2_r1-robolectric-0.jar', # name defines filename used by robolectric in runtime
|
||||
)
|
||||
|
||||
remote_file(
|
||||
name = 'robolectric-android-all-binary-remote-jar',
|
||||
url = 'mvn:org.robolectric:android-all:jar:4.1.2_r1-robolectric-0',
|
||||
sha1 = 'aecc8ce5119a25fcea1cdf8285469c9d1261a352',
|
||||
)
|
||||
@@ -122,8 +130,14 @@ prebuilt_jar(
|
||||
visibility = ['//ReactAndroid/...',],
|
||||
)
|
||||
|
||||
remote_file(
|
||||
export_file(
|
||||
name = 'json-jar',
|
||||
src = ':json-remote-jar',
|
||||
out = 'json-20080701.jar', # name defines filename used by robolectric in runtime
|
||||
)
|
||||
|
||||
remote_file(
|
||||
name = 'json-remote-jar',
|
||||
url = 'mvn:org.json:json:jar:20080701',
|
||||
sha1 = 'd652f102185530c93b66158b1859f35d45687258',
|
||||
)
|
||||
@@ -134,8 +148,14 @@ prebuilt_jar(
|
||||
visibility = ['//ReactAndroid/...',],
|
||||
)
|
||||
|
||||
remote_file(
|
||||
export_file(
|
||||
name = 'tagsoup-jar',
|
||||
src = ':tagsoup-remote-jar',
|
||||
out = 'tagsoup-1.2.jar', # name defines filename used by robolectric in runtime
|
||||
)
|
||||
|
||||
remote_file(
|
||||
name = 'tagsoup-remote-jar',
|
||||
url = 'mvn:org.ccil.cowan.tagsoup:tagsoup:jar:1.2',
|
||||
sha1 = '639fd364750d7363c85797dc944b4a80f78fa684',
|
||||
)
|
||||
@@ -146,8 +166,14 @@ prebuilt_jar(
|
||||
visibility = ['//ReactAndroid/...',],
|
||||
)
|
||||
|
||||
remote_file(
|
||||
export_file(
|
||||
name = 'robolectric-shadows-binary-jar',
|
||||
src = ':robolectric-shadows-binary-remote-jar',
|
||||
out = 'shadows-core-3.0-16.jar', # name defines filename used by robolectric in runtime
|
||||
)
|
||||
|
||||
remote_file(
|
||||
name = 'robolectric-shadows-binary-remote-jar',
|
||||
url = 'https://repo1.maven.org/maven2/org/robolectric/shadows-core/3.0/shadows-core-3.0-16.jar',
|
||||
sha1 = '39d7a856bf91640b1a6d044333336a2b3f3c198f',
|
||||
)
|
||||
|
||||
+4
-4
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "react-native",
|
||||
"version": "1000.0.0",
|
||||
"version": "0.33.1",
|
||||
"description": "A framework for building native apps using React",
|
||||
"license": "BSD-3-Clause",
|
||||
"repository": {
|
||||
@@ -124,7 +124,7 @@
|
||||
"react-native": "local-cli/wrong-react-native.js"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"react": "15.3.1-rc.2"
|
||||
"react": "~15.3.1"
|
||||
},
|
||||
"dependencies": {
|
||||
"absolute-path": "^0.0.0",
|
||||
@@ -208,7 +208,7 @@
|
||||
"jest-runtime": "~14.1.0",
|
||||
"mock-fs": "^3.11.0",
|
||||
"portfinder": "0.4.0",
|
||||
"react": "15.3.1-rc.2",
|
||||
"react": "~15.3.1",
|
||||
"shelljs": "0.6.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -105,7 +105,7 @@ class Resolver {
|
||||
preferNativePlatform: true,
|
||||
fileWatcher: opts.fileWatcher,
|
||||
cache: opts.cache,
|
||||
shouldThrowOnUnresolvedErrors: (_, platform) => platform === 'ios',
|
||||
shouldThrowOnUnresolvedErrors: (_, platform) => platform !== 'android',
|
||||
transformCode: opts.transformCode,
|
||||
extraNodeModules: opts.extraNodeModules,
|
||||
assetDependencies: ['react-native/Libraries/Image/AssetRegistry'],
|
||||
|
||||
Reference in New Issue
Block a user