Browse Source

fix: hide bullets if properties are empty too

Tienson Qin 4 years ago
parent
commit
527c36dcfa
2 changed files with 10 additions and 6 deletions
  1. 8 4
      src/main/frontend/components/block.cljs
  2. 2 2
      src/main/frontend/util/property.cljs

+ 8 - 4
src/main/frontend/components/block.cljs

@@ -1257,11 +1257,15 @@
                  (:block/uuid child)))))]))))
 
 (defn block-content-empty?
-  [block]
+  [{:block/keys [properties title body]}]
   (and
-    (property/properties-built-in? (:block/properties block))
-    (= (:block/title block) [])
-    (every? #(= % ["Horizontal_Rule"]) (:block/body block))))
+   (or
+    (empty? properties)
+    (property/properties-built-in? properties))
+
+   (empty? title)
+
+   (every? #(= % ["Horizontal_Rule"]) body)))
 
 (rum/defcs block-control < rum/reactive
   [state config block uuid block-id body children collapsed? *ref-collapsed? *control-show? edit-input-id edit? doc-mode?]

+ 2 - 2
src/main/frontend/util/property.cljs

@@ -29,8 +29,8 @@
   [properties]
   (and (seq properties)
        (let [ks (map (comp keyword string/lower-case name) (keys properties))
-             built-in-properties* (built-in-properties)]
-         (every? #(contains? built-in-properties* %) ks))))
+             built-in-properties-set (built-in-properties)]
+         (every? built-in-properties-set ks))))
 
 (defn contains-properties?
   [content]