Browse Source

fix: add property heading support back

Tienson Qin 4 years ago
parent
commit
5da141ea8a
2 changed files with 22 additions and 4 deletions
  1. 10 3
      src/main/frontend/components/block.cljs
  2. 12 1
      src/main/frontend/components/content.cljs

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

@@ -1233,9 +1233,16 @@
         priority (priority-cp t)
         tags (block-tags-cp t)
         bg-color (:background-color properties)
-        elem (if (and (false? unordered)
-                      heading-level
-                      (<= heading-level 6))
+        heading-level (or (and (false? unordered)
+                               heading-level
+                               (<= heading-level 6)
+                               heading-level)
+                          (and (get properties :heading)
+                               (<= level 6)
+                               level
+                               ;; FIXME: construct the proper level later
+                               2))
+        elem (if heading-level
                (keyword (str "h" heading-level))
                :div)]
     (->elem

+ 12 - 1
src/main/frontend/components/content.cljs

@@ -128,7 +128,8 @@
   [target block-id]
   (rum/with-context [[t] i18n/*tongue-context*]
     (when-let [block (db/entity [:block/uuid block-id])]
-      (let [properties (:block/properties block)]
+      (let [properties (:block/properties block)
+            heading? (true? (:heading properties))]
         [:div#custom-context-menu
          [:div.py-1.rounded-md.bg-base-3.shadow-xs
           [:div.flex-row.flex.justify-between.py-4.pl-2
@@ -146,6 +147,16 @@
                          (editor-handler/remove-block-property! block-id "background-color"))}
             "Clear"]]
 
+          (ui/menu-link
+           {:key "Convert heading"
+            :on-click (fn [_e]
+                        (if heading?
+                          (editor-handler/remove-block-property! block-id :heading)
+                          (editor-handler/set-block-property! block-id :heading true)))}
+           (if heading?
+             "Convert back to a block"
+             "Convert to a heading"))
+
           (ui/menu-link
            {:key "Open in sidebar"
             :on-click (fn [_e]