Merge branch 'master' into feat/integration-plugins-core

resources/package.json

@@ -1,6 +1,6 @@
 {
   "name": "Logseq",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "main": "electron.js",
   "author": "Logseq",
   "description": "A privacy-first, open-source platform for knowledge management and collaboration.",

src/main/frontend/components/block.cljs

@@ -403,9 +403,9 @@
                                                            redirect-page-name])]
                                  (let [page (db/entity [:block/name (string/lower-case redirect-page-name)])]
                                    (when-let [f (state/get-page-blocks-cp)]
-                                     (f (state/get-current-repo) redirect-page-name {:sidebar? sidebar? :preview? true})))]
+                                     (f (state/get-current-repo) page {:sidebar? sidebar? :preview? true})))]
                    :interactive true
-                   :delay       1000}
+                   :delay       [1000, 100]}
                   inner)
         inner))))
 
@@ -564,7 +564,7 @@
                                                :max-height 600}}
                                       (blocks-container [block] (assoc config :preview? true))]
                         :interactive true
-                        :delay       1000} inner)
+                        :delay       [1000, 100]} inner)
              inner))]
         [:span.warning.mr-1 {:title "Block ref invalid"}
          (util/format "((%s))" id)]))))
@@ -1385,8 +1385,7 @@
            (str (:block/uuid block) "-" k)))]
 
       (and pre-block? properties)
-      (ui/tippy {:title "Click to edit page properties"}
-                [:span "🍵"])
+      [:span.opacity-50 "Properties"]
 
       :else
       nil)))

src/main/frontend/handler/editor.cljs

@@ -2821,7 +2821,8 @@
      {:block b :level 2}
      {:block e :level 2}]"
   [{:keys [collapse?] :or {collapse? false}}]
-  (let [page (state/get-current-page)]
+  (when-let [page (or (state/get-current-page)
+                      (date/today))]
     (->>
      (-> page
          (db/get-page-blocks-no-cache)

src/main/frontend/search.cljs

@@ -103,6 +103,19 @@
   (when-let [engine (get-engine repo)]
     (protocol/transact-blocks! engine data)))
 
+(defn exact-matched?
+  [q match]
+  (when (and (string? q) (string? match))
+    (boolean
+     (reduce
+      (fn [coll char]
+        (let [coll' (drop-while #(not= char %) coll)]
+          (if (seq coll')
+            (rest coll')
+            (reduced false))))
+      (seq (string/lower-case match))
+      (seq (string/lower-case q))))))
+
 (defn page-search
   ([q]
    (page-search q 3))
@@ -121,7 +134,9 @@
                     (:name item))
                  result)
                 (remove nil?)
-                (distinct))))))))
+                (distinct)
+                (filter (fn [name]
+                          (exact-matched? q name))))))))))
 
 (defn file-search
   ([q]

src/main/frontend/state.cljs

@@ -151,8 +151,7 @@
 
 (defn get-current-page
   []
-  (and
-   (= :page (get-current-route))
+  (when (= :page (get-current-route))
    (get-in (get-route-match)
            [:path-params :name])))
 

src/main/frontend/util.cljc

@@ -1005,10 +1005,8 @@
 
 (defn tag-valid?
   [tag-name]
-  (when tag-name
-    (and
-     (not (safe-re-find #"#" tag-name))
-     (safe-re-find regex/valid-tag-pattern tag-name))))
+  (when (string? tag-name)
+    (not (safe-re-find #"[# \t\r\n]+" tag-name))))
 
 (defn encode-str
   [s]

src/main/frontend/version.cljs

@@ -1,3 +1,3 @@
 (ns frontend.version)
 
-(defonce version "0.1.4-2")
+(defonce version "0.1.5")