fix: context is null

windyGex · Dec 31, 2020 · 9cb0165 · 9cb0165
1 parent a4d7fed
commit 9cb0165
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/connect.jsx b/src/connect.jsx
@@ -52,8 +52,8 @@ const connect = function (mapStateToProps = state => state, config = {}) {
                 this._deps = {};
                 this._change = change.bind(this);
                 this._get = get.bind(this);
-                this.store = context.store || Store.get();
-                if (config.inject) {
+                this.store = context && context.store || Store.get();
+                if (config.inject && context) {
                     if (context.injectStore) {
                         this.store = context.injectStore;
                     } else {

diff --git a/src/inject.jsx b/src/inject.jsx
@@ -50,7 +50,7 @@ const inject = function (key, value) {
                     this[key].on('change', this._change);
                     this[key].history = this[key].history || this.props.history;
                     if (this[key].name) {
-                        this.context.store && this.context.store.mount(this[key].name, this[key]);
+                        this.context && this.context.store && this.context.store.mount(this[key].name, this[key]);
                     }
                     if (!Component.prototype._hasSet) {
                         Object.defineProperty(Component.prototype, key, {