From 6295d9b177029b0b3c47ed34fde0b46fbebb9197 Mon Sep 17 00:00:00 2001
From: Timothy Farrell <tim@thecookiejar.me>
Date: Sat, 16 Dec 2017 04:58:18 -0600
Subject: [PATCH] Expose frptools utils: call and id

Makes subscribeToRender more tolerant of non-functions
---
 packages/frptools/src/index.js      | 1 +
 packages/gallery/package.json       | 2 +-
 packages/gallery/src/utils/domvm.js | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/frptools/src/index.js b/packages/frptools/src/index.js
index 74dc444..f2b5de3 100644
--- a/packages/frptools/src/index.js
+++ b/packages/frptools/src/index.js
@@ -1,3 +1,4 @@
 export { prop } from './property';
 export { computed } from './computed';
 export { container } from './container';
+export { call, id } from './util.js';
diff --git a/packages/gallery/package.json b/packages/gallery/package.json
index 9f96566..06fbc37 100644
--- a/packages/gallery/package.json
+++ b/packages/gallery/package.json
@@ -16,7 +16,7 @@
 		"domvm": "~3.2.1",
 		"exif-parser": "~0.1.9",
 		"extract-text-webpack-plugin": "^3.0.2",
-		"frptools": "2.2.0",
+		"frptools": "3.0.1",
 		"moment": "~2.19.3",
 		"pica": "~2.0.8",
 		"pouchdb-adapter-http": "~6.3.4",
diff --git a/packages/gallery/src/utils/domvm.js b/packages/gallery/src/utils/domvm.js
index 499df7d..a38e73b 100644
--- a/packages/gallery/src/utils/domvm.js
+++ b/packages/gallery/src/utils/domvm.js
@@ -1,5 +1,6 @@
 // export * from 'domvm/dist/dev/domvm.dev.js';
 export * from 'domvm/dist/mini/domvm.mini.js';
+import { call } from 'frptools';
 import { deepAssign } from './conversion.js';
 import { error } from '../services/console.js';
 
@@ -7,7 +8,7 @@ export function subscribeToRender(vm, subscribables, subscriptions) {
 	const redraw = (...args) => vm.redraw();
 	const subList = subscribables.map(s => s.subscribe(redraw)).concat(subscriptions);
 
-	vm.config({ hooks: { willUnmount: () => subList.forEach(s => s()) } });
+	vm.config({ hooks: { willUnmount: () => subList.forEach(call) } });
 }
 
 export function patchRefStyle(ref, style, evt, node, vm) {