Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(antd): disabled property of options of antd theme #4216

Merged
merged 5 commits into from
Jun 28, 2024
Merged

fix(antd): disabled property of options of antd theme #4216

merged 5 commits into from
Jun 28, 2024

Conversation

KingMario
Copy link
Contributor

@KingMario KingMario commented Jun 12, 2024 •
edited
Loading

Reasons for making this change

The disabled properties of options of checkboxes and radio widgets are wrongly set.

This PR fixes the issues in the two widgets.

Checklist

  • I'm updating documentation
  • I'm adding or updating code
    • I've added and/or updated tests. I've run npm run test:update to update snapshots, if needed.
    • I've updated docs if needed
    • I've updated the changelog with a description of the PR
  • I'm adding a new feature
    • I've updated the playground with an example use of the feature

KingMario added a commit to KingMario/react-jsonschema-form that referenced this pull request Jun 12, 2024
@KingMario
chore: update CHANGELOG.md for rjsf-team#4216
3395ef0
KingMario added a commit to KingMario/react-jsonschema-form that referenced this pull request Jun 12, 2024
@KingMario
chore: update CHANGELOG.md for rjsf-team#4216
8f562a9
@KingMario KingMario changed the title fix: disabled property of options of antd theme fix(antd): disabled property of options of antd theme Jun 13, 2024
KingMario added a commit to KingMario/react-jsonschema-form that referenced this pull request Jun 15, 2024
@KingMario
chore: update CHANGELOG.md for rjsf-team#4216
d1a8610
heath-freenome
heath-freenome reviewed Jun 21, 2024
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
@heath-freenome
Copy link
Member

@KingMario Still waiting for you to resolve the conflicts. Would love to get this into the next release that I hope to do in the next few days

KingMario added a commit to KingMario/react-jsonschema-form that referenced this pull request Jun 24, 2024
@KingMario
chore: update CHANGELOG.md for rjsf-team#4216
79a4d3c
@KingMario
Copy link
Contributor Author

@heath-freenome sorry for being late. The conflict resolved.

@heath-freenome
Copy link
Member

@KingMario I have no idea why your tests are now failing. Can you fix please?

@KingMario
Copy link
Contributor Author

@KingMario I have no idea why your tests are now failing. Can you fix please?

Let me see how to fix it.

KingMario added a commit to KingMario/react-jsonschema-form that referenced this pull request Jun 25, 2024
@KingMario
chore: update CHANGELOG.md for rjsf-team#4216
51a8945
@KingMario KingMario force-pushed the fixes/antd-enum-disabled branch 2 times, most recently from ef86679 to 5a4d919 Compare June 25, 2024 23:30
@KingMario
Copy link
Contributor Author

KingMario commented Jun 25, 2024 •
edited
Loading

Hi @heath-freenome, I just updated the test snapshot according to the failed test. I hope this time the test passes.

BTW, when I ran test:update, the command failed. That's why I haven't checked I've added and/or updated tests. I've run npm run test:update to update snapshots, if needed. in this PR.

image image

@KingMario
Copy link
Contributor Author

KingMario commented Jun 26, 2024 •
edited
Loading

@heath-freenome I see the test failed again.

I just figured out how to test locally and updated the test, and the PULL_REQUEST_TEMPLATE.md regarding test as well.

BTW, if it's possible for the contributer to trigger the tests when a PR is created, it'll speed the resolving of failed tests.

