Merge pull request #1935 from filipesilva/idle-save

idle save

Author: filipesilva

src/cljs/athens/components.cljs

@@ -20,7 +20,6 @@
                                                       to-str)]
     (dispatch [:block/save {:uid       uid
                             :string    new-block-content
-                            :callback  #()
                             :add-time? true}])))
 
 

src/cljs/athens/db.cljs

@@ -653,8 +653,6 @@
   "uid -> Current block
    state -> Look at state atom in block-el"
   [uid state]
-  (let [{:string/keys [local]} @state
-        callback               #(swap! state assoc :string/previous local)]
+  (let [{:string/keys [local]} @state]
     (dispatch [:block/save {:uid      uid
-                            :string   local
-                            :callback callback}])))
+                            :string   local}])))

src/cljs/athens/events.cljs

@@ -820,7 +820,7 @@
 
 (reg-event-fx
   :block/save
-  (fn [{:keys [db]} [_ {:keys [uid string callback] :as args}]]
+  (fn [{:keys [db]} [_ {:keys [uid string] :as args}]]
     (log/debug ":block/save args" (pr-str args))
     (let [local?      (not (db-picker/remote-db? db))
           block-eid   (common-db/e-by-av @db/dsdb :block/uid uid)
@@ -831,8 +831,7 @@
       (log/debug ":block/save local?" local?
                  ", do-nothing?" do-nothing?)
       (when-not do-nothing?
-        {:fx [[:dispatch [:resolve-transact-forward event]]
-              [:invoke-callback callback]]}))))
+        {:fx [[:dispatch [:resolve-transact-forward event]]]}))))
 
 
 (reg-event-fx

src/cljs/athens/views/blocks/content.cljs

@@ -333,7 +333,8 @@
 
 (defn textarea-change
   [e _uid state]
-  (swap! state assoc :string/local (.. e -target -value)))
+  (swap! state assoc :string/local (.. e -target -value))
+  ((:string/idle-fn @state)))
 
 
 (defn textarea-click
@@ -410,7 +411,7 @@
                                :on-change      (fn [e] (textarea-change e uid state))
                                :on-paste       (fn [e] (textarea-paste e uid state))
                                :on-key-down    (fn [e] (textarea-keydown/textarea-key-down e uid state))
-                               :on-blur        (fn [_] (db/transact-state-for-uid (or original-uid uid) state))
+                               :on-blur        (:string/save-fn @state)
                                :on-click       (fn [e] (textarea-click e uid state))
                                :on-mouse-enter (fn [e] (textarea-mouse-enter e uid state))
                                :on-mouse-down  (fn [e] (textarea-mouse-down e uid state))}])

src/cljs/athens/views/blocks/core.cljs

@@ -19,6 +19,7 @@
     [athens.views.blocks.context-menu        :as context-menu]
     [athens.views.blocks.drop-area-indicator :as drop-area-indicator]
     [com.rpl.specter                         :as s]
+    [goog.functions                          :as gfns]
     [re-frame.core                           :as rf]
     [reagent.core                            :as r]
     [stylefy.core                            :as stylefy]))
@@ -258,6 +259,7 @@
    [block-el block linked-ref-data {}])
   ([block linked-ref-data _opts]
    (let [{:keys [linked-ref initial-open linked-ref-uid parent-uids]} linked-ref-data
+         {:block/keys [uid original-uid]} block
          state (r/atom {:string/local      nil
                         :string/previous   nil
                         ;; one of #{:page :block :slash :hashtag :template}
@@ -274,7 +276,12 @@
                         :caret-position    nil
                         :show-editable-dom false
                         :linked-ref/open   (or (false? linked-ref) initial-open)
-                        :block/uid         (:block/uid block)})]
+                        :block/uid         uid})
+         save-fn #(db/transact-state-for-uid (or original-uid uid) state)
+         idle-fn (gfns/debounce save-fn 2000)]
+     (swap! state assoc
+            :string/save-fn save-fn
+            :string/idle-fn idle-fn)
 
      (fn [block linked-ref-data opts]
        (let [{:block/keys [uid

src/cljs/athens/views/blocks/textarea_keydown.cljs

@@ -582,7 +582,7 @@
                                                    (replace-first tail #"(?s)\)\)(.*)" ""))]
 
                                 ;; save block before navigating away
-                                (db/transact-state-for-uid uid state)
+                                ((:string/save-fn @state))
 
                                 (cond
                                   (and (re-find #"(?s)\[\[" head)

src/cljs/athens/views/pages/block_page.cljs

@@ -65,7 +65,6 @@
   [state block-uid]
   (dispatch [:block/save {:uid       block-uid
                           :string    (:string/local state)
-                          :callback  #()
                           :add-time? true}]))