allow deferring firing hooks in explicit u.batch()

dist/uPlot.cjs.js

@@ -4539,6 +4539,17 @@ function uPlot(opts, data, then) {
 	}
 
 	let queuedCommit = false;
+	let deferHooks = false;
+	let hooksQueue = [];
+
+	function flushHooks() {
+		deferHooks = false;
+
+		for (let i = 0; i < hooksQueue.length; i++)
+			fire(...hooksQueue[i]);
+
+		hooksQueue.length = 0;
+	}
 
 	function commit() {
 		if (!queuedCommit) {
@@ -4548,10 +4559,15 @@ function uPlot(opts, data, then) {
 	}
 
 	// manual batching (aka immediate mode), skips microtask queue
-	function batch(fn) {
+	function batch(fn, _deferHooks = false) {
 		queuedCommit = true;
+		deferHooks = _deferHooks;
+
 		fn(self);
 		_commit();
+
+		if (_deferHooks && hooksQueue.length > 0)
+			queueMicrotask(flushHooks);
 	}
 
 	self.batch = batch;
@@ -5727,10 +5743,14 @@ function uPlot(opts, data, then) {
 	const hooks = self.hooks = opts.hooks || {};
 
 	function fire(evName, a1, a2) {
-		if (evName in hooks) {
-			hooks[evName].forEach(fn => {
-				fn.call(null, self, a1, a2);
-			});
+		if (deferHooks)
+			hooksQueue.push([evName, a1, a2]);
+		else {
+			if (evName in hooks) {
+				hooks[evName].forEach(fn => {
+					fn.call(null, self, a1, a2);
+				});
+			}
 		}
 	}
 

dist/uPlot.d.ts

@@ -65,7 +65,7 @@ declare class uPlot {
 	redraw(rebuildPaths?: boolean, recalcAxes?: boolean): void;
 
 	/** manual batching of multiple ops (aka immediate mode that skips implicit microtask queue), ops, e.g. setScale('x', ...) && setScale('y', ...) */
-	batch(txn: Function): void;
+	batch(txn: Function, deferHooks?: boolean): void;
 
 	/** destroys DOM, removes resize & scroll listeners, etc. */
 	destroy(): void;

dist/uPlot.esm.js

@@ -4537,6 +4537,17 @@ function uPlot(opts, data, then) {
 	}
 
 	let queuedCommit = false;
+	let deferHooks = false;
+	let hooksQueue = [];
+
+	function flushHooks() {
+		deferHooks = false;
+
+		for (let i = 0; i < hooksQueue.length; i++)
+			fire(...hooksQueue[i]);
+
+		hooksQueue.length = 0;
+	}
 
 	function commit() {
 		if (!queuedCommit) {
@@ -4546,10 +4557,15 @@ function uPlot(opts, data, then) {
 	}
 
 	// manual batching (aka immediate mode), skips microtask queue
-	function batch(fn) {
+	function batch(fn, _deferHooks = false) {
 		queuedCommit = true;
+		deferHooks = _deferHooks;
+
 		fn(self);
 		_commit();
+
+		if (_deferHooks && hooksQueue.length > 0)
+			queueMicrotask(flushHooks);
 	}
 
 	self.batch = batch;
@@ -5725,10 +5741,14 @@ function uPlot(opts, data, then) {
 	const hooks = self.hooks = opts.hooks || {};
 
 	function fire(evName, a1, a2) {
-		if (evName in hooks) {
-			hooks[evName].forEach(fn => {
-				fn.call(null, self, a1, a2);
-			});
+		if (deferHooks)
+			hooksQueue.push([evName, a1, a2]);
+		else {
+			if (evName in hooks) {
+				hooks[evName].forEach(fn => {
+					fn.call(null, self, a1, a2);
+				});
+			}
 		}
 	}
 

dist/uPlot.iife.js

@@ -4540,6 +4540,17 @@ var uPlot = (function () {
 		}
 
 		let queuedCommit = false;
+		let deferHooks = false;
+		let hooksQueue = [];
+
+		function flushHooks() {
+			deferHooks = false;
+
+			for (let i = 0; i < hooksQueue.length; i++)
+				fire(...hooksQueue[i]);
+
+			hooksQueue.length = 0;
+		}
 
 		function commit() {
 			if (!queuedCommit) {
@@ -4549,10 +4560,15 @@ var uPlot = (function () {
 		}
 
 		// manual batching (aka immediate mode), skips microtask queue
-		function batch(fn) {
+		function batch(fn, _deferHooks = false) {
 			queuedCommit = true;
+			deferHooks = _deferHooks;
+
 			fn(self);
 			_commit();
+
+			if (_deferHooks && hooksQueue.length > 0)
+				queueMicrotask(flushHooks);
 		}
 
 		self.batch = batch;
@@ -5728,10 +5744,14 @@ var uPlot = (function () {
 		const hooks = self.hooks = opts.hooks || {};
 
 		function fire(evName, a1, a2) {
-			if (evName in hooks) {
-				hooks[evName].forEach(fn => {
-					fn.call(null, self, a1, a2);
-				});
+			if (deferHooks)
+				hooksQueue.push([evName, a1, a2]);
+			else {
+				if (evName in hooks) {
+					hooks[evName].forEach(fn => {
+						fn.call(null, self, a1, a2);
+					});
+				}
 			}
 		}
 

src/uPlot.js

@@ -2022,6 +2022,17 @@ export default function uPlot(opts, data, then) {
 	}
 
 	let queuedCommit = false;
+	let deferHooks = false;
+	let hooksQueue = [];
+
+	function flushHooks() {
+		deferHooks = false;
+
+		for (let i = 0; i < hooksQueue.length; i++)
+			fire(...hooksQueue[i])
+
+		hooksQueue.length = 0;
+	}
 
 	function commit() {
 		if (!queuedCommit) {
@@ -2031,10 +2042,15 @@ export default function uPlot(opts, data, then) {
 	}
 
 	// manual batching (aka immediate mode), skips microtask queue
-	function batch(fn) {
+	function batch(fn, _deferHooks = false) {
 		queuedCommit = true;
+		deferHooks = _deferHooks;
+
 		fn(self);
 		_commit();
+
+		if (_deferHooks && hooksQueue.length > 0)
+			queueMicrotask(flushHooks);
 	}
 
 	self.batch = batch;
@@ -3210,10 +3226,14 @@ export default function uPlot(opts, data, then) {
 	const hooks = self.hooks = opts.hooks || {};
 
 	function fire(evName, a1, a2) {
-		if (evName in hooks) {
-			hooks[evName].forEach(fn => {
-				fn.call(null, self, a1, a2);
-			});
+		if (deferHooks)
+			hooksQueue.push([evName, a1, a2]);
+		else {
+			if (evName in hooks) {
+				hooks[evName].forEach(fn => {
+					fn.call(null, self, a1, a2);
+				});
+			}
 		}
 	}