📎 Cosmetic changes on text shape component.

frontend/src/app/main/ui/shapes/text.cljs

@@ -2,24 +2,27 @@
 ;; License, v. 2.0. If a copy of the MPL was not distributed with this
 ;; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 ;;
-;; Copyright (c) 2016-2019 Andrey Antukh <niwi@niwi.nz>
+;; This Source Code Form is "Incompatible With Secondary Licenses", as
+;; defined by the Mozilla Public License, v. 2.0.
+;;
+;; Copyright (c) 2020 UXBOX Labs SL
 
 (ns app.main.ui.shapes.text
   (:require
-   [clojure.set :as set]
+   [app.common.data :as d]
-   [promesa.core :as p]
+   [app.common.geom.matrix :as gmt]
-   [cuerdas.core :as str]
+   [app.common.geom.shapes :as geom]
-   [rumext.alpha :as mf]
    [app.main.data.fetch :as df]
    [app.main.fonts :as fonts]
    [app.main.ui.context :as muc]
    [app.main.ui.shapes.group :refer [mask-id-ctx]]
-   [app.common.data :as d]
-   [app.common.geom.shapes :as geom]
-   [app.common.geom.matrix :as gmt]
-   [app.util.object :as obj]
    [app.util.color :as uc]
-   [app.util.text :as ut]))
+   [app.util.object :as obj]
+   [app.util.text :as ut]
+   [clojure.set :as set]
+   [cuerdas.core :as str]
+   [promesa.core :as p]
+   [rumext.alpha :as mf]))
 
 ;; --- Text Editor Rendering
 

frontend/src/app/main/ui/workspace/shapes/text.cljs

@@ -11,32 +11,32 @@
   (:require
    ["slate" :as slate]
    ["slate-react" :as rslate]
-   [goog.events :as events]
-   [goog.object :as gobj]
-   [cuerdas.core :as str]
-   [rumext.alpha :as mf]
-   [beicon.core :as rx]
-   [app.util.color :as color]
-   [app.util.dom :as dom]
-   [app.util.text :as ut]
-   [app.util.object :as obj]
-   [app.util.color :as uc]
-   [app.util.timers :as timers]
    [app.common.data :as d]
    [app.common.geom.shapes :as geom]
-   [app.main.refs :as refs]
-   [app.main.store :as st]
-   [app.main.fonts :as fonts]
    [app.main.data.workspace :as dw]
    [app.main.data.workspace.common :as dwc]
    [app.main.data.workspace.texts :as dwt]
-   [app.main.ui.cursors :as cur]
+   [app.main.fonts :as fonts]
-   [app.main.ui.workspace.shapes.common :as common]
+   [app.main.refs :as refs]
-   [app.main.ui.shapes.text :as text]
+   [app.main.store :as st]
-   [app.main.ui.keyboard :as kbd]
    [app.main.ui.context :as muc]
+   [app.main.ui.cursors :as cur]
+   [app.main.ui.keyboard :as kbd]
    [app.main.ui.shapes.filters :as filters]
-   [app.main.ui.shapes.shape :refer [shape-container]])
+   [app.main.ui.shapes.shape :refer [shape-container]]
+   [app.main.ui.shapes.text :as text]
+   [app.main.ui.workspace.shapes.common :as common]
+   [app.util.color :as color]
+   [app.util.color :as uc]
+   [app.util.dom :as dom]
+   [app.util.object :as obj]
+   [app.util.text :as ut]
+   [app.util.timers :as timers]
+   [beicon.core :as rx]
+   [cuerdas.core :as str]
+   [goog.events :as events]
+   [goog.object :as gobj]
+   [rumext.alpha :as mf])
   (:import
    goog.events.EventType
    goog.events.KeyCodes))
@@ -59,16 +59,15 @@
 (mf/defc text-wrapper
   {::mf/wrap-props false}
   [props]
-  (let [{:keys [id x1 y1 content group grow-type width height ] :as shape} (unchecked-get props "shape")
+  (let [shape             (unchecked-get props "shape")
         selected-iref     (mf/use-memo (mf/deps (:id shape))
                                        #(refs/make-selected-ref (:id shape)))
         selected?         (mf/deref selected-iref)
         edition           (mf/deref refs/selected-edition)
         current-transform (mf/deref refs/current-transform)
-
         render-editor     (mf/use-state false)
 
-        edition?  (= edition id)
+        edition?          (= edition (:id shape))
 
         embed-resources?  (mf/use-ctx muc/embed-ctx)
 
@@ -80,17 +79,20 @@
           (dom/stop-propagation event)
           (dom/prevent-default event)
           (when selected?
-            (st/emit! (dw/start-edition-mode (:id shape)))))]
+            (st/emit! (dw/start-edition-mode (:id shape)))))
 
-    (mf/use-effect
+        check?
-     (mf/deps shape edition selected? current-transform)
+        (and (#{:auto-width :auto-height} (:grow-type shape))
-     (fn [] (let [check? (and (#{:auto-width :auto-height} (:grow-type shape))
              selected?
              (not edition?)
              (not embed-resources?)
-                              (nil? current-transform))
+             (nil? current-transform))]
-                  result (timers/schedule #(reset! render-editor check?))]
+
-              #(rx/dispose! result))))
+    (mf/use-effect
+     (mf/deps check?)
+     (fn []
+       (let [sem (timers/schedule #(reset! render-editor check?))]
+         #(rx/dispose! sem))))
 
     [:> shape-container {:shape shape
                          :on-double-click on-double-click