Merge pull request #5150 from penpot/alotor-bugfixing

Alotor bugfixing

CHANGES.md

@@ -27,6 +27,9 @@
 
 ### :bug: Bugs fixed
 
+- Fix problem with go back button on error page [Taiga #8887](https://tree.taiga.io/project/penpot/issue/8887)
+- Fix problem with shadows in text for Safari [Taiga #8770](https://tree.taiga.io/project/penpot/issue/8770)
+
 ## 2.2.1
 
 ### :bug: Bugs fixed

frontend/src/app/main/data/plugins.cljs

@@ -26,6 +26,13 @@
     (catch :default e
       (.error js/console "Error" e))))
 
+(defn close-plugin!
+  [{:keys [plugin-id]}]
+  (try
+    (.ɵunloadPlugin ^js ug/global plugin-id)
+    (catch :default e
+      (.error js/console "Error" e))))
+
 (defn delay-open-plugin
   [plugin]
   (ptk/reify ::delay-open-plugin

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

@@ -98,7 +98,11 @@
                                         (obj/set! "fill" (str "url(#fill-" index "-" render-id ")")))}
                         (cond-> browser-props
                           (obj/merge! browser-props)))
-              shape (assoc shape :fills (:fills data))
+              shape (-> shape
+                        (assoc :fills (:fills data))
+                        ;; The text elements have the shadow and blur already applied in the
+                        ;; group parent.
+                        (dissoc :shadow :blur))
 
               ;; Need to create new render-id per text-block
               render-id (dm/str render-id "-" index)]

frontend/src/app/main/ui/static.cljs

@@ -42,11 +42,10 @@
     [:section {:class (stl/css :exception-layout)}
      [:button
       {:class (stl/css :exception-header)
-       :on-click rt/nav-root}
+       :on-click on-nav-root}
       i/logo-icon
       (when profile-id
-        (str "< "
+        (str "< " (tr "not-found.no-permission.go-dashboard")))]
-             (tr "not-found.no-permission.go-dashboard")))]
      [:div {:class (stl/css :deco-before)} i/logo-error-screen]
      (when-not profile-id
        [:button {:class (stl/css :login-header)

frontend/src/app/main/ui/workspace/plugins.cljs

@@ -141,6 +141,7 @@
              (st/emit! (ptk/event ::ev/event {::ev/name "remove-plugin"
                                               :name (:name plugin)
                                               :host (:host plugin)}))
+             (dp/close-plugin! plugin)
              (preg/remove-plugin! plugin)
              (reset! plugins-state* (preg/plugins-list)))))]