DND + alert fixes

meese-os · Feb 9, 2024 · c118321 · c118321
1 parent e3f0f36
commit c118321
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/frontend/client/index.d.ts b/frontend/client/index.d.ts
@@ -703,7 +703,9 @@ export type WindowAttributes = {
 	/**
 	 * If window should have the default drop action.
 	 */
-	droppable?: boolean;
+	droppable?: boolean | {
+		dataTransferProperty?: 'files' | 'items';
+	};
 
 	/**
 	 * Minimum dimension.

diff --git a/frontend/client/package.json b/frontend/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@meese-os/client",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "meeseOS client",
   "scripts": {
     "test": "npm run eslint && npm run stylelint && npm run jest",

diff --git a/frontend/client/src/utils/dnd.js b/frontend/client/src/utils/dnd.js
@@ -90,12 +90,14 @@ const retval = (fn, ...args) => {
 	return true;
 };
 
-const getDataTransfer = (ev, type) => {
+const getDataTransfer = (ev, type, dataTransferProperty) => {
 	let files = [];
 	let data;
 
 	if (ev.dataTransfer) {
-		files = ev.dataTransfer.files ? Array.from(ev.dataTransfer.files) : [];
+		files = ev.dataTransfer[dataTransferProperty]
+      ? Array.from(ev.dataTransfer[dataTransferProperty])
+			: [];
 
 		try {
 			const transfer = ev.dataTransfer.getData(type);
@@ -200,10 +202,11 @@ export const draggable = (el, options = {}) => {
  * @returns {DroppableInstance}
  */
 export const droppable = (el, options = {}) => {
-	const { strict, type, effect, ondragenter, ondragover, ondragleave, ondrop } =
+	const { strict, type, effect, dataTransferProperty, ondragenter, ondragover, ondragleave, ondrop } =
 		{
 			type: "application/json",
 			effect: "move",
+			dataTransferProperty: "files",
 			ondragenter: () => true,
 			ondragover: () => true,
 			ondragleave: () => true,
@@ -242,7 +245,7 @@ export const droppable = (el, options = {}) => {
 			return false;
 		}
 
-		const { files, data } = getDataTransfer(ev, type);
+		const { files, data } = getDataTransfer(ev, type, dataTransferProperty);
 
 		ev.stopPropagation();
 		ev.preventDefault();

diff --git a/frontend/dialogs/package.json b/frontend/dialogs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@meese-os/dialogs",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "meeseOS Dialogs",
   "scripts": {
     "test": "npm run eslint && npm run stylelint",

diff --git a/frontend/dialogs/src/dialogs/alert.js b/frontend/dialogs/src/dialogs/alert.js
@@ -94,12 +94,7 @@ export default class AlertDialog extends Dialog {
 
 			if (this.args.type === "error") {
 				const { error } = this.args;
-				const msg =
-					error instanceof Error
-						? error.stack
-							? error.stack
-							: error
-						: String(error);
+				const msg = error instanceof Error ? `${error.message}\n\n${error.stack || 'No stack'}` : error;
 
 				children.push(
 					h(TextareaField, {