Merge remote-tracking branch 'upstream/master' into add-email-field

zepatrik · zepatrik · commit 173e91c3fb27 · 2019-10-23T19:27:05.000+02:00
# Conflicts:
#	src/TextWidget/TextWidget.tsx
diff --git a/example/src/examples/alternatives/schema.json b/example/src/examples/alternatives/schema.json
@@ -3,23 +3,8 @@
     "Color": {
       "title": "Color",
       "type": "string",
-      "anyOf": [
-        {
-          "type": "string",
-          "enum": ["#ff0000"],
-          "title": "Red"
-        },
-        {
-          "type": "string",
-          "enum": ["#00ff00"],
-          "title": "Green"
-        },
-        {
-          "type": "string",
-          "enum": ["#0000ff"],
-          "title": "Blue"
-        }
-      ]
+      "enum": ["#ff0000", "#00ff00", "#0000ff"],
+      "enumNames": ["Red", "Green", "Blue"]
     },
     "Toggle": {
       "title": "Toggle",
diff --git a/example/src/examples/custom-array/ui-schema.json b/example/src/examples/custom-array/ui-schema.json
@@ -1 +1,5 @@
-{}
+{
+  "ui:options": {
+    "addButtonLabel": "Custom add label"
+  }
+}
diff --git a/example/src/menu/Menu.tsx b/example/src/menu/Menu.tsx
@@ -27,31 +27,33 @@ class RawMenuAppBar extends React.Component<any, any> {
     const { drawerOpen } = this.state;
 
     return (
-      <AppBar position="static" className={classes.toolbar}>
-        <Toolbar>
-          <Hidden only={['lg', 'xl']}>
-            <IconButton
-              className={classes.menuButton}
-              color="inherit"
-              aria-label="Menu"
-              onClick={this.toggleDrawer(true)}
-            >
-              <MenuIcon />
-            </IconButton>
-          </Hidden>
-          <div className={classes.flexCtr}>
-            <Typography variant="h6" color="inherit">
-              {pkg.name}
-            </Typography>
-          </div>
-        </Toolbar>
+      <>
+        <AppBar position="static" className={classes.toolbar}>
+          <Toolbar>
+            <Hidden only={['lg', 'xl']}>
+              <IconButton
+                className={classes.menuButton}
+                color="inherit"
+                aria-label="Menu"
+                onClick={this.toggleDrawer(true)}
+              >
+                <MenuIcon />
+              </IconButton>
+            </Hidden>
+            <div className={classes.flexCtr}>
+              <Typography variant="h6" color="inherit">
+                {pkg.name}
+              </Typography>
+            </div>
+          </Toolbar>
+        </AppBar>
         <LeftDrawer
           open={drawerOpen}
           toggleDrawer={this.toggleDrawer}
           onSelectMenuItem={onSelectMenuItem}
           selectedMenuItem={selectedMenuItem}
         />
-      </AppBar>
+      </>
     );
   }
 }
diff --git a/example/yarn.lock b/example/yarn.lock
@@ -4855,9 +4855,9 @@ safe-regex@^1.1.0:
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
 safer-eval@^1.3.0:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/safer-eval/-/safer-eval-1.3.3.tgz#0309e9fcc0609e66c1b599fd0d4772132b260ca8"
-  integrity sha512-j/qb0rtnwTp5V1D7nR0Ns/14HU8OiHPaoZNJhM+Lfmv1nbXZCXG9LHaVW157agEocdSVAeeRNddK/yuWfalzGQ==
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/safer-eval/-/safer-eval-1.3.5.tgz#a75a1193a4e1dfadd34a8c87ad08e7b978c494b1"
+  integrity sha512-BJ//K2Y+EgCbOHEsDGS5YahYBcYy7JcFpKDo2ba5t4MnOGHYtk7HvQkcxTDFvjQvJ0CRcdas/PyF+gTTCay+3w==
   dependencies:
     clones "^1.2.0"
 
