Skip to content

Commit 9f2d047

Browse files
committed
merge the 2 workflow in 1 that build and publish depending on branch name
Upgrade to Tauri v2 beta. Improve speed of autopaste and stability of clipboard
1 parent e01b305 commit 9f2d047

File tree

12 files changed

+2318
-1426
lines changed

12 files changed

+2318
-1426
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ jobs:
5858
releaseDraft: false
5959
prerelease: false
6060

61-
6261
build-flatpak:
6362
name: 📦️ Build with Flatpak
6463
needs: build-tauri

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,5 @@ ydotool
1818
/cldr-json/
1919
/emoji-mart/
2020
io.github.vemonet.EmojiMart/
21+
22+
src-tauri/gen/schemas

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ OS := $(shell uname)
44
install:
55
yarn
66
rustup component add rustfmt
7+
# sudo apt-get install xdotool
78

89
# Install ydotool to auto-paste on wayland
910
install-wayland:

README.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ Modern emoji picker popup for desktop, based on the amazing [Emoji Mart](https:/
44

55
- 🍾 Built as a popup: quick invocation through your system custom shortcuts, and disappears when not needed, does not stay as a standalone window, does not run in the background
66
- 🔎 Search text box automatically focused and ready to type when invoked
7-
- ⌨️ Can use the keyboard to navigate and select emojis
7+
- ⌨️ Use the keyboard to navigate and select emojis
88
- 🌍 Complete translation in [22 languages](https://github.com/vemonet/EmojiMart/tree/main/src/data), it will use your system language automatically
99
- 🧠 Remember your favorite emojis
1010
- ⚔️ Cross-platform, can be installed natively on Linux, MacOS, or Windows (although only tested on Linux at the moment)
11-
- 🧑‍🚀 Uses modern and flexible technologies (TSX for the UI, Rust for the cross-platform compilation, what else?), making it easier to maintain and build upon in the future
12-
- ✒️ On x11 the selected emoji is automatically pasted to your currently focused app, instead of being added to the clipboard! (it allows to uses emojis without losing what was copied before).
11+
- 🧑‍🚀 Uses modern and flexible technologies
12+
- ✒️ On x11 the selected emoji is automatically pasted to your currently focused app.
1313
- ⚠️ Auto-paste can be enabled also on Wayland, but require to open permissions of `/dev/uinput`, which is not recommended for security.
1414

15-
🆕 This project just had its **first release**, it should be already usable, but you might face bugs as it is not yet battle tested (especially regarding auto-paste). Please report any weird behavior in the GitHub issues! And feel free to contribute, the codebase is quite small and understandable.
15+
Please report any weird behavior in the GitHub issues! And feel free to contribute, the codebase is quite small and understandable.
1616

1717
![Emoji Mart screenshot](https://raw.github.com/vemonet/EmojiMart/main/resources/screenshot.png)
1818

@@ -71,7 +71,7 @@ flatpak run io.github.vemonet.EmojiMart --lang fr
7171
gsettings set org.gnome.mutter center-new-windows true
7272
```
7373

74-
<!--
74+
<!--
7575
7676
##### ⚠️ Enable auto-paste on Wayland
7777
@@ -145,13 +145,10 @@ Inspired by:
145145

146146
- [x] Auto-paste on Wayland: currently using `ydotool` requires too many permissions (`--device=all` and user r/w access to `/dev/uinput`).
147147

148-
- [ ] Use [libei](https://gitlab.freedesktop.org/libinput/libei): once it has been implemented by mutter: https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2628
149-
- [ ] And merged to flatpak https://github.com/flatpak/xdg-desktop-portal/pull/762
148+
- [ ] Use [libei](https://gitlab.freedesktop.org/libinput/libei): once it has been implemented by mutter: https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/2628 and merged to flatpak https://github.com/flatpak/xdg-desktop-portal/pull/762
149+
- [ ] Recent rust crate for libei protocol: https://crates.io/crates/reis
150150

151-
- [ ] On x11: improve the process to add the emoji to the clipboard > paste > close the app. Currently there is an issue with `xdotool` clearing the clipboard when called from tauri
152151
- [ ] Select multiple emoji when pressing a specific key, e.g. when pressing shift?
153-
- [ ] Check if working properly on MacOS
154-
- [ ] Check if working properly on Windows
155152
- [ ] Add auto-paste on Windows and MacOS when the compatibility between Enigo and Tauri is resolved (cf. https://github.com/enigo-rs/enigo/issues/15 and https://github.com/tauri-apps/tauri/issues/6421)
156153
- [ ] Improve persistence https://aptabase.com/blog/persistent-state-tauri-apps
157154

package.json

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,23 @@
1212
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
1313
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
1414
"test": "vitest",
15-
"lint": "prettier --ignore-path .gitignore --check . && eslint . --ignore-path .gitignore",
15+
"lint": "eslint . --ignore-path .gitignore",
1616
"fmt": "prettier \"**/*.{svelte,ts,tsx,js,cjs,yml,md,html,css}\" --ignore-path .gitignore --write",
1717
"internationalize": "node resources/internationalize.js"
1818
},
1919
"dependencies": {
2020
"@emoji-mart/data": "^1.1.2",
21-
"@tauri-apps/api": "^1.4.0",
21+
"@tauri-apps/api": "^2.0.0-beta.6",
22+
"@tauri-apps/plugin-cli": "^2.0.0-beta.2",
23+
"@tauri-apps/plugin-clipboard-manager": "^2.0.0-beta.2",
24+
"@tauri-apps/plugin-os": "^2.0.0-beta.2",
2225
"emoji-mart": "^5.5.2"
2326
},
2427
"devDependencies": {
2528
"@sveltejs/adapter-auto": "^2.0.0",
2629
"@sveltejs/adapter-static": "^1.0.0-next.50",
2730
"@sveltejs/kit": "^1.20.4",
28-
"@tauri-apps/cli": "^1.4.0",
31+
"@tauri-apps/cli": "^2.0.0-beta.11",
2932
"@types/cookie": "^0.5.1",
3033
"@typescript-eslint/eslint-plugin": "^5.45.0",
3134
"@typescript-eslint/parser": "^5.45.0",

0 commit comments

Comments
 (0)