From b121e4fe5b8e8949e5ebdf5daddf722fb7558781 Mon Sep 17 00:00:00 2001
From: Lucio D'Alessandro <lda@juxt.pro>
Date: Tue, 8 Sep 2020 08:26:16 +0100
Subject: [PATCH] Fix issue #18

---
 README.md              | 2 +-
 project.clj            | 2 +-
 src/fork/re_frame.cljs | 5 ++++-
 src/fork/reagent.cljs  | 5 +++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index b945a49..30de48a 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ As at this state you must be dying of curiosity, I will dive right into the impl
 #### In Deps
 
 ```clojure
-fork {:mvn/version "2.2.0"}
+fork {:mvn/version "2.2.1"}
 ```
 
 or
diff --git a/project.clj b/project.clj
index 77b51a8..65f624c 100644
--- a/project.clj
+++ b/project.clj
@@ -1,4 +1,4 @@
-(defproject fork "2.2.0"
+(defproject fork "2.2.1"
   :description "Reagent & Re-Frame form library"
   :url "https://github.com/luciodale/fork"
   :license {:name "MIT"}
diff --git a/src/fork/re_frame.cljs b/src/fork/re_frame.cljs
index 8436008..5c88477 100644
--- a/src/fork/re_frame.cljs
+++ b/src/fork/re_frame.cljs
@@ -85,7 +85,10 @@
                                       :server-dispatch-logic
                                       #(rf/dispatch [::server-dispatch-logic config path])})))
                   :reset (fn [& [m]]
-                           (reset! state (merge {:values {} :touched #{}} m))
+                           (reset! state (merge (when (:keywordize-keys props)
+                                                  {:keywordize-keys true})
+                                                {:values {} :touched #{}}
+                                                m))
                            (rf/dispatch [::clean path]))}]
     (r/create-class
      {:component-did-mount
diff --git a/src/fork/reagent.cljs b/src/fork/reagent.cljs
index 0d21b75..c1c6360 100644
--- a/src/fork/reagent.cljs
+++ b/src/fork/reagent.cljs
@@ -69,8 +69,9 @@
                                       :state state
                                       :server-dispatch-logic
                                       #(server-dispatch-logic state config path)})))
-                  :reset (fn [& [m]] (reset! state (merge {:values {}
-                                                           :touched #{}}
+                  :reset (fn [& [m]] (reset! state (merge (when (:keywordize-keys props)
+                                                            {:keywordize-keys true})
+                                                          {:values {} :touched #{}}
                                                           m)))}]
     (r/create-class
      {:component-did-mount