From 88c0beddc6b689beb7d1df0ab2021d7a9a4dc308 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 22 Dec 2020 15:21:34 +0100 Subject: [PATCH] :bug: Fix unexpected behavior of potok with native atom and symbols. --- frontend/deps.edn | 4 ++-- frontend/package.json | 2 +- frontend/src/app/main/refs.cljs | 2 +- frontend/yarn.lock | 14 +++++++------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/frontend/deps.edn b/frontend/deps.edn index 6fc84b17f..f01316de7 100644 --- a/frontend/deps.edn +++ b/frontend/deps.edn @@ -14,7 +14,7 @@ funcool/beicon {:mvn/version "2020.12.20-1"} funcool/cuerdas {:mvn/version "2020.03.26-3"} funcool/okulary {:mvn/version "2020.04.14-0"} - funcool/potok {:mvn/version "3.1.0"} + funcool/potok {:mvn/version "3.2.0"} funcool/promesa {:mvn/version "6.0.0"} funcool/rumext {:mvn/version "2020.11.27-0"} @@ -35,7 +35,7 @@ funcool/datoteka {:mvn/version "1.2.0"} binaryage/devtools {:mvn/version "RELEASE"} - thheller/shadow-cljs {:mvn/version "2.11.7"} + thheller/shadow-cljs {:mvn/version "2.11.10"} ;; i18n parsing carocad/parcera {:mvn/version "0.11.0"} diff --git a/frontend/package.json b/frontend/package.json index d48058db0..34208b024 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -29,7 +29,7 @@ "postcss-clean": "^1.1.0", "rimraf": "^3.0.0", "sass": "^1.30.0", - "shadow-cljs": "2.11.9" + "shadow-cljs": "^2.11.9" }, "dependencies": { "date-fns": "^2.15.0", diff --git a/frontend/src/app/main/refs.cljs b/frontend/src/app/main/refs.cljs index decf82f9a..101f8c564 100644 --- a/frontend/src/app/main/refs.cljs +++ b/frontend/src/app/main/refs.cljs @@ -163,7 +163,7 @@ objects (get-in state [:workspace-data :pages-index page-id :objects]) selected (get-in state [:workspace-local :selected]) children (cp/get-children id objects)] - (some selected children)))] + (some #(contains? selected %) children)))] (l/derived selector st/state))) diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 6fcf4a1c7..3a97208b1 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -1373,9 +1373,9 @@ editorconfig@^0.15.3: sigmund "^1.0.1" electron-to-chromium@^1.3.621: - version "1.3.629" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.629.tgz#a08d13b64d90e3c77ec5b9bffa3efbc5b4a00969" - integrity sha512-iSPPJtPvHrMAvYOt+9cdbDmTasPqwnwz4lkP8Dn200gDNUBQOLQ96xUsWXBwXslAo5XxdoXAoQQ3RAy4uao9IQ== + version "1.3.631" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.631.tgz#b28ebc7bfb348bb0aede2fae8888d775ddb6f5ee" + integrity sha512-mPEG/52142po0XK1jQkZtbMmp38MZtQ3JDFItYxV65WXyhxDYEQ54tP4rb93m0RbMlZqQ+4zBw2N7UumSgGfbA== elliptic@^6.5.3: version "6.5.3" @@ -4416,10 +4416,10 @@ shadow-cljs-jar@1.3.2: resolved "https://registry.yarnpkg.com/shadow-cljs-jar/-/shadow-cljs-jar-1.3.2.tgz#97273afe1747b6a2311917c1c88d9e243c81957b" integrity sha512-XmeffAZHv8z7451kzeq9oKh8fh278Ak+UIOGGrapyqrFBB773xN8vMQ3O7J7TYLnb9BUwcqadKkmgaq7q6fhZg== -shadow-cljs@2.11.9: - version "2.11.9" - resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.11.9.tgz#28b728e5bae703759a17af2608ea7a577de34811" - integrity sha512-hwfB435Xk1SRDns98KjHeU2e0MKhexD7BVgY8ck4PVLlhKvMrhztwJzpfieIN3b6Thd4f3IeJpVcGUFooQ5iLA== +shadow-cljs@^2.11.9: + version "2.11.10" + resolved "https://registry.yarnpkg.com/shadow-cljs/-/shadow-cljs-2.11.10.tgz#0d55263a5ad31cac48d07fe9c719821122ec969d" + integrity sha512-/QbBjT75Dn+SY5C7ntu0VSYrId9Jj2EjncxpnB9E9OJn7mpdbmK3zs+PIC/6gpPdBr4gUhfagauD6AJEmsI6xg== dependencies: node-libs-browser "^2.2.1" readline-sync "^1.4.7"