Merge pull request #4796 from penpot/palba-bugfixing-007

🐛 Bugfixing

CHANGES.md

@@ -50,6 +50,10 @@
 - Penpot crashes when a new colorpicker is created while uploading an image to another instance [Taiga #8119](https://tree.taiga.io/project/penpot/issue/8119)
 - Removing Underline and Strikethrough Affects the Previous Text Object [Taiga #8103](https://tree.taiga.io/project/penpot/issue/8103)
 - Color library loses association with shapes when exporting/importing the document [Taiga #8132](https://tree.taiga.io/project/penpot/issue/8132)
+- Fix can't collapse groups when searching in the assets tab [Taiga #8125](https://tree.taiga.io/project/penpot/issue/8125)
+- Fix 'Detach instance' shortcut is not working [Taiga #8102](https://tree.taiga.io/project/penpot/issue/8102)
+- Fix import file message does not detect 0 as error [Taiga #6824](https://tree.taiga.io/project/penpot/issue/6824)
+
 
 ## 2.0.3
 

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

@@ -1096,6 +1096,14 @@
     (update [_ state]
       (assoc-in state [:workspace-assets :open-status file-id section] open?))))
 
+(defn clear-assets-section-open
+  []
+  (ptk/reify ::clear-assets-section-open
+    ptk/UpdateEvent
+    (update [_ state]
+      (assoc-in state [:workspace-assets :open-status] {}))))
+
+
 (defn set-assets-group-open
   [file-id section path open?]
   (ptk/reify ::set-assets-group-open

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

@@ -615,7 +615,6 @@
       (let [page-id          (:current-page-id state)
             objects          (wsh/lookup-page-objects state page-id)
             file             (wsh/get-local-file state)
-            container        (cfh/get-container file :page page-id)
             libraries        (wsh/get-libraries state)
             selected         (->> state
                                   (wsh/lookup-selected)
@@ -627,7 +626,7 @@
             changes (when can-detach?
                       (reduce
                        (fn [changes id]
-                         (cll/generate-detach-instance changes container libraries id))
+                         (cll/generate-detach-component changes id file page-id libraries))
                        (pcb/empty-changes it)
                        selected))]
 

frontend/src/app/main/ui/dashboard/import.cljs

@@ -489,7 +489,7 @@
 
            :else
            [:& context-notification
-            {:type :success
+            {:type (if (zero? success-num) :warning :success)
              :content (tr "dashboard.import.import-message" (i18n/c success-num))}]))
 
        (for [entry entries]

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

@@ -9,8 +9,10 @@
   (:require
    [app.common.data.macros :as dm]
    [app.main.data.modal :as modal]
+   [app.main.data.workspace :as dw]
    [app.main.data.workspace.assets :as dwa]
    [app.main.refs :as refs]
+   [app.main.store :as st]
    [app.main.ui.components.context-menu-a11y :refer [context-menu-a11y]]
    [app.main.ui.components.search-bar :refer [search-bar]]
    [app.main.ui.context :as ctx]
@@ -103,6 +105,7 @@
         on-search-term-change
         (mf/use-fn
          (fn [event]
+           (st/emit! (dw/clear-assets-section-open))
            (swap! filters* assoc :term event)))
 
         on-section-filter-change
@@ -112,6 +115,7 @@
                                (dom/get-value))
                            (as-> (dom/get-current-target event) $
                              (dom/get-attribute $ "data-testid")))]
+             (st/emit! (dw/clear-assets-section-open))
              (swap! filters* assoc :section value :open-menu false))))
 
         show-libraries-dialog

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

@@ -192,8 +192,10 @@
            on-drag-start do-rename cancel-rename on-rename-group on-group on-ungroup on-context-menu
            selected-full local]}]
 
-  (let [group-open?    (or ^boolean force-open?
+  (let [group-open?    (if (false? (get open-groups prefix)) ;; if the user has closed it specifically, respect that
-                           ^boolean (get open-groups prefix (if (= prefix "") true false)))
+                         false
+                         (or ^boolean force-open?
+                             ^boolean (get open-groups prefix (if (= prefix "") true false))))
         dragging*      (mf/use-state false)
         dragging?      (deref dragging*)
 

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

@@ -318,6 +318,7 @@
     (and has-term?
          (some pos? (map count [filtered-components filtered-colors filtered-media filtered-typographies]))
          (some #(> 60 (count %)) [filtered-components filtered-colors filtered-media filtered-typographies]))))
+
 (mf/defc file-library
   {::mf/wrap-props false}
   [{:keys [file local? default-open? filters]}]
@@ -333,8 +334,10 @@
         open-status      (mf/deref open-status-ref)
         force-open-lib?  (force-lib-open? file-id filters)
 
-        open?            (or force-open-lib?
+        open?            (if (false? (:library open-status)) ;; if the user has closed it specifically, respect that
-                             (d/nilv (:library open-status) default-open?))
+                           false
+                           (or force-open-lib?
+                               (d/nilv (:library open-status) default-open?)))
 
         unselect-all
         (mf/use-fn