Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[react-native-reanimated] Upgrade react-native-reanimated to 1.9.0 #8424

Merged
merged 3 commits into from May 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -7,6 +7,8 @@ Package-specific changes not released in any SDK will be added here just before

### 📚 3rd party library updates

- Updated `react-native-reanimated` from `1.7.0` to `1.9.0`. ([#8424](https://github.com/expo/expo/pull/8424) by [@sjchmiela](https://github.com/sjchmiela))

### 🛠 Breaking changes

- `react-native-view-shot` is no longer installed by default, install it with `expo install react-native-view-shot`. ([#7950](https://github.com/expo/expo/pull/7950) by [@evanbacon](https://github.com/evanbacon))
Expand Down
@@ -1,11 +1,19 @@
package versioned.host.exp.exponent.modules.api.reanimated.nodes;

import java.text.NumberFormat;
import java.util.Locale;

import com.facebook.react.bridge.ReadableMap;
import versioned.host.exp.exponent.modules.api.reanimated.NodesManager;
import versioned.host.exp.exponent.modules.api.reanimated.Utils;

public class ConcatNode extends Node {
private final int[] mInputIDs;
private final static NumberFormat sFormatter = NumberFormat.getInstance(Locale.ENGLISH);
static {
sFormatter.setMinimumFractionDigits(0);
sFormatter.setGroupingUsed(false);
}

public ConcatNode(int nodeID, ReadableMap config, NodesManager nodesManager) {
super(nodeID, config, nodesManager);
Expand All @@ -17,7 +25,11 @@ protected String evaluate() {
StringBuilder builder = new StringBuilder();
for (int i = 0; i < mInputIDs.length; i++) {
Node inputNodes = mNodesManager.findNodeById(mInputIDs[i], Node.class);
builder.append(inputNodes.value());
Object value = inputNodes.value();
if (value instanceof Double) {
value = sFormatter.format((Double) value);
}
builder.append(value);
}
return builder.toString();
}
Expand Down
Expand Up @@ -183,6 +183,9 @@ public double evaluate(Node[] input) {
private static final Operator LESS_THAN = new CompOperator() {
@Override
public boolean eval(Double x, Double y) {
if (x == null || y == null) {
return false;
}
return x < y;
}
};
Expand All @@ -198,6 +201,9 @@ public boolean eval(Double x, Double y) {
private static final Operator GREATER_THAN = new CompOperator() {
@Override
public boolean eval(Double x, Double y) {
if (x == null || y == null) {
return false;
}
return x > y;
}
};
Expand Down
4 changes: 2 additions & 2 deletions apps/bare-expo/ios/Podfile.lock
Expand Up @@ -481,7 +481,7 @@ PODS:
- ReactCommon/jscallinvoker (= 0.61.4)
- RNGestureHandler (1.6.1):
- React
- RNReanimated (1.7.1):
- RNReanimated (1.9.0):
- React
- RNScreens (2.2.0):
- React
Expand Down Expand Up @@ -937,7 +937,7 @@ SPEC CHECKSUMS:
React-RCTVibration: 0f76400ee3cec6edb9c125da49fed279340d145a
ReactCommon: a6a294e7028ed67b926d29551aa9394fd989c24c
RNGestureHandler: 8f09cd560f8d533eb36da5a6c5a843af9f056b38
RNReanimated: 4e102df74a9674fa943e05f97f3362b6e44d0b48
RNReanimated: b5ccb50650ba06f6e749c7c329a1bc3ae0c88b43
RNScreens: 812b79d384e2bea7eebc4ec981469160d4948fd5
SDWebImage: 21b19f56b4226cdfe3aefe4e6848dc43ed129a86
UMAppLoader: ee77a072f9e15128f777ccd6d2d00f52ab4387e6
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions apps/bare-expo/ios/Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion apps/bare-expo/package.json
Expand Up @@ -90,7 +90,7 @@
"react-native": "0.61.4",
"react-native-appearance": "~0.3.3",
"react-native-gesture-handler": "~1.6.0",
"react-native-reanimated": "~1.7.0",
"react-native-reanimated": "~1.9.0",
"react-native-safe-area-context": "0.7.3",
"react-native-screens": "~2.2.0",
"react-native-unimodules": "~0.9.1",
Expand Down
2 changes: 1 addition & 1 deletion apps/native-component-list/package.json
Expand Up @@ -88,7 +88,7 @@
"react-native-maps": "0.26.1",
"react-native-paper": "github:brentvatne/react-native-paper#@brent/fix-bottom-navigation-rn-57",
"react-native-platform-touchable": "^1.1.1",
"react-native-reanimated": "~1.7.0",
"react-native-reanimated": "~1.9.0",
"react-native-safe-area-context": "0.7.3",
"react-native-safe-area-view": "^0.14.8",
"react-native-screens": "~2.2.0",
Expand Down
25 changes: 0 additions & 25 deletions ios/Exponent.xcodeproj/project.pbxproj

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 0 additions & 11 deletions ios/Exponent/Versioned/Core/Api/Reanimated/REANodesManager.m
Expand Up @@ -23,17 +23,6 @@
#import "Nodes/REAFunctionNode.h"
#import "Nodes/REACallFuncNode.h"

@interface RCTUIManager ()

- (void)updateView:(nonnull NSNumber *)reactTag
viewName:(NSString *)viewName
props:(NSDictionary *)props;

- (void)setNeedsLayout;

@end


// Interface below has been added in order to use private methods of RCTUIManager,
// RCTUIManager#UpdateView is a React Method which is exported to JS but in
// Objective-C it stays private
Expand Down
2 changes: 1 addition & 1 deletion packages/expo/bundledNativeModules.json
Expand Up @@ -59,7 +59,7 @@
"react-native-branch": "4.2.1",
"react-native-gesture-handler": "~1.6.0",
"react-native-maps": "0.26.1",
"react-native-reanimated": "~1.7.0",
"react-native-reanimated": "~1.9.0",
"react-native-screens": "~2.2.0",
"react-native-svg": "11.0.1",
"react-native-view-shot": "3.1.2",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Expand Up @@ -14070,10 +14070,10 @@ react-native-platform-touchable@^1.1.1:
resolved "https://registry.yarnpkg.com/react-native-platform-touchable/-/react-native-platform-touchable-1.1.1.tgz#fde4acc65eea585d28b164d0c3716a42129a68e4"
integrity sha1-/eSsxl7qWF0osWTQw3FqQhKaaOQ=

react-native-reanimated@~1.7.0:
version "1.7.1"
resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-1.7.1.tgz#6363c7f3ebbabc56a05d5dccaf09d95f3b6a2d69"
integrity sha512-aBwhoQdH4shkeTPbi7vKcAwYOzBp/6zElEKuIOgby11TceoM7y5SgNImC3HbDWWld3QV2PA2AgQGwAy51WgF3Q==
react-native-reanimated@~1.9.0:
version "1.9.0"
resolved "https://registry.yarnpkg.com/react-native-reanimated/-/react-native-reanimated-1.9.0.tgz#38676c99dd585504fdc7331efb45e5f48ec7339a"
integrity sha512-Aj+spgIHRiVv7ezGADxnSH1EoKrQRD2+XaSiGY0MiB/pvRNNrZPSJ+3NVpvLwWf9lZMOP7dwqqyJIzoZgBDt8w==
dependencies:
fbjs "^1.0.0"

Expand Down