1
0
Эх сурвалжийг харах

Merge branch 'master' into feat/worker-sync

Tienson Qin 2 долоо хоног өмнө
parent
commit
a8ed1c88e6

+ 1 - 2
src/electron/electron/handler.cljs

@@ -428,8 +428,7 @@
   (.close win))
 
 (defmethod handle :theme-loaded [^js win]
-  (.manage (windowStateKeeper) win)
-  (.show win))
+  (.manage (windowStateKeeper) win))
 
 (defmethod handle :keychain/save-e2ee-password [_window [_ key encrypted-text]]
   (keychain/<set-password! key encrypted-text))

+ 2 - 0
src/electron/electron/window.cljs

@@ -67,6 +67,8 @@
                                (callback (bean/->js
                                           {:cancel         false
                                            :requestHeaders headers})))))
+     ;; Show window as soon as it's ready
+     (.once win "ready-to-show" #(.show win))
      (.loadURL win url)
      ;;(when dev? (.. win -webContents (openDevTools)))
      win)))

+ 9 - 1
src/main/frontend/components/property.css

@@ -185,7 +185,7 @@
 }
 
 
-.positioned-properties, .property-value-inner {
+.positioned-properties, .property-value-inner, .ls-icon-color-wrap {
   .select-item {
     @apply flex items-center shrink-0;
   }
@@ -193,6 +193,14 @@
   .ls-icon-priorityLvlUrgent {
     @apply text-orange-rx-08;
   }
+
+  .ls-icon-priorityLvlMedium {
+    @apply opacity-80;
+  }
+
+  .ls-icon-priorityLvlLow {
+    @apply opacity-60;
+  }
 }
 
 .property-value-inner {

+ 1 - 6
src/main/frontend/components/theme.cljs

@@ -33,8 +33,6 @@
      {:ref   *el
       :class "top-1/2 -left-1/2 z-[-999]"}]))
 
-(defonce *once-theme-loaded? (volatile! false))
-
 (rum/defc ^:large-vars/cleanup-todo container < rum/static
   [{:keys [route theme accent-color editor-font on-click current-repo db-restoring?
            settings-open? sidebar-open? system-theme? sidebar-blocks-len preferred-language]} child]
@@ -76,10 +74,7 @@
      [preferred-language])
 
     (hooks/use-effect!
-     #(js/setTimeout
-       (fn [] (when-not @*once-theme-loaded?
-                (ipc/ipc :theme-loaded)
-                (vreset! *once-theme-loaded? true))) 100) ; Wait for the theme to be applied
+     #(ipc/ipc :theme-loaded)
      [])
 
     (hooks/use-effect!

+ 1 - 1
src/main/logseq/api/db_based.cljs

@@ -199,7 +199,7 @@
               (let [k (keyword (api-block/sanitize-user-property-name class-uuid-or-ident-or-title))]
                 (if (qualified-keyword? k)
                   k
-                  (ldb/get-case-page (db/get-db) class-uuid-or-ident-or-title))))
+                  (some-> (ldb/get-case-page (db/get-db) class-uuid-or-ident-or-title) :db/id))))
         class (db/entity eid)]
     (when-not (ldb/class? class)
       (throw (ex-info "Not a tag" {:input class-uuid-or-ident-or-title})))