Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rjsf-team/react-jsonschema-form
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a9afe48adf5791c2054b58b851e51a9634a2f96e
Choose a base ref
...
head repository: rjsf-team/react-jsonschema-form
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f1f99ff4fdba623350c4c5f1570896b66304c802
Choose a head ref

Commits on Jan 6, 2018

  1. fix typo in css code

    epicfaace authored Jan 6, 2018
    Copy the full SHA
    ca5ce74 View commit details

Commits on Apr 22, 2018

  1. Copy the full SHA
    c6591d2 View commit details

Commits on Nov 16, 2018

  1. Copy the full SHA
    951aa58 View commit details
  2. Added ui:enumDisabled to CheckboxesWidget.js (#1082)

    * Added ui:enumDisabled to CheckboxesWidget.js
    
    * prettier fix
    skyckp123 authored and glasserc committed Nov 16, 2018
    Copy the full SHA
    a6d3179 View commit details

Commits on Dec 4, 2018

  1. Fix infinite loop when setting formData to falsey value in onChange h…

    …andler (#1089)
    
    Fixes #1086
    
    Change-type: patch
    Signed-off-by: Lucian <lucian.buzzo@gmail.com>
    LucianBuzzo authored and edi9999 committed Dec 4, 2018
    Copy the full SHA
    8d61038 View commit details
  2. Create LICENSE.md (#1072)

    Adam Grabek authored and edi9999 committed Dec 4, 2018
    Copy the full SHA
    5bf3633 View commit details
  3. fix: check obj1 in mergeObjects (#1095)

    nLight authored and edi9999 committed Dec 4, 2018
    Copy the full SHA
    1ad9a15 View commit details

Commits on Dec 8, 2018

  1. Copy the full SHA
    51caab6 View commit details

Commits on Dec 13, 2018

  1. Infer type from enum if a type is not provided to SelectWidget (#1100)

    Connects to #1098
    
    Change-type: minor
    Signed-off-by: Lucian <lucian.buzzo@gmail.com>
    LucianBuzzo authored and edi9999 committed Dec 13, 2018
    Copy the full SHA
    0ac0da7 View commit details

Commits on Dec 21, 2018

  1. Key-value pair in additional properties retains order when edited (#1101

    )
    
    * Make key-value pair stay at the same place and remove strange behavior with label
    
    * Handle case when you click input and immediately unclick
    
    * Add two test cases
    aerfio authored and edi9999 committed Dec 21, 2018
    Copy the full SHA
    ae9e58d View commit details

Commits on Jan 5, 2019

  1. Docs updated: Firefox date, time support (#1115)

    Firefox date, time input types partial support starting from Firefox 57
    razeel authored and edi9999 committed Jan 5, 2019
    Copy the full SHA
    c5c52f1 View commit details

Commits on Jan 7, 2019

  1. Fix failing unit tests related to time widget (#1119)

    It appears that due to the recent change from 2018 to 2019, there is one
    additional year in the select list, which caused the unit tests to fail.
    
    Signed-off-by: Lucian <lucian.buzzo@gmail.com>
    LucianBuzzo authored and edi9999 committed Jan 7, 2019
    Copy the full SHA
    4b9c475 View commit details

Commits on Jan 10, 2019

  1. Bump 1.0.7

    glasserc committed Jan 10, 2019
    Copy the full SHA
    65ca9de View commit details
  2. Add delete button for additionalProperties key-value pair (#1123)

    * add del button functionality
    
    * delete unnecesary console.logs
    
    * fix tests
    
    * remove unnecesary console.log
    
    * Fix disappearing key-value pair and repair delete button
    
    * Add .vscode to gitignore
    
    * fix tests
    
    * Make test work for select/radio button
    
    * Add test cases
    
    * Remove one file from PR and one helper function
    
    * Add one classname for value input
    
    * remove accidentally added .vscode
    
    * linted codebase
    
    * remove inline styles, make use of bootstrap 3 styles and fix related tests
    
    * revert changes to .gitignore
    aerfio authored and glasserc committed Jan 10, 2019
    Copy the full SHA
    7379491 View commit details
  3. Fix README about how to push

    This keeps biting me.
    glasserc committed Jan 10, 2019
    Copy the full SHA
    2364405 View commit details
  4. Copy the full SHA
    4ec3890 View commit details
  5. Copy the full SHA
    7027672 View commit details
  6. Copy the full SHA
    69211d9 View commit details
  7. A small semantic fix (#1112)

    Change `div` to `ul`, update react key
    nataliyakarat authored and glasserc committed Jan 10, 2019
    Copy the full SHA
    3d1524d View commit details
  8. fixed individually (#1109)

    0xflotus authored and glasserc committed Jan 10, 2019
    Copy the full SHA
    3a37dd2 View commit details
  9. Pass disabled and readonly to object field template (#1088)

    * ObjectField passes readonly & disabled prop to template
    
    * Update README
    olzraiti authored and glasserc committed Jan 10, 2019
    Copy the full SHA
    a3e0e9a View commit details
  10. Fix: #1104 Clear ajv errors before each validate (#1105)

    * Clear ajv errors before validate
    it prevent persisting not wanted errors
    
    * #1104 Add link to issue on code
    pieplu authored and glasserc committed Jan 10, 2019
    Copy the full SHA
    dfd3acc View commit details
  11. Copy the full SHA
    1a6c867 View commit details
  12. Give ids to array and object fields (#1102)

    * fix typo in css code
    
    * Give ids to array fields and object fields, give "root" id to the topmost fieldset
    epicfaace authored and glasserc committed Jan 10, 2019
    Copy the full SHA
    597a7ba View commit details
  13. Bump v1.1.0

    glasserc committed Jan 10, 2019
    Copy the full SHA
    b5a286a View commit details

Commits on Jan 14, 2019

  1. Handle sort arrays better (#1125)

    * move array item from index to newIndex
    
    * formating
    
    * moved reordering to a function
    
    * adds test for array sorting
    Christian Sletten Eide authored and glasserc committed Jan 14, 2019
    Copy the full SHA
    a2f3e68 View commit details
  2. Add preliminary support for the anyOf keyword (#1118)

    * Add preliminary support for the anyOf keyword
    
    This change introduces support for the `anyOf` keyword. The keyword is NOT
    supported in arrays (using the `items` keyword).
    Options provided in the `anyOf` keyword are rendered using a new
    component called `AnyOfField` this can be overridden with a custom
    field using the `fields` property.
    
    Signed-off-by: Lucian <lucian.buzzo@gmail.com>
    
    * Refactor unnecessary .map
    
    * Change selected option based on form data
    
    * Update README
    
    * Update README FAQ
    
    * Share prop types between fields
    LucianBuzzo authored and glasserc committed Jan 14, 2019
    Copy the full SHA
    66d800e View commit details
  3. Bump version v1.2.0

    glasserc committed Jan 14, 2019
    Copy the full SHA
    4c81b02 View commit details

Commits on Jan 18, 2019

  1. Fix typos (#1135)

    Maria Comas authored and glasserc committed Jan 18, 2019
    Copy the full SHA
    f27a24d View commit details
  2. Copy the full SHA
    f72be02 View commit details
  3. Expand anyOf support to also support oneOf (#1133)

    Signed-off-by: Lucian <lucian.buzzo@gmail.com>
    LucianBuzzo authored and glasserc committed Jan 18, 2019
    Copy the full SHA
    b068705 View commit details
  4. Copy the full SHA
    1941e76 View commit details

Commits on Jan 19, 2019

  1. doc: fix spacing

    epicfaace committed Jan 19, 2019
    Copy the full SHA
    0a48b41 View commit details
  2. Copy the full SHA
    4a1f754 View commit details
  3. Fix custom boolean option labels using oneOf schemas (#1137)

    * Allow boolean option label overrides with oneOf schema
    
    * Add oneOf RadioWidget playground sample
    
    * Document oneOf RadioWidget usage
    
    * Allow boolean enum options to be re-ordered for consistency with oneOf behavior
    pushred authored and epicfaace committed Jan 19, 2019
    Copy the full SHA
    98d7bc3 View commit details
  4. Add hidden widget for arrays (#978)

    mike391 authored and epicfaace committed Jan 19, 2019
    Copy the full SHA
    c17f3bd View commit details
  5. Copy the full SHA
    863912d View commit details
  6. Copy the full SHA
    e4e67ad View commit details

Commits on Jan 20, 2019

  1. Copy the full SHA
    7b87c82 View commit details
  2. Add encodeUriComponent to file name (#967)

    Fix for non-standard file names (with spaces, apostrophes, etc) that prevent to be used.
    jorgerobles authored and epicfaace committed Jan 20, 2019
    Copy the full SHA
    75571ba View commit details

Commits on Jan 21, 2019

  1. doc: fix typo

    epicfaace authored Jan 21, 2019
    Copy the full SHA
    55c0261 View commit details
  2. #556 - handle recursive references to deep schema definitions (#1142)

    * #556 - handle recursive references to deep schema definitions
    
    * test: add tests for recursive references
    
    * fix: handle multiple recursive references to deep schema definitions
    epicfaace authored Jan 21, 2019
    Copy the full SHA
    cf46342 View commit details
  3. Copy the full SHA
    c43e504 View commit details
  4. Copy the full SHA
    3606c7c View commit details
  5. docs: add docs using mkdocs

    epicfaace committed Jan 21, 2019
    Copy the full SHA
    0fd711e View commit details
  6. docs: Add docs_dir

    epicfaace committed Jan 21, 2019
    Copy the full SHA
    7339a09 View commit details
  7. Copy the full SHA
    ba833fa View commit details
  8. Add test and update documentation for using anyOf inside array items (#…

    …1131)
    
    * Add test and update documentation for using anyOf inside array items
    
    Signed-off-by: Lucian <lucian.buzzo@gmail.com>
    LucianBuzzo authored and epicfaace committed Jan 21, 2019
    Copy the full SHA
    251a274 View commit details
  9. Copy the full SHA
    67ff7da View commit details
  10. Copy the full SHA
    7e74bb6 View commit details
Showing with 20,899 additions and 10,831 deletions.
  1. +13 −11 .babelrc
  2. +127 −2 .gitignore
  3. +6 −0 .travis.yml
  4. +15 −0 CODE_OF_CONDUCT.md
  5. +2 −3 ISSUE_TEMPLATE.md
  6. +201 −0 LICENSE.md
  7. +2 −4 PULL_REQUEST_TEMPLATE.md
  8. +9 −1,872 README.md
  9. +645 −0 docs/advanced-customization.md
  10. +29 −0 docs/definitions.md
  11. +157 −0 docs/dependencies.md
  12. +758 −0 docs/form-customization.md
  13. +301 −0 docs/index.md
  14. +94 −0 docs/theme-customization.md
  15. +165 −0 docs/validation.md
  16. +17 −0 mkdocs.yml
  17. +2 −0 netlify.toml
  18. +9,721 −7,944 package-lock.json
  19. +37 −29 package.json
  20. +73 −51 playground/app.js
  21. +0 −7 playground/index.html
  22. +0 −7 playground/index.prod.html
  23. +21 −0 playground/samples/alternatives.js
  24. +59 −0 playground/samples/anyOf.js
  25. +2 −2 playground/samples/customArray.js
  26. +1 −1 playground/samples/customObject.js
  27. +10 −1 playground/samples/files.js
  28. +8 −0 playground/samples/index.js
  29. +28 −0 playground/samples/null.js
  30. +73 −0 playground/samples/nullable.js
  31. +24 −0 playground/samples/oneOf.js
  32. +6 −20 playground/samples/propertyDependencies.js
  33. +2 −8 playground/samples/schemaDependencies.js
  34. +1 −1 playground/samples/validation.js
  35. +7 −1 playground/samples/widgets.js
  36. +141 −22 src/components/Form.js
  37. +152 −63 src/components/fields/ArrayField.js
  38. +23 −27 src/components/fields/BooleanField.js
  39. +1 −2 src/components/fields/DescriptionField.js
  40. +186 −0 src/components/fields/MultiSchemaField.js
  41. +20 −0 src/components/fields/NullField.js
  42. +85 −18 src/components/fields/NumberField.js
  43. +87 −35 src/components/fields/ObjectField.js
  44. +153 −57 src/components/fields/SchemaField.js
  45. +7 −26 src/components/fields/StringField.js
  46. +5 −0 src/components/fields/index.js
  47. +30 −14 src/components/widgets/AltDateWidget.js
  48. +34 −2 src/components/widgets/BaseInput.js
  49. +39 −1 src/components/widgets/CheckboxWidget.js
  50. +6 −3 src/components/widgets/CheckboxesWidget.js
  51. +5 −4 src/components/widgets/FileWidget.js
  52. +6 −1 src/components/widgets/RadioWidget.js
  53. +18 −3 src/components/widgets/SelectWidget.js
  54. +2 −0 src/index.js
  55. +36 −0 src/types.js
  56. +279 −30 src/utils.js
  57. +116 −23 src/validate.js
  58. +28 −0 src/withTheme.js
  59. +234 −77 test/ArrayFieldTemplate_test.js
  60. +383 −13 test/ArrayField_test.js
  61. +428 −1 test/BooleanField_test.js
  62. +52 −12 test/FieldTemplate_test.js
  63. +967 −25 test/Form_test.js
  64. +60 −0 test/NullField_test.js
  65. +377 −103 test/NumberField_test.js
  66. +67 −24 test/ObjectFieldTemplate_test.js
  67. +155 −5 test/ObjectField_test.js
  68. +3 −3 test/SchemaField_test.js
  69. +116 −7 test/StringField_test.js
  70. +712 −0 test/anyOf_test.js
  71. +60 −0 test/const_test.js
  72. +590 −0 test/oneOf_test.js
  73. +1 −1 test/performance_test.js
  74. +1 −0 test/setup-jsdom.js
  75. +18 −1 test/test_utils.js
  76. +271 −3 test/uiSchema_test.js
  77. +1,795 −210 test/utils_test.js
  78. +281 −47 test/validate_test.js
  79. +236 −0 test/withTheme_test.js
  80. +5 −1 webpack.config.dev.js
  81. +4 −0 webpack.config.dist.js
  82. +8 −3 webpack.config.prod.js
24 changes: 13 additions & 11 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
{
"presets": ["react", "env"],
"presets": [
"@babel/preset-react",
"@babel/preset-env"
],
"plugins": [
"transform-object-rest-spread",
"transform-class-properties",
"transform-runtime"
"@babel/plugin-proposal-object-rest-spread",
"@babel/plugin-proposal-class-properties",
[
"@babel/plugin-transform-runtime",
{
"corejs": 2
}
]
],
"env": {
"development": {
"plugins": [
["react-transform", {
"transforms": [{
"transform": "react-transform-hmr",
"imports": ["react"],
"locals": ["module"]
}]
}]
"@babel/plugin-transform-react-jsx"
]
}
}
129 changes: 127 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,131 @@
npm-debug.log
node_modules
# Created by https://www.gitignore.io/api/osx,node,linux,windows
# Edit at https://www.gitignore.io/?templates=osx,node,linux,windows

### Linux ###
*~

# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*

# KDE directory preferences
.directory

# Linux trash folder which might appear on any partition or disk
.Trash-*

# .nfs files are created when an open file is removed but is still being accessed
.nfs*

### Node ###
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output

# Dependency directories
node_modules/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variables file
.env
.env.test

### OSX ###
# General
.DS_Store
.AppleDouble
.LSOverride

# Icon must end with two \r
Icon

# Thumbnails
._*

# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent

# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk

### Windows ###
# Windows thumbnail cache files
Thumbs.db
ehthumbs.db
ehthumbs_vista.db

# Dump file
*.stackdump

# Folder config file
[Dd]esktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp

# Windows shortcuts
*.lnk

# End of https://www.gitignore.io/api/osx,node,linux,windows

# Package specific files

build
_build
site
dist
lib
yarn.lock

# IDE
.vscode
.idea

# Code coverage
coverage
.nyc_output
6 changes: 6 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -3,6 +3,12 @@ language:
- node_js
node_js:
- "6"
- "7"
- "8"
- "9"
- "10"
- "11"
- "12"
env:
- ACTION=test
- ACTION="run lint"
15 changes: 15 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Community Participation Guidelines

This repository is governed by Mozilla's code of conduct and etiquette guidelines.
For more details, please read the
[Mozilla Community Participation Guidelines](https://www.mozilla.org/about/governance/policies/participation/).

## How to Report
For more information on how to report violations of the Community Participation Guidelines, please read our '[How to Report](https://www.mozilla.org/about/governance/policies/participation/reporting/)' page.

<!--
## Project Specific Etiquette
In some cases, there will be additional project etiquette i.e.: (https://bugzilla.mozilla.org/page.cgi?id=etiquette.html).
Please update for your project.
-->
5 changes: 2 additions & 3 deletions ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
### Prerequisites

- [ ] I have read the [documentation](https://github.com/mozilla-services/react-jsonschema-form/blob/master/README.md#readme);
- [ ] I have read the [documentation](https://react-jsonschema-form.readthedocs.io/);
- [ ] In the case of a bug report, I understand that providing a [SSCCE](http://sscce.org/) example is tremendously useful to the maintainers.
- [ ] Ideally, I'm providing a [sample JSFiddle](https://jsfiddle.net/n1k0/f2y3fq7L/6/) or a [shared playground link](https://mozilla-services.github.io/react-jsonschema-form/) demonstrating the issue.

### Description

@@ -13,8 +14,6 @@
2. [Second Step]
3. [and so on...]

Ideally, I'm providing a [sample JSFiddle](https://jsfiddle.net/n1k0/f2y3fq7L/6/) or a [shared playground link](https://mozilla-services.github.io/react-jsonschema-form/) demonstrating the issue.

#### Expected behavior

[What you expected to happen]
Loading