From c5e617271c4145d6792962dedaea05267a0ca967 Mon Sep 17 00:00:00 2001 From: "alonso.torres" Date: Mon, 26 Oct 2020 11:28:23 +0100 Subject: [PATCH] :arrow_up: Upgrades to react 17.0.1 --- frontend/package.json | 4 +- .../src/app/main/ui/components/dropdown.cljs | 4 +- frontend/src/app/main/ui/modal.cljs | 6 +-- .../workspace/colorpicker/pixel_overlay.cljs | 2 +- .../app/main/ui/workspace/shapes/text.cljs | 4 +- .../src/app/main/ui/workspace/viewport.cljs | 4 +- frontend/src/app/util/dom.cljs | 3 ++ frontend/yarn.lock | 44 ++++++------------- 8 files changed, 29 insertions(+), 42 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 9dab680222..7b6133a52f 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -32,8 +32,8 @@ "map-stream": "0.0.7", "mousetrap": "^1.6.5", "randomcolor": "^0.6.2", - "react": "^16.13.1", - "react-dom": "^16.13.1", + "react": "17.0.1", + "react-dom": "17.0.1", "rxjs": "7.0.0-beta.4", "slate": "^0.59.0", "slate-react": "^0.59.0", diff --git a/frontend/src/app/main/ui/components/dropdown.cljs b/frontend/src/app/main/ui/components/dropdown.cljs index d6479d61ff..209224bff9 100644 --- a/frontend/src/app/main/ui/components/dropdown.cljs +++ b/frontend/src/app/main/ui/components/dropdown.cljs @@ -31,8 +31,8 @@ on-mount (fn [] - (let [lkey1 (events/listen js/document EventType.CLICK on-click) - lkey2 (events/listen js/document EventType.KEYUP on-keyup)] + (let [lkey1 (events/listen (dom/get-root) EventType.CLICK on-click) + lkey2 (events/listen (dom/get-root) EventType.KEYUP on-keyup)] #(do (events/unlistenByKey lkey1) (events/unlistenByKey lkey2))))] diff --git a/frontend/src/app/main/ui/modal.cljs b/frontend/src/app/main/ui/modal.cljs index 4b2d36256a..908ebced87 100644 --- a/frontend/src/app/main/ui/modal.cljs +++ b/frontend/src/app/main/ui/modal.cljs @@ -75,9 +75,9 @@ (mf/use-layout-effect (mf/deps allow-click-outside) (fn [] - (let [keys [(events/listen js/document EventType.KEYDOWN handle-keydown) - (events/listen js/window EventType.POPSTATE on-pop-state) - (events/listen js/document EventType.CLICK handle-click-outside)]] + (let [keys [(events/listen js/window EventType.POPSTATE on-pop-state) + (events/listen (dom/get-root) EventType.KEYDOWN handle-keydown) + (events/listen (dom/get-root) EventType.CLICK handle-click-outside)]] #(doseq [key keys] (events/unlistenByKey key))))) diff --git a/frontend/src/app/main/ui/workspace/colorpicker/pixel_overlay.cljs b/frontend/src/app/main/ui/workspace/colorpicker/pixel_overlay.cljs index 4f6bb25e82..3599660a05 100644 --- a/frontend/src/app/main/ui/workspace/colorpicker/pixel_overlay.cljs +++ b/frontend/src/app/main/ui/workspace/colorpicker/pixel_overlay.cljs @@ -129,7 +129,7 @@ (mf/use-effect (fn [] - (let [listener (events/listen js/document EventType.KEYDOWN handle-keydown)] + (let [listener (events/listen (dom/get-root) EventType.KEYDOWN handle-keydown)] #(events/unlistenByKey listener)))) (mf/use-effect diff --git a/frontend/src/app/main/ui/workspace/shapes/text.cljs b/frontend/src/app/main/ui/workspace/shapes/text.cljs index 1fccaefdd2..c389583f50 100644 --- a/frontend/src/app/main/ui/workspace/shapes/text.cljs +++ b/frontend/src/app/main/ui/workspace/shapes/text.cljs @@ -360,8 +360,8 @@ on-mount (fn [] (when (not read-only?) - (let [lkey1 (events/listen js/document EventType.CLICK on-click-outside) - lkey2 (events/listen js/document EventType.KEYUP on-key-up)] + (let [lkey1 (events/listen (dom/get-root) EventType.CLICK on-click-outside) + lkey2 (events/listen (dom/get-root) EventType.KEYUP on-key-up)] (st/emit! (dwt/assign-editor id editor) dwc/start-undo-transaction) diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs index 4f315a1dbb..914b9437e9 100644 --- a/frontend/src/app/main/ui/workspace/viewport.cljs +++ b/frontend/src/app/main/ui/workspace/viewport.cljs @@ -471,8 +471,8 @@ (let [node (mf/ref-val viewport-ref) prnt (dom/get-parent node) - key1 (events/listen js/document EventType.KEYDOWN on-key-down) - key2 (events/listen js/document EventType.KEYUP on-key-up) + key1 (events/listen (dom/get-root) EventType.KEYDOWN on-key-down) + key2 (events/listen (dom/get-root) EventType.KEYUP on-key-up) key3 (events/listen node EventType.MOUSEMOVE on-mouse-move) ;; bind with passive=false to allow the event to be cancelled ;; https://stackoverflow.com/a/57582286/3219895 diff --git a/frontend/src/app/util/dom.cljs b/frontend/src/app/util/dom.cljs index 8c8817671e..92edd65357 100644 --- a/frontend/src/app/util/dom.cljs +++ b/frontend/src/app/util/dom.cljs @@ -219,3 +219,6 @@ (defn release-pointer [event] (-> event get-target (.releasePointerCapture (.-pointerId event)))) + +(defn get-root [] + (query js/document "#app")) diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 97ba2f5104..cfb999f660 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -2590,7 +2590,7 @@ logform@^2.2.0: ms "^2.1.1" triple-beam "^1.3.0" -loose-envify@^1.1.0, loose-envify@^1.4.0: +loose-envify@^1.1.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== @@ -3336,15 +3336,6 @@ progress@^1.1.8: resolved "https://registry.yarnpkg.com/progress/-/progress-1.1.8.tgz#e260c78f6161cdd9b0e56cc3e0a85de17c7a57be" integrity sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74= -prop-types@^15.6.2: - version "15.7.2" - resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5" - integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ== - dependencies: - loose-envify "^1.4.0" - object-assign "^4.1.1" - react-is "^16.8.1" - psl@^1.1.28: version "1.8.0" resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24" @@ -3442,29 +3433,22 @@ randomfill@^1.0.3: randombytes "^2.0.5" safe-buffer "^5.1.0" -react-dom@^16.13.1: - version "16.14.0" - resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.14.0.tgz#7ad838ec29a777fb3c75c3a190f661cf92ab8b89" - integrity sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw== +react-dom@17.0.1: + version "17.0.1" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-17.0.1.tgz#1de2560474ec9f0e334285662ede52dbc5426fc6" + integrity sha512-6eV150oJZ9U2t9svnsspTMrWNyHc6chX0KzDeAOXftRa8bNeOKTTfCJ7KorIwenkHd2xqVTBTCZd79yk/lx/Ug== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" - prop-types "^15.6.2" - scheduler "^0.19.1" + scheduler "^0.20.1" -react-is@^16.8.1: - version "16.13.1" - resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" - integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== - -react@^16.13.1: - version "16.14.0" - resolved "https://registry.yarnpkg.com/react/-/react-16.14.0.tgz#94d776ddd0aaa37da3eda8fc5b6b18a4c9a3114d" - integrity sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g== +react@17.0.1: + version "17.0.1" + resolved "https://registry.yarnpkg.com/react/-/react-17.0.1.tgz#6e0600416bd57574e3f86d92edba3d9008726127" + integrity sha512-lG9c9UuMHdcAexXtigOZLX8exLWkW0Ku29qPRU8uhF2R9BN96dLCt0psvzPLlHc5OWkgymP3qwTRgbnw5BKx3w== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1" - prop-types "^15.6.2" read-pkg-up@^1.0.1: version "1.0.1" @@ -3724,10 +3708,10 @@ sax@~1.2.4: resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw== -scheduler@^0.19.1: - version "0.19.1" - resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.19.1.tgz#4f3e2ed2c1a7d65681f4c854fa8c5a1ccb40f196" - integrity sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA== +scheduler@^0.20.1: + version "0.20.1" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.20.1.tgz#da0b907e24026b01181ecbc75efdc7f27b5a000c" + integrity sha512-LKTe+2xNJBNxu/QhHvDR14wUXHRQbVY5ZOYpOGWRzhydZUqrLb2JBvLPY7cAqFmqrWuDED0Mjk7013SZiOz6Bw== dependencies: loose-envify "^1.1.0" object-assign "^4.1.1"