diff --git a/package.json b/package.json
@@ -34,12 +34,12 @@
     "np": "^5.0.3",
     "npm-run-all": "^4.1.5",
     "prettier": "^1.18.2",
-    "pretty-quick": "^1.11.1",
+    "pretty-quick": "^2.0.0",
     "react": "^16.8.6",
     "react-dom": "^16.8.6",
     "react-jsonschema-form": "^1.6.1",
-    "rimraf": "^2.6.3",
-    "tsdx": "^0.7.2",
+    "rimraf": "^3.0.0",
+    "tsdx": "^0.10.5",
     "tslib": "^1.10.0",
     "typescript": "^3.5.3"
   },
diff --git a/src/AddButton/AddButton.tsx b/src/AddButton/AddButton.tsx
@@ -5,9 +5,10 @@ import { AddButtonProps } from 'react-jsonschema-form';
 import Button from '@material-ui/core/Button';
 import AddIcon from '@material-ui/icons/Add';
 
-const AddButton: React.FC<AddButtonProps> = props => (
+// TODO: Add label property on type definition
+const AddButton: React.FC<AddButtonProps & { label?: string }> = props => (
   <Button {...props} color="secondary">
-    <AddIcon /> Add Item
+    <AddIcon /> {props.label || 'Add Item'}
   </Button>
 );
 
diff --git a/src/ArrayFieldTemplate/ArrayFieldTemplate.tsx b/src/ArrayFieldTemplate/ArrayFieldTemplate.tsx
@@ -152,6 +152,7 @@ const DefaultFixedArrayFieldTemplate = (props: ArrayFieldTemplateProps) => {
           className="array-item-add"
           onClick={props.onAddClick}
           disabled={props.disabled || props.readonly}
+          label={props.uiSchema.buttonLabel}
         />
       )}
     </fieldset>
@@ -192,6 +193,11 @@ const DefaultNormalArrayFieldTemplate = (props: ArrayFieldTemplateProps) => {
                     className="array-item-add"
                     onClick={props.onAddClick}
                     disabled={props.disabled || props.readonly}
+                    {...(props.uiSchema['ui:options'] && {
+                      label: props.uiSchema['ui:options'][
+                        'addButtonLabel'
+                      ] as string,
+                    })}
                   />
                 </Box>
               </Grid>
diff --git a/src/PasswordWidget/PasswordWidget.tsx b/src/PasswordWidget/PasswordWidget.tsx
@@ -1,8 +1,7 @@
 import React from 'react';
 
 import FormControl from '@material-ui/core/FormControl';
-import Input from '@material-ui/core/Input';
-import InputLabel from '@material-ui/core/InputLabel';
+import TextField from '@material-ui/core/TextField';
 
 import { WidgetProps } from 'react-jsonschema-form';
 
@@ -36,16 +35,17 @@ const PasswordWidget = ({
       //error={!!rawErrors}
       required={required}
     >
-      <InputLabel>{label || schema.title}</InputLabel>
-      <Input
+      <TextField
+        id={id}
+        label={label || schema.title}
         autoFocus={autofocus}
         required={required}
         disabled={disabled || readonly}
         type="password"
         value={value ? value : ''}
+        onChange={_onChange}
         onFocus={_onFocus}
         onBlur={_onBlur}
-        onChange={_onChange}
       />
     </FormControl>
   );
diff --git a/src/TextWidget/TextWidget.tsx b/src/TextWidget/TextWidget.tsx
@@ -41,7 +41,6 @@ const TextWidget = ({
         autoFocus={autofocus}
         required={required}
         disabled={disabled || readonly}
-        name={name}
         type="text"
         value={value ? value : ''}
         onChange={_onChange}
diff --git a/yarn.lock b/yarn.lock

-Original file line number
+Diff line change
@@ @@ -1 +1,5 @@ @@
 -{}
 +{
 +  "ui:options": {
 +    "addButtonLabel": "Custom add label"
 +  }
 +}