some fixes

Brendonovich · Dec 18, 2024 · 5a87abc · 5a87abc
1 parent 91c7721
commit 5a87abc
Show file tree

Hide file tree

Showing 14 changed files with 200 additions and 167 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
@@ -10,7 +10,7 @@
 	},
 	"dependencies": {
 		"@iconify/json": "^2.2.196",
-		"@kobalte/core": "^0.13.6",
+		"@kobalte/core": "^0.13.7",
 		"@macrograph/api-contract": "workspace:*",
 		"@macrograph/interface": "workspace:*",
 		"@macrograph/packages": "workspace:*",
@@ -39,7 +39,7 @@
 		"@kobalte/tailwindcss": "^0.6.5",
 		"@macrograph/config": "workspace:*",
 		"@tailwindcss/forms": "^0.5.7",
-		"@tauri-apps/cli": "^1.5.11",
+		"@tauri-apps/cli": "^1.6.3",
 		"autoprefixer": "^10.4.19",
 		"postcss": "^8.4.38",
 		"tailwindcss": "^3.4.3",

diff --git a/apps/desktop/src-tauri/Cargo.toml b/apps/desktop/src-tauri/Cargo.toml
@@ -10,10 +10,11 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [build-dependencies]
-tauri-build = { version = "1.3", features = [] }
+tauri-build = { version = "1.5.0", features = [] }
 
 [dependencies]
-tauri = { version = "1.3.0", features = [ "clipboard-all",
+tauri = { version = "1.8.0", features = [
+	"clipboard-all",
 	"shell-all",
 	"devtools",
 	"dialog-all",

diff --git a/apps/desktop/src-tauri/assets/dmg-background.png b/apps/desktop/src-tauri/assets/dmg-background.png
diff --git a/apps/desktop/src-tauri/tauri.conf.json b/apps/desktop/src-tauri/tauri.conf.json
@@ -51,7 +51,10 @@
         "icons/icon.ico"
       ],
       "identifier": "macrograph.brendonovich.dev",
-      "targets": "all"
+      "targets": "all",
+      "dmg": {
+        "background": "./assets/dmg-background.png"
+      }
     },
     "security": {
       "csp": "asset: https://asset.localhost;"

diff --git a/interface/package.json b/interface/package.json
@@ -8,7 +8,7 @@
     "./tailwind.config.js": "./tailwind.config.js"
   },
   "dependencies": {
-    "@kobalte/core": "^0.13.6",
+    "@kobalte/core": "^0.13.7",
     "@macrograph/action-history": "workspace:*",
     "@macrograph/api-contract": "workspace:*",
     "@macrograph/clipboard": "workspace:*",

diff --git a/interface/src/Sidebar/InlineTextEditor.tsx b/interface/src/Sidebar/InlineTextEditor.tsx
@@ -8,6 +8,7 @@ import {
   Switch,
   type ValidComponent,
   batch,
+  createEffect,
   createSignal,
   onMount,
   splitProps,
@@ -25,6 +26,8 @@ export function InlineTextEditor<T extends ValidComponent = "span">(
   const [local, others] = splitProps(props, ["value", "onChange", "class"]);
   const ctx = useContext() ?? createContextValue();
 
+  createEffect(() => console.log({ editing: ctx.editing() }));
+
   return (
     <div
       class={clsx(

diff --git a/interface/src/components/Graph/ContextMenu.tsx b/interface/src/components/Graph/ContextMenu.tsx
@@ -13,7 +13,11 @@ export function ContextMenuRenameItem() {
   const inlineEditorContext = useInlineTextEditorCtx()!;
 
   return (
-    <ContextMenuItem onSelect={() => inlineEditorContext.setEditing(true)}>
+    <ContextMenuItem
+      onSelect={() => {
+        inlineEditorContext.setEditing(true);
+      }}
+    >
       <IconAntDesignEditOutlined /> Rename
     </ContextMenuItem>
   );