Browse Source

fix: graphs switch in the left sidebar

Tienson Qin 4 years ago
parent
commit
264e2cd90e

+ 14 - 11
src/main/frontend/components/repo.cljs

@@ -238,17 +238,20 @@
         (when (seq repos)
           (ui/dropdown-with-links
            (fn [{:keys [toggle-fn]}]
-             (reset! toggle-dropdown-f toggle-fn)
-             [:span#repo-switch.block.pr-2.whitespace-nowrap
-              [:span
-               (let [repo-name (get-repo-name current-repo)
-                     repo-name (if (or (util/electron?)
-                                       (mobile-util/is-native-platform?))
-                                 (last
-                                  (string/split repo-name #"/"))
-                                 repo-name)]
-                 [:span#repo-name.font-medium {:title repo-name} repo-name])
-               [:span.dropdown-caret.ml-2 {:style {:border-top-color "#6b7280"}}]]])
+             [:a.item.group.flex.items-center.px-2.py-2.text-sm.font-medium.rounded-md {:on-click toggle-fn}
+              (ui/icon "database mr-3" {:style {:font-size 20}
+                                        :id "database-icon"})
+              [:div.graphs
+               [:span#repo-switch.block.pr-2.whitespace-nowrap
+                [:span
+                 (let [repo-name (get-repo-name current-repo)
+                       repo-name (if (or (util/electron?)
+                                         (mobile-util/is-native-platform?))
+                                   (last
+                                    (string/split repo-name #"/"))
+                                   repo-name)]
+                   [:span#repo-name.font-medium {:title repo-name} repo-name])
+                 [:span.dropdown-caret.ml-2 {:style {:border-top-color "#6b7280"}}]]]]])
            links
            (cond->
             {:modal-class (util/hiccup->class

+ 2 - 10
src/main/frontend/components/sidebar.cljs

@@ -178,20 +178,12 @@
     (let [active? (fn [route] (= route (get-in route-match [:data :name])))
           page-active? (fn [page]
                          (= page (get-in route-match [:parameters :path :name])))
-          left-sidebar? (state/sub :ui/left-sidebar-open?)
-          toggle-dropdown-f (atom nil)]
+          left-sidebar? (state/sub :ui/left-sidebar-open?)]
       (when left-sidebar?
         [:div.left-sidebar-inner.flex-1.flex.flex-col.min-h-0
          [:div.flex.flex-col.pb-4.wrap
           [:nav.flex-1.px-2.space-y-1 {:aria-label "Sidebar"}
-           [:a.item.group.flex.items-center.px-2.py-2.text-sm.font-medium.rounded-md.ignore-outside-event
-            {:on-mouse-down (fn [e]
-                              (util/stop e)
-                              (when-let [f @toggle-dropdown-f]
-                                (f)))}
-            (ui/icon "database mr-3" {:style {:font-size 20}})
-            [:div.graphs
-             (repo/repos-dropdown toggle-dropdown-f)]]
+           (repo/repos-dropdown)
            [:a.item.group.flex.items-center.px-2.py-2.text-sm.font-medium.rounded-md {:href (rfe/href :all-journals)}
             (ui/icon "calendar mr-3" {:style {:font-size 20}})
             [:span.flex-1 "Journals"]]

+ 1 - 1
src/main/frontend/components/sidebar.css

@@ -77,7 +77,7 @@
   height: 100%;
 
   > .wrap {
-    padding-top: 42px;
+    padding-top: 60px;
   }
 
   .dropdown-wrapper {