Pārlūkot izejas kodu

fix: bring back :ref/default-open-blocks-level

Tienson Qin 4 mēneši atpakaļ
vecāks
revīzija
d7f0c248ff

+ 1 - 5
deps/common/resources/templates/config.edn

@@ -327,10 +327,6 @@
  ;; Default value: 2
  ;; Default value: 2
  :ref/default-open-blocks-level 2
  :ref/default-open-blocks-level 2
 
 
- ;; Configure the threshold for linked references before collapsing.
- ;; Default value: 100
- :ref/linked-references-collapsed-threshold 50
-
  ;; Graph view configuration.
  ;; Graph view configuration.
  ;; Example usage:
  ;; Example usage:
  ;; :graph/settings
  ;; :graph/settings
@@ -408,4 +404,4 @@
  ;;  :page-ref?        true        ;; Default value: true
  ;;  :page-ref?        true        ;; Default value: true
  ;;  :properties?      true        ;; Default value: true
  ;;  :properties?      true        ;; Default value: true
  ;;  :list?            false}      ;; Default value: false
  ;;  :list?            false}      ;; Default value: false
- }
+ }

+ 0 - 4
deps/graph-parser/test/resources/exporter-test-graph/logseq/config.edn

@@ -271,10 +271,6 @@
  ;; Default value: 2
  ;; Default value: 2
  :ref/default-open-blocks-level 2
  :ref/default-open-blocks-level 2
 
 
- ;; Configure the threshold for linked references before collapsing.
- ;; Default value: 100
- :ref/linked-references-collapsed-threshold 50
-
  ;; Graph view configuration.
  ;; Graph view configuration.
  ;; Example usage:
  ;; Example usage:
  ;; :graph/settings
  ;; :graph/settings

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

@@ -2112,7 +2112,9 @@
                         (or ref? query?)
                         (or ref? query?)
                         (assoc :ref-query-child? true)
                         (assoc :ref-query-child? true)
                         true
                         true
-                        (assoc :block-children? true))]
+                        (assoc :block-children? true)
+                        (integer? (:block-level config))
+                        (update :block-level inc))]
           (block-list config' children))]])))
           (block-list config' children))]])))
 
 
 (defn- block-content-empty?
 (defn- block-content-empty?

+ 1 - 1
src/main/frontend/components/views.cljs

@@ -1529,7 +1529,7 @@
   (let [lazy-item-render (fn [rows idx]
   (let [lazy-item-render (fn [rows idx]
                            (lazy-item rows idx (assoc option :list-view? true)
                            (lazy-item rows idx (assoc option :list-view? true)
                                       (fn [block]
                                       (fn [block]
-                                        (block-container (assoc config :list-view? true) block))))
+                                        (block-container (assoc config :list-view? true :block-level 1) block))))
         list-cp (fn [rows]
         list-cp (fn [rows]
                   (when (seq rows)
                   (when (seq rows)
                     (ui/virtualized-list
                     (ui/virtualized-list

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

@@ -3884,9 +3884,11 @@
   (let [block (or (db/entity (:db/id block)) block)]
   (let [block (or (db/entity (:db/id block)) block)]
     (or
     (or
      (util/collapsed? block)
      (util/collapsed? block)
+     (and (or (:list-view? config) (:ref? config))
+          (integer? (:block-level config))
+          (>= (:block-level config) (state/get-ref-open-blocks-level)))
      (and (or (:view? config) (:popup? config))
      (and (or (:view? config) (:popup? config))
           (or (ldb/page? block)
           (or (ldb/page? block)
-              (some? (:block/_parent block))
               (:table-block-title? config))))))
               (:table-block-title? config))))))
 
 
 (defn batch-set-heading!
 (defn batch-set-heading!

+ 0 - 1
src/main/frontend/schema/handler/common_config.cljc

@@ -60,7 +60,6 @@
               [:or :string :keyword]
               [:or :string :keyword]
               :string]]
               :string]]
     [:ref/default-open-blocks-level :int]
     [:ref/default-open-blocks-level :int]
-    [:ref/linked-references-collapsed-threshold :int]
     [:graph/settings [:map-of :keyword [:or :boolean :int :nil]]]
     [:graph/settings [:map-of :keyword [:or :boolean :int :nil]]]
     [:graph/forcesettings [:map-of :keyword :int]]
     [:graph/forcesettings [:map-of :keyword :int]]
     [:favorites [:vector :string]]
     [:favorites [:vector :string]]

+ 7 - 18
src/main/frontend/state.cljs

@@ -615,24 +615,13 @@ should be done through this fn in order to get global config and config defaults
       (get-in @state [:me :settings :start-of-week])
       (get-in @state [:me :settings :start-of-week])
       6))
       6))
 
 
-;; TODO: support this later
-(comment
-  (defn get-ref-open-blocks-level
-    []
-    (or
-     (when-let [value (:ref/default-open-blocks-level (get-config))]
-       (when (integer? value)
-         value))
-     2)))
-
-(comment
-  (defn get-linked-references-collapsed-threshold
-    []
-    (or
-     (when-let [value (:ref/linked-references-collapsed-threshold (get-config))]
-       (when (integer? value)
-         value))
-     100)))
+(defn get-ref-open-blocks-level
+  []
+  (or
+   (when-let [value (:ref/default-open-blocks-level (get-config))]
+     (when (integer? value)
+       (min value 9)))
+   2))
 
 
 (defn get-export-bullet-indentation
 (defn get-export-bullet-indentation
   []
   []