         attrs (merge props size)
         style (make-style shape)]
     (html
-     [:g
-      (if (or drawing? editing?)
-        [:g
-         [:rect (merge attrs +select-rect-attrs+)]])
-      [:foreignObject attrs
-       [:p {:ref "container" :style style} content]]])))
+     [:foreignObject attrs
+      [:p {:style style} content]])))
 
-;; (def text-shape
-;;   (mx/component
-;;    {:render text-shape-render
-;;     :name "text-shape"
-;;     :mixins [mx/static]}))
+(def text-shape
+  (mx/component
+   {:render text-shape-render
+    :name "text-shape"
+    :mixins [mx/static]}))

     (when line-height {:lineHeight line-height})
     (when letter-spacing {:letterSpacing letter-spacing}))))

(defn- text-shape-render
  [own {:keys [id x1 y1 x2 y2 content drawing? editing?] :as shape}]
  (let [key (str id)
        rfm (geom/transformation-matrix shape)
        size (geom/size shape)

    (merge
     {:fontSize (str size "px")
      :color color
      :whiteSpace "pre"
      :textAlign align
      :fontFamily family
      :fontWeight weight
