{logChangedState(index)}
+{(logChangedState(index))}
{props.name}
diff --git a/src/app/containers/ActionContainer.tsx b/src/app/containers/ActionContainer.tsx index 1fa8c6a8b..34b669aa0 100644 --- a/src/app/containers/ActionContainer.tsx +++ b/src/app/containers/ActionContainer.tsx @@ -24,6 +24,7 @@ function ActionContainer(props) { let actionsArr = []; const hierarchyArr: any[] = []; + function findDiff(index) { const statelessCleanning = (obj: { name?: string; @@ -154,7 +155,6 @@ function ActionContainer(props) { } // Sort by index. hierarchyArr.sort((a, b) => a.index - b.index); - actionsArr = hierarchyArr.map( ( snapshot: { diff --git a/src/app/containers/MainContainer.tsx b/src/app/containers/MainContainer.tsx index 7e29ad73e..cbce2946f 100644 --- a/src/app/containers/MainContainer.tsx +++ b/src/app/containers/MainContainer.tsx @@ -18,7 +18,6 @@ const mixpanel = require('mixpanel').init('12fa2800ccbf44a5c36c37bc9776e4c0', { debug: false, protocol: 'https', }); - function MainContainer(): any { const [store, dispatch] = useStoreContext(); const { tabs, currentTab, port: currentPort } = store; diff --git a/src/app/containers/StateContainer.tsx b/src/app/containers/StateContainer.tsx index ec6a0a409..2b630e734 100644 --- a/src/app/containers/StateContainer.tsx +++ b/src/app/containers/StateContainer.tsx @@ -41,6 +41,8 @@ const StateContainer = (props: StateContainerProps): JSX.Element => { viewIndex, webMetrics, currLocation, + // added snapshots, Rob 11/4 + snapshots, } = props; return ( diff --git a/src/app/reducers/mainReducer.js b/src/app/reducers/mainReducer.js index ef6c2af47..1ea0c068b 100644 --- a/src/app/reducers/mainReducer.js +++ b/src/app/reducers/mainReducer.js @@ -1,4 +1,5 @@ import { produce, original } from 'immer'; +import { debuglog } from 'util'; import * as types from '../constants/actionTypes.ts'; @@ -11,25 +12,27 @@ export default (state, action) => produce(state, draft => { // eslint-disable-next-line max-len // function that finds the index in the hierarchy and extracts the name of the equivalent index to add to the post message // eslint-disable-next-line consistent-return + + // (action.payload, hierarchy) const findName = (index, obj) => { // eslint-disable-next-line eqeqeq if (obj && obj.index == index) { return obj.name; } - const objChildArray = []; if (obj) { + // eslint-disable-next-line no-restricted-syntax for (const objChild of obj.children) { objChildArray.push(findName(index, objChild)); } } + // eslint-disable-next-line no-restricted-syntax for (const objChildName of objChildArray) { if (objChildName) { return objChildName; } } }; - switch (action.type) { // Save case will store the series user wants to save to the chrome local storage case types.SAVE: { @@ -76,11 +79,12 @@ export default (state, action) => produce(state, draft => { } case types.MOVE_BACKWARD: { - if (snapshots.length > 0 && sliderIndex > 0) { + if (sliderIndex > 0) { const newIndex = sliderIndex - 1; // eslint-disable-next-line max-len // finds the name by the newIndex parsing through the hierarchy to send to background.js the current name in the jump action const nameFromIndex = findName(newIndex, hierarchy); + port.postMessage({ action: 'jumpToSnap', payload: snapshots[newIndex], @@ -105,9 +109,9 @@ export default (state, action) => produce(state, draft => { port.postMessage({ action: 'jumpToSnap', + payload: snapshots[newIndex], index: newIndex, name: nameFromIndex, - payload: snapshots[newIndex], tabId: currentTab, }); @@ -146,7 +150,8 @@ export default (state, action) => produce(state, draft => { // eslint-disable-next-line max-len // finds the name by the action.payload parsing through the hierarchy to send to background.js the current name in the jump action const nameFromIndex = findName(action.payload, hierarchy); - + // nameFromIndex is a number based on which jump button is pushed + port.postMessage({ action: 'jumpToSnap', payload: snapshots[action.payload], diff --git a/src/app/store.tsx b/src/app/store.tsx index 0241cca82..541f39610 100644 --- a/src/app/store.tsx +++ b/src/app/store.tsx @@ -3,4 +3,4 @@ import React, { useContext } from 'react'; export const StoreContext = React.createContext(); -export const useStoreContext:any = () => useContext(StoreContext); +export const useStoreContext:any = () => useContext(StoreContext); \ No newline at end of file diff --git a/src/app/styles/components/d3graph.css b/src/app/styles/components/d3graph.css index d2ee6aa4b..15f2174c2 100644 --- a/src/app/styles/components/d3graph.css +++ b/src/app/styles/components/d3graph.css @@ -30,17 +30,18 @@ body { div.tooltip { position: absolute; - text-align: center; - display: inline; - max-width: 250px; - overflow-wrap: break-word; - padding: 6px; - color: #2b2f39; + /* text-align: center; */ + /* display: inline; */ + max-width: 150px; + /* overflow-wrap: break-word; */ + padding: 0.5rem 1rem; + /* padding: 6px; */ + color: white; font-size: 12px; - font-family: 'Overpass Mono', monospace; - background: #679dca; - border-radius: 8px; - pointer-events: none; + font-family: 'Roboto', sans-serif; + background: #51565e; + border-radius: 5px; + /* pointer-events: none; */ } .d3-tip { diff --git a/src/app/styles/components/diff.css b/src/app/styles/components/diff.css index 26efa4689..cb74dd16f 100644 --- a/src/app/styles/components/diff.css +++ b/src/app/styles/components/diff.css @@ -38,7 +38,7 @@ ul.jsondiffpatch-delta { } .jsondiffpatch-unchanged, .jsondiffpatch-movedestination { - color: gray; + color: white; } .jsondiffpatch-unchanged, .jsondiffpatch-movedestination > .jsondiffpatch-value { diff --git a/src/app/styles/layout/_stateContainer.scss b/src/app/styles/layout/_stateContainer.scss index ef195152d..2608411af 100644 --- a/src/app/styles/layout/_stateContainer.scss +++ b/src/app/styles/layout/_stateContainer.scss @@ -209,6 +209,7 @@ max-width: 150px; background-color: #51565e; border-radius: 5px; + color: white; } .bargraph-position { diff --git a/src/app/styles/main.scss b/src/app/styles/main.scss index a6c84ce39..029440139 100644 --- a/src/app/styles/main.scss +++ b/src/app/styles/main.scss @@ -64,4 +64,5 @@ } .props p{ line-height:1; -} \ No newline at end of file +} + diff --git a/src/backend/helpers.ts b/src/backend/helpers.ts index 5ee41be8b..b42ac9b83 100644 --- a/src/backend/helpers.ts +++ b/src/backend/helpers.ts @@ -111,6 +111,8 @@ export const getHooksNames = (elementType: string): Array