🐛 Fix inconsistency on naming

This also a fix of passing incorrect prop :shared-libs
to a component that already expectes :libraries.

It also removes unnecesary use of refs/libraries ref

frontend/src/app/main/ui/inspect/attributes/text.cljs

@@ -56,10 +56,12 @@
          (make-typographies-library-ref (:typography-ref-file style)))
 
         typography-library (mf/deref typography-library-ref)
+
+        ;; FIXME: too many duplicate operations
         file-typographies-viewer    (mf/deref file-typographies-ref)
         file-typographies-workspace (mf/deref refs/workspace-file-typography)
 
-        file-library-workspace      (get (mf/deref refs/libraries) (:typography-ref-file style))
+        file-library-workspace      (get (mf/deref refs/files) (:typography-ref-file style))
         typography-external-lib (get-in file-library-workspace [:data :typographies (:typography-ref-id style)])
 
         color-format       (mf/use-state :hex)

frontend/src/app/main/ui/inspect/right_sidebar.cljs

@@ -26,16 +26,11 @@
   "Retrieve all libraries, including the local file, on workspace or viewer"
   [from]
   (if (= from :workspace)
-    (let [workspace-data (deref refs/workspace-data)
+    (deref refs/libraries)
-          {:keys [id] :as local} workspace-data
+    (let [viewer-data (deref refs/viewer-data)
-          libraries (deref refs/libraries)]
+          local       (get-in viewer-data [:file :data])
-      (-> libraries
+          id          (get local :id)
-          (assoc id {:id id
+          libraries   (:libraries viewer-data)]
-                     :data local})))
-    (let [viewer-data     (deref refs/viewer-data)
-          local           (get-in viewer-data [:file :data])
-          id              (get local :id)
-          libraries       (:libraries viewer-data)]
       (-> libraries
           (assoc id {:id id
                      :data local})))))

frontend/src/app/main/ui/workspace/color_palette.cljs

@@ -166,9 +166,9 @@
 
 (defn- make-library-colors-ref
   [file-id]
-  (l/derived (fn [libraries]
+  (l/derived (fn [files]
-               (dm/get-in libraries [file-id :data :colors]))
+               (dm/get-in files [file-id :data :colors]))
-             refs/libraries))
+             refs/files))
 
 (mf/defc file-color-palette*
   {::mf/private true}

frontend/src/app/main/ui/workspace/colorpicker/libraries.cljs

@@ -48,7 +48,7 @@
            {:value "file" :label (tr "workspace.libraries.colors.file-library")}])
 
         options
