Merge branch 'master' into tests

Author: nmwenz90

src/app/__tests__/SwitchApp.test.tsx

@@ -25,10 +25,10 @@ describe('Unit testing for SwitchApp.jsx', () => {
     value: 100,
     label: 'component',
   };
-  // nate and edwin: mockImplementation creates a mock function call
+  // mockImplementation creates a mock function call
   const dispatch = jest.fn();
 
-  // nate and edwin: mockImplementation creates a mock state
+  // mockImplementation creates a mock state
   useStoreContext.mockImplementation(() => [state, dispatch]);
 
   beforeEach(() => {

src/app/containers/ActionContainer.tsx

@@ -46,7 +46,7 @@ function ActionContainer() {
   // if true involk displayArray to display the hierarchy
   if (hierarchy) displayArray(hierarchy);
 
-  // Edwin: handles keyboard presses, function passes an event and index of each action-component
+  // handles keyboard presses, function passes an event and index of each action-component
   function handleOnKeyDown(e:KeyboardEvent, i:number) {
     let currIndex = i;
     // up array key pressed

src/backend/helpers.js

@@ -23,10 +23,8 @@ export const throttle = (f, t) => {
     if (isOnCooldown && isCallQueued) return;
     if (isOnCooldown) {
       isCallQueued = true;
-      console.log('snapshot update already queued');
       return;
     }
-    console.log('no queue, updating snapshot from trigger func');
     f();
     isOnCooldown = true;
     isCallQueued = false;
@@ -35,14 +33,12 @@ export const throttle = (f, t) => {
       if (isCallQueued) {
         isCallQueued = false;
         isOnCooldown = true; // not needed I think
-        console.log('calling queued call');
         f();
         setTimeout(runAfterTimeout, t);
         return;
       }
       isOnCooldown = false;
     };
-    console.log('queueing snapshot update');
     setTimeout(runAfterTimeout, t);
   };
   return throttledFunc;

src/backend/linkFiber.ts

@@ -73,14 +73,11 @@ export default (snap: Snapshot, mode: Mode): ()=>void => {
     }, '*');
   }
 
-  // Carlos: Injects instrumentation to update our state tree every time
+  // Injects instrumentation to update our state tree every time
   // a hooks component changes state
   function traverseHooks(memoizedState: any): HookStates {
     const hooksStates: HookStates = [];
     while (memoizedState && memoizedState.queue) {
-      // Carlos: these two are legacy comments, we should look into them later
-      // prevents useEffect from crashing on load
-      // if (memoizedState.next.queue === null) { // prevents double pushing snapshot updates
       if (memoizedState.memoizedState && memoizedState.queue.lastRenderedReducer && memoizedState.queue.lastRenderedReducer.name === 'basicStateReducer') {
         hooksStates.push({
           component: memoizedState.queue,

src/backend/timeJump.ts

@@ -32,7 +32,10 @@ export default (origin, mode) => {
 
     if (!target) return;
 
-    if (target.state === 'stateless') target.children.forEach(child => jump(child));
+    if (target.state === 'stateless') {
+      target.children.forEach(child => jump(child));
+      return;
+    }
     const component = componentActionsRecord.getComponentByIndex(target.componentData.index);
     if (component && component.setState) {
       component.setState(prevState => {

src/extension/build/build.zip

@@ -86,6 +86,8 @@ module.exports = (env, argv) => {
         },
       }),
     );
+  } else {
+    config.mode = 'production';
   }
   return config;
 };