Merge pull request #175 from preactjs/option-hooks

Author: marvinhagemeister

package-lock.json

@@ -100,7 +100,7 @@
 		"microbundle": "^0.6.0",
 		"mocha": "^5.2.0",
 		"npm-merge-driver-install": "^1.1.1",
-		"preact": "^10.0.4",
+		"preact": "^10.5.7",
 		"prettier": "^2.1.2",
 		"sinon": "^1.17.5",
 		"sinon-chai": "^2.8.0",

package.json

@@ -39,8 +39,17 @@ renderToString.render = renderToString;
  */
 let shallowRender = (vnode, context) => renderToString(vnode, context, SHALLOW);
 
+const EMPTY_ARR = [];
+function renderToString(vnode, context, opts) {
+	const res = _renderToString(vnode, context, opts);
+	// options._commit, we don't schedule any effects in this library right now,
+	// so we can pass an empty queue to this hook.
+	if (options.__c) options.__c(vnode, EMPTY_ARR);
+	return res;
+}
+
 /** The default export is an alias of `render()`. */
-function renderToString(vnode, context, opts, inner, isSvgMode, selectValue) {
+function _renderToString(vnode, context, opts, inner, isSvgMode, selectValue) {
 	if (vnode == null || typeof vnode === 'boolean') {
 		return '';
 	}
@@ -77,7 +86,7 @@ function renderToString(vnode, context, opts, inner, isSvgMode, selectValue) {
 			for (let i = 0; i < children.length; i++) {
 				rendered +=
 					(i > 0 && pretty ? '\n' : '') +
-					renderToString(
+					_renderToString(
 						children[i],
 						context,
 						opts,
@@ -173,7 +182,8 @@ function renderToString(vnode, context, opts, inner, isSvgMode, selectValue) {
 				context = assign(assign({}, context), c.getChildContext());
 			}
 
-			return renderToString(
+			if (options.diffed) options.diffed(vnode);
+			return _renderToString(
 				rendered,
 				context,
 				opts,
@@ -313,7 +323,7 @@ function renderToString(vnode, context, opts, inner, isSvgMode, selectValue) {
 							: nodeName === 'foreignObject'
 							? false
 							: isSvgMode,
-					ret = renderToString(
+					ret = _renderToString(
 						child,
 						context,
 						opts,

src/index.js

@@ -1067,7 +1067,7 @@ describe('render', () => {
 		});
 	});
 
-	it('should invoke options._render and options._diff', () => {
+	it('should invoke option hooks', () => {
 		const calls = [];
 		// _diff
 		const oldDiff = options.__b;
@@ -1081,6 +1081,17 @@ describe('render', () => {
 			calls.push(['_render', args]);
 			if (oldRender) oldRender(...args);
 		};
+		const oldDiffed = options.diffed;
+		options.diffed = (...args) => {
+			calls.push(['diffed', args]);
+			if (oldDiffed) oldDiffed(...args);
+		};
+		// _commit
+		const oldCommit = options.__c;
+		options.__c = (...args) => {
+			calls.push(['_commit', args]);
+			if (oldCommit) oldCommit(...args);
+		};
 
 		function Component1({ children }) {
 			return children;
@@ -1098,11 +1109,14 @@ describe('render', () => {
 		expect(calls).to.deep.equal([
 			['_diff', [vnode1]],
 			['_render', [vnode1]],
+			['diffed', [vnode1]],
 			['_diff', [vnode2]],
-			['_render', [vnode2]]
+			['_render', [vnode2]],
+			['diffed', [vnode2]],
+			['_commit', [vnode1, []]]
 		]);
 
-		expect(calls.length).to.equal(4);
+		expect(calls.length).to.equal(7);
 
 		options.__b = oldDiff;
 		options.__r = oldRender;