refactor font

Author: sprocketc

src/renderer/attribute/impl/font_size.cljs

@@ -3,29 +3,17 @@
   (:require
    [renderer.attribute.hierarchy :as attribute.hierarchy]
    [renderer.attribute.views :as attribute.views]
-   [renderer.utils.dom :as utils.dom]
-   [renderer.utils.element :as utils.element]
+   [renderer.element.impl.text :as element.impl.text]
    [renderer.utils.length :as utils.length]))
 
 (defmethod attribute.hierarchy/description [:default :font-size]
   []
   "The font-size attribute refers to the size of the font from baseline to
    baseline when multiple lines of text are set solid in a multiline layout environment.")
 
-(defn get-font-size!
-  [{:keys [content] :as el}]
-  (when-let [svg (utils.dom/canvas-element!)]
-    (let [dom-el (utils.element/->dom-element el)]
-      (.appendChild svg dom-el)
-      (set! (.-innerHTML dom-el) (if (empty? content) "\u00a0" content))
-      (let [computed-style (.getComputedStyle js/window dom-el nil)
-            font-size (.getPropertyValue computed-style "font-size")]
-        (.remove dom-el)
-        font-size))))
-
 (defmethod attribute.hierarchy/update-attr :font-size
   [el attribute f & more]
-  (let [font-size (get-font-size! el)
+  (let [font-size (:font-size (element.impl.text/get-computed-styles! el))
         font-size (utils.length/unit->px font-size)]
     (assoc-in el [:attrs attribute] (str (apply f font-size more)))))
 

src/renderer/attribute/impl/font_style.cljs

@@ -3,29 +3,17 @@
   (:require
    [renderer.attribute.hierarchy :as attribute.hierarchy]
    [renderer.attribute.views :as attribute.views]
-   [renderer.utils.dom :as utils.dom]
-   [renderer.utils.element :as utils.element]
+   [renderer.element.impl.text :as element.impl.text]
    [renderer.utils.length :as utils.length]))
 
 (defmethod attribute.hierarchy/description [:default :font-style]
   []
   "The font-size attribute refers to the size of the font from baseline to
    baseline when multiple lines of text are set solid in a multiline layout environment.")
 
-(defn get-font-size!
-  [{:keys [content] :as el}]
-  (when-let [svg (utils.dom/canvas-element!)]
-    (let [dom-el (utils.element/->dom-element el)]
-      (.appendChild svg dom-el)
-      (set! (.-innerHTML dom-el) (if (empty? content) "\u00a0" content))
-      (let [computed-style (.getComputedStyle js/window dom-el nil)
-            font-size (.getPropertyValue computed-style "font-size")]
-        (.remove dom-el)
-        font-size))))
-
 (defmethod attribute.hierarchy/update-attr :font-style
   [el attribute f & more]
-  (let [font-size (get-font-size! el)
+  (let [font-size (:font-size (element.impl.text/get-computed-styles! el))
         font-size (utils.length/unit->px font-size)]
     (assoc-in el [:attrs attribute] (str (apply f font-size more)))))
 

src/renderer/element/impl/renderable.cljs

@@ -5,23 +5,10 @@
    [renderer.element.hierarchy :as element.hierarchy]
    [renderer.element.subs :as-alias element.subs]
    [renderer.element.views :as element.views]
-   [renderer.tool.subs :as-alias tool.subs]
-   [renderer.utils.bounds :as utils.bounds]
-   [renderer.utils.dom :as utils.dom]
-   [renderer.utils.element :as utils.element]))
+   [renderer.tool.subs :as-alias tool.subs]))
 
 (derive ::element.hierarchy/renderable ::element.hierarchy/element)
 
-(defmethod element.hierarchy/bbox ::element.hierarchy/renderable
-  [{:keys [content] :as el}]
-  (when-let [svg (utils.dom/canvas-element!)]
-    (let [dom-el (utils.element/->dom-element el)]
-      (.appendChild svg dom-el)
-      (set! (.-innerHTML dom-el) (if (empty? content) "\u00a0" content))
-      (let [bbox (utils.bounds/dom-el->bbox dom-el)]
-        (.remove dom-el)
-        bbox))))
-
 (defmethod element.hierarchy/render ::element.hierarchy/renderable
   [el]
   (let [child-els @(rf/subscribe [::element.subs/filter-visible (:children el)])

src/renderer/element/impl/text.cljs

@@ -128,11 +128,13 @@
       (let [computed-style (.getComputedStyle js/window dom-el nil)
             font-style (.getPropertyValue computed-style "font-style")
             font-size (.getPropertyValue computed-style "font-size")
-            font-weight (.getPropertyValue computed-style "font-weight")]
+            font-weight (.getPropertyValue computed-style "font-weight")
+            bbox (utils.bounds/dom-el->bbox dom-el)]
         (.remove dom-el)
         {:font-style font-style
          :font-size font-size
-         :font-weight font-weight}))))
+         :font-weight font-weight
+         :bbox bbox}))))
 
 (defn font-file->path-data
   [file content x y font-size]
@@ -193,3 +195,7 @@
       (-> (js/fetch (default-font-path font-style font-weight))
           (.then (fn [response]
                    (font-file->path-data response content x y font-size)))))))
+
+(defmethod element.hierarchy/bbox :text
+  [el]
+  (:bbox (get-computed-styles! el)))

src/renderer/utils/attribute.cljs

@@ -107,6 +107,7 @@
    "floodColor"
    "floodOpacity"
    "fontFamily"
+   "fontSize"
    "fontSizeAdjust"
    "fontStretch"
    "fontStyle"