Merge branch 'master' of github.com:davidkpiano/react-redux-form

Author: davidkpiano

README.md

@@ -1,4 +1,4 @@
-# React Redux Form 🎃
+# React Redux Form 🍂
 
 [![Join the chat at https://gitter.im/react-redux-form/Lobby](https://badges.gitter.im/react-redux-form/Lobby.svg)](https://gitter.im/react-redux-form/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Build Status](https://travis-ci.org/davidkpiano/react-redux-form.svg?branch=master)](https://travis-ci.org/davidkpiano/react-redux-form) [![npm version](https://badge.fury.io/js/react-redux-form.svg)](https://badge.fury.io/js/react-redux-form)

src/reducers/form/reset-action-reducer.js

@@ -2,9 +2,12 @@ import actionTypes from '../../action-types';
 import updateField from '../../utils/update-field';
 import mapValues from '../../utils/map-values';
 import initialFieldState from '../../constants/initial-field-state';
+import isPlainObject from 'lodash/isPlainObject';
 import i from 'icepick';
 
-const resetFieldState = (field) => {
+const resetFieldState = (field, key) => {
+  if (!isPlainObject(field) || key === '$form') return field;
+
   if (field.$form) return mapValues(field, resetFieldState);
 
   return i.merge(initialFieldState, {