Merge 'upstream/master' into 5.3.0-wip

# Conflicts:
#	lib/react.js.map
#	lib/react_prod.js
#	lib/react_prod.js.map
#	lib/react_with_addons.js.map
#	lib/react_with_react_dom_prod.js
#	lib/react_with_react_dom_prod.js.map

Author: aaronlademann-wf

.travis.yml

@@ -16,6 +16,5 @@ before_script:
   - pub run dependency_validator -i build_runner,build_test,build_web_compilers
 
 script:
-  # TODO once production is above 2.4.1 re-check the `fails-on-2.4.1` tagged tests
-  - pub run build_runner test --release -- -p chrome -x fails-on-241
-  - pub run build_runner test -- -p chrome -x fails-on-241
+  - pub run build_runner test --release -- -p chrome
+  - pub run build_runner test -- -p chrome

CHANGELOG.md

@@ -1,3 +1,19 @@
+## [5.2.1](https://github.com/cleandart/react-dart/compare/5.2.0...5.2.1)
+
+- Temporarily pin react-redux dependency to version `7.1.0` to prevent widespread test failures as a result of 
+  [`Provider` being converted into a function component with hooks](https://github.com/reduxjs/react-redux/pull/1377).
+
+## [5.2.0](https://github.com/cleandart/react-dart/compare/5.1.1...5.2.0)
+
+- [#190] Fix null value handling in `setStateWithUpdater`
+- [#235] Fix null value handling in `getDerivedStateFromError` interop
+- [#238] Fix js package security vulnerability
+- [#236] Expose `componentZone` to allow overriding the zone in which Component2 lifecycle methods are run, for testing
+
+## [5.1.1](https://github.com/cleandart/react-dart/compare/5.1.0...5.1.1)
+
+- Improve the documentation for deprecated `Component2` lifecycle methods.
+
 ## [5.1.0](https://github.com/cleandart/react-dart/compare/5.0.1...5.1.0)
 
 __Full ReactJS 16.x Component Lifecycle Support__

js_src/_dart_helpers.js

@@ -127,7 +127,8 @@ function _createReactDartComponentClass2(dartInteropStatics, componentStatics, j
       dartInteropStatics.handleComponentDidCatch(this.dartComponent, error, info);
     }
     static getDerivedStateFromError(error) {
-      return dartInteropStatics.handleGetDerivedStateFromError(componentStatics, error);
+      let derivedState = dartInteropStatics.handleGetDerivedStateFromError(componentStatics, error);
+      return typeof derivedState !== 'undefined' ? derivedState : null;
     }
     render() {
       var result = dartInteropStatics.handleRender(this.dartComponent, this.props, this.state, this.context);

lib/react.dart

@@ -13,6 +13,7 @@ import 'dart:js';
 import 'dart:js_util';
 
 import "package:js/js.dart";
+import 'package:meta/meta.dart';
 
 import "package:react/react.dart";
 import 'package:react/react_client/js_interop_helpers.dart';
@@ -60,6 +61,21 @@ dynamic listifyChildren(dynamic children) {
   }
 }
 
+/// The zone in which React will call component lifecycle methods.
+///
+/// This can be used to sync a test's zone and React's component zone, ensuring that component prop callbacks and
+/// lifecycle method output all occurs within the same zone as the test.
+///
+/// __Example:__
+///
+///     test('zone test', () {
+///       componentZone = Zone.current;
+///
+///       // ... test your component
+///     }
+@visibleForTesting
+Zone componentZone = Zone.root;
+
 /// Use [ReactDartComponentFactoryProxy2] instead.
 ///
 /// Will be removed when [Component] is removed in the `6.0.0` release.
@@ -428,7 +444,8 @@ final ReactDartInteropStatics _dartInteropStatics = (() {
     var props = new UnmodifiableMapView(component.props);
 
     component.transactionalSetStateCallbacks.forEach((callback) {
-      nextState.addAll(callback(nextState, props));
+      final stateUpdates = callback(nextState, props);
+      if (stateUpdates != null) nextState.addAll(stateUpdates);
     });
     component.transactionalSetStateCallbacks.clear();
   }
@@ -524,10 +541,6 @@ final ReactDartInteropStatics _dartInteropStatics = (() {
 })();
 
 abstract class _ReactDartInteropStatics2 {
-  // TODO 3.1.0-wip expose for testing?
-  /// The zone in which all component lifecycle methods are run.
-  static final componentZone = Zone.root;
-
   static void _updatePropsAndStateWithJs(Component2 component, JsMap props, JsMap state) {
     component
       ..props = new JsBackedMap.backedBy(props)
@@ -634,7 +647,9 @@ abstract class _ReactDartInteropStatics2 {
         try {
           throwErrorFromJS(error);
         } catch (e) {
-          return jsBackingMapOrJsCopy(componentStatics.instanceForStaticMethods.getDerivedStateFromError(e));
+          final result = componentStatics.instanceForStaticMethods.getDerivedStateFromError(e);
+          if (result != null) return jsBackingMapOrJsCopy(result);
+          return null;
         }
       });
 

lib/react.js

@@ -93,10 +93,12 @@ class Component2BridgeImpl extends Component2Bridge {
   @override
   void setStateWithUpdater(Component2 component, StateUpdaterCallback stateUpdater, SetStateCallback callback) {
     final firstArg = allowInterop((JsMap jsPrevState, JsMap jsProps, [_]) {
-      return jsBackingMapOrJsCopy(stateUpdater(
+      final value = stateUpdater(
         new JsBackedMap.backedBy(jsPrevState),
         new JsBackedMap.backedBy(jsProps),
-      ));
+      );
+      if (value == null) return null;
+      return jsBackingMapOrJsCopy(value);
     });
 
     if (callback == null) {