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

resources/package.json

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

src/main/frontend/components/header.cljs

@@ -90,13 +90,6 @@
           :options {:href (rfe/href :graph)}
           :icon svg/graph-sm})
 
-       (when (or logged?
-                 (util/electron?)
-                 (and (nfs/supported?) current-repo))
-         {:title (t :all-graphs)
-          :options {:href (rfe/href :repos)}
-          :icon svg/repos-sm})
-
        (when current-repo
          {:title (t :all-pages)
           :options {:href (rfe/href :all-pages)}

src/main/frontend/components/repo.cljs

@@ -50,13 +50,13 @@
            (when (nfs-handler/supported?)
              [:div.mr-8
               (ui/button
-               (t :open-a-directory)
-               :on-click page-handler/ls-dir-files!)])
+                (t :open-a-directory)
+                :on-click page-handler/ls-dir-files!)])
            (when (and (state/logged?) (not (util/electron?)))
              (ui/button
-              "Add another git repo"
-              :href (rfe/href :repo-add nil {:graph-types "github"})
-              :intent "logseq"))]
+               "Add another git repo"
+               :href (rfe/href :repo-add nil {:graph-types "github"})
+               :intent "logseq"))]
           (for [{:keys [id url] :as repo} repos]
             (let [local? (config/local-db? url)]
               [:div.flex.justify-between.mb-1 {:key id}
@@ -94,7 +94,7 @@
       (when-not (= repo config/local-repo)
         (if (and nfs-repo? (nfs-handler/supported?))
           (let [syncing? (state/sub :graph/syncing?)]
-            [:div.ml-2.mr-2.opacity-30.refresh.hover:opacity-100 {:class (if syncing? "loader" "initial")}
+            [:div.ml-3.mr-1.mt-1.opacity-30.refresh.hover:opacity-100 {:class (if syncing? "loader" "initial")}
              [:a
               {:on-click #(nfs-handler/refresh! repo
                                                 repo-handler/create-today-journal!)
@@ -161,10 +161,10 @@
                               [:span (t :download)]]]])]]
                        :else
                        [:p (t :git/local-changes-synced)])]
-                   ;; [:a.text-sm.font-bold {:href "/diff"} "Check diff"]
+                    ;; [:a.text-sm.font-bold {:href "/diff"} "Check diff"]
                     [:div.flex.flex-row.justify-between.align-items.mt-2
                      (ui/button (t :git/push)
-                                :on-click (fn [] (state/set-modal! commit/add-commit-message)))
+                       :on-click (fn [] (state/set-modal! commit/add-commit-message)))
                      (if pushing? svg/loading)]]
                    [:hr]
                    [:div
@@ -173,7 +173,7 @@
                        (str ": " last-pulled-at)])
                     [:div.flex.flex-row.justify-between.align-items
                      (ui/button (t :git/pull)
-                                :on-click (fn [] (repo-handler/pull-current-repo)))
+                       :on-click (fn [] (repo-handler/pull-current-repo)))
                      (if pulling? svg/loading)]
                     [:a.mt-5.text-sm.opacity-50.block
                      {:on-click (fn []
@@ -185,29 +185,34 @@
 (rum/defc repos-dropdown < rum/reactive
   [on-click]
   (when-let [current-repo (state/sub :git/current-repo)]
-    (let [logged? (state/logged?)
-          local-repo? (= current-repo config/local-repo)
-          get-repo-name (fn [repo]
-                          (if (config/local-db? repo)
-                            (config/get-local-dir repo)
-                            (db/get-repo-path repo)))]
-      (let [repos (->> (state/sub [:me :repos])
-                       (remove (fn [r] (= config/local-repo (:url r)))))]
-        (cond
-          (> (count repos) 1)
+    (rum/with-context [[t] i18n/*tongue-context*]
+      (let [get-repo-name (fn [repo]
+                            (if (config/local-db? repo)
+                              (config/get-local-dir repo)
+                              (db/get-repo-path repo)))
+            repos (state/sub [:me :repos])
+            repos (remove (fn [r] (= config/local-repo (:url r))) repos)
+            switch-repos (remove (fn [repo]
+                                   (= current-repo (:url repo)))
+                                 repos)]
+        (when (seq repos)
           (ui/dropdown-with-links
            (fn [{:keys [toggle-fn]}]
              [:a#repo-switch.fade-link {:on-click toggle-fn}
-              (let [repo-name (get-repo-name current-repo)
-                    repo-name (if (util/electron?)
-                                (last (string/split repo-name #"/"))
-                                repo-name)]
-                [:span#repo-name repo-name])
-              [:span.dropdown-caret.ml-1 {:style {:border-top-color "#6b7280"}}]])
+
+              [:span
+               [:span.repo-plus svg/plus]
+               (let [repo-name (get-repo-name current-repo)
+                     repo-name (if (util/electron?)
+                                 (last (string/split repo-name #"/"))
+                                 repo-name)]
+                 [:span#repo-name repo-name])
+               [:span.dropdown-caret.ml-1 {:style {:border-top-color "#6b7280"}}]]])
            (mapv
             (fn [{:keys [id url]}]
               {:title (get-repo-name url)
-               :options {:on-click (fn []
+               :options {:class "ml-1"
+                         :on-click (fn []
                                      (repo-handler/push-if-auto-enabled! (state/get-current-repo))
                                      (state/set-current-repo! url)
                                      ;; load config
@@ -216,23 +221,18 @@
                                        (route-handler/redirect-to-home!))
                                      (when on-click
                                        (on-click url)))}})
-            (remove (fn [repo]
-                      (= current-repo (:url repo)))
-                    repos))
-           {:modal-class (util/hiccup->class
-                          "origin-top-right.absolute.left-0.mt-2.w-48.rounded-md.shadow-lg ")})
-
-          (and current-repo (not local-repo?))
-          (let [repo-name (get-repo-name current-repo)]
-            (if (config/local-db? current-repo)
-              [:span.fade-link#repo-name
-               (if (util/electron?)
-                 (last (string/split repo-name #"/"))
-                 repo-name)]
-              [:a.fade-link#repo-name
-               {:href current-repo
-                :target "_blank"}
-               repo-name]))
-
-          :else
-          nil)))))
+            switch-repos)
+           (cond->
+             {:modal-class (util/hiccup->class
+                            "origin-top-right.absolute.left-0.mt-2.w-48.rounded-md.shadow-lg")
+              :links-footer [:div
+                             (when (seq switch-repos) [:hr.my-4])
+                             [:a {:class "block px-4 py-2 text-sm text-gray-700 transition ease-in-out duration-150 cursor menu-link"
+                                  :href (rfe/href :repo-add)}
+                              (t :new-graph)]
+                             [:a {:class "block px-4 py-2 text-sm text-gray-700 transition ease-in-out duration-150 cursor menu-link"
+                                  :href (rfe/href :repos)}
+                              (t :all-graphs)]]}
+             (seq switch-repos)
+             (assoc :links-header [:div.font-medium.text-sm.opacity-70.px-4.py-2
+                                   "Switch to:"]))))))))

src/main/frontend/components/repo.css

@@ -7,4 +7,9 @@
       margin: 0.25rem 0;
     }
   }
-}
+}
+
+.repo-plus svg {
+    display: inline;
+    transform: scale(0.7);
+}

src/main/frontend/dicts.cljs

@@ -240,6 +240,7 @@
         :page-search "Search in the current page"
         :new-page "New page"
         :new-file "New file"
+        :new-graph "Add new graph"
         :graph "Graph"
         :graph-view "View Graph"
         :publishing "Publishing"

src/main/frontend/modules/outliner/datascript.cljc

@@ -43,9 +43,9 @@
                 (not (:skip-transact? opts)))
        (try
          (let [conn (conn/get-conn false)
-              editor-cursor (state/get-last-edit-block)
-              meta (merge opts {:editor-cursor editor-cursor})
-              rs (d/transact! conn txs meta)]
+               editor-cursor (state/get-current-edit-block-and-position)
+               meta (merge opts {:editor-cursor editor-cursor})
+               rs (d/transact! conn txs meta)]
           (when-not config/test?
             (after-transact-pipelines rs))
           rs)

src/main/frontend/state.cljs

@@ -81,6 +81,7 @@
     :editor/show-input nil
     :editor/last-saved-cursor nil
     :editor/editing? nil
+    :editor/last-edit-block-input-id nil
     :editor/last-edit-block-id nil
     :editor/in-composition? false
     :editor/content {}
@@ -440,7 +441,7 @@
 
 (defn get-last-edit-input-id
   []
-  (:editor/last-edit-block-id @state))
+  (:editor/last-edit-block-input-id @state))
 
 (defn editing?
   []
@@ -707,6 +708,10 @@
   (get @state :editor/block))
 
 (defn get-last-edit-block
+  []
+  (:editor/last-edit-block @state))
+
+(defn get-current-edit-block-and-position
   []
   (let [edit-input-id (get-edit-input-id)
         edit-block (get-edit-block)
@@ -737,7 +742,8 @@
                     (assoc
                      :editor/block block
                      :editor/editing? {edit-input-id true}
-                     :editor/last-edit-block-id edit-input-id
+                     :editor/last-edit-block-input-id edit-input-id
+                     :editor/last-edit-block block
                      :cursor-range cursor-range))))
 
        (when-let [input (gdom/getElement edit-input-id)]

src/main/frontend/ui.cljs

@@ -585,11 +585,22 @@
                 (assoc :selected selected))
       label])])
 
-(rum/defc tippy
-  [opts child]
-  (Tippy (merge {:arrow true
-                 :sticky true
-                 :theme (:ui/theme @state/state)
-                 :disabled (not (state/enable-tooltip?))
-                 :unmountHTMLWhenHide true} opts)
-         child))
+(rum/defcs tippy < rum/static
+  (rum/local false ::mounted?)
+  [state opts child]
+  (let [*mounted? (::mounted? state)
+        mounted? @*mounted?]
+    (Tippy (->
+           (merge {:arrow true
+                   :sticky true
+                   :theme (:ui/theme @state/state)
+                   :disabled (not (state/enable-tooltip?))
+                   :unmountHTMLWhenHide true
+                   :open @*mounted?
+                   :onShow #(reset! *mounted? true)
+                   :onHide #(reset! *mounted? false)}
+                  opts)
+           (assoc :html (if mounted?
+                          (:html opts)
+                          [:div ""])))
+          child)))

src/main/frontend/version.cljs

@@ -1,3 +1,3 @@
 (ns frontend.version)
 
-(defonce version "0.1.6")
+(defonce version "0.1.6-1")