🎉 Add animations to interactions

frontend/src/app/main/data/viewer.cljs

@@ -9,6 +9,7 @@
    [app.common.data :as d]
    [app.common.pages :as cp]
    [app.common.spec :as us]
+   [app.common.types.interactions :as cti]
    [app.common.uuid :as uuid]
    [app.main.constants :as c]
    [app.main.data.comments :as dcm]
@@ -316,6 +317,12 @@
     (update [_ state]
       (d/dissoc-in state [:viewer-local :nav-scroll]))))
 
+(defn complete-animation
+  []
+  (ptk/reify ::complete-animation
+    ptk/UpdateEvent
+    (update [_ state]
+      (d/dissoc-in state [:viewer-local :current-animation]))))
 
 ;; --- Navigation inside page
 
@@ -335,23 +342,38 @@
         (rx/of (rt/nav screen pparams (assoc qparams :index index)))))))
 
 (defn go-to-frame
-  [frame-id]
-  (us/verify ::us/uuid frame-id)
-  (ptk/reify ::go-to-frame
-    ptk/UpdateEvent
-    (update [_ state]
-      (assoc-in state [:viewer-local :overlays] []))
+  ([frame-id] (go-to-frame frame-id nil))
+  ([frame-id animation]
+   (us/verify ::us/uuid frame-id)
+   (us/verify (s/nilable ::cti/animation) animation)
+   (ptk/reify ::go-to-frame
+     ptk/UpdateEvent
+     (update [_ state]
+       (let [route   (:route state)
+             qparams (:query-params route)
+             page-id (:page-id qparams)
+             index   (:index qparams)
+             frames  (get-in state [:viewer :pages page-id :frames])
+             frame   (get frames index)]
+         (cond-> state
+           :always
+           (assoc-in [:viewer-local :overlays] [])
 
-    ptk/WatchEvent
-    (watch [_ state _]
-      (let [route   (:route state)
-            qparams (:query-params route)
-            page-id (:page-id qparams)
+           (some? animation)
+           (assoc-in [:viewer-local :current-animation]
+                     {:kind :go-to-frame
+                      :orig-frame-id (:id frame)
+                      :animation animation}))))
 
-            frames  (get-in state [:viewer :pages page-id :frames])
-            index   (d/index-of-pred frames #(= (:id %) frame-id))]
-        (when index
-          (rx/of (go-to-frame-by-index index)))))))
+     ptk/WatchEvent
+     (watch [_ state _]
+       (let [route   (:route state)
+             qparams (:query-params route)
+             page-id (:page-id qparams)
+             frames  (get-in state [:viewer :pages page-id :frames])
+             index   (d/index-of-pred frames #(= (:id %) frame-id))]
+         (when index
+           (rx/of (go-to-frame-by-index index))))))))
 
 (defn go-to-frame-auto
   []
@@ -383,12 +405,39 @@
 
 ;; --- Overlays
 
+(defn- do-open-overlay
+  [state frame position close-click-outside background-overlay animation]
+  (cond-> state
+    :always
+    (update-in [:viewer-local :overlays] conj 
+               {:frame frame
+                :position position
+                :close-click-outside close-click-outside
+                :background-overlay background-overlay})
+    (some? animation)
+    (assoc-in [:viewer-local :current-animation]
+              {:kind :open-overlay
+               :overlay-id (:id frame)
+               :animation animation})))
+
+(defn- do-close-overlay
+  [state frame-id animation]
+  (if (nil? animation)
+    (update-in state [:viewer-local :overlays]
+               (fn [overlays]
+                 (d/removev #(= (:id (:frame %)) frame-id) overlays)))
+    (assoc-in state [:viewer-local :current-animation]
+              {:kind :close-overlay
+               :overlay-id frame-id
+               :animation animation})))
+
 (defn open-overlay
-  [frame-id position close-click-outside background-overlay]
+  [frame-id position close-click-outside background-overlay animation]
   (us/verify ::us/uuid frame-id)
   (us/verify ::us/point position)
   (us/verify (s/nilable ::us/boolean) close-click-outside)
   (us/verify (s/nilable ::us/boolean) background-overlay)
+  (us/verify (s/nilable ::cti/animation) animation)
   (ptk/reify ::open-overlay
     ptk/UpdateEvent
     (update [_ state]
@@ -399,19 +448,21 @@
             frame    (d/seek #(= (:id %) frame-id) frames)
             overlays (get-in state [:viewer-local :overlays])]
         (if-not (some #(= (:frame %) frame) overlays)
-          (update-in state [:viewer-local :overlays] conj 
-                     {:frame frame
-                      :position position
-                      :close-click-outside close-click-outside
-                      :background-overlay background-overlay})
+          (do-open-overlay state
+                           frame
+                           position
+                           close-click-outside
+                           background-overlay
+                           animation)
           state)))))
 
 (defn toggle-overlay
-  [frame-id position close-click-outside background-overlay]
+  [frame-id position close-click-outside background-overlay animation]
   (us/verify ::us/uuid frame-id)
   (us/verify ::us/point position)
   (us/verify (s/nilable ::us/boolean) close-click-outside)
   (us/verify (s/nilable ::us/boolean) background-overlay)
+  (us/verify (s/nilable ::cti/animation) animation)
   (ptk/reify ::toggle-overlay
     ptk/UpdateEvent
     (update [_ state]
@@ -422,23 +473,27 @@
             frame    (d/seek #(= (:id %) frame-id) frames)
             overlays (get-in state [:viewer-local :overlays])]
         (if-not (some #(= (:frame %) frame) overlays)
-          (update-in state [:viewer-local :overlays] conj 
-                     {:frame frame
-                      :position position
-                      :close-click-outside close-click-outside
-                      :background-overlay background-overlay})
-          (update-in state [:viewer-local :overlays]
-                     (fn [overlays]
-                       (d/removev #(= (:id (:frame %)) frame-id) overlays))))))))
+          (do-open-overlay state
+                           frame
+                           position
+                           close-click-outside
+                           background-overlay
+                           animation)
+          (do-close-overlay state
+                            (:id frame)
+                            (cti/invert-direction animation)))))))
 
 (defn close-overlay
-  [frame-id]
-  (ptk/reify ::close-overlay
-    ptk/UpdateEvent
-    (update [_ state]
-      (update-in state [:viewer-local :overlays]
-                 (fn [overlays]
-                   (d/removev #(= (:id (:frame %)) frame-id) overlays))))))
+  ([frame-id] (close-overlay frame-id nil))
+  ([frame-id animation]
+   (us/verify ::us/uuid frame-id)
+   (us/verify (s/nilable ::cti/animation) animation)
+   (ptk/reify ::close-overlay
+     ptk/UpdateEvent
+     (update [_ state]
+       (do-close-overlay state
+                         frame-id
+                         animation)))))
 
 ;; --- Objects selection