JS-object-based props/state, Component2 initial impl, JsMap

.travis.yml

@@ -21,8 +21,3 @@ jobs:
         - pub run dependency_validator -i build_runner,build_test,build_web_compilers
         - pub run test -p chrome
         - pub run build_runner test -- -p chrome
-    - stage: Dart 1
-      dart: 1.24.3
-      script:
-        - dartanalyzer .
-        - pub run test -p chrome

js_src/_dart_helpers.js

@@ -77,6 +77,48 @@ function _createReactDartComponentClass(dartInteropStatics, componentStatics, js
   return ReactDartComponent;
 }
 
+function _createReactDartComponentClass2(dartInteropStatics, componentStatics) {
+  class ReactDartComponent2 extends React.Component {
+    constructor(props) {
+      super(props);
+      // TODO combine these two calls into one
+      this.dartComponent = dartInteropStatics.initComponent(this, componentStatics);
+      this.state = dartInteropStatics.handleGetInitialState(this.dartComponent);
+    }
+    // FIXME remove unsafe members when implementing new React 16 lifecycle methods
+    UNSAFE_componentWillMount() {
+      dartInteropStatics.handleComponentWillMount(this.dartComponent, this);
+    }
+    componentDidMount() {
+      dartInteropStatics.handleComponentDidMount(this.dartComponent);
+    }
+    // FIXME remove unsafe members when implementing new React 16 lifecycle methods
+    UNSAFE_componentWillReceiveProps(nextProps) {
+      dartInteropStatics.handleComponentWillReceiveProps(this.dartComponent, nextProps);
+    }
+    shouldComponentUpdate(nextProps, nextState) {
+      return dartInteropStatics.handleShouldComponentUpdate(this.dartComponent, nextProps, nextState);
+    }
+    // FIXME remove unsafe members when implementing new React 16 lifecycle methods
+    UNSAFE_componentWillUpdate(nextProps, nextState) {
+      dartInteropStatics.handleComponentWillUpdate(this.dartComponent, nextProps, nextState);
+    }
+    componentDidUpdate(prevProps, prevState) {
+      dartInteropStatics.handleComponentDidUpdate(this.dartComponent, this, prevProps, prevState);
+    }
+    componentWillUnmount() {
+      dartInteropStatics.handleComponentWillUnmount(this.dartComponent);
+    }
+    render() {
+      var result = dartInteropStatics.handleRender(this.dartComponent);
+      if (typeof result === 'undefined') result = null;
+      return result;
+    }
+  }
+
+  return ReactDartComponent2;
+}
+
 function _markChildValidated(child) {
   const store = child._store;
   if (store) store.validated = true;
@@ -86,5 +128,6 @@ module.exports = {
   _getProperty,
   _setProperty,
   _createReactDartComponentClass,
+  _createReactDartComponentClass2,
   _markChildValidated,
 };

js_src/polyfill/delete_property.js

@@ -0,0 +1,11 @@
+// Reflect.deleteProperty polyfill for IE11
+if (typeof Reflect === 'undefined') {
+  Reflect = {};
+}
+if (typeof Reflect.deleteProperty !== 'function') {
+  Object.defineProperty(Reflect, 'deleteProperty', {
+    value: function deleteProperty(target, propertyKey) {
+      return (delete target[propertyKey]);
+    }
+  });
+}

js_src/polyfill/object_assign.js

@@ -0,0 +1,5 @@
+const objectAssign = require('object-assign');
+
+if (!Object.assign) {
+  Object.assign = objectAssign
+}

js_src/react.js

@@ -1,3 +1,6 @@
+require('./polyfill/delete_property');
+require('./polyfill/object_assign');
+
 const React = require('react');
 const PropTypes = require('prop-types');
 const DartHelpers = require('./_dart_helpers');