From a179f73deb320dee3568c069d558dff9a62e3b06 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Mon, 8 Jan 2024 18:05:35 +0100
Subject: [PATCH] :zap: Add minor performance improvements to asset-section
 react component

---
 .../ui/workspace/sidebar/assets/common.cljs   | 60 ++++++++++++-------
 frontend/src/app/util/array.cljs              |  7 ++-
 2 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs b/frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs
index d421f90a9..7b4194a7f 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs
@@ -26,6 +26,7 @@
    [app.main.ui.components.title-bar :refer [title-bar]]
    [app.main.ui.context :as ctx]
    [app.main.ui.icons :as i]
+   [app.util.array :as array]
    [app.util.dom :as dom]
    [app.util.dom.dnd :as dnd]
    [app.util.i18n :as i18n :refer [tr]]
@@ -120,7 +121,8 @@
     :workspace? true}])
 
 (mf/defc section-icon
-  [{:keys [section] :as props}]
+  {::mf/wrap-props false}
+  [{:keys [section]}]
   (case section
     :colors i/drop-refactor
     :components i/component-refactor
@@ -130,28 +132,42 @@
 (mf/defc asset-section
   {::mf/wrap-props false}
   [{:keys [children file-id title section assets-count open?]}]
-  (let [children       (->> (if (array? children) children [children])
-                            (filter some?))
-        get-role       #(.. % -props -role)
-        title-buttons  (filter #(= (get-role %) :title-button) children)
-        content        (filter #(= (get-role %) :content) children)]
-    [:div {:class (stl/css :asset-section)}
-     [:& title-bar {:collapsable  true
-                    :collapsed    (not open?)
-                    :all-clickable true
-                    :on-collapsed #(st/emit! (dw/set-assets-section-open file-id section (not open?)))
-                    :class        (stl/css :title-spacing)
-                    :title        (mf/html [:span {:class (stl/css :title-name)}
-                                            [:span {:class (stl/css :section-icon)}
-                                             [:& section-icon {:section section}]]
-                                            [:span {:class (stl/css :section-name)}
-                                             title]
+  (let [children    (-> (array/normalize-to-array children)
+                        (array/without-nils))
 
-                                            [:span {:class (stl/css :num-assets)}
-                                             assets-count]])}
-      title-buttons]
-     (when ^boolean open?
-       content)]))
+        is-button?  #(= :title-button (.. % -props -role))
+        is-content? #(= :content (.. % -props -role))
+
+        buttons     (array/filter is-button? children)
+        content     (array/filter is-content? children)
+
+        on-collapsed
+        (mf/use-fn
+         (mf/deps file-id section open?)
+         (fn [_]
+           (st/emit! (dw/set-assets-section-open file-id section (not open?)))))
+
+        title
+        (mf/html
+         [:span {:class (stl/css :title-name)}
+          [:span {:class (stl/css :section-icon)}
+           [:& section-icon {:section section}]]
+          [:span {:class (stl/css :section-name)}
+           title]
+
+          [:span {:class (stl/css :num-assets)}
+           assets-count]])]
+
+    [:div {:class (stl/css :asset-section)}
+     [:& title-bar
+      {:collapsable   true
+       :collapsed     (not open?)
+       :all-clickable true
+       :on-collapsed  on-collapsed
+       :class         (stl/css :title-spacing)
+       :title         title}
+      buttons]
+     (when ^boolean open? content)]))
 
 (mf/defc asset-section-block
   {::mf/wrap-props false}
diff --git a/frontend/src/app/util/array.cljs b/frontend/src/app/util/array.cljs
index c04dddb20..012b62c0a 100644
--- a/frontend/src/app/util/array.cljs
+++ b/frontend/src/app/util/array.cljs
@@ -6,7 +6,7 @@
 
 (ns app.util.array
   "A collection of helpers for work with javascript arrays."
-  (:refer-clojure :exclude [conj! conj]))
+  (:refer-clojure :exclude [conj! conj filter]))
 
 (defn conj
   "A conj like function for js arrays."
@@ -44,3 +44,8 @@
 (defn without-nils
   [^js/Array o]
   (.filter o (fn [v] (some? v))))
+
+(defn filter
+  "A specific filter for js arrays."
+  [pred ^js/Array o]
+  (.filter o pred))