merged previous stuffs on master

crates/ui/src/menu/mod.rs

@@ -1,12 +1,15 @@
 use gpui::App;
 
 mod app_menu_bar;
+mod context_menu;
+mod dropdown_menu;
 mod menu_item;
-
-pub mod context_menu;
-pub mod popup_menu;
+mod popup_menu;
 
 pub use app_menu_bar::AppMenuBar;
+pub use context_menu::{ContextMenu, ContextMenuExt, ContextMenuState};
+pub use dropdown_menu::DropdownMenu;
+pub use popup_menu::{PopupMenu, PopupMenuItem};
 
 pub(crate) fn init(cx: &mut App) {
     app_menu_bar::init(cx);