Merge pull request #979 from bridge-core/dev

v2.6.4

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "bridge",
-	"version": "2.6.3",
+	"version": "2.6.4",
 	"private": true,
 	"scripts": {
 		"dev": "vite",
@@ -63,12 +63,12 @@
 		"autoprefixer": "^10.4.13",
 		"markdown-it": "^12.3.2",
 		"node-fetch": "^2.6.7",
-		"postcss": "^8.4.20",
+		"postcss": "^8.4.31",
 		"prettier": "^2.2.1",
 		"sass": "^1.19.0",
 		"tailwindcss": "^3.2.4",
 		"typescript": "^4.4.3",
-		"vite": "^4.0.0",
+		"vite": "^4.0.5",
 		"vite-plugin-ejs": "^1.4.3",
 		"vite-plugin-pwa": "^0.14.0",
 		"vite-plugin-solid": "^2.5.0"

src-tauri/Cargo.toml

@@ -16,11 +16,11 @@ tauri-build = { version = "1.1", features = [] }
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.2.2", features = ["api-all", "updater"] }
+tauri = { version = "1.2.5", features = ["api-all", "updater"] }
 discord-rich-presence = "0.2.3"
 chrono = "0.4.23"
 window-shadows = "0.2.0"
-tokio = { version = "1.23", features = ["process", "io-util", "sync"] }
+tokio = { version = "1.24", features = ["process", "io-util", "sync"] }
 mime_guess = "2.0.4"
 
 [features]

src-tauri/src/fs_extra.rs

@@ -44,7 +44,10 @@ pub async fn reveal_in_file_explorer(path: &str) -> Result<(), String> {
             .spawn()
             .expect("Failed to open finder");
     } else {
-        // TODO: Linux
+        Command::new("xdg-open")
+            .args([path])
+            .spawn()
+            .expect("Failed to open file explorer");
     }
 
     Ok(())

src/components/ContextMenu/ContextMenu.vue

@@ -102,7 +102,6 @@ export default {
 <style>
 .context-menu-transition-enter-active,
 .context-menu-transition-leave-active {
-	transition: opacity 0.08s;
 }
 .context-menu-transition-enter,
 .context-menu-transition-leave-to {

src/components/ContextMenu/showContextMenu.ts

@@ -48,6 +48,5 @@ export async function showContextMenu(
 		}
 	})
 
-	// This is necessary so an old click outside event doesn't close the new menu
-	setTimeout(() => app.contextMenu.show(event, actionManager, options), 60)
+	app.contextMenu.show(event, actionManager, options)
 }

src/components/Data/TypeLoader.ts

@@ -219,7 +219,10 @@ export class TypeLoader {
 		this.userTypeDisposables = []
 
 		for (const typeScriptFile of typeScriptFiles) {
-			const fileUri = Uri.file(typeScriptFile)
+			const fileUri = Uri.file(
+				// This for some reason fixes monaco suggesting the wrong path for quickfixes #932
+				typeScriptFile.replace('/BP/', '/bp/')
+			)
 			const file = await app.fileSystem
 				.readFile(typeScriptFile)
 				.catch(() => null)

src/components/Editors/Text/TextTab.ts

@@ -104,7 +104,8 @@ export class TextTab extends FileTab {
 		if (!this.editorModel || this.editorModel.isDisposed()) {
 			const file = await this.fileHandle.getFile()
 			const fileContent = await file.text()
-			const uri = Uri.file(this.getPath())
+			// This for some reason fixes monaco suggesting the wrong path for quickfixes #932
+			const uri = Uri.file(this.getPath().replace('/BP/', '/bp/'))
 
 			this.editorModel = markRaw(
 				editor.getModel(uri) ??

src/components/Solid/DirectoryViewer/Common/Name.tsx

@@ -25,7 +25,7 @@ export function Name(props: NameProps) {
 		props.baseWrapper.unselectAll()
 		props.baseWrapper.isSelected.value = true
 	}
-	const onClick = (event: MouseEvent) => {
+	const onMouseDown = (event: MouseEvent) => {
 		// Left click
 		if (event.button === 0) {
 			props.baseWrapper.onClick(event)
@@ -41,7 +41,7 @@ export function Name(props: NameProps) {
 			classList={{
 				selected: isSelected(),
 			}}
-			onClick={onClick}
+			onMouseDown={onMouseDown}
 			onFocus={(event: FocusEvent) => onFocus(event)}
 			onBlur={() => setIsFocused(false)}
 		>

src/components/UIElements/DirectoryViewer/Common/Name.vue

@@ -12,7 +12,8 @@
 		@click.prevent="onClick($event)"
 		@keydown.space.prevent="isFocused ? onClick($event) : null"
 		@keydown.stop="onKeyDown"
-		@click.right.prevent.stop="baseWrapper.onRightClick($event)"
+		@mousedown.right.prevent.stop="baseWrapper.onRightClick($event)"
+		@click.right.prevent.stop
 		@focus.exact="onFocus"
 		@blur="isFocused = false"
 	>

src/components/UIElements/DirectoryViewer/ContextMenu/Actions/Edit.ts

@@ -17,25 +17,19 @@ export const EditAction = async (
 	baseWrapper: BaseWrapper<any>,
 	options: IEditOptions = {}
 ) => {
-	// Construct and return submenu
-	return <ISubmenuConfig>{
-		type: 'submenu',
-		icon:
-			baseWrapper instanceof DirectoryWrapper
-				? 'mdi-folder-edit-outline'
-				: 'mdi-file-edit-outline',
-		name: 'actions.edit.name',
+	return [
+		options.hideRename ? null : RenameAction(baseWrapper),
+		options.hideDelete ? null : DeleteAction(baseWrapper),
+		options.hideDuplicate ? null : DuplicateAction(baseWrapper),
+		// options.hideRename && options.hideDelete && options.hideDuplicate
+		// 	? null
+		// 	: { type: 'divider' },
 
-		actions: [
-			CopyAction(baseWrapper),
-			PasteAction(
-				baseWrapper instanceof DirectoryWrapper
-					? baseWrapper
-					: baseWrapper.getParent()!
-			),
-			options.hideDuplicate ? null : DuplicateAction(baseWrapper),
-			options.hideRename ? null : RenameAction(baseWrapper),
-			options.hideDelete ? null : DeleteAction(baseWrapper),
-		],
-	}
+		CopyAction(baseWrapper),
+		PasteAction(
+			baseWrapper instanceof DirectoryWrapper
+				? baseWrapper
+				: baseWrapper.getParent()!
+		),
+	]
 }