diff --git a/components/Carbon.js b/components/Carbon.js
index 880250d..365fb90 100644
--- a/components/Carbon.js
+++ b/components/Carbon.js
@@ -39,6 +39,7 @@ class Carbon extends PureComponent {
   }
 
   componentWillReceiveProps(newProps) {
+    // TODO use getDerivedStateFromProps() on React@16.3
     this.handleLanguageChange(newProps.children, { customProps: newProps })
   }
 
diff --git a/components/ImagePicker.js b/components/ImagePicker.js
index b42b83f..8a076dd 100644
--- a/components/ImagePicker.js
+++ b/components/ImagePicker.js
@@ -46,6 +46,7 @@ export default class extends React.Component {
   }
 
   componentWillReceiveProps(nextProps) {
+    // TODO use getDerivedStateFromProps() on React@16.3
     if (this.state.crop && this.props.aspectRatio !== nextProps.aspectRatio) {
       // update crop for editor container aspect-ratio change
       this.setState({