@updog/data-editor 0.1.72 → 0.1.73

package/index.d.ts

@@ -168,6 +168,8 @@ declare var export_default = {
       filteredRows_other: "{{filtered}} of {{total}} rows",
     },
     toast: {
+      clipboardWriteFailed:
+        "The browser blocked the copy to the clipboard. You can paste inside this table.",
       dismiss: "Dismiss",
       rowMayNotBeVisible:
         "Row has been added but may not be visible due to active filters or sorting",

package/index.js

@@ -157,6 +157,7 @@ var Hr = {
 			filteredRows_other: "{{filtered}} of {{total}} rows"
 		},
 		toast: {
+			clipboardWriteFailed: "The browser blocked the copy to the clipboard. You can paste inside this table.",
 			dismiss: "Dismiss",
 			rowMayNotBeVisible: "Row has been added but may not be visible due to active filters or sorting"
 		},
@@ -12816,14 +12817,14 @@ var xf = class {
 			return;
 		}
 		let s = uf(e);
-		t.fillStyle = n.cellBgIdle, Pd(t, 0, 0, a, o), this.paintBodyPane(s, s.panes.scrollable), this.selectionPainter.paintSelectionOutlines(s, null), this.selectionPainter.paintFocusBorder(s, null), this.lastFillHandleRect = this.selectionPainter.paintFillHandle(s, null), this.overlayPainter.paintClipboardOverlay(s), this.overlayPainter.paintFillOverlay(s);
+		t.fillStyle = n.cellBgIdle, Pd(t, 0, 0, a, o), this.paintBodyPane(s, s.panes.scrollable), this.selectionPainter.paintSelectionOutlines(s, null), this.selectionPainter.paintFocusBorder(s, null), this.overlayPainter.paintClipboardOverlay(s), this.overlayPainter.paintFillOverlay(s), this.lastFillHandleRect = this.selectionPainter.paintFillHandle(s, null);
 		let c = s.panes.pinned;
 		if (c?.clip) {
 			t.fillStyle = n.cellBgIdle, Pd(t, c.clip.x, c.clip.y, c.clip.w, c.clip.h), t.save(), t.beginPath(), t.rect(c.clip.x, c.clip.y, c.clip.w, c.clip.h), t.clip(), this.paintBodyPane(s, c), t.restore(), t.save(), t.beginPath();
 			let e = Math.min(s.totalRows * 34, o - 36);
-			t.rect(c.clip.x, 36, c.clip.w, e), t.clip(), this.selectionPainter.paintSelectionOutlines(s, c), this.selectionPainter.paintFocusBorder(s, c);
+			t.rect(c.clip.x, 36, c.clip.w, e), t.clip(), this.selectionPainter.paintSelectionOutlines(s, c), this.selectionPainter.paintFocusBorder(s, c), this.overlayPainter.paintClipboardOverlay(s);
 			let r = this.selectionPainter.paintFillHandle(s, c);
-			r && (this.lastFillHandleRect = r), this.overlayPainter.paintClipboardOverlay(s), t.restore();
+			r && (this.lastFillHandleRect = r), t.restore();
 		}
 		this.markerPainter.paint(s), this.headerPainter.paintHeaderRow(s), this.headerPainter.paintCornerCell(s), s.resizeGuideX >= 0 && this.overlayPainter.paintResizeGuide(s), this.hasSkeletons = s.hasSkeletons, this.hasPendingCells = s.hasPendingCells;
 	}
@@ -18990,12 +18991,17 @@ function uv(e, t, n) {
 		}
 		o.push(r.map((e) => String(t[e.id] ?? "")).join("	"));
 	}
