From 451d2f540a1445cf66e2556e559db08851150b1d Mon Sep 17 00:00:00 2001
From: Anthony Gubler <agubler@gmail.com>
Date: Tue, 26 Feb 2019 11:15:42 +0000
Subject: [PATCH] Default stateKey to 'state' (#273)

---
 src/stores/StoreProvider.ts        | 15 +++++++++++----
 tests/stores/unit/StoreProvider.ts |  2 +-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/stores/StoreProvider.ts b/src/stores/StoreProvider.ts
index f4283650c..a0a8b9fb4 100644
--- a/src/stores/StoreProvider.ts
+++ b/src/stores/StoreProvider.ts
@@ -12,7 +12,7 @@ export interface GetPaths<S = any> {
 
 export interface StoreProviderProperties<S = any> {
 	renderer: (store: Store<S>) => DNode | DNode[];
-	stateKey: string;
+	stateKey?: string;
 	paths?: GetPaths<S>;
 }
 
@@ -41,10 +41,14 @@ export class StoreProvider<S = any> extends WidgetBase<StoreProviderProperties<S
 		}
 	}
 
+	private _getProperties() {
+		return { stateKey: 'state', ...this.properties };
+	}
+
 	@diffProperty('stateKey')
 	@diffProperty('paths', pathDiff)
-	protected onChange(previousProperties: StoreProviderProperties, currentProperties: StoreProviderProperties) {
-		const { stateKey, paths } = currentProperties;
+	protected onChange(previousProperties: any, currentProperties: StoreProviderProperties) {
+		const { stateKey = 'state', paths } = currentProperties;
 		if (this._handle) {
 			this._handle.destroy();
 			this._handle = undefined;
@@ -68,8 +72,11 @@ export class StoreProvider<S = any> extends WidgetBase<StoreProviderProperties<S
 	}
 
 	protected render(): DNode | DNode[] {
-		const { stateKey, renderer } = this.properties;
+		const { stateKey, renderer } = this._getProperties();
 		const store = this._getStore(stateKey);
+		if (!this._handle) {
+			this.onChange({}, this._getProperties());
+		}
 		if (store) {
 			return renderer(store);
 		}
diff --git a/tests/stores/unit/StoreProvider.ts b/tests/stores/unit/StoreProvider.ts
index a7900c7bc..4fbaec972 100644
--- a/tests/stores/unit/StoreProvider.ts
+++ b/tests/stores/unit/StoreProvider.ts
@@ -88,12 +88,12 @@ describe('StoreProvider', () => {
 		const container = new TestContainer();
 		container.registry.base = registry;
 		container.__setProperties__({
-			stateKey: 'state',
 			renderer(injectedStore) {
 				assert.strictEqual<any>(injectedStore, store);
 				return v('div');
 			}
 		});
+		container.__render__();
 		invalidateCount = 0;
 		fooProcess(store)({});
 		assert.strictEqual(invalidateCount, 1);