KingMario added a commit to KingMario/react-jsonschema-form that referenced this pull request Jun 26, 2024
@KingMario
chore: update CHANGELOG.md for rjsf-team#4216
aa24bc4
heath-freenome
heath-freenome reviewed Jun 28, 2024
View reviewed changes
CHANGELOG.md Outdated Show resolved Hide resolved
@heath-freenome heath-freenome merged commit 3d851f4 into rjsf-team:main Jun 28, 2024
5 checks passed
@KingMario KingMario deleted the fixes/antd-enum-disabled branch June 29, 2024 02:52
nickgros added a commit that referenced this pull request Aug 18, 2024
@nickgros
Merge changes in main to rjsf-v6 (#4276)
94b54dc 
Co-authored-by: Heath C <51679588+heath-freenome@users.noreply.github.com>
Co-authored-by: Abdallah Al-Soqatri <abdallah.al-soqatri@aspentech.com>
Co-authored-by: Kevin Burnett <18027+burnettk@users.noreply.github.com>
Co-authored-by: Marek Bodinger <marek.bodinger@gmail.com>
Co-authored-by: Mehdi Salem <mehdi.salem@qt.io>
Co-authored-by: Nick Grosenbacher <nickgrosenbacher@gmail.com>
Co-authored-by: Abdallah Al-Soqatri <abdallah.al-soqatri@inmation.com>
Co-authored-by: Jonasz Wiącek <jonaszwiacek@gmail.com>
Co-authored-by: Bogdan Savluk <savluk.bogdan@gmail.com>
Co-authored-by: Christian Wendt <54559756+cwendtxealth@users.noreply.github.com>
Co-authored-by: Ben Lambert <ben@blam.sh>
Co-authored-by: David R. Bild <david@davidbild.org>
Co-authored-by: Ariqun <38001928+Ariqun@users.noreply.github.com>
Co-authored-by: Shivam Anand Murmu <35562703+Rozamo@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Shubham Biswas <46351104+Shubhcoder@users.noreply.github.com>
Co-authored-by: popmanhe <neo_temp@hotmail.com>
Co-authored-by: Yuki Aoki <me@aoki.app>
Co-authored-by: Xiangcheng Kuo <37873394+orange-guo@users.noreply.github.com>
Co-authored-by: Bart van Andel <bavanandel@gmail.com>
Co-authored-by: Laurent Direr <laurent.direr@gmail.com>
Co-authored-by: Vegard Stenvik <42935080+vstenvik@users.noreply.github.com>
Co-authored-by: Appie <abdallarko@hotmail.com>
Co-authored-by: Oren Forer <oforer@gmail.com>
Co-authored-by: Marcus Penn <11893741+mpenndev@users.noreply.github.com>
Co-authored-by: joachimhagheim <47362824+joachimhagheim@users.noreply.github.com>
Co-authored-by: MarekBodingerBA <104828482+MarekBodingerBA@users.noreply.github.com>
Co-authored-by: momesana <momesana@gmail.com>
Co-authored-by: Martti Roitto <MarttiR@users.noreply.github.com>
Co-authored-by: Serge van den Oever <serge@macaw.nl>
Co-authored-by: Enzo Ferey <hello@enzoferey.com>
Co-authored-by: Skyf0l <tom.rorato@gmail.com>
Co-authored-by: Jaejoon Han <jj2726@gmail.com>
Co-authored-by: とまとみ <tomatommy.bs@gmail.com>
Co-authored-by: Daniel Todd <todddaniel@gmail.com>
Co-authored-by: Dmitry Dzhus <dima@dzhus.org>
Co-authored-by: Alexander Kachkaev <alexander@kachkaev.ru>
Co-authored-by: shaddollxz <56341682+shaddollxz@users.noreply.github.com>
Co-authored-by: Changyu Geng <gcyyq@hotmail.com>
Co-authored-by: Helen Lin <46795546+helen-m-lin@users.noreply.github.com>
Co-authored-by: solimant <solimant@users.noreply.github.com>
Co-authored-by: David Li <davidli@cs.stanford.edu>
fix(utils): direct lodash function import to improve bundling on library client side (#3976)
fix: #3961 resolve all recurse list for object properties (#3981)
fix gap in outline when label is hidden (#3984)
Fix: Expose the internal `ajv` variable in the validator implementation classes (#3991)
Fixes: #3972 indirectly by exposing the `ajv` variable for use in the issue
Fix: Change FormHelperText usage with @mui/material to render divs (#4032)
Fixes #4031 by switching the render component for `FormHelperText` to be `div`
fix: Added support for anyOf/oneOf in uiSchema (#4055)
Fixes #4039 by updating `MultiSchemaField` to properly support `anyOf`/`oneOf` arrays in the `uiSchema`
Fix checkbox with 0 as a value was unselectable in antd (#4068)
Fixed #4067 by properly dealing with enums that have 0 as a value
Fix potential XSS in the preview button of FileWidget (#4065)
Fix: Make 'ui:rows' option work with chakra-ui for textarea elements #4070 (#4078)
Fix typo in ErrorsListTemplate example (#4087)
Fix #4080 by moving `base64` encoder/decoder from `@rjsf/utils` to playground (#4093)
Fix: Error state not resetting when schema changes (#4079) (#4103)
Fix noImplicitAny error (#4106)
Fixes: [WARNING] Duplicate key "include" in object literal [duplicate-object-key] (#4114)
Fixes: Warning: validateDOMNesting(...): <p> cannot appear as a descendant of <p>. (#4117)
Fix documentation to add missing Form imports (#4131)
Fix #4127 to add missing `Form` import in documentation
Fix: filename should be bold (#4125)
Fix: use correct ConfigProvider context by using named imports (#4132)
Fix 4134 by filtering out bad DOM props (#4140)
Fixes: #4134 by updating the spreading of props onto the `TextField` to remove bad DOM fields
Fixed Programmatic submit not working properly in Firefox (#4150)
Fix Maximum call stack size exceeded in findSchemaDefinition (#4123)
fix typos in constants.ts, Form.tsx (#4185)
Fix mui imports in docs (#4218)
fix] Resetting number fields should check the entire string when deciding to leave the input text alone (#4202) (#4220)
Fixed performance issue with large schema dependencies and oneOf (#4203) (#4204)
Fixed performance issue #4203
fix(core): field ui-options higher priority (#4212)
fix(antd): disabled property of options of antd theme (#4216)
fix: omitExtraData on submit and on validateForm (#4228)
Fix IdSchema and PathSchema types (#4196)
fixes #4236
Fix #4197 in various themes by showing empty option in SelectWidget when appropriate (#4200)
fix: xss when rendering schema errors (#4256)
fix 4215 and 4260 by updating optionsList() to take a uiSchema (#4263)
Fixes #4215 and #4260 by supporting alternate titles for enums and anyOf/oneOf lists via the uiSchema
Fixed Changelog (#4269)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@heath-freenome heath-freenome heath-freenome approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@KingMario @heath-freenome