From 85a1443adafd0d850e447db768248ca0f3a70888 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Fri, 25 Aug 2023 11:03:26 +0200 Subject: [PATCH] :lipstick: Add cosmetic improvements to get-frames fn --- common/src/app/common/types/shape_tree.cljc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/common/src/app/common/types/shape_tree.cljc b/common/src/app/common/types/shape_tree.cljc index b4bf4c08a..d06291e3b 100644 --- a/common/src/app/common/types/shape_tree.cljc +++ b/common/src/app/common/types/shape_tree.cljc @@ -111,16 +111,21 @@ (defn get-frames "Retrieves all frame objects as vector" ([objects] (get-frames objects nil)) - ([objects {:keys [skip-components? skip-copies?] :or {skip-components? false skip-copies? false}}] + ([objects {:keys [skip-components? skip-copies?] + :or {skip-components? false + skip-copies? false}}] (->> (or (-> objects meta ::index-frames) (let [lookup (d/getf objects) xform (comp (remove #(= uuid/zero %)) (keep lookup) (filter cph/frame-shape?))] (->> (keys objects) - (into [] xform)))) - (remove #(or (and skip-components? (ctk/instance-head? %)) - (and skip-copies? (and (ctk/instance-head? %) (not (ctk/main-instance? %))))))))) + (sequence xform)))) + (remove #(or (and ^boolean skip-components? + ^boolean (ctk/instance-head? %)) + (and ^boolean skip-copies? + (and ^boolean (ctk/instance-head? %) + (not ^boolean (ctk/main-instance? %))))))))) (defn get-frames-ids "Retrieves all frame ids as vector"