-        (mf/with-memo [library-options file-id]
+        (mf/with-memo [library-options libraries file-id]
           (into library-options
                 (comp
                  (map val)

frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs

@@ -321,7 +321,7 @@
         current-file-id     (mf/use-ctx ctx/current-file-id)
         current-page-id     (mf/use-ctx ctx/current-page-id)
 
-        libraries           (deref refs/libraries)
+        libraries           (deref refs/files)
         current-file        (get libraries current-file-id)
 
         objects             (-> (dsh/get-page (:data current-file) current-page-id)

frontend/src/app/main/ui/workspace/sidebar/assets/components.cljs

@@ -44,7 +44,7 @@
 
 (defn- get-component-root-and-container
   [file-id component]
-  (let [data       (dm/get-in @refs/libraries [file-id :data])
+  (let [data       (dm/get-in @refs/files [file-id :data])
         root-shape (ctf/get-component-root data component)
         container  (ctf/get-component-page data component)]
     [root-shape container]))
@@ -453,7 +453,7 @@
          (fn [component event]
 
            (let [file-data
-                 (dm/get-in @refs/libraries [file-id :data])
+                 (dm/get-in @refs/files [file-id :data])
 
                  shape-main
                  (ctf/get-component-root file-data component)]

frontend/src/app/main/ui/workspace/sidebar/options.cljs

@@ -44,7 +44,7 @@
 
 (mf/defc shape-options*
   {::mf/wrap [#(mf/throttle % 60)]}
-  [{:keys [shape shapes-with-children page-id file-id shared-libs] :as props}]
+  [{:keys [shape shapes-with-children page-id file-id libraries] :as props}]
   (let [shape-type (dm/get-prop shape :type)
         shape-id   (dm/get-prop shape :id)
 
@@ -56,8 +56,8 @@
     [:*
      (case shape-type
        :frame   [:> frame/options* props]
-       :group   [:& group/options {:shape shape :shape-with-children shapes-with-children :file-id file-id :shared-libs shared-libs}]
+       :group   [:& group/options {:shape shape :shape-with-children shapes-with-children :file-id file-id :libraries libraries}]
-       :text    [:& text/options {:shape shape  :file-id file-id :shared-libs shared-libs}]
+       :text    [:& text/options {:shape shape  :file-id file-id :libraries libraries}]
        :rect    [:& rect/options {:shape shape}]
        :circle  [:& circle/options {:shape shape}]
        :path    [:& path/options {:shape shape}]
@@ -83,7 +83,7 @@
   [{:keys [selected objects page-id file-id selected-shapes shapes-with-children]}]
   (let [sp-panel             (mf/deref refs/specialized-panel)
         drawing              (mf/deref refs/workspace-drawing)
-        shared-libs          (mf/deref refs/libraries)
+        libraries            (mf/deref refs/libraries)
         edition              (mf/deref refs/selected-edition)
         edit-grid?           (ctl/grid-layout? objects edition)
         grid-edition         (mf/deref refs/workspace-grid-edition)
@@ -113,7 +113,7 @@
         {:shape (:object drawing)
          :page-id page-id
          :file-id file-id
-         :shared-libs shared-libs}]
+         :libraries libraries}]
 
        (= 0 (count selected))
        [:> page/options*]
@@ -123,7 +123,7 @@
         {:shape (first selected-shapes)
          :page-id page-id
          :file-id file-id
-         :shared-libs shared-libs
+         :libraries libraries
          :shapes-with-children shapes-with-children}]
 
        :else
@@ -132,7 +132,7 @@
          :shapes selected-shapes
          :page-id page-id
          :file-id file-id
-         :shared-libs shared-libs}])]))
+         :libraries libraries}])]))
 
 (mf/defc options-content*
   {::mf/memo true

frontend/src/app/main/ui/workspace/sidebar/options/menus/color_selection.cljs

@@ -19,8 +19,8 @@
    [rumext.v2 :as mf]))
 
 (defn- prepare-colors
-  [shapes file-id shared-libs]
+  [shapes file-id libraries]
-  (let [data           (into [] (remove nil? (ctc/extract-all-colors shapes file-id shared-libs)))
+  (let [data           (into [] (remove nil? (ctc/extract-all-colors shapes file-id libraries)))
         groups         (d/group-by :attrs #(dissoc % :attrs) data)
         all-colors     (distinct (mapv :attrs data))
 

frontend/src/app/main/ui/workspace/sidebar/options/menus/component.cljs

@@ -295,7 +295,8 @@
   (let [single?             (= 1 (count shapes))
         shape               (first shapes)
         current-file-id     (mf/use-ctx ctx/current-file-id)
-        libraries           (mf/deref refs/files)
+
+        libraries           (mf/deref refs/libraries)
         objects             (mf/deref refs/workspace-page-objects)
 
         ^boolean
@@ -513,7 +514,7 @@
   [{:keys [shapes swap-opened?]}]
   (let [current-file-id     (mf/use-ctx ctx/current-file-id)
 
-        libraries           (deref refs/libraries)
+        libraries           (deref refs/files)
         current-file        (get libraries current-file-id)
 
         state*              (mf/use-state

frontend/src/app/main/ui/workspace/sidebar/options/menus/text.cljs

@@ -184,7 +184,7 @@
 
   (let [file-id        (mf/use-ctx ctx/current-file-id)
         typographies   (mf/deref refs/workspace-file-typography)
-        shared-libs    (mf/deref refs/libraries)
+        libraries      (mf/deref refs/files)
         label          (case type
                          :multiple (tr "workspace.options.text-options.title-selection")
                          :group (tr "workspace.options.text-options.title-group")
@@ -224,21 +224,19 @@
            (emit-update! ids attrs)))
 
         typography
-        (mf/use-memo
+        (mf/with-memo [values file-id libraries]
-         (mf/deps values file-id shared-libs)
+          (cond
-         (fn []
+            (and typography-id
-           (cond
+                 (not= typography-id :multiple)
-             (and typography-id
+                 (not= typography-file-id file-id))
-                  (not= typography-id :multiple)
+            (-> libraries
-                  (not= typography-file-id file-id))
+                (get-in [typography-file-id :data :typographies typography-id])
-             (-> shared-libs
+                (assoc :file-id typography-file-id))
-                 (get-in [typography-file-id :data :typographies typography-id])
-                 (assoc :file-id typography-file-id))
 
-             (and typography-id
+            (and typography-id
-                  (not= typography-id :multiple)
+                 (not= typography-id :multiple)
-                  (= typography-file-id file-id))
+                 (= typography-file-id file-id))
-             (get typographies typography-id))))
+            (get typographies typography-id)))
 
         on-convert-to-typography
         (fn [_]

frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs

@@ -48,13 +48,13 @@
   [{:keys [index color disable-gradient disable-opacity disable-image disable-picker hidden
            on-change on-reorder on-detach on-open on-close on-remove
            disable-drag on-focus on-blur select-only select-on-focus]}]
-  (let [shared-libs      (mf/deref refs/libraries)
+  (let [libraries        (mf/deref refs/files)
         hover-detach     (mf/use-state false)
         on-change        (h/use-ref-callback on-change)
 
         file-id          (or (:ref-file color) (:file-id color))
         color-id         (or (:ref-id color) (:id color))
-        src-colors       (dm/get-in shared-libs [file-id :data :colors])
+        src-colors       (dm/get-in libraries [file-id :data :colors])
         color-name       (dm/get-in src-colors [color-id :name])
 
         multiple-colors? (uc/multiple? color)

frontend/src/app/main/ui/workspace/sidebar/options/shapes/group.cljs

@@ -34,7 +34,7 @@
   [props]
   (let [shape                    (unchecked-get props "shape")
         shape-with-children      (unchecked-get props "shape-with-children")
-        shared-libs              (unchecked-get props "shared-libs")
+        libraries                (unchecked-get props "libraries")
         objects                  (->> shape-with-children (group-by :id) (d/mapm (fn [_ v] (first v))))
         file-id                  (unchecked-get props "file-id")
         layout-container-values  (select-keys shape layout-container-flex-attrs)
@@ -106,7 +106,7 @@
       {:type type
        :shapes (vals objects)
        :file-id file-id
-       :libraries shared-libs}]
+       :libraries libraries}]
 
      (when-not (empty? shadow-ids)
        [:> shadow-menu* {:ids ids :values (get shape :shadow) :type type}])

frontend/src/app/main/ui/workspace/sidebar/options/shapes/text.cljs

@@ -29,7 +29,7 @@
    [rumext.v2 :as mf]))
 
 (mf/defc options
-  [{:keys [shape file-id] :as props}]
+  [{:keys [shape file-id libraries] :as props}]
   (let [ids    [(:id shape)]
         type   (:type shape)
 
@@ -53,8 +53,6 @@
                        (mf/deref refs/workspace-v2-editor-state)
                        (mf/deref refs/workspace-editor-state))
 
-        shared-libs  (mf/deref refs/libraries)
-
         editor-state (when (not (features/active-feature? @st/state "text-editor/v2"))
                        (get state-map (:id shape)))
 
@@ -150,7 +148,7 @@
         {:type type
          :shapes [shape]
          :file-id file-id
-         :libraries shared-libs}])
+         :libraries libraries}])
 
      [:> shadow-menu* {:ids ids :values (get shape :shadow)}]
 

frontend/src/app/main/ui/workspace/text_palette.cljs

@@ -68,7 +68,7 @@
          (str (:font-size typography) "px | " (:name variant-data))]])]))
 
 (mf/defc palette
-  [{:keys [selected selected-ids current-file-id file-typographies shared-libs size width]}]
+  [{:keys [selected selected-ids current-file-id file-typographies libraries size width]}]
   (let [file-id
         (case selected
           :recent nil
@@ -79,7 +79,7 @@
         (case selected
           :recent []
           :file (sort-by #(str/lower (:name %)) (vals file-typographies))
-          (sort-by #(str/lower (:name %)) (vals (get-in shared-libs [selected :data :typographies]))))
+          (sort-by #(str/lower (:name %)) (vals (get-in libraries [selected :data :typographies]))))
         state (mf/use-state {:offset 0})
         offset-step 144
         buttons-size (cond
@@ -182,13 +182,17 @@
   {::mf/wrap [mf/memo]}
   [{:keys [size width selected] :as props}]
   (let [selected-ids      (mf/deref refs/selected-shapes)
+
+        ;; FIXME: we have duplicate operations, if we already have the
+        ;; libraries, so we already have file-typographies so we don't
+        ;; need two separate lens/refs for that
         file-typographies (mf/deref refs/workspace-file-typography)
-        shared-libs       (mf/deref refs/libraries)
+        libraries         (mf/deref refs/files)
         current-file-id   (mf/use-ctx ctx/current-file-id)]
     [:& palette {:current-file-id current-file-id
                  :selected-ids selected-ids
                  :file-typographies file-typographies
-                 :shared-libs shared-libs
+                 :libraries libraries
                  :width width
                  :selected selected
                  :size size}]))

frontend/src/app/main/ui/workspace/text_palette_ctx_menu.cljs

@@ -17,11 +17,11 @@
 (mf/defc text-palette-ctx-menu
   [{:keys [show-menu? close-menu on-select-palette selected]}]
   (let [typographies (mf/deref refs/workspace-file-typography)
-        shared-libs  (mf/deref refs/libraries)]
+        libraries    (mf/deref refs/libraries)]
     [:& dropdown {:show show-menu?
                   :on-close close-menu}
      [:ul {:class (stl/css :text-context-menu)}
-      (for [[idx cur-library] (map-indexed vector (vals shared-libs))]
+      (for [[idx cur-library] (map-indexed vector (vals libraries))]
         (let [typographies (-> cur-library (get-in [:data :typographies]) vals)]
           [:li
            {:class (stl/css-case :palette-library true