Merge a17bb18 into 8dea9cc

src/dom/index.js

@@ -1,4 +1,5 @@
 import { IS_NON_DIMENSIONAL } from '../constants';
+import { applyRef } from '../util';
 import options from '../options';
 
 /**
@@ -70,8 +71,8 @@ export function setAccessor(node, name, old, value, isSvg) {
 		// ignore
 	}
 	else if (name==='ref') {
-		if (old) old(null);
-		if (value) value(node);
+		applyRef(old, null);
+		applyRef(value, node);
 	}
 	else if (name==='class' && !isSvg) {
 		node.className = value || '';

src/preact.js

@@ -5,10 +5,15 @@ import { render } from './render';
 import { rerender } from './render-queue';
 import options from './options';
 
+function createRef() {
+	return {};
+}
+
 export default {
 	h,
 	createElement,
 	cloneElement,
+	createRef,
 	Component,
 	render,
 	rerender,
@@ -19,6 +24,7 @@ export {
 	h,
 	createElement,
 	cloneElement,
+	createRef,
 	Component,
 	render,
 	rerender,

src/util.js

@@ -10,6 +10,17 @@ export function extend(obj, props) {
 	return obj;
 }
 
+/** Invoke or update a ref, depending on whether it is a function or object ref.
+ *  @param {object|function} [ref=null]
+ *  @param {any} [value]
+ */
+export function applyRef(ref, value) {
+	if (ref!=null) {
+		if (typeof ref=='function') ref(value);
+		else ref.current = value;
+	}
+}
+
 /**
  * Call a function asynchronously, as soon as possible. Makes
  * use of HTML Promise to schedule the callback if available,

src/vdom/component.js

@@ -1,6 +1,6 @@
 import { SYNC_RENDER, NO_RENDER, FORCE_RENDER, ASYNC_RENDER, ATTR_KEY } from '../constants';
 import options from '../options';
-import { extend } from '../util';
+import { extend, applyRef } from '../util';
 import { enqueueRender } from '../render-queue';
 import { getNodeProps } from './index';
 import { diff, mounts, diffLevel, flushMounts, recollectNodeTree, removeChildren } from './diff';
@@ -52,7 +52,7 @@ export function setComponentProps(component, props, renderMode, context, mountAl
 		}
 	}
 
-	if (component.__ref) component.__ref(component);
+	applyRef(component.__ref, component);
 }
 
 
@@ -292,5 +292,5 @@ export function unmountComponent(component) {
 		removeChildren(base);
 	}
 
-	if (component.__ref) component.__ref(null);
+	applyRef(component.__ref, null);
 }

src/vdom/diff.js

@@ -4,6 +4,7 @@ import { buildComponentFromVNode } from './component';
 import { createNode, setAccessor } from '../dom/index';
 import { unmountComponent } from './component';
 import options from '../options';
+import { applyRef } from '../util';
 import { removeNode } from '../dom/index';
 
 /**
@@ -284,7 +285,7 @@ export function recollectNodeTree(node, unmountOnly) {
 	else {
 		// If the node's VNode had a ref function, invoke it with null here.
 		// (this is part of the React spec, and smart for unsetting references)
-		if (node[ATTR_KEY]!=null && node[ATTR_KEY].ref) node[ATTR_KEY].ref(null);
+		if (node[ATTR_KEY]!=null) applyRef(node[ATTR_KEY].ref, null);
 
 		if (unmountOnly===false || node[ATTR_KEY]==null) {
 			removeNode(node);