✨ Improved frame indices

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

@@ -32,7 +32,6 @@
    [app.main.data.workspace.fix-bool-contents :as fbc]
    [app.main.data.workspace.groups :as dwg]
    [app.main.data.workspace.guides :as dwgu]
-   [app.main.data.workspace.indices :as dwidx]
    [app.main.data.workspace.interactions :as dwi]
    [app.main.data.workspace.layers :as dwly]
    [app.main.data.workspace.layout :as layout]
@@ -128,9 +127,7 @@
                               team-id (dm/get-in bundle [:project :team-id])]
                           (rx/merge
                            (rx/of (dwn/initialize team-id file-id)
-                                  (dwp/initialize-file-persistence file-id)
-                                  (dwidx/start-indexing))
-
+                                  (dwp/initialize-file-persistence file-id))
                            (->> stream
                                 (rx/filter #(= ::dwc/index-initialized %))
                                 (rx/take 1)
@@ -153,6 +150,7 @@
              :workspace-project project
              :workspace-file (assoc file :initialized true)
              :workspace-data (-> (:data file)
+                                 (cph/start-object-indices)
                                  ;; DEBUG: Uncomment this to try out migrations in local without changing
                                  ;; the version number
                                  #_(assoc :version 17)
@@ -196,7 +194,6 @@
     (watch [_ _ _]
       (rx/merge
        (rx/of (dwn/finalize file-id))
-       (rx/of (dwidx/stop-indexing))
        (->> (rx/of ::dwp/finalize)
             (rx/observe-on :async))))))
 

frontend/src/app/main/data/workspace/changes.cljs

@@ -162,7 +162,10 @@
             (us/assert ::spec.change/changes redo-changes)
             (us/assert ::spec.change/changes undo-changes)
 
-            (update-in state path cp/process-changes redo-changes false)
+            (update-in state path (fn [file]
+                                    (-> file
+                                        (cp/process-changes redo-changes false)
+                                        (cph/update-object-indices page-id))))
 
             (catch :default err
               (log/error :js/error err)

frontend/src/app/main/data/workspace/indices.cljs

@@ -1,75 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; License, v. 2.0. If a copy of the MPL was not distributed with this
-;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;;
-;; Copyright (c) UXBOX Labs SL
-
-(ns app.main.data.workspace.indices
-  (:require
-   [app.main.data.workspace.changes :as dwc]
-   [app.main.data.workspace.indices.object-tree :as dwi-object-tree]
-   [app.main.data.workspace.state-helpers :as wsh]
-   [app.main.refs :as refs]
-   [beicon.core :as rx]
-   [potok.core :as ptk]))
-
-(def stop-indexing? (ptk/type? ::stop-indexing))
-
-(def objects-changes #{:add-obj :mod-obj :del-obj :mov-objects})
-
-(defn stop-indexing
-  []
-  (ptk/reify ::stop-indexing
-    ptk/UpdateEvent
-    (update [_ state]
-      (-> state
-          (dissoc :index-object-tree)))))
-
-(defn process-changes
-  "Simplify changes so we have only the type of operation and the ids"
-  [changes]
-  (->> changes
-       (filter #(contains? objects-changes (:type %)))
-       (mapcat (fn [{:keys [type id shapes]}]
-                 (if (some? shapes)
-                   (->> shapes (map #(vector type %)))
-                   [[type id]])))))
-
-(defn update-indexing
-  [change-type shape-id old-objects new-objects]
-  (ptk/reify ::update-indexing
-    ptk/UpdateEvent
-    (update [_ state]
-      (-> state
-          (update :index-object-tree dwi-object-tree/update-index shape-id change-type old-objects new-objects)))))
-
-(defn start-indexing
-  []
-  (ptk/reify ::start-indexing
-    ptk/UpdateEvent
-    (update [_ state]
-      (let [objects (wsh/lookup-page-objects state)]
-        (-> state
-            (assoc :index-object-tree (dwi-object-tree/init-index objects)))))
-
-    ptk/WatchEvent
-    (watch [_ _ stream]
-      (let [stopper (->> stream (rx/filter stop-indexing?) (rx/take 1))
-            objects-delta (->> (rx/from-atom refs/workspace-page-objects {:emit-current-value? true}) (rx/buffer 2 1))]
-        (->> stream
-             (rx/filter dwc/commit-changes?)
-             (rx/flat-map #(->> % deref :changes process-changes))
-             (rx/with-latest-from objects-delta)
-             (rx/map (fn [[[type id] [objects-old objects-new]]]
-                       (update-indexing type id objects-old objects-new)))
-             #_(rx/tap (fn [[[type id] [objects-old objects-new]]]
-                       (let [obj-old (get objects-old id)
-                             obj-new (get objects-new id)]
-                         (prn ">change" (or (:name obj-old) (:name obj-new)))
-                         (prn "  > " type)
-                         (.log js/console "  >" (clj->js obj-old))
-                         (.log js/console "  >" (clj->js obj-new))
-
-                         )))
-             (rx/take-until stopper)
-             (rx/ignore))))))

frontend/src/app/main/data/workspace/indices/object_tree.cljs

@@ -1,16 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; License, v. 2.0. If a copy of the MPL was not distributed with this
-;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
-;;
-;; Copyright (c) UXBOX Labs SL
-
-(ns app.main.data.workspace.indices.object-tree)
-
-(defn objects-tree
-  [_objects])
-
-(defn init-index
-  [_objects])
-
-(defn update-index
-  [_index _shape-id _change-type _old-objects _new-objects])

frontend/src/app/main/data/workspace/thumbnails.cljs

@@ -73,12 +73,13 @@
 
              (rx/merge-map
               (fn [data]
-                (let [params {:file-id file-id :object-id object-id :data data}]
-                  (rx/merge
-                   ;; Update the local copy of the thumbnails so we don't need to request it again
-                   (rx/of #(assoc-in % [:workspace-file :thumbnails object-id] data))
-                   (->> (rp/mutation! :upsert-file-object-thumbnail params)
-                        (rx/ignore)))))))))))
+                (when (some? file-id)
+                  (let [params {:file-id file-id :object-id object-id :data data}]
+                    (rx/merge
+                     ;; Update the local copy of the thumbnails so we don't need to request it again
+                     (rx/of #(assoc-in % [:workspace-file :thumbnails object-id] data))
+                     (->> (rp/mutation! :upsert-file-object-thumbnail params)
+                          (rx/ignore))))))))))))
 
 (defn- extract-frame-changes
   "Process a changes set in a commit to extract the frames that are changing"

frontend/src/app/main/ui/workspace/shapes/path.cljs

@@ -14,6 +14,12 @@
    [app.main.ui.workspace.shapes.path.common :as pc]
    [rumext.alpha :as mf]))
 
