Manually sync main -> dev (4.2.0) (#1152)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: github-bot <[email protected]> Co-authored-by: Jerrod Heiser <[email protected]> Co-authored-by: noahwebs <[email protected]> Co-authored-by: ccedrone <[email protected]>
cengage · Aug 15, 2024 · b2d1229 · b2d1229
1 parent 346c978
commit b2d1229
Show file tree

Hide file tree

Showing 21 changed files with 33 additions and 106 deletions.
diff --git a/.changeset/cuddly-dolphins-yell.md b/.changeset/cuddly-dolphins-yell.md
@@ -0,0 +1,5 @@
+---
+"react-magma-docs": patch
+---
+
+build: Resolve merge conflicts when pulling main -> dev
diff --git a/.changeset/dropdown-menuItemRole.md b/.changeset/dropdown-menuItemRole.md
diff --git a/.changeset/dropdownContent-falseChild.md b/.changeset/dropdownContent-falseChild.md
diff --git a/.changeset/feat-dropdownExpandableMenu.md b/.changeset/feat-dropdownExpandableMenu.md
diff --git a/.changeset/feat-optionalPerPageSelect.md b/.changeset/feat-optionalPerPageSelect.md
diff --git a/.changeset/fix-datePickerEscape.md b/.changeset/fix-datePickerEscape.md
diff --git a/.changeset/fix-dropdownDocsStorybook.md b/.changeset/fix-dropdownDocsStorybook.md
diff --git a/.changeset/fix-expandableDropdown.md b/.changeset/fix-expandableDropdown.md
diff --git a/.changeset/fix-expandableDropdownDisabled.md b/.changeset/fix-expandableDropdownDisabled.md
diff --git a/.changeset/fix-labelsColors.md b/.changeset/fix-labelsColors.md
diff --git a/.changeset/fix-modalEscape.md b/.changeset/fix-modalEscape.md
diff --git a/.changeset/fix-passInputLarge.md b/.changeset/fix-passInputLarge.md
diff --git a/.changeset/fix-radioGroup.md b/.changeset/fix-radioGroup.md
diff --git a/.changeset/fix-subPageTabs b/.changeset/fix-subPageTabs
diff --git a/.changeset/inputHeight.md b/.changeset/inputHeight.md
diff --git a/.changeset/nativeSelectHeight.md b/.changeset/nativeSelectHeight.md
diff --git a/.changeset/pre.json b/.changeset/pre.json
@@ -10,22 +10,5 @@
     "react-magma-docs": "5.0.3",
     "react-magma-landing": "1.1.2"
   },
-  "changesets": [
-    "dropdown-menuItemRole",
-    "dropdownContent-falseChild",
-    "feat-dropdownExpandableMenu",
-    "feat-optionalPerPageSelect",
-    "fix-datePickerEscape",
-    "fix-dropdownDocsStorybook",
-    "fix-expandableDropdown",
-    "fix-expandableDropdownDisabled",
-    "fix-labelsColors",
-    "fix-modalEscape",
-    "fix-passInputLarge",
-    "fix-radioGroup",
-    "inputHeight",
-    "nativeSelectHeight",
-    "sortArrows",
-    "update-modalPadding"
-  ]
-}
+  "changesets": []
+}
diff --git a/.changeset/sortArrows.md b/.changeset/sortArrows.md
diff --git a/.changeset/update-modalPadding.md b/.changeset/update-modalPadding.md
diff --git a/packages/react-magma-dom/CHANGELOG.md b/packages/react-magma-dom/CHANGELOG.md
@@ -74,8 +74,6 @@
 
 ## 4.1.1
 
-## 4.2.0-next.14
-
 ### Patch Changes
 
 - 89e7a8f13: fix(DropdownExpandableMenuListItem): Add `role="menuitem"`

diff --git a/website/react-magma-docs/src/pages/api-intro/changelog.mdx b/website/react-magma-docs/src/pages/api-intro/changelog.mdx
@@ -5,6 +5,32 @@ order: 4
 
 <PageContent componentName="changelog" type="api_intro">
 
+## 4.2.0
+
+### Minor Changes
+
+- de22be548: feat(DropdownExpandableMenu): A new menu item display for the Dropdown component which enables expandable lists by one level
+- de22be548: feat(TablePagination): TablePagination component will hide rows per page select when no onRowsPerPageChange argument passed
+
+### Patch Changes
+
+- de22be548: fix(DropdownContent): Handle `false` as child
+- de22be548: fix(StyledLabel/TabPanel): Update various labels and TabPanel content to be neutral700 (instead of neutral500)
+- de22be548: fix(Select/Combobox/Dropdown/DatePicker): Added support for closing components that have menus with the escape key inside of modals while retaining an open modal state.
+- de22be548: fix(PasswordInput): Update placement of Show/Hide button on Large input size
+- de22be548: fix(RadioGroup): Radio Group label is now a span to improve a11y
+- de22be548: fix(Input): Update Input height to match button sizes: 40px (instead of 42px) and 56px (instead of 58px)
+- de22be548: fix(NativeSelect): Update NativeSelect height to match button sizes: 40px (instead of 42px)
+- de22be548: fix(Table/DataGrid): Update Ascending (point up) and Descending (point down) arrows to match other design systems
+- de22be548: fix(Modal): Update padding so it's equal on all sides (16px small viewport or 24px for large)
+
+## 4.1.1
+
+### Patch Changes
+
+- 0d718be80: fix(Input Base): Fixed case where default value of `0` did not render the default value in the input field
+- 0d718be80: fix(Input/Textarea): Fix `maxLength` console warning regarding passing a boolean attribute
+- 0d718be80: docs(tabs): Update TabProps to remove `isActive`-- this component does not use it. Use `activeIndex` on the `TabsContainer` to indicate the active tab
 
 ## 4.5.0