Browse Source

fix: expand/collapse all doesn't work in "Linked Reference" section

close #3803
Tienson Qin 4 years ago
parent
commit
e627d5ddcf
2 changed files with 5 additions and 5 deletions
  1. 3 2
      src/main/frontend/components/block.cljs
  2. 2 3
      src/main/frontend/handler/editor.cljs

+ 3 - 2
src/main/frontend/components/block.cljs

@@ -2172,8 +2172,9 @@
 (rum/defcs block-container < rum/reactive
   {:init (fn [state]
            (let [[config block] (:rum/args state)]
-             (state/set-collapsed-block! (:block/uuid block)
-                                         (editor-handler/block-default-collapsed? block config))
+             (when-not (some? (state/sub-collapsed (:block/uuid block)))
+               (state/set-collapsed-block! (:block/uuid block)
+                                           (editor-handler/block-default-collapsed? block config)))
              (assoc state
                     ::init-collapsed? (get-in block [:block/properties :collapsed])
                     ::control-show? (atom false))))

+ 2 - 3
src/main/frontend/handler/editor.cljs

@@ -3503,8 +3503,8 @@
 (defn collapse-block! [block-id]
   (when (collapsable? block-id)
     (when-not (skip-collapsing-in-db?)
-      (set-block-property! block-id :collapsed true))
-    (state/set-collapsed-block! block-id true)))
+      (set-block-property! block-id :collapsed true)))
+  (state/set-collapsed-block! block-id true))
 
 (defn expand-block! [block-id]
   (when-not (skip-collapsing-in-db?)
@@ -3595,7 +3595,6 @@
    (expand-all! nil))
   ([block-id]
    (->> (all-blocks-with-level {:root-block block-id})
-        (filter (fn [b] (-> b :block/properties :collapsed)))
         (map (comp expand-block! :block/uuid))
         dorun)))