+(defn apply-content-modifiers
+  [shape content-modifiers]
+  (let [shape (update shape :content upc/apply-content-modifiers content-modifiers)
+        [_ new-selrect] (helpers/content->points+selrect shape (:content shape))]
+    (assoc shape :selrect new-selrect)))
+
 (mf/defc path-wrapper
   {::mf/wrap-props false}
   [props]
@@ -22,11 +28,7 @@
         content-modifiers (mf/deref content-modifiers-ref)
         editing-id (mf/deref refs/selected-edition)
         editing? (= editing-id (:id shape))
-        shape (update shape :content upc/apply-content-modifiers content-modifiers)
-
-        [_ new-selrect]
-        (helpers/content->points+selrect shape (:content shape))
-        shape (assoc shape :selrect new-selrect)]
+        shape (mf/use-memo (mf/deps shape content-modifiers) #(apply-content-modifiers shape content-modifiers))]
 
     [:> shape-container {:shape shape
                          :pointer-events (when editing? "none")}

frontend/src/app/main/ui/workspace/shapes/text/viewport_texts.cljs

@@ -32,8 +32,8 @@
 
 (defn strip-modifier
   [modifier]
-  (if (or (some? (get-in modifier [:modifiers :resize-vector]))
-          (some? (get-in modifier [:modifiers :resize-vector-2])))
+  (if (or (some? (dm/get-in modifier [:modifiers :resize-vector]))
+          (some? (dm/get-in modifier [:modifiers :resize-vector-2])))
     modifier
     (d/update-when modifier :modifiers dissoc :displacement :rotation)))