Merge pull request #52 from jzuniga206/native

Updated styling of left component panel + More changes

Author: sean1292

package.json

@@ -71,7 +71,7 @@
     "electron": "cross-env NODE_ENV=development electron .",
     "build": "cross-env NODE_ENV=production webpack --config webpack.config.production.js",
     "build-bin": "electron-builder -mwl",
-    "test": "cross-env NODE_ENV=test jest",
+    "test": "cross-env NODE_ENV=test jest --verbose",
     "test:clear": "cross-env NODE_ENV=test jest --clearCache",
     "linter": "eslint src",
     "develop": "concurrently \"npm run dev\" \"npm run electron\""
@@ -184,7 +184,7 @@
     "extract-text-webpack-plugin": "^4.0.0-beta.0",
     "html-webpack-plugin": "^3.1.0",
     "identity-obj-proxy": "^3.0.0",
-    "jest": "^23.6.0",
+    "jest": "^25.2.6",
     "node-sass": "^4.13.1",
     "postcss-loader": "^2.1.6",
     "redux-mock-store": "^1.5.4",

src/components/bottom/BottomPanel.tsx

@@ -1,6 +1,12 @@
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
-import { handleClose, deleteProp, addProp, toggleNative, changeComponentFocusChild } from '../../actions/actionCreators';
+import {
+  handleClose,
+  deleteProp,
+  addProp,
+  toggleNative,
+  changeComponentFocusChild
+} from '../../actions/actionCreators';
 import BottomTabs from './BottomTabs';
 import { PropsInt, PropInt } from '../../interfaces/Interfaces';
 import { toggleCodeEdit } from '../../actions/actionCreators';
@@ -12,7 +18,7 @@ const mapDispatchToProps = (dispatch: any) => ({
   deleteProp: (id: number) => dispatch(deleteProp(id)),
   handleNotificationClose: () => dispatch(handleClose()),
   toggleNative: () => dispatch(toggleNative()),
-  toggleCodeEdit: () => dispatch(toggleCodeEdit()),
+  toggleCodeEdit: () => dispatch(toggleCodeEdit())
 });
 
 const mapStateToProps = (store: any) => ({
@@ -64,8 +70,6 @@ class BottomPanel extends Component<BottomPanelPropsInt> {
           focusChild={focusChild}
           changeFocusComponent={changeFocusComponent}
           updateCode={updateCode}
-          toggleNative={toggleNative}
-          native={native}
           toggleCodeEdit={toggleCodeEdit}
           codeReadOnly={codeReadOnly}
         />

src/components/bottom/BottomTabs.tsx

@@ -202,13 +202,15 @@ class BottomTabs extends Component<BottomTabsPropsInt, StateInt> {
                 htmlAttribCount ? `(${htmlAttribCount})` : ''
               } `}
             />
-            <Tab
+            {/* <Tab
               disableRipple
               classes={{ root: classes.tabRoot, selected: classes.tabSelected }}
               label="Add Child Props"
-            />
+            /> */}
           </Tabs>
-          <FormGroup>
+          {
+            // REACT NATIVE TOGGLE REMOVED AND MOVED TO LEFTCONTAINER. REMOVE THIS CODE IF NO ADVERSE EFFECTS FOUND
+            /* <FormGroup>
             <FormControlLabel
               className={classes.switch}
               control={
@@ -223,7 +225,8 @@ class BottomTabs extends Component<BottomTabsPropsInt, StateInt> {
               label="Native Mode"
               labelPlacement="start"
             />
-          </FormGroup>
+          </FormGroup> */
+          }
         </Box>
         {value === 0 && (
           <div

src/components/bottom/Props.tsx

@@ -7,7 +7,11 @@ import TextField from '@material-ui/core/TextField';
 import Button from '@material-ui/core/Button';
 import Select from '@material-ui/core/Select';
 import InputLabel from '@material-ui/core/InputLabel';
-import { addProp, changeComponentFocusChild, deleteProp } from '../../actions/actionCreators';
+import {
+  addProp,
+  changeComponentFocusChild,
+  deleteProp
+} from '../../actions/actionCreators';
 import DataTable from './DataTable';
 import { PropInt, PropsInt } from '../../interfaces/Interfaces';
 
@@ -147,7 +151,7 @@ const mapDispatchToProps = (dispatch: any) => ({
   }: {
     componentId: number;
     childId: number;
-  }) => dispatch(changeComponentFocusChild({ componentId, childId })),
+  }) => dispatch(changeComponentFocusChild({ componentId, childId }))
 });
 
 const mapStateToProps = (store: any) => ({
@@ -198,8 +202,12 @@ class Props extends Component<PropsPropsInt, StateInt> {
   }
 
   // using useState to locally check a clickedValue
-
-  handleChange = (event: any) => {
+  // React.ChangeEvent<HTML...Element> is the correct typing for events
+  handleChange = (
+    event:
+      | React.ChangeEvent<HTMLInputElement>
+      | React.ChangeEvent<HTMLSelectElement>
+  ) => {
     if (event.target.id === 'propVariable') {
       this.setState({
         [event.target.id]: event.target.value.trim()
@@ -251,15 +259,16 @@ class Props extends Component<PropsPropsInt, StateInt> {
       type: propType
     });
 
-    this.props.changeComponentFocusChild({ componentId: this.props.focusComponent.id , childId: this.props.focusChild.childId});
+    this.props.changeComponentFocusChild({
+      componentId: this.props.focusComponent.id,
+      childId: this.props.focusChild.childId
+    });
     this.setState({
       propVariable: '',
       propValue: '',
       propRequired: true,
       propType: ''
     });
-
-    
   };
 
   render() {
@@ -312,19 +321,28 @@ class Props extends Component<PropsPropsInt, StateInt> {
             >
               <Grid container spacing={8}>
                 <Grid item xs={3}>
-                  <form className="props-input" onSubmit={this.handleAddProp}>
+                  <form
+                    className="props-input"
+                    // JZ: assigned typing to onSubmit event, matches handleAddProp func
+                    onSubmit={(event: React.ChangeEvent<HTMLFormElement>) =>
+                      this.handleAddProp(event)
+                    }
+                  >
                     <Grid container spacing={8}>
                       <Grid item xs={6}>
                         <FormControl>
                           <TextField
                             type="text"
-                            native
+                            // native commented out due to overload error with material
                             id="propVariable"
                             label="Prop"
                             margin="none"
                             autoFocus
                             size="medium"
-                            onChange={this.handleChange}
+                            onChange={(
+                              //JZ: assigned typing to incoming event
+                              event: React.ChangeEvent<HTMLInputElement>
+                            ) => this.handleChange(event)}
                             value={this.state.propVariable}
                             color={'primary'}
                             required