Merge pull request #16 from clearlysid/feat/tauri-emit-listen-update

feat: new window api by @Gami13
clearlysid · Jul 21, 2024 · 4daf47e · 4daf47e
2 parents b21a06a + 54e9822
commit 4daf47e
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,3 +15,5 @@ node_modules/
 
 dist-js
 dist
+
+examples/tauri-app/pnpm-lock.yaml
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "tauri-plugin-decorum"
 version = "0.1.4"
-authors = [ "Siddharth" ]
+authors = ["Siddharth"]
 description = "Opnionated window decoration controls for apps built with Tauri."
 edition = "2021"
 rust-version = "1.70"

diff --git a/examples/tauri-app/package.json b/examples/tauri-app/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "@tauri-apps/api": "^2.0.0-alpha.11",
+    "@tauri-apps/api": "^2.0.0-beta.15",
     "tauri-plugin-decorum-api": "link:../../"
   },
   "devDependencies": {
@@ -21,6 +21,6 @@
     "@vitejs/plugin-react": "^4.2.1",
     "typescript": "^5.0.2",
     "vite": "^5.0.0",
-    "@tauri-apps/cli": ">=2.0.0-beta.0"
+    "@tauri-apps/cli": ">=2.0.0-beta.22"
   }
-}
+}
diff --git a/package.json b/package.json
@@ -22,12 +22,12 @@
     "pretest": "yarn build"
   },
   "dependencies": {
-    "@tauri-apps/api": ">=2.0.0-beta.6"
+    "@tauri-apps/api": ">=2.0.0-beta.24"
   },
   "devDependencies": {
     "@rollup/plugin-typescript": "^11.1.6",
     "rollup": "^4.9.6",
     "typescript": "^5.3.3",
     "tslib": "^2.6.2"
   }
-}
+}
diff --git a/src/js/controls.js b/src/js/controls.js
@@ -31,7 +31,7 @@ document.addEventListener("DOMContentLoaded", () => {
 		return;
 	}
 
-	const win = tauri.window.getCurrent();
+	const win = tauri.window.getCurrentWindow();
 	const invoke = tauri.core.invoke;
 
 	console.log("DECORUM: Waiting for [data-tauri-decorum-tb] ...")

diff --git a/yarn.lock b/yarn.lock
@@ -99,10 +99,10 @@
   resolved "https://registry.yarnpkg.com/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.17.2.tgz#5a2d08b81e8064b34242d5cc9973ef8dd1e60503"
   integrity sha512-TGGO7v7qOq4CYmSBVEYpI1Y5xDuCEnbVC5Vth8mOsW0gDSzxNrVERPc790IGHsrT2dQSimgMr9Ub3Y1Jci5/8w==
 
-"@tauri-apps/api@>=2.0.0-beta.6":
-  version "2.0.0-beta.11"
-  resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-2.0.0-beta.11.tgz#7ec6f6f007da4e55315270619448ce39fd11b4e3"
-  integrity sha512-wJRY+fBUm3KpqZDHMIz5HRv+1vlnvRJ/dFxiyY3NlINTx2qXqDou5qWYcP1CuZXsd39InWVPV3FAZvno/kGCkA==
+"@tauri-apps/api@>=2.0.0-beta.24":
+  version "2.0.0-beta.15"
+  resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-2.0.0-beta.15.tgz#41d5fbeaccf3926b6f9f3f9fb5137ba2e272e5c1"
+  integrity sha512-H9w6iISmR+NvH4XuyCZB4zDN10tf9RFt6i/9JHEjaRhAowdAaJ+oiXq/3kedizNClHMtbTQ5j0oqDVPkZDAI8g==
 
 "@types/estree@1.0.5", "@types/estree@^1.0.0":
   version "1.0.5"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,3 +15,5 @@ node_modules/

		dist-js
		dist

		examples/tauri-app/pnpm-lock.yaml