-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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.
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
fix: retain fields when hoisting row/collapsible fields in recursiveNestedPaths #2769
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ow/collapsible fields
AlessioGr
added a commit
that referenced
this pull request
Jun 5, 2023
* test setup * change i18n cookie name * set html lng and dir dynamically * arabic support * localization optional object * update docs * resolve conflict on Localizer * optional field rtl key * data-rtl on html field * data-rtl on html textarea * fix json formatting * add rtl to button * Update index.scss @editMany * add rtl index.scss @nav * Revert "add rtl index.scss @nav" This reverts commit 5b8ed8f. * Revert "Update index.scss @editMany" This reverts commit 66cef65. * Revert "add rtl to button" This reverts commit ccf6cc0. * fix build * fix: typo * fix: unifiedLocaleConfig erroring when no locale is set * chore(release): v1.8.4 * chore: update changelog * chore: improve formatting * chore: styling and more verbose alternative to logical and assignment * chore: style * fix: account for missing locales in extractLocaleObject * chore: extractLocaleObject => extractLabeledLocale * ExtendedLocale => LabeledLocale * docs: document useLabeledLocale hook * feat: allows objectid through relationship validation * chore(release): v1.8.5 * fix: recursiveNestedPaths not merging existing fields when hoisting row/collapsible fields (#2769) * improve field rtl enabled detection * fix: fields not rtl if the defaultLocale is rtl and the field is untranslated * chore: improve comment --------- Co-authored-by: Seied Ali Mirkarimi <dasmergo@gmail.com> Co-authored-by: Alessio Gravili <alessio@gravili.de>
AlessioGr
added a commit
to AlessioGr/payload
that referenced
this pull request
Jun 6, 2023
* test setup * change i18n cookie name * set html lng and dir dynamically * arabic support * localization optional object * update docs * resolve conflict on Localizer * optional field rtl key * data-rtl on html field * data-rtl on html textarea * fix json formatting * add rtl to button * Update index.scss @editMany * add rtl index.scss @nav * Revert "add rtl index.scss @nav" This reverts commit 5b8ed8f. * Revert "Update index.scss @editMany" This reverts commit 66cef65. * Revert "add rtl to button" This reverts commit ccf6cc0. * fix build * fix: typo * fix: unifiedLocaleConfig erroring when no locale is set * chore(release): v1.8.4 * chore: update changelog * chore: improve formatting * chore: styling and more verbose alternative to logical and assignment * chore: style * fix: account for missing locales in extractLocaleObject * chore: extractLocaleObject => extractLabeledLocale * ExtendedLocale => LabeledLocale * docs: document useLabeledLocale hook * feat: allows objectid through relationship validation * chore(release): v1.8.5 * fix: recursiveNestedPaths not merging existing fields when hoisting row/collapsible fields (payloadcms#2769) * improve field rtl enabled detection * fix: fields not rtl if the defaultLocale is rtl and the field is untranslated * chore: improve comment --------- Co-authored-by: Seied Ali Mirkarimi <dasmergo@gmail.com> Co-authored-by: Alessio Gravili <alessio@gravili.de>
AlessioGr
added a commit
that referenced
this pull request
Jun 6, 2023
* test setup * change i18n cookie name * set html lng and dir dynamically * arabic support * localization optional object * update docs * resolve conflict on Localizer * optional field rtl key * data-rtl on html field * data-rtl on html textarea * fix json formatting * add rtl to button * Update index.scss @editMany * add rtl index.scss @nav * Revert "add rtl index.scss @nav" This reverts commit 5b8ed8f. * Revert "Update index.scss @editMany" This reverts commit 66cef65. * Revert "add rtl to button" This reverts commit ccf6cc0. * fix build * fix: typo * fix: unifiedLocaleConfig erroring when no locale is set * chore(release): v1.8.4 * chore: update changelog * chore: improve formatting * chore: styling and more verbose alternative to logical and assignment * chore: style * fix: account for missing locales in extractLocaleObject * chore: extractLocaleObject => extractLabeledLocale * ExtendedLocale => LabeledLocale * docs: document useLabeledLocale hook * feat: allows objectid through relationship validation * chore(release): v1.8.5 * fix: recursiveNestedPaths not merging existing fields when hoisting row/collapsible fields (#2769) * improve field rtl enabled detection * fix: fields not rtl if the defaultLocale is rtl and the field is untranslated * chore: improve comment --------- Co-authored-by: Seied Ali Mirkarimi <dasmergo@gmail.com> Co-authored-by: Alessio Gravili <alessio@gravili.de>
DanRibbens
pushed a commit
that referenced
this pull request
Jun 6, 2023
* test setup * change i18n cookie name * set html lng and dir dynamically * arabic support * localization optional object * update docs * resolve conflict on Localizer * optional field rtl key * data-rtl on html field * data-rtl on html textarea * fix json formatting * add rtl to button * Update index.scss @editMany * add rtl index.scss @nav * Revert "add rtl index.scss @nav" This reverts commit 5b8ed8f. * Revert "Update index.scss @editMany" This reverts commit 66cef65. * Revert "add rtl to button" This reverts commit ccf6cc0. * fix build * fix: typo * fix: unifiedLocaleConfig erroring when no locale is set * chore(release): v1.8.4 * chore: update changelog * chore: improve formatting * chore: styling and more verbose alternative to logical and assignment * chore: style * fix: account for missing locales in extractLocaleObject * chore: extractLocaleObject => extractLabeledLocale * ExtendedLocale => LabeledLocale * docs: document useLabeledLocale hook * feat: allows objectid through relationship validation * chore(release): v1.8.5 * fix: recursiveNestedPaths not merging existing fields when hoisting row/collapsible fields (#2769) * improve field rtl enabled detection * fix: fields not rtl if the defaultLocale is rtl and the field is untranslated * chore: improve comment --------- Co-authored-by: Seied Ali Mirkarimi <dasmergo@gmail.com> Co-authored-by: Alessio Gravili <alessio@gravili.de>
AlessioGr
added a commit
that referenced
this pull request
Jun 6, 2023
* admin panel rtl support this will make directions to right for rtl support in css * chore(release): v1.8.4 * chore: update changelog * feat: allows objectid through relationship validation * chore(release): v1.8.5 * fix: recursiveNestedPaths not merging existing fields when hoisting row/collapsible fields (#2769) * fix: incorrect margin for pills * fix: isFieldRTL detection * rtl support for textarea and text input fields * rtl for create new button * rtl for upload field * rtl for locale picker * Account API url rtl * navgroup rtl * rtl for date fields * RTL for blocks field * fix: exclude monaco code editor from ltr due to microsoft/monaco-editor#2371 * RTL array field * fix: drawer close button for RTL * rtl for EditMany view * rtl for StepNav * rtl for Block SectionTitle * rtl for field labels * rtl for leave-without-saving button * rtl for template-default * rtl for Acount view * rtl for version view * rtl for versions view * rtl for Global Edit * rtl for collection list view * rtl for Nav Menu * rtl for Edit and Edit/Auth view * fix: SectionTitle for blocks field * collection list fixes --------- Co-authored-by: Alessio Gravili <alessio@gravili.de> Co-authored-by: ibr-hin95 <ibr.hin95@gmail.com>
AlessioGr
added a commit
that referenced
this pull request
Jun 6, 2023
* admin panel rtl support this will make directions to right for rtl support in css * chore(release): v1.8.4 * chore: update changelog * feat: allows objectid through relationship validation * chore(release): v1.8.5 * fix: recursiveNestedPaths not merging existing fields when hoisting row/collapsible fields (#2769) * fix: incorrect margin for pills * fix: isFieldRTL detection * rtl support for textarea and text input fields * rtl for create new button * rtl for upload field * rtl for locale picker * Account API url rtl * navgroup rtl * rtl for date fields * RTL for blocks field * fix: exclude monaco code editor from ltr due to microsoft/monaco-editor#2371 * RTL array field * fix: drawer close button for RTL * rtl for EditMany view * rtl for StepNav * rtl for Block SectionTitle * rtl for field labels * rtl for leave-without-saving button * rtl for template-default * rtl for Acount view * rtl for version view * rtl for versions view * rtl for Global Edit * rtl for collection list view * rtl for Nav Menu * rtl for Edit and Edit/Auth view * fix: SectionTitle for blocks field * collection list fixes --------- Co-authored-by: Alessio Gravili <alessio@gravili.de> Co-authored-by: ibr-hin95 <ibr.hin95@gmail.com>
AlessioGr
added a commit
that referenced
this pull request
Jul 16, 2023
* admin panel rtl support this will make directions to right for rtl support in css * chore(release): v1.8.4 * chore: update changelog * feat: allows objectid through relationship validation * chore(release): v1.8.5 * fix: recursiveNestedPaths not merging existing fields when hoisting row/collapsible fields (#2769) * fix: incorrect margin for pills * fix: isFieldRTL detection * rtl support for textarea and text input fields * rtl for create new button * rtl for upload field * rtl for locale picker * Account API url rtl * navgroup rtl * rtl for date fields * RTL for blocks field * fix: exclude monaco code editor from ltr due to microsoft/monaco-editor#2371 * RTL array field * fix: drawer close button for RTL * rtl for EditMany view * rtl for StepNav * rtl for Block SectionTitle * rtl for field labels * rtl for leave-without-saving button * rtl for template-default * rtl for Acount view * rtl for version view * rtl for versions view * rtl for Global Edit * rtl for collection list view * rtl for Nav Menu * rtl for Edit and Edit/Auth view * fix: SectionTitle for blocks field * collection list fixes --------- Co-authored-by: Alessio Gravili <alessio@gravili.de> Co-authored-by: ibr-hin95 <ibr.hin95@gmail.com>
AlessioGr
added a commit
that referenced
this pull request
Jul 16, 2023
* test setup * change i18n cookie name * set html lng and dir dynamically * arabic support * localization optional object * update docs * resolve conflict on Localizer * optional field rtl key * data-rtl on html field * data-rtl on html textarea * fix json formatting * add rtl to button * Update index.scss @editMany * add rtl index.scss @nav * Revert "add rtl index.scss @nav" This reverts commit 5b8ed8f. * Revert "Update index.scss @editMany" This reverts commit 66cef65. * Revert "add rtl to button" This reverts commit ccf6cc0. * fix build * fix: typo * fix: unifiedLocaleConfig erroring when no locale is set * chore(release): v1.8.4 * chore: update changelog * chore: improve formatting * chore: styling and more verbose alternative to logical and assignment * chore: style * fix: account for missing locales in extractLocaleObject * chore: extractLocaleObject => extractLabeledLocale * ExtendedLocale => LabeledLocale * docs: document useLabeledLocale hook * feat: allows objectid through relationship validation * chore(release): v1.8.5 * fix: recursiveNestedPaths not merging existing fields when hoisting row/collapsible fields (#2769) * improve field rtl enabled detection * fix: fields not rtl if the defaultLocale is rtl and the field is untranslated * chore: improve comment --------- Co-authored-by: Seied Ali Mirkarimi <dasmergo@gmail.com> Co-authored-by: Alessio Gravili <alessio@gravili.de>
DanRibbens
pushed a commit
that referenced
this pull request
Aug 22, 2023
Co-authored-by: Alessio Gravili <alessio@gravili.de> Co-authored-by: ibr-hin95 <ibr.hin95@gmail.com> Co-authored-by: Seied Ali Mirkarimi <dasmergo@gmail.com> Co-authored-by: muathkhatib <mkhatib.dev@gmail.com> Co-authored-by: ibr-hin95 <40246707+ibr-hin95@users.noreply.github.com> fix: recursiveNestedPaths not merging existing fields when hoisting row/collapsible fields (#2769) fix: exclude monaco code editor from ltr due to microsoft/monaco-editor#2371 BREAKING CHANGE: - The admin hook for `useLocale` now returns a Locale object of the currently active locale. Previously this would only return the code as a string. Any custom components built which had `locale = useLocale()` should be replaced with `{ code: locale } = useLocale()` to maintain the same functionality. - The property `localization.locales` of `SanitizedConfig` type has changed. This was an array of strings and is now an array of Locale objects having: `label: string`, `code: string` and `rtl: boolean`. If you are using localization.locales from the config you will need to adjust your project or plugin accordingly.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Fixes and issue where hoisting of row/collapsible fields would omit existing sibling fields. Discussed in this PR comment.
Type of change
Checklist: