♻️ Remove separate the content of the text of the rest of properties on components updates

CHANGES.md

@@ -24,7 +24,6 @@ on [its own changelog](library/CHANGES.md)
 - Deselect layers (and path nodes) with Ctrl+Shift+Drag [Github #2509](https://github.com/penpot/penpot/issues/2509)
 - Copy to SVG from contextual menu [Github #838](https://github.com/penpot/penpot/issues/838)
 - Add styles for Inkeep Chat at workspace [Taiga #10708](https://tree.taiga.io/project/penpot/us/10708)
-- On components overrides, separate the content of the text from the rest of properties [Taiga #7434](https://tree.taiga.io/project/penpot/us/7434)
 - Add configuration for air gapped installations with Docker
 - Support system color scheme [Github #5030](https://github.com/penpot/penpot/issues/5030)
 - Persist ruler visibility across files and reloads [GitHub #4586](https://github.com/penpot/penpot/issues/4586)

common/src/app/common/files/migrations.cljc

@@ -32,7 +32,6 @@
    [app.common.types.shape :as cts]
    [app.common.types.shape.interactions :as ctsi]
    [app.common.types.shape.shadow :as ctss]
-   [app.common.types.text :as cttx]
    [app.common.uuid :as uuid]
    [clojure.set :as set]
    [cuerdas.core :as str]))
@@ -1326,31 +1325,6 @@
         (update :pages-index d/update-vals update-container)
         (d/update-when :components d/update-vals update-container))))
 
-(defmethod migrate-data "0004-add-partial-text-touched-flags"
-  [data _]
-  (letfn [(update-object [page object]
-            (if (and (cfh/text-shape? object)
-                     (ctk/in-component-copy? object))
-              (let [file            {:id (:id data) :data data}
-                    libs            (when (:libs data)
-                                      (deref (:libs data)))
-                    ref-shape       (ctf/find-ref-shape file page libs object
-                                                        {:include-deleted? true :with-context? true})
-                    partial-touched (when ref-shape
-                                      (cttx/get-diff-type (:content object) (:content ref-shape)))]
-                (if (seq partial-touched)
-                  (update object :touched (fn [touched]
-                                            (reduce #(ctk/set-touched-group %1 %2)
-                                                    touched
-                                                    partial-touched)))
-                  object))
-              object))
-
-          (update-page [page]
-            (d/update-when page :objects d/update-vals (partial update-object page)))]
-
-    (update data :pages-index d/update-vals update-page)))
-
 (defmethod migrate-data "0004-clean-shadow-and-colors"
   [data _]
   (letfn [(clean-shadow [shadow]
@@ -1562,7 +1536,6 @@
          "0002-clean-shape-interactions"
          "0003-fix-root-shape"
          "0003-convert-path-content"
-         "0004-add-partial-text-touched-flags"
          "0004-clean-shadow-and-colors"
          "0005-deprecate-image-type"
          "0006-fix-old-texts-fills"

common/src/app/common/logic/libraries.cljc

@@ -29,7 +29,6 @@
    [app.common.types.shape-tree :as ctst]
    [app.common.types.shape.interactions :as ctsi]
    [app.common.types.shape.layout :as ctl]
-   [app.common.types.text :as cttx]
    [app.common.types.token :as cto]
    [app.common.types.typography :as cty]
    [app.common.types.variant :as ctv]
@@ -1666,7 +1665,7 @@
 
 
 (defn- add-update-attr-operations
-  [attr dest-shape origin-shape roperations uoperations touched is-text-partial-change?]
+  [attr dest-shape origin-shape roperations uoperations touched]
   (let [orig-value (get origin-shape attr)
         dest-value (get dest-shape attr)
         ;; position-data is a special case because can be affected by :geometry-group and :content-group
@@ -1678,27 +1677,10 @@
              (not= orig-value dest-value)
              (touched :geometry-group))
 
-        ;; We want to split the changes on the text itself and on its properties
-        text-value
-        (when is-text-partial-change?
-          (cond
-            (touched :text-content-structure-same-attrs)
-            ;; Keep the dest structure and texts, update its attrs to make them like the origin
-            (cttx/copy-attrs-keys dest-value (cttx/get-first-paragraph-text-attrs orig-value))
-
-            (touched :text-content-text)
-            ;; Keep the texts touched in dest: copy the texts from dest over the attrs of origin
-            (cttx/copy-text-keys dest-value orig-value)
-
-            (touched :text-content-attribute)
-            ;; Keep the attrs touched in dest: copy the texts from origin over the attrs of dest
-            (cttx/copy-text-keys orig-value dest-value)))
-
         val (cond
               ;; If position data changes and the geometry group is touched
               ;; we need to put to nil so we can regenerate it
               reset-pos-data? nil
-              is-text-partial-change? text-value
               :else orig-value)
 
         roperation {:type :set
@@ -1712,33 +1694,6 @@
     [(conj roperations roperation)
      (conj uoperations uoperation)]))
 
-(defn- is-text-partial-change?
-  "Check if the attr update is a text partial change"
-  [origin-shape dest-shape attr touched]
-  (let [partial-text-keys [:text-content-attribute :text-content-text]
-        active-keys       (filter touched partial-text-keys)
-        orig-content      (get origin-shape attr)
-        orig-attrs        (cttx/get-first-paragraph-text-attrs orig-content)
-
-        equal-orig-attrs? (cttx/equal-attrs? orig-content orig-attrs)]
-    (and
-     (or
-     ;; One and only one of the keys is pressent
-      (= 1 (count active-keys))
-      (and
-       (not (touched :text-content-attribute))
-       (touched :text-content-structure-same-attrs)))
-
-     (or
-      ;; Both has the same structure
-      (cttx/equal-structure? (:content origin-shape) (:content dest-shape))
-
-      ;; The origin and destiny have different structures, but each have the same attrs
-      ;; for all the items on its content tree
-      (and
-       equal-orig-attrs?
-       (touched :text-content-structure-same-attrs))))))
-
 (defn- update-attrs
   "The main function that implements the attribute sync algorithm. Copy
   attributes that have changed in the origin shape to the dest shape.
@@ -1782,29 +1737,14 @@
             (generate-update-tokens container dest-shape origin-shape touched omit-touched?))
 
           (let [attr-group        (get ctk/sync-attrs attr)
-                ;; On texts, when we want to omit the touched attrs, both text (the actual letters)
-                ;; and attrs (bold, font, etc) are in the same attr :content.
-                ;; If only one of them is touched, we want to adress this case and
-                ;; only update the untouched one
-                text-partial-change? (when (and
-                                            omit-touched?
-                                            (= :text (:type origin-shape))
-                                            (= :content attr)
-                                            (touched attr-group))
-                                       (is-text-partial-change? origin-shape dest-shape attr touched))
-
                 skip-operations? (or (= (get origin-shape attr) (get dest-shape attr))
                                      (and (touched attr-group)
-                                          omit-touched?
+                                          omit-touched?))
-                                          ;; When it is a text-partial-change, we should generate operations
-                                          ;; even when omit-touched? is true, but updating only the text or
-                                          ;; the attributes, omiting the other part
-                                          (not text-partial-change?)))
 
                 [roperations' uoperations']
                 (if skip-operations?
                   [roperations uoperations]
-                  (add-update-attr-operations attr dest-shape origin-shape roperations uoperations touched text-partial-change?))]
+                  (add-update-attr-operations attr dest-shape origin-shape roperations uoperations touched))]
             (recur (next attrs)
                    roperations'
                    uoperations')))))))
@@ -1839,7 +1779,7 @@
                    ;; If the attr is not touched in the origin shape, don't copy it
                    (not (touched-origin attr-group)))
                 [roperations uoperations]
-                (add-update-attr-operations attr dest-shape origin-shape roperations uoperations touched false))]
+                (add-update-attr-operations attr dest-shape origin-shape roperations uoperations touched))]
           (recur (next attrs)
                  roperations'
                  uoperations'))

common/src/app/common/types/container.cljc

@@ -18,7 +18,6 @@
    [app.common.types.plugins :as ctpg]
    [app.common.types.shape-tree :as ctst]
    [app.common.types.shape.layout :as ctl]
-   [app.common.types.text :as cttx]
    [app.common.types.token :as ctt]
    [app.common.uuid :as uuid]
    [clojure.set :as set]))
@@ -570,16 +569,13 @@
              (not equal?)
              (not (and ignore-geometry is-geometry?)))
 
-        content-diff-type (when (and (= (:type shape) :text) (= attr :content))
-                            (cttx/get-diff-type (:content shape) val))
-
         token-groups (if (= attr :applied-tokens)
                        (get-token-groups shape val)
                        #{})
 
         groups (cond-> token-groups
                  (and group (not equal?))
-                 (set/union #{group} content-diff-type))]
+                 (set/union #{group}))]
     (cond-> shape
       ;; Depending on the origin of the attribute change, we need or not to
       ;; set the "touched" flag for the group the attribute belongs to.

common/test/common_tests/logic/text_sync_test.cljc

@@ -1,881 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; 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) KALEIDOS INC
-
-(ns common-tests.logic.text-sync-test
-  (:require
-   [app.common.files.changes-builder :as pcb]
-   [app.common.logic.libraries :as cll]
-   [app.common.logic.shapes :as cls]
-   [app.common.test-helpers.components :as thc]
-   [app.common.test-helpers.compositions :as tho]
-   [app.common.test-helpers.files :as thf]
-   [app.common.test-helpers.ids-map :as thi]
-   [app.common.test-helpers.shapes :as ths]
-   [clojure.test :as t]))
-
-(t/use-fixtures :each thi/test-fixture)
-
-
-(t/deftest test-sync-unchanged-copy-when-changed-attribute
-  (let [;; ==== Setup
-        file       (-> (thf/sample-file :file1)
-                       (tho/add-frame-with-text :main-root :main-child "hello world")
-                       (thc/make-component :component1 :main-root)
-                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
-        page       (thf/current-page file)
-        main-child (ths/get-shape file :main-child)
-
-        ;; ==== Action
-        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
-                                                 #{(:id main-child)}
-                                                 (fn [shape]
-                                                   (assoc-in shape [:content :children 0 :children 0 :children 0 :font-size] "32"))
-                                                 (:objects page)
-                                                 {})
-
-        updated-file (thf/apply-changes file changes1)
-
-        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
-                                                     nil
-                                                     :components
-                                                     (:id updated-file)
-                                                     (thi/id :component1)
-                                                     (:id updated-file)
-                                                     {(:id updated-file) updated-file}
-                                                     (:id updated-file))
-
-        file'     (thf/apply-changes updated-file changes2)
-
-        ;; ==== Get
-        copy-child' (ths/get-shape file' :copy-child)
-        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
-    (t/is (= "32" (:font-size line)))
-    (t/is (= "hello world" (:text line)))))
-
-(t/deftest test-sync-unchanged-copy-when-changed-text
-  (let [;; ==== Setup
-        file       (-> (thf/sample-file :file1)
-                       (tho/add-frame-with-text :main-root :main-child "hello world")
-                       (thc/make-component :component1 :main-root)
-                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
-        page       (thf/current-page file)
-        main-child (ths/get-shape file :main-child)
-
-        ;; ==== Action
-        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
-                                                 #{(:id main-child)}
-                                                 (fn [shape]
-                                                   (assoc-in shape [:content :children 0 :children 0 :children 0 :text] "Bye"))
-                                                 (:objects page)
-                                                 {})
-
-        updated-file (thf/apply-changes file changes1)
-
-        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
-                                                     nil
-                                                     :components
-                                                     (:id updated-file)
-                                                     (thi/id :component1)
-                                                     (:id updated-file)
-                                                     {(:id updated-file) updated-file}
-                                                     (:id updated-file))
-
-        file'     (thf/apply-changes updated-file changes2)
-
-        ;; ==== Get
-        copy-child' (ths/get-shape file' :copy-child)
-        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
-    (t/is (= "14" (:font-size line)))
-    (t/is (= "Bye" (:text line)))))
-
-(t/deftest test-sync-unchanged-copy-when-changed-both
-  (let [;; ==== Setup
-        file       (-> (thf/sample-file :file1)
-                       (tho/add-frame-with-text :main-root :main-child "hello world")
-                       (thc/make-component :component1 :main-root)
-                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
-        page       (thf/current-page file)
-        main-child (ths/get-shape file :main-child)
-
-        ;; ==== Action
-        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
-                                                 #{(:id main-child)}
-                                                 (fn [shape]
-                                                   (-> shape
-                                                       (assoc-in [:content :children 0 :children 0 :children 0 :font-size] "32")
-                                                       (assoc-in [:content :children 0 :children 0 :children 0 :text] "Bye")))
-                                                 (:objects page)
-                                                 {})
-
-        updated-file (thf/apply-changes file changes1)
-
-        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
-                                                     nil
-                                                     :components
-                                                     (:id updated-file)
-                                                     (thi/id :component1)
-                                                     (:id updated-file)
-                                                     {(:id updated-file) updated-file}
-                                                     (:id updated-file))
-
-        file'     (thf/apply-changes updated-file changes2)
-
-        ;; ==== Get
-        copy-child' (ths/get-shape file' :copy-child)
-        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
-    (t/is (= "32" (:font-size line)))
-    (t/is (= "Bye" (:text line)))))
-
-(t/deftest test-sync-updated-attr-copy-when-changed-attribute
-  (let [;; ==== Setup
-        file0      (-> (thf/sample-file :file1)
-                       (tho/add-frame-with-text :main-root :main-child "hello world")
-                       (thc/make-component :component1 :main-root)
-                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
-        page0      (thf/current-page file0)
-        copy-child (ths/get-shape file0 :copy-child)
-
-        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
-                                               #{(:id copy-child)}
-                                               (fn [shape]
-                                                 (assoc-in shape [:content :children 0 :children 0 :children 0 :font-weight] "700"))
-                                               (:objects (thf/current-page file0))
-                                               {})
-        file       (thf/apply-changes file0 changes)
-        main-child (ths/get-shape file :main-child)
-        page       (thf/current-page file)
-
-        ;; ==== Action
-        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
-                                                 #{(:id main-child)}
-                                                 (fn [shape]
-                                                   (assoc-in shape [:content :children 0 :children 0 :children 0 :font-size] "32"))
-                                                 (:objects page)
-                                                 {})
-
-        updated-file (thf/apply-changes file changes1)
-
-        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
-                                                     nil
-                                                     :components
-                                                     (:id updated-file)
-                                                     (thi/id :component1)
-                                                     (:id updated-file)
-                                                     {(:id updated-file) updated-file}
-                                                     (:id updated-file))
-
-        file'     (thf/apply-changes updated-file changes2)
-
-        ;; ==== Get
-        copy-child' (ths/get-shape file' :copy-child)
-        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
-    ;; The attr doesn't change, because it was touched
-    (t/is (= "14" (:font-size line)))
-    (t/is (= "hello world" (:text line)))))
-
-(t/deftest test-sync-updated-attr-copy-when-changed-text
-  (let [;; ==== Setup
-        file0      (-> (thf/sample-file :file1)
-                       (tho/add-frame-with-text :main-root :main-child "hello world")
-                       (thc/make-component :component1 :main-root)
-                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
-        page0      (thf/current-page file0)
-        copy-child (ths/get-shape file0 :copy-child)
-
-        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
-                                               #{(:id copy-child)}
-                                               (fn [shape]
-                                                 (assoc-in shape [:content :children 0 :children 0 :children 0 :font-weight] "700"))
-                                               (:objects (thf/current-page file0))
-                                               {})
-        file       (thf/apply-changes file0 changes)
-        main-child (ths/get-shape file :main-child)
-        page       (thf/current-page file)
-
-        ;; ==== Action
-        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
-                                                 #{(:id main-child)}
-                                                 (fn [shape]
-                                                   (assoc-in shape [:content :children 0 :children 0 :children 0 :text] "Bye"))
-                                                 (:objects page)
-                                                 {})
-
-        updated-file (thf/apply-changes file changes1)
-
-        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
-                                                     nil
-                                                     :components
-                                                     (:id updated-file)
-                                                     (thi/id :component1)
-                                                     (:id updated-file)
-                                                     {(:id updated-file) updated-file}
-                                                     (:id updated-file))
-
-        file'     (thf/apply-changes updated-file changes2)
-
-        ;; ==== Get
-        copy-child' (ths/get-shape file' :copy-child)
-        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
-    (t/is (= "14" (:font-size line)))
-    ;; The text is updated because only attrs were touched
-    (t/is (= "Bye" (:text line)))))
-
-(t/deftest test-sync-updated-attr-copy-when-changed-both
-  (let [;; ==== Setup
-        file0      (-> (thf/sample-file :file1)
-                       (tho/add-frame-with-text :main-root :main-child "hello world")
-                       (thc/make-component :component1 :main-root)
-                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
-        page0      (thf/current-page file0)
-        copy-child (ths/get-shape file0 :copy-child)
-
-        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
-                                               #{(:id copy-child)}
-                                               (fn [shape]
-                                                 (assoc-in shape [:content :children 0 :children 0 :children 0 :font-weight] "700"))
-                                               (:objects (thf/current-page file0))
-                                               {})
-        file       (thf/apply-changes file0 changes)
-        main-child (ths/get-shape file :main-child)
-        page       (thf/current-page file)
-
-        ;; ==== Action
-        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
-                                                 #{(:id main-child)}
-                                                 (fn [shape]
-                                                   (-> shape
-                                                       (assoc-in [:content :children 0 :children 0 :children 0 :font-size] "32")
-                                                       (assoc-in [:content :children 0 :children 0 :children 0 :text] "Bye")))
-                                                 (:objects page)
-                                                 {})
-
-        updated-file (thf/apply-changes file changes1)
-
-        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
-                                                     nil
-                                                     :components
-                                                     (:id updated-file)
-                                                     (thi/id :component1)
-                                                     (:id updated-file)
-                                                     {(:id updated-file) updated-file}
-                                                     (:id updated-file))
-
-        file'     (thf/apply-changes updated-file changes2)
-
-        ;; ==== Get
-        copy-child' (ths/get-shape file' :copy-child)
-        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
-    ;; The attr doesn't change, because it was touched
-    (t/is (= "14" (:font-size line)))
-    ;; The text is updated because only attrs were touched
-    (t/is (= "Bye" (:text line)))))
-
-(t/deftest test-sync-updated-text-copy-when-changed-attribute
-  (let [;; ==== Setup
-        file0      (-> (thf/sample-file :file1)
-                       (tho/add-frame-with-text :main-root :main-child "hello world")
-                       (thc/make-component :component1 :main-root)
-                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
-        page0      (thf/current-page file0)
-        copy-child (ths/get-shape file0 :copy-child)
-
-        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
-                                               #{(:id copy-child)}
-                                               (fn [shape]
-                                                 (assoc-in shape [:content :children 0 :children 0 :children 0 :text] "Hi"))
-                                               (:objects (thf/current-page file0))
-                                               {})
-        file       (thf/apply-changes file0 changes)
-        main-child (ths/get-shape file :main-child)
-        page       (thf/current-page file)
-
-        ;; ==== Action
-        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
-                                                 #{(:id main-child)}
-                                                 (fn [shape]
-                                                   (assoc-in shape [:content :children 0 :children 0 :children 0 :font-size] "32"))
-                                                 (:objects page)
-                                                 {})
-
-        updated-file (thf/apply-changes file changes1)
-
-        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
-                                                     nil
-                                                     :components
-                                                     (:id updated-file)
-                                                     (thi/id :component1)
-                                                     (:id updated-file)
-                                                     {(:id updated-file) updated-file}
-                                                     (:id updated-file))
-
-        file'     (thf/apply-changes updated-file changes2)
-
-        ;; ==== Get
-        copy-child' (ths/get-shape file' :copy-child)
-        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
-    ;; The attr is updated because only text were touched
-    (t/is (= "32" (:font-size line)))
-    (t/is (= "Hi" (:text line)))))
-
-(t/deftest test-sync-updated-text-copy-when-changed-text
-  (let [;; ==== Setup
-        file0      (-> (thf/sample-file :file1)
-                       (tho/add-frame-with-text :main-root :main-child "hello world")
-                       (thc/make-component :component1 :main-root)
-                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
-        page0      (thf/current-page file0)
-        copy-child (ths/get-shape file0 :copy-child)
-
-        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
-                                               #{(:id copy-child)}
-                                               (fn [shape]
-                                                 (assoc-in shape [:content :children 0 :children 0 :children 0 :text] "Hi"))
-                                               (:objects (thf/current-page file0))
-                                               {})
-        file       (thf/apply-changes file0 changes)
-        main-child (ths/get-shape file :main-child)
-        page       (thf/current-page file)
-
-        ;; ==== Action
-        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
-                                                 #{(:id main-child)}
-                                                 (fn [shape]
-                                                   (assoc-in shape [:content :children 0 :children 0 :children 0 :text] "Bye"))
-                                                 (:objects page)
-                                                 {})
-
-        updated-file (thf/apply-changes file changes1)
-
-        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
-                                                     nil
-                                                     :components
-                                                     (:id updated-file)
-                                                     (thi/id :component1)
-                                                     (:id updated-file)
-                                                     {(:id updated-file) updated-file}
-                                                     (:id updated-file))
-
-        file'     (thf/apply-changes updated-file changes2)
-
-        ;; ==== Get
-        copy-child' (ths/get-shape file' :copy-child)
-        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
-    (t/is (= "14" (:font-size line)))
-    ;; The text doesn't change, because it was touched
-    (t/is (= "Hi" (:text line)))))
-
-(t/deftest test-sync-updated-text-copy-when-changed-both
-  (let [;; ==== Setup
-        file0      (-> (thf/sample-file :file1)
-                       (tho/add-frame-with-text :main-root :main-child "hello world")
-                       (thc/make-component :component1 :main-root)
-                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
-        page0      (thf/current-page file0)
-        copy-child (ths/get-shape file0 :copy-child)
-
-        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
-                                               #{(:id copy-child)}
-                                               (fn [shape]
-                                                 (assoc-in shape [:content :children 0 :children 0 :children 0 :text] "Hi"))
-                                               (:objects (thf/current-page file0))
-                                               {})
-        file       (thf/apply-changes file0 changes)
-        main-child (ths/get-shape file :main-child)
-        page       (thf/current-page file)
-
-        ;; ==== Action
-        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
-                                                 #{(:id main-child)}
-                                                 (fn [shape]
-                                                   (-> shape
-                                                       (assoc-in [:content :children 0 :children 0 :children 0 :font-size] "32")
-                                                       (assoc-in [:content :children 0 :children 0 :children 0 :text] "Bye")))
-                                                 (:objects page)
-                                                 {})
-
-        updated-file (thf/apply-changes file changes1)
-
-        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
-                                                     nil
-                                                     :components
-                                                     (:id updated-file)
-                                                     (thi/id :component1)
-                                                     (:id updated-file)
-                                                     {(:id updated-file) updated-file}
-                                                     (:id updated-file))
-
-        file'     (thf/apply-changes updated-file changes2)
-
-        ;; ==== Get
-        copy-child' (ths/get-shape file' :copy-child)
-        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
-    ;; The attr is updated because only text were touched
-    (t/is (= "32" (:font-size line)))
-    ;; The text doesn't change, because it was touched
-    (t/is (= "Hi" (:text line)))))
-
-(t/deftest test-sync-updated-both-copy-when-changed-attribute
-  (let [;; ==== Setup
-        file0      (-> (thf/sample-file :file1)
-                       (tho/add-frame-with-text :main-root :main-child "hello world")
-                       (thc/make-component :component1 :main-root)
-                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
-        page0      (thf/current-page file0)
-        copy-child (ths/get-shape file0 :copy-child)
-
-        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
-                                               #{(:id copy-child)}
-                                               (fn [shape]
-                                                 (-> shape
-                                                     (assoc-in [:content :children 0 :children 0 :children 0 :font-weight] "700")
-                                                     (assoc-in [:content :children 0 :children 0 :children 0 :text] "Hi")))
-                                               (:objects (thf/current-page file0))
-                                               {})
-        file       (thf/apply-changes file0 changes)
-        main-child (ths/get-shape file :main-child)
-        page       (thf/current-page file)
-
-        ;; ==== Action
-        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
-                                                 #{(:id main-child)}
-                                                 (fn [shape]
-                                                   (assoc-in shape [:content :children 0 :children 0 :children 0 :font-size] "32"))
-                                                 (:objects page)
-                                                 {})
-
-        updated-file (thf/apply-changes file changes1)
-
-        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
-                                                     nil
-                                                     :components
-                                                     (:id updated-file)
-                                                     (thi/id :component1)
-                                                     (:id updated-file)
-                                                     {(:id updated-file) updated-file}
-                                                     (:id updated-file))
-
-        file'     (thf/apply-changes updated-file changes2)
-
-        ;; ==== Get
-        copy-child' (ths/get-shape file' :copy-child)
-        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
-    ;; The attr doesn't change, because it was touched
-    (t/is (= "14" (:font-size line)))
-    (t/is (= "Hi" (:text line)))))
-
-(t/deftest test-sync-updated-both-copy-when-changed-text
-  (let [;; ==== Setup
-        file0      (-> (thf/sample-file :file1)
-                       (tho/add-frame-with-text :main-root :main-child "hello world")
-                       (thc/make-component :component1 :main-root)
-                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
-        page0      (thf/current-page file0)
-        copy-child (ths/get-shape file0 :copy-child)
-
-        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
-                                               #{(:id copy-child)}
-                                               (fn [shape]
-                                                 (-> shape
-                                                     (assoc-in [:content :children 0 :children 0 :children 0 :font-weight] "700")
-                                                     (assoc-in [:content :children 0 :children 0 :children 0 :text] "Hi")))
-                                               (:objects (thf/current-page file0))
-                                               {})
-        file       (thf/apply-changes file0 changes)
-        main-child (ths/get-shape file :main-child)
-        page       (thf/current-page file)
-
-        ;; ==== Action
-        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
-                                                 #{(:id main-child)}
-                                                 (fn [shape]
-                                                   (assoc-in shape [:content :children 0 :children 0 :children 0 :text] "Bye"))
-                                                 (:objects page)
-                                                 {})
-
-        updated-file (thf/apply-changes file changes1)
-
-        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
-                                                     nil
-                                                     :components
-                                                     (:id updated-file)
-                                                     (thi/id :component1)
-                                                     (:id updated-file)
-                                                     {(:id updated-file) updated-file}
-                                                     (:id updated-file))
-
-        file'     (thf/apply-changes updated-file changes2)
-
-        ;; ==== Get
-        copy-child' (ths/get-shape file' :copy-child)
-        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
-    (t/is (= "14" (:font-size line)))
-    ;; The text doesn't change, because it was touched
-    (t/is (= "Hi" (:text line)))))
-
-(t/deftest test-sync-updated-both-copy-when-changed-both
-  (let [;; ==== Setup
-        file0      (-> (thf/sample-file :file1)
-                       (tho/add-frame-with-text :main-root :main-child "hello world")
-                       (thc/make-component :component1 :main-root)
-                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
-        page0      (thf/current-page file0)
-        copy-child (ths/get-shape file0 :copy-child)
-
-        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
-                                               #{(:id copy-child)}
-                                               (fn [shape]
-                                                 (-> shape
-                                                     (assoc-in [:content :children 0 :children 0 :children 0 :font-weight] "700")
-                                                     (assoc-in [:content :children 0 :children 0 :children 0 :text] "Hi")))
-                                               (:objects (thf/current-page file0))
-                                               {})
-        file       (thf/apply-changes file0 changes)
-        main-child (ths/get-shape file :main-child)
-        page       (thf/current-page file)
-
-        ;; ==== Action
-        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
-                                                 #{(:id main-child)}
-                                                 (fn [shape]
-                                                   (-> shape
-                                                       (assoc-in [:content :children 0 :children 0 :children 0 :font-size] "32")
-                                                       (assoc-in [:content :children 0 :children 0 :children 0 :text] "Bye")))
-                                                 (:objects page)
-                                                 {})
-
-        updated-file (thf/apply-changes file changes1)
-
-        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
-                                                     nil
-                                                     :components
-                                                     (:id updated-file)
-                                                     (thi/id :component1)
-                                                     (:id updated-file)
-                                                     {(:id updated-file) updated-file}
-                                                     (:id updated-file))
-
-        file'     (thf/apply-changes updated-file changes2)
-
-        ;; ==== Get
-        copy-child' (ths/get-shape file' :copy-child)
-        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
-    ;; The attr doesn't change, because it was touched
-    (t/is (= "14" (:font-size line)))
-    ;; The text doesn't change, because it was touched
-    (t/is (= "Hi" (:text line)))))
-
-(t/deftest test-sync-updated-structure-same-attrs-copy-when-changed-attribute
-  (let [;; ==== Setup
-        file0      (-> (thf/sample-file :file1)
-                       (tho/add-frame-with-text :main-root :main-child "hello world")
-                       (thc/make-component :component1 :main-root)
-                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
-        page0      (thf/current-page file0)
-        copy-child (ths/get-shape file0 :copy-child)
-
-        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
-                                               #{(:id copy-child)}
-                                               (fn [shape]
-                                                 (let [line (get-in shape [:content :children 0 :children 0 :children 0])]
-                                                   (update-in shape [:content :children 0 :children 0 :children]
-                                                              #(conj % line))))
-                                               (:objects (thf/current-page file0))
-                                               {})
-        file       (thf/apply-changes file0 changes)
-        main-child (ths/get-shape file :main-child)
-        page       (thf/current-page file)
-
-        ;; ==== Action
-        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
-                                                 #{(:id main-child)}
-                                                 (fn [shape]
-                                                   ;; Update the attrs on all the content tree
-                                                   (-> shape
-                                                       (assoc-in [:content :children 0 :children 0 :children 0 :font-size] "32")
-                                                       (assoc-in [:content :children 0 :children 0 :font-size] "32")))
-                                                 (:objects page)
-                                                 {})
-
-        updated-file (thf/apply-changes file changes1)
-
-        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
-                                                     nil
-                                                     :components
-                                                     (:id updated-file)
-                                                     (thi/id :component1)
-                                                     (:id updated-file)
-                                                     {(:id updated-file) updated-file}
-                                                     (:id updated-file))
-
-        file'     (thf/apply-changes updated-file changes2)
-
-        ;; ==== Get
-        copy-child' (ths/get-shape file' :copy-child)
-        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
-    ;; The attr is updated because all the attrs on the structure are equal
-    (t/is (= "32" (:font-size line)))
-    (t/is (= "hello world" (:text line)))))
-
-(t/deftest test-sync-updated-structure-same-attrs-copy-when-changed-text
-  (let [;; ==== Setup
-        file0      (-> (thf/sample-file :file1)
-                       (tho/add-frame-with-text :main-root :main-child "hello world")
-                       (thc/make-component :component1 :main-root)
-                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
-        page0      (thf/current-page file0)
-        copy-child (ths/get-shape file0 :copy-child)
-
-        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
-                                               #{(:id copy-child)}
-                                               (fn [shape]
-                                                 (let [line (get-in shape [:content :children 0 :children 0 :children 0])]
-                                                   (update-in shape [:content :children 0 :children 0 :children]
-                                                              #(conj % line))))
-                                               (:objects (thf/current-page file0))
-                                               {})
-        file       (thf/apply-changes file0 changes)
-        main-child (ths/get-shape file :main-child)
-        page       (thf/current-page file)
-
-        ;; ==== Action
-        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
-                                                 #{(:id main-child)}
-                                                 (fn [shape]
-                                                   (assoc-in shape [:content :children 0 :children 0 :children 0 :text] "Bye"))
-                                                 (:objects page)
-                                                 {})
-
-        updated-file (thf/apply-changes file changes1)
-
-        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
-                                                     nil
-                                                     :components
-                                                     (:id updated-file)
-                                                     (thi/id :component1)
-                                                     (:id updated-file)
-                                                     {(:id updated-file) updated-file}
-                                                     (:id updated-file))
-
-        file'     (thf/apply-changes updated-file changes2)
-
-        ;; ==== Get
-        copy-child' (ths/get-shape file' :copy-child)
-        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
-    (t/is (= "14" (:font-size line)))
-    ;; The text doesn't change, because the structure was touched
-    (t/is (= "hello world" (:text line)))))
-
-(t/deftest test-sync-updated-structure-same-attrs-copy-when-changed-both
-  (let [;; ==== Setup
-        file0      (-> (thf/sample-file :file1)
-                       (tho/add-frame-with-text :main-root :main-child "hello world")
-                       (thc/make-component :component1 :main-root)
-                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
-        page0      (thf/current-page file0)
-        copy-child (ths/get-shape file0 :copy-child)
-
-        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
-                                               #{(:id copy-child)}
-                                               (fn [shape]
-                                                 (let [line (get-in shape [:content :children 0 :children 0 :children 0])]
-                                                   (update-in shape [:content :children 0 :children 0 :children]
-                                                              #(conj % line))))
-                                               (:objects (thf/current-page file0))
-                                               {})
-        file       (thf/apply-changes file0 changes)
-        main-child (ths/get-shape file :main-child)
-        page       (thf/current-page file)
-
-        ;; ==== Action
-        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
-                                                 #{(:id main-child)}
-                                                 (fn [shape]
-                                                     ;; Update the attrs on all the content tree
-                                                   (-> shape
-                                                       (assoc-in [:content :children 0 :children 0 :children 0 :font-size] "32")
-                                                       (assoc-in [:content :children 0 :children 0 :font-size] "32")
-                                                       (assoc-in [:content :children 0 :children 0 :children 0 :text] "Bye")))
-                                                 (:objects page)
-                                                 {})
-
-        updated-file (thf/apply-changes file changes1)
-
-        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
-                                                     nil
-                                                     :components
-                                                     (:id updated-file)
-                                                     (thi/id :component1)
-                                                     (:id updated-file)
-                                                     {(:id updated-file) updated-file}
-                                                     (:id updated-file))
-
-        file'     (thf/apply-changes updated-file changes2)
-
-        ;; ==== Get
-        copy-child' (ths/get-shape file' :copy-child)
-        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
-    ;; The attr is updated because all the attrs on the structure are equal
-    (t/is (= "32" (:font-size line)))
-    ;; The text doesn't change, because the structure was touched
-    (t/is (= "hello world" (:text line)))))
-
-(t/deftest test-sync-updated-structure-diff-attrs-copy-when-changed-attribute
-  (let [;; ==== Setup
-        file0      (-> (thf/sample-file :file1)
-                       (tho/add-frame-with-text :main-root :main-child "hello world")
-                       (thc/make-component :component1 :main-root)
-                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
-        page0      (thf/current-page file0)
-        copy-child (ths/get-shape file0 :copy-child)
-
-        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
-                                               #{(:id copy-child)}
-                                               (fn [shape]
-                                                 (let [line (-> (get-in shape [:content :children 0 :children 0 :children 0])
-                                                                (assoc :font-weight "700"))]
-                                                   (update-in shape [:content :children 0 :children 0 :children]
-                                                              #(conj % line))))
-                                               (:objects (thf/current-page file0))
-                                               {})
-        file       (thf/apply-changes file0 changes)
-        main-child (ths/get-shape file :main-child)
-        page       (thf/current-page file)
-
-        ;; ==== Action
-        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
-                                                 #{(:id main-child)}
-                                                 (fn [shape]
-                                                   ;; Update the attrs on all the content tree
-                                                   (-> shape
-                                                       (assoc-in [:content :children 0 :children 0 :children 0 :font-size] "32")
-                                                       (assoc-in [:content :children 0 :children 0 :font-size] "32")))
-                                                 (:objects page)
-                                                 {})
-
-        updated-file (thf/apply-changes file changes1)
-
-        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
-                                                     nil
-                                                     :components
-                                                     (:id updated-file)
-                                                     (thi/id :component1)
-                                                     (:id updated-file)
-                                                     {(:id updated-file) updated-file}
-                                                     (:id updated-file))
-
-        file'     (thf/apply-changes updated-file changes2)
-
-        ;; ==== Get
-        copy-child' (ths/get-shape file' :copy-child)
-        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
-    ;; The attr doesn't change, because not all the attrs on the structure are equal
-    (t/is (= "14" (:font-size line)))
-    (t/is (= "hello world" (:text line)))))
-
-(t/deftest test-sync-updated-structure-diff-attrs-copy-when-changed-text
-  (let [;; ==== Setup
-        file0      (-> (thf/sample-file :file1)
-                       (tho/add-frame-with-text :main-root :main-child "hello world")
-                       (thc/make-component :component1 :main-root)
-                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
-        page0      (thf/current-page file0)
-        copy-child (ths/get-shape file0 :copy-child)
-
-        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
-                                               #{(:id copy-child)}
-                                               (fn [shape]
-                                                 (let [line (-> (get-in shape [:content :children 0 :children 0 :children 0])
-                                                                (assoc :font-weight "700"))]
-                                                   (update-in shape [:content :children 0 :children 0 :children]
-                                                              #(conj % line))))
-                                               (:objects (thf/current-page file0))
-                                               {})
-        file       (thf/apply-changes file0 changes)
-        main-child (ths/get-shape file :main-child)
-        page       (thf/current-page file)
-
-        ;; ==== Action
-        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
-                                                 #{(:id main-child)}
-                                                 (fn [shape]
-                                                   (assoc-in shape [:content :children 0 :children 0 :children 0 :text] "Bye"))
-                                                 (:objects page)
-                                                 {})
-
-        updated-file (thf/apply-changes file changes1)
-
-        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
-                                                     nil
-                                                     :components
-                                                     (:id updated-file)
-                                                     (thi/id :component1)
-                                                     (:id updated-file)
-                                                     {(:id updated-file) updated-file}
-                                                     (:id updated-file))
-
-        file'     (thf/apply-changes updated-file changes2)
-
-        ;; ==== Get
-        copy-child' (ths/get-shape file' :copy-child)
-        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
-    (t/is (= "14" (:font-size line)))
-    ;; The text doesn't change, because the structure was touched
-    (t/is (= "hello world" (:text line)))))
-
-(t/deftest test-sync-updated-structure-diff-attrs-copy-when-changed-both
-  (let [;; ==== Setup
-        file0      (-> (thf/sample-file :file1)
-                       (tho/add-frame-with-text :main-root :main-child "hello world")
-                       (thc/make-component :component1 :main-root)
-                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
-        page0      (thf/current-page file0)
-        copy-child (ths/get-shape file0 :copy-child)
-
-        changes    (cls/generate-update-shapes (pcb/empty-changes nil (:id page0))
-                                               #{(:id copy-child)}
-                                               (fn [shape]
-                                                 (let [line (-> (get-in shape [:content :children 0 :children 0 :children 0])
-                                                                (assoc :font-weight "700"))]
-                                                   (update-in shape [:content :children 0 :children 0 :children]
-                                                              #(conj % line))))
-                                               (:objects (thf/current-page file0))
-                                               {})
-        file       (thf/apply-changes file0 changes)
-        main-child (ths/get-shape file :main-child)
-        page       (thf/current-page file)
-
-        ;; ==== Action
-        changes1     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
-                                                 #{(:id main-child)}
-                                                 (fn [shape]
-                                                     ;; Update the attrs on all the content tree
-                                                   (-> shape
-                                                       (assoc-in [:content :children 0 :children 0 :children 0 :font-size] "32")
-                                                       (assoc-in [:content :children 0 :children 0 :font-size] "32")
-                                                       (assoc-in [:content :children 0 :children 0 :children 0 :text] "Bye")))
-                                                 (:objects page)
-                                                 {})
-
-        updated-file (thf/apply-changes file changes1)
-
-        changes2     (cll/generate-sync-file-changes (pcb/empty-changes)
-                                                     nil
-                                                     :components
-                                                     (:id updated-file)
-                                                     (thi/id :component1)
-                                                     (:id updated-file)
-                                                     {(:id updated-file) updated-file}
-                                                     (:id updated-file))
-
-        file'     (thf/apply-changes updated-file changes2)
-
-        ;; ==== Get
-        copy-child' (ths/get-shape file' :copy-child)
-        line (get-in copy-child' [:content :children 0 :children 0 :children 0])]
-    ;; The attr doesn't change, because not all the attrs on the structure are equal
-    (t/is (= "14" (:font-size line)))
-    ;; The text doesn't change, because the structure was touched
-    (t/is (= "hello world" (:text line)))))

common/test/common_tests/logic/text_touched_test.cljc

@@ -1,132 +0,0 @@
-;; This Source Code Form is subject to the terms of the Mozilla Public
-;; 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) KALEIDOS INC
-
-(ns common-tests.logic.text-touched-test
-  (:require
-   [app.common.files.changes-builder :as pcb]
-   [app.common.logic.shapes :as cls]
-   [app.common.test-helpers.components :as thc]
-   [app.common.test-helpers.compositions :as tho]
-   [app.common.test-helpers.files :as thf]
-   [app.common.test-helpers.ids-map :as thi]
-   [app.common.test-helpers.shapes :as ths]
-   [clojure.test :as t]))
-
-(t/use-fixtures :each thi/test-fixture)
-
-(t/deftest test-text-copy-changed-attribute
-  (let [;; ==== Setup
-        file       (-> (thf/sample-file :file1)
-                       (tho/add-frame-with-text :main-root :main-child "hello world")
-                       (thc/make-component :component1 :main-root)
-                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
-        page       (thf/current-page file)
-        copy-child (ths/get-shape file :copy-child)
-
-        ;; ==== Action
-        changes     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
-                                                #{(:id copy-child)}
-                                                (fn [shape]
-                                                  (assoc-in shape [:content :children 0 :children 0 :font-size] "32"))
-                                                (:objects page)
-                                                {})
-
-        file'       (thf/apply-changes file changes)
-        copy-child' (ths/get-shape file' :copy-child)]
-    (t/is (= #{:content-group :text-content-attribute} (:touched copy-child')))))
-
-(t/deftest test-text-copy-changed-text
-  (let [;; ==== Setup
-        file       (-> (thf/sample-file :file1)
-                       (tho/add-frame-with-text :main-root :main-child "hello world")
-                       (thc/make-component :component1 :main-root)
-                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
-        page       (thf/current-page file)
-        copy-child (ths/get-shape file :copy-child)
-
-        ;; ==== Action
-        changes     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
-                                                #{(:id copy-child)}
-                                                (fn [shape]
-                                                  (assoc-in shape [:content :children 0 :children 0 :text] "Bye"))
-                                                (:objects page)
-                                                {})
-
-        file'       (thf/apply-changes file changes)
-        copy-child' (ths/get-shape file' :copy-child)]
-    (t/is (= #{:content-group :text-content-text} (:touched copy-child')))))
-
-(t/deftest test-text-copy-changed-both
-  (let [;; ==== Setup
-        file       (-> (thf/sample-file :file1)
-                       (tho/add-frame-with-text :main-root :main-child "hello world")
-                       (thc/make-component :component1 :main-root)
-                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
-        page       (thf/current-page file)
-        copy-child (ths/get-shape file :copy-child)
-
-        ;; ==== Action
-        changes     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
-                                                #{(:id copy-child)}
-                                                (fn [shape]
-                                                  (-> shape
-                                                      (assoc-in [:content :children 0 :children 0 :font-size] "32")
-                                                      (assoc-in [:content :children 0 :children 0 :text] "Bye")))
-                                                (:objects page)
-                                                {})
-
-        file'       (thf/apply-changes file changes)
-        copy-child' (ths/get-shape file' :copy-child)]
-    (t/is (= #{:content-group :text-content-attribute :text-content-text} (:touched copy-child')))))
-
-(t/deftest test-text-copy-changed-structure-same-attrs
-  (let [;; ==== Setup
-        file       (-> (thf/sample-file :file1)
-                       (tho/add-frame-with-text :main-root :main-child "hello world")
-                       (thc/make-component :component1 :main-root)
-                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
-        page       (thf/current-page file)
-        copy-child (ths/get-shape file :copy-child)
-
-        ;; ==== Action
-        changes     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
-                                                #{(:id copy-child)}
-                                                (fn [shape]
-                                                  (let [line (get-in shape [:content :children 0 :children 0])]
-                                                    (update-in shape [:content :children 0 :children]
-                                                               #(conj % line))))
-                                                (:objects page)
-                                                {})
-
-        file'       (thf/apply-changes file changes)
-        copy-child' (ths/get-shape file' :copy-child)]
-    (t/is (= #{:content-group :text-content-structure :text-content-structure-same-attrs} (:touched copy-child')))))
-
-(t/deftest test-text-copy-changed-structure-diff-attrs
-  (let [;; ==== Setup
-        file       (-> (thf/sample-file :file1)
-                       (tho/add-frame-with-text :main-root :main-child "hello world")
-                       (thc/make-component :component1 :main-root)
-                       (thc/instantiate-component :component1 :copy-root {:children-labels [:copy-child]}))
-        page       (thf/current-page file)
-        copy-child (ths/get-shape file :copy-child)
-
-        ;; ==== Action
-        changes     (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
-                                                #{(:id copy-child)}
-                                                (fn [shape]
-                                                  (let [line (-> shape
-                                                                 (get-in [:content :children 0 :children 0])
-                                                                 (assoc :font-size "32"))]
-                                                    (update-in shape [:content :children 0 :children]
-                                                               #(conj % line))))
-                                                (:objects page)
-                                                {})
-
-        file'       (thf/apply-changes file changes)
-        copy-child' (ths/get-shape file' :copy-child)]
-    (t/is (= #{:content-group :text-content-structure} (:touched copy-child')))))
-