fix(overmind): fix context issue with statemachine

Author: christianalfoni

packages/node_modules/overmind/src/statemachine.ts

@@ -1,3 +1,5 @@
+import { VALUE } from 'proxy-state-tree'
+
 import { Derive } from './'
 
 export type StatemachineDefinition<States extends string> = {
@@ -14,17 +16,19 @@ export type Statemachine<States extends string> = {
   [State in States]: <T>(entry?: () => T, exit?: () => void) => T
 }
 
+const CURRENT_EXIT = Symbol('CURRENT_EXIT')
+
 class Machine<States extends string>  {
   current: States
-  private _currentExit: (() => void) | undefined
+  private [CURRENT_EXIT]: (() => void) | undefined
   constructor(definition: StatemachineDefinition<States>) {
     this.current = definition.initial
 
     Object.keys(definition.states).reduce((aggr, key) => {
-      aggr[key] = (entry, exit) => {
+      aggr[key] = function (entry, exit) {
         if (definition.states[this.current].includes(key as any)) {
-          if (this._currentExit) this._currentExit()
-          this._currentExit = exit
+          if (this[CURRENT_EXIT]) this._currentExit()
+          this[VALUE][CURRENT_EXIT] = exit
           this.current = key as any
           return entry && entry()
         }
@@ -34,9 +38,10 @@ class Machine<States extends string>  {
     }, this)
   }
   reset() {
-    if (this._currentExit) {
-      this._currentExit()
-      this._currentExit = undefined
+    const exit = this[CURRENT_EXIT]
+    if (typeof exit === 'function') {
+      exit()
+      this[VALUE][CURRENT_EXIT] = undefined
     }
   }
 }

packages/overmind-website/src/index.tsx

@@ -20,6 +20,8 @@ const overmind = createOvermind(
       }
 )
 
+overmind.actions.login()
+
 setConfig({
   ignoreSFC: true, // RHL will be __completely__ disabled for SFC
   pureRender: true, // RHL will not change render method

packages/overmind-website/src/overmind/actions.ts

@@ -124,3 +124,7 @@ export const changeQuery: Operator<string> = pipe(
 export const viewHelpGotIt: Action = ({ state }) => {
   state.showViewHelp = false
 }
+
+export const login: Action = ({ state }) => {
+  state.mode.authenticating(() => {})
+}

packages/overmind-website/src/overmind/state.ts

@@ -1,3 +1,5 @@
+import { Statemachine, statemachine } from 'overmind'
+
 import {
   Api,
   Demo,
@@ -8,6 +10,12 @@ import {
   Video,
 } from './types'
 
+type Mode =
+  | 'unauthenticated'
+  | 'authenticating'
+  | 'authenticated'
+  | 'unauthenticating'
+
 type State = {
   page: Page
   currentGuide: GuideParams
@@ -31,6 +39,7 @@ type State = {
   versions: {
     [name: string]: string
   }
+  mode: Statemachine<Mode>
 }
 
 const state: State = {
@@ -54,6 +63,15 @@ const state: State = {
   isLoadingVideos: false,
   showViewHelp: false,
   versions: {},
+  mode: statemachine<Mode>({
+    initial: 'unauthenticated',
+    states: {
+      unauthenticated: ['authenticating'],
+      authenticating: ['unauthenticated', 'authenticated'],
+      authenticated: ['unauthenticating'],
+      unauthenticating: ['unauthenticated', 'authenticated'],
+    },
+  }),
 }
 
 export default state