-	navigator.clipboard.writeText(o.join("\n"));
+	let s = o.join("\n");
+	return {
+		text: s,
+		written: navigator.clipboard.writeText(s).then(() => !0).catch(() => !1)
+	};
 }
 //#endregion
 //#region src/components/DataEditor/DataEditorGrid/controller/ClipboardManager.ts
 var dv = {
 	clipboard: null,
+	marqueeVisible: !1,
 	version: 0
 }, fv = class {
 	_store;
@@ -19012,6 +19018,9 @@ var dv = {
 	_clipboardMaxRow = -1;
 	_sourceMinRowIndex = -1;
 	_sourceMaxRowIndex = -1;
+	_marqueeVisible = !1;
+	_osText = null;
+	_osWrite = null;
 	_sortState = null;
 	_t = (e) => e;
 	_version = 0;
@@ -19039,7 +19048,7 @@ var dv = {
 			operation: "copy",
 			columnIds: e.columnIds,
 			rowIds: e.rowIds
-		}, this.precomputeLookup(), this.notify(), uv(this._clipboard, this._columns, this._store));
+		}, this._marqueeVisible = !0, this.precomputeLookup(), this.notify(), this.writeToOs(this._clipboard));
 	}
 	cut() {
 		let e = this.buildClipboardFromSnapshot();
@@ -19047,10 +19056,11 @@ var dv = {
 			operation: "cut",
 			columnIds: e.columnIds,
 			rowIds: e.rowIds
-		}, this.precomputeLookup(), this.notify(), uv(this._clipboard, this._columns, this._store));
+		}, this._marqueeVisible = !0, this.precomputeLookup(), this.notify(), this.writeToOs(this._clipboard));
 	}
 	async paste() {
-		if (this._clipboard) {
+		let e = await this.readOsClipboard();
+		if (this._clipboard && (!e.ok || e.ours)) {
 			let e = this.resolveTargetFromSnapshot();
 			if (!e) return;
 			let t = this._clipboard, n = this._store, r = dl(t.columnIds, e.columnIds, t.rowIds ?? null, e.rowIds, this._columns, (e) => n.getRowId(e), n.getSnapshot().filteredCount, t.operation === "cut"), i = await n.pasteInternal(r, e.rowIds, {
@@ -19060,27 +19070,28 @@ var dv = {
 			i && (this.syncInternalPasteToServer(i, t, e), this._sortState && Fs.info(this._t("dataEditor.toast.rowMayNotBeVisible")), this.clear());
 			return;
 		}
-		let e;
-		try {
-			e = await navigator.clipboard.readText();
-		} catch (e) {
+		if (!e.ok) {
 			this._store.errorHandler.handleError({
 				code: "OPERATION_ERROR",
 				message: "Failed to read clipboard",
 				source: "clipboard-manager",
-				originalError: e
+				originalError: e.error
 			});
 			return;
 		}
-		if (!e) return;
-		let { row: t, col: n } = this.resolveAnchor(), r = await this._store.pasteFromText(e, t, n, this._validator);
-		r && this.syncExternalPasteToServer(r, t, n, e);
+		let t = e.text;
+		if (!t) return;
+		let { row: n, col: r } = this.resolveAnchor(), i = await this._store.pasteFromText(t, n, r, this._validator);
+		i && this.syncExternalPasteToServer(i, n, r, t);
 	}
 	clear() {
-		this._clipboard && (this._clipboard = null, this._clipboardColIndices = null, this._clipboardRowSet = null, this._clipboardIsWholeColumn = !1, this._clipboardMinCol = -1, this._clipboardMaxCol = -1, this._clipboardMinRow = -1, this._clipboardMaxRow = -1, this._sourceMinRowIndex = -1, this._sourceMaxRowIndex = -1, this.notify());
+		this._clipboard && (this._clipboard = null, this._clipboardColIndices = null, this._clipboardRowSet = null, this._clipboardIsWholeColumn = !1, this._clipboardMinCol = -1, this._clipboardMaxCol = -1, this._clipboardMinRow = -1, this._clipboardMaxRow = -1, this._sourceMinRowIndex = -1, this._sourceMaxRowIndex = -1, this._marqueeVisible = !1, this._osText = null, this._osWrite = null, this.notify());
+	}
+	hideMarquee() {
+		this._marqueeVisible && (this._marqueeVisible = !1, this.notify());
 	}
 	isCellInClipboard(e, t) {
-		if (!this._clipboard || !this._clipboardColIndices || !this._clipboardColIndices.has(e)) return !1;
+		if (!this._marqueeVisible || !this._clipboard || !this._clipboardColIndices || !this._clipboardColIndices.has(e)) return !1;
 		if (this._clipboardIsWholeColumn) return !0;
 		if (!this._clipboardRowSet) return !1;
 		let n = this._store.getRowId(t);
@@ -19090,7 +19101,7 @@ var dv = {
 		return this._clipboard?.operation ?? null;
 	}
 	getClipboardBounds() {
-		if (!this._clipboard) return null;
+		if (!this._clipboard || !this._marqueeVisible) return null;
 		let e = this._clipboardIsWholeColumn ? this._store.getSnapshot().filteredCount - 1 : this._clipboardMaxRow;
 		return {
 			minCol: this._clipboardMinCol,
@@ -19099,6 +19110,32 @@ var dv = {
 			maxRow: e
 		};
 	}
+	writeToOs(e) {
+		let t = uv(e, this._columns, this._store);
+		this._osText = t.text, this._osWrite = t.written, t.written.then((e) => {
+			e || (this._store.errorHandler.handleError({
+				code: "OPERATION_ERROR",
+				message: "Failed to write clipboard",
+				source: "clipboard-manager"
+			}), Fs.error(this._t("dataEditor.toast.clipboardWriteFailed")));
+		});
+	}
+	async readOsClipboard() {
+		let e = this._osWrite ? await this._osWrite : !0;
+		try {
+			let t = await navigator.clipboard.readText();
+			return {
+				ok: !0,
+				text: t,
+				ours: !e || t === this._osText
+			};
+		} catch (e) {
+			return {
+				ok: !1,
+				error: e
+			};
+		}
+	}
 	buildClipboardFromSnapshot() {
 		let e = yd(this._selection.getSelection(), this.resolveContext());
 		return e === null ? null : {
@@ -19201,6 +19238,7 @@ var dv = {
 	notify() {
 		this._version++, this._snapshot = {
 			clipboard: this._clipboard,
+			marqueeVisible: this._marqueeVisible,
 			version: this._version
 		};
 		for (let e of this._listeners) e();
@@ -19588,8 +19626,8 @@ var Tv = class {
 			return;
 		}
 		if (e.key === "Escape") {
-			if (this._clipboard.getSnapshot().clipboard) {
-				this._clipboard.clear();
+			if (this._clipboard.getSnapshot().marqueeVisible) {
+				this._clipboard.hideMarquee();
 				return;
 			}
 			this._selection.clear();
@@ -20402,6 +20440,8 @@ var Lv = {
 	}, [j]), m(() => {
 		H.clipboard.setSortState(E);
 	}, [H, E]), m(() => {
+		H.clipboard.hideMarquee();
+	}, [H, j]), m(() => {
 		H.clipboard.setTranslate(N);
 	}, [H, N]), m(() => {
 		H.setBounds(g, ae.columns.length);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@updog/data-editor",
-  "version": "0.1.72",
+  "version": "0.1.73",
   "description": "Client-side CSV importer and spreadsheet editor for React. Import CSV, Excel, JSON, TSV, and XML, match columns, validate, and edit 1M+ rows entirely in the browser.",
   "author": "Mikhail Kutateladze <admin@updog.tech>",
   "homepage": "https://updog.tech",