Merge pull request #6605 from penpot/niwinz-develop-fixes-1

🐛 Fix default theme setup

.circleci/config.yml

@@ -107,11 +107,19 @@ jobs:
           keys:
             - v1-dependencies-{{ checksum "frontend/deps.edn"}}-{{ checksum "frontend/yarn.lock" }}
 
+      - run:
+          name: "install dependencies"
+          working_directory: "./frontend"
+          # We install playwright here because the dependent tasks
+          # uses the same cache as this task so we prepopulate it
+          command: |
+            yarn install
+            yarn run playwright install chromium
+
       - run:
           name: "lint scss on frontend"
           working_directory: "./frontend"
           command: |
-            yarn install
             yarn run lint:scss
 
       - run:
@@ -125,6 +133,7 @@ jobs:
             - ~/.m2
             - ~/.yarn
             - ~/.gitlibs
+            - ~/.cache/ms-playwright
           key: v1-dependencies-{{ checksum "frontend/deps.edn"}}-{{ checksum "frontend/yarn.lock" }}
 
   test-components:

frontend/src/app/main.cljs

@@ -27,7 +27,6 @@
    [app.plugins :as plugins]
    [app.util.dom :as dom]
    [app.util.i18n :as i18n]
-   [app.util.theme :as theme]
    [beicon.v2.core :as rx]
    [debug]
    [features]
@@ -96,8 +95,7 @@
   (cur/init-styles)
   (thr/init!)
   (init-ui)
-  (st/emit! (theme/initialize)
+  (st/emit! (plugins/initialize)
-            (plugins/initialize)
             (initialize)))
 
 (defn ^:export reinit

frontend/src/app/main/ui.cljs

@@ -28,7 +28,6 @@
    [app.main.ui.onboarding.team-choice :refer [onboarding-team-modal]]
    [app.main.ui.releases :refer [release-notes-modal]]
    [app.main.ui.static :as static]
-   [app.util.dom :as dom]
    [app.util.i18n :refer [tr]]
    [app.util.theme :as theme]
    [beicon.v2.core :as rx]
@@ -358,13 +357,10 @@
   []
   (let [route   (mf/deref refs/route)
         edata   (mf/deref refs/exception)
-        profile (mf/deref refs/profile)
+        profile (mf/deref refs/profile)]
-        profile-theme (:theme profile)
-        system-theme (mf/deref theme/preferred-color-scheme)]
 
-    (mf/with-effect [profile-theme system-theme]
+    ;; initialize themes
-      (dom/set-html-theme-color
+    (theme/use-initialize profile)
-       (if (= profile-theme "system") system-theme profile-theme)))
 
     [:& (mf/provider ctx/current-route) {:value route}
      [:& (mf/provider ctx/current-profile) {:value profile}

frontend/src/app/main/ui/settings/options.cljs

@@ -14,6 +14,7 @@
    [app.main.ui.components.forms :as fm]
    [app.util.dom :as dom]
    [app.util.i18n :as i18n :refer [tr]]
+   [app.util.theme :as theme]
    [rumext.v2 :as mf]))
 
 (def ^:private schema:options-form
@@ -37,6 +38,7 @@
   (let [profile (mf/deref refs/profile)
         initial (mf/with-memo [profile]
                   (update profile :lang #(or % "")))
+
         form    (fm/use-form :schema schema:options-form
                              :initial initial)]
 
@@ -58,7 +60,7 @@
      [:div {:class (stl/css :fields-row)}
       [:& fm/select {:label (tr "dashboard.select-ui-theme")
                      :name :theme
-                     :default "default"
+                     :default theme/default
                      :options [{:label (tr "dashboard.select-ui-theme.dark") :value "dark"}
                                {:label (tr "dashboard.select-ui-theme.light") :value "light"}
                                {:label (tr "dashboard.select-ui-theme.system") :value "system"}]

frontend/src/app/util/dom.cljs

@@ -70,17 +70,6 @@
   [^string title]
   (set! (.-title globals/document) title))
 
-(defn set-html-lang!
-  [^string lang]
-  (.setAttribute (.querySelector js/document "html") "lang" lang))
-
-(defn set-html-theme-color
-  [^string color]
-  (let [node (.querySelector js/document "body")
-        class (if (= color "dark") "default" "light")]
-    (.removeAttribute node "class")
-    (.add ^js (.-classList ^js node) class)))
-
 (defn set-page-style!
   [styles]
   (let [node  (first (get-elements-by-tag globals/document "head"))

frontend/src/app/util/theme.cljs

@@ -6,33 +6,37 @@
 
 (ns app.util.theme
   (:require
+   [app.common.data :as d]
    [app.util.globals :as globals]
    [beicon.v2.core :as rx]
-   [potok.v2.core :as ptk]))
+   [rumext.v2 :as mf]))
 
-
+(defonce ^:private color-scheme-media-query
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-;; Set the preferred color scheme based on the user's system settings.
-;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-
-(defonce ^:private color-scheme-mq
   (.matchMedia globals/window "(prefers-color-scheme: dark)"))
 
-;; This atom is referenced in app.main.ui.app
+(def ^:const default "dark")
-(defonce preferred-color-scheme
-  (atom (if (.-matches color-scheme-mq) "dark" "light")))
 
-(defonce prefers-color-scheme-sub
+(defn- set-color-scheme
-  (let [sub (rx/behavior-subject "dark")
+  [^string color]
-        ob  (->> (rx/from-event color-scheme-mq "change")
-                 (rx/map #(if (.-matches %) "dark" "light")))]
-    (rx/sub! ob sub)
-    sub))
 
-(defn initialize
+  (let [node  (.querySelector js/document "body")
-  []
+        class (if (= color "dark") "default" "light")]
-  (ptk/reify ::initialize
+    (.removeAttribute node "class")
-    ptk/WatchEvent
+    (.add ^js (.-classList ^js node) class)))
-    (watch [_ _ _]
+
-      (->> prefers-color-scheme-sub
+(defn use-initialize
-           (rx/map #(reset! preferred-color-scheme %))))))
+  [{profile-theme :theme}]
+  (let [system-theme* (mf/use-state #(if (.-matches color-scheme-media-query) "dark" "light"))
+        system-theme  (deref system-theme*)]
+
+    (mf/with-effect []
+      (let [s (->> (rx/from-event color-scheme-media-query "change")
+                   (rx/map #(if (.-matches %) "dark" "light"))
+                   (rx/subs! #(reset! system-theme* %)))]
+        (fn []
+          (rx/dispose! s))))
+
+    (mf/with-effect [system-theme profile-theme]
+      (set-color-scheme
+       (if (= profile-theme "system") system-theme
+           (d/nilv profile-theme "dark"))))))