Browse Source

fix(ui): incorrect behavior for the table header action popups

charlie 8 months ago
parent
commit
d4b14d8e67
1 changed files with 9 additions and 16 deletions
  1. 9 16
      src/main/frontend/components/views.cljs

+ 9 - 16
src/main/frontend/components/views.cljs

@@ -99,22 +99,6 @@
         sub-content (fn [{:keys [id]}]
                       (let [[open? set-open!] (rum/use-state false)]
                         [:<>
-                         (when property
-                           (shui/dropdown-menu-sub
-                            {:open open?
-                             :on-open-change (fn [v]
-                                               (when (or (true? v)
-                                                         (not (or (some-> @shui-popup/*last-show-target
-                                                                          (.closest "[data-icon-picker=true]"))
-                                                                  (js/document.querySelector ".cp__emoji-icon-picker"))))
-                                                 (set-open! v)))}
-                            (shui/dropdown-menu-sub-trigger
-                             [:div.flex.flex-row.items-center.gap-1
-                              (ui/icon "settings" {:size 15})
-                              [:div "Configure"]])
-                            (shui/dropdown-menu-sub-content
-                             [:div.ls-property-dropdown-editor.-m-1
-                              (property-config/dropdown-editor property nil {})])))
                          (shui/dropdown-menu-item
                           {:key "asc"
                            :on-click #(column-set-sorting! sorting column true)}
@@ -127,6 +111,15 @@
                           [:div.flex.flex-row.items-center.gap-1
                            (ui/icon "arrow-down" {:size 15})
                            [:div "Sort descending"]])
+                         (when property
+                           (shui/dropdown-menu-item
+                             {:on-click #(shui/popup-show! (.-target %)
+                                           (fn []
+                                             [:div.ls-property-dropdown-editor.-m-1
+                                              (property-config/dropdown-editor property nil {})])
+                                           {:align "start"})}
+                             [:div.flex.flex-row.items-center.gap-1
+                              (ui/icon "adjustments" {:size 15}) "Configure"]))
                          (when property
                            (shui/dropdown-menu-item
                             {:on-click (fn [_e]