Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
a034eea
Migrate to svelte ts for API example
Legend-Master Jul 8, 2026
85d7b39
Clean up
Legend-Master Jul 8, 2026
1599846
Use `$derived` `selectedWebview`
Legend-Master Jul 8, 2026
62e0c5e
Do the change in onchange instead of state effects
Legend-Master Jul 8, 2026
74c451b
Set initial x y and sizes
Legend-Master Jul 8, 2026
752bdc0
revert ai slop on main.ts
Legend-Master Jul 8, 2026
3988c91
More cleanup
Legend-Master Jul 8, 2026
7c82a54
Remove ConsoleMessage
Legend-Master Jul 8, 2026
8ee8486
Remove View type
Legend-Master Jul 8, 2026
ebbd4cc
license header
Legend-Master Jul 8, 2026
59c8adf
Use `ViewProps`
Legend-Master Jul 8, 2026
a87146c
Use same button spacing through out
Legend-Master Jul 8, 2026
df2ed6b
Move theme example to top level theme switch
Legend-Master Jul 8, 2026
b920b3d
Fix menu views
Legend-Master Jul 8, 2026
2a286eb
More cleanups
Legend-Master Jul 8, 2026
34f5d28
Merge branch 'dev' into api-example-svelte-ts
Legend-Master Jul 8, 2026
31f1bc9
Final cleanup
Legend-Master Jul 8, 2026
43bd0a5
Move types to svelte files
Legend-Master Jul 8, 2026
85d914c
fallback to empty string not false
Legend-Master Jul 8, 2026
7905fa9
Initial work
Legend-Master Jul 9, 2026
36428a9
Bump deps
Legend-Master Jul 9, 2026
a700e24
Make dragging with states work
Legend-Master Jul 9, 2026
ed4f25c
Fix sorting
Legend-Master Jul 9, 2026
0866502
Move everything to `MenuBuilder.svelte`
Legend-Master Jul 9, 2026
96447a4
Add remove button
Legend-Master Jul 9, 2026
29415b7
Fix Menu and Tray
Legend-Master Jul 9, 2026
327a032
Make menu items reactive
Legend-Master Jul 9, 2026
af1103a
Sync checked states
Legend-Master Jul 9, 2026
a61af0c
Add placeholder to menu builder
Legend-Master Jul 9, 2026
30e59cf
Set user-select to none
Legend-Master Jul 9, 2026
7337f92
Fix text in the console
Legend-Master Jul 9, 2026
fd89122
Rework tray page layout
Legend-Master Jul 9, 2026
ac3dd89
Close all menus on MenuBuilder unmounted
Legend-Master Jul 9, 2026
a61eec6
Clean up menus properly
Legend-Master Jul 9, 2026
04077e3
Add initial text and icon on the menu builders
Legend-Master Jul 9, 2026
493bcdf
Move MenuItems to MenuBuilder
Legend-Master Jul 9, 2026
a171c71
format
Legend-Master Jul 9, 2026
307f9cc
Merge branch 'dev' into api-example-svelte-ts
Legend-Master Jul 9, 2026
30d7fc4
Merge branch 'api-example-svelte-ts' into menu-example-rework
Legend-Master Jul 9, 2026
d6b562d
Re-create all the elements as a work around
Legend-Master Jul 10, 2026
cb7b195
Reorder the menu items on builder changes
Legend-Master Jul 10, 2026
bbb4623
On one tray for the tray page
Legend-Master Jul 10, 2026
68043da
Update menus on add and remove
Legend-Master Jul 10, 2026
9f1b46c
Same for the tray
Legend-Master Jul 10, 2026
4a9bcca
Space and align checkboxes
Legend-Master Jul 10, 2026
b8bcd6f
Merge remote-tracking branch 'upstream/dev' into menu-example-rework
Legend-Master Jul 13, 2026
777d3cc
Clean up menus properly
Legend-Master Jul 14, 2026
72320bc
Merge branch 'dev' into menu-example-rework
Legend-Master Jul 15, 2026
eeb2555
Remove duplicated webview in new command
Legend-Master Jul 15, 2026
c8ea99f
Merge branch 'dev' into menu-example-rework
FabianLars Jul 15, 2026
127dea8
Fix dark mode
Legend-Master Jul 15, 2026
56dcc2a
no border in dark mode
Legend-Master Jul 15, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions crates/tauri-macros/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -131,27 +131,27 @@ pub fn default_runtime(attributes: TokenStream, input: TokenStream) -> TokenStre
/// let kind = ItemKind::Check;
/// let resources_table = app.resources_table();
/// match kind {
/// ItemKind::Submenu => {
/// let i = resources_table.get::<Submenu<R>>(rid)?;
/// i.set_text(text)
/// }
/// ItemKind::MenuItem => {
/// let i = resources_table.get::<MenuItem<R>>(rid)?;
/// i.set_text(text)
/// }
/// ItemKind::Predefined => {
/// let i = resources_table.get::<PredefinedMenuItem<R>>(rid)?;
/// i.set_text(text)
/// }
/// ItemKind::Check => {
/// let i = resources_table.get::<CheckMenuItem<R>>(rid)?;
/// i.set_text(text)
/// }
/// ItemKind::Icon => {
/// let i = resources_table.get::<IconMenuItem<R>>(rid)?;
/// i.set_text(text)
/// }
/// _ => unreachable!(),
/// ItemKind::Submenu => {
/// let i = resources_table.get::<Submenu<R>>(rid)?;
/// i.set_text(text)
/// }
/// ItemKind::MenuItem => {
/// let i = resources_table.get::<MenuItem<R>>(rid)?;
/// i.set_text(text)
/// }
/// ItemKind::Predefined => {
/// let i = resources_table.get::<PredefinedMenuItem<R>>(rid)?;
/// i.set_text(text)
/// }
/// ItemKind::Check => {
/// let i = resources_table.get::<CheckMenuItem<R>>(rid)?;
/// i.set_text(text)
/// }
/// ItemKind::Icon => {
/// let i = resources_table.get::<IconMenuItem<R>>(rid)?;
/// i.set_text(text)
/// }
/// _ => unreachable!(),
/// }
/// ```
#[proc_macro]
Expand Down
5 changes: 2 additions & 3 deletions crates/tauri/src/menu/plugin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -359,19 +359,18 @@ struct NewOptions {

#[command(root = "crate")]
fn new<R: Runtime>(
app: Webview<R>,
webview: Webview<R>,
kind: ItemKind,
options: Option<NewOptions>,
channels: State<'_, MenuChannels>,
handler: Channel<MenuId>,
) -> crate::Result<(ResourceId, MenuId)> {
let options = options.unwrap_or_default();
let mut resources_table = app.resources_table();
let mut resources_table = webview.resources_table();

let (rid, id) = match kind {
ItemKind::Menu => {
let mut builder = MenuBuilder::new(&app);
let mut builder = MenuBuilder::new(&webview);
if let Some(id) = options.id {
builder = builder.id(id);
}
Expand Down
12 changes: 7 additions & 5 deletions examples/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,12 @@
"devDependencies": {
"@iconify-json/codicon": "^1.2.49",
"@iconify-json/ph": "^1.2.2",
"@sveltejs/vite-plugin-svelte": "^7.0.0",
"@unocss/extractor-svelte": "^66.6.6",
"svelte": "^5.55.7",
"unocss": "^66.6.6",
"vite": "^8.0.16"
"@sveltejs/vite-plugin-svelte": "^7.2.0",
"@types/sortablejs": "^1.15.9",
"@unocss/extractor-svelte": "^66.7.5",
"sortablejs": "^1.15.7",
"svelte": "^5.56.4",
"unocss": "^66.7.5",
"vite": "^8.1.4"
}
}
1 change: 1 addition & 0 deletions examples/api/src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ pub fn run_app<R: Runtime, F: FnOnce(&App<R>) + Send + 'static>(

#[allow(unused_mut)]
let mut window_builder = WebviewWindowBuilder::new(app, "main", WebviewUrl::default())
.disable_drag_drop_handler()
.on_document_title_changed(|_window, title| {
println!("document title changed: {title}");
});
Expand Down
Loading
Loading