support types for ToggleButton and revert ButtonGroup

mui · Jul 6, 2021 · 04b2903 · 04b2903
1 parent b7486ed
commit 04b2903
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/docs/pages/api-docs/button-group.json b/docs/pages/api-docs/button-group.json
@@ -5,7 +5,7 @@
     "color": {
       "type": {
         "name": "union",
-        "description": "'inherit'<br>&#124;&nbsp;'primary'<br>&#124;&nbsp;'secondary'<br>&#124;&nbsp;'error'<br>&#124;&nbsp;'info'<br>&#124;&nbsp;'success'<br>&#124;&nbsp;'warning'<br>&#124;&nbsp;string"
+        "description": "'inherit'<br>&#124;&nbsp;'primary'<br>&#124;&nbsp;'secondary'<br>&#124;&nbsp;string"
       },
       "default": "'primary'"
     },

diff --git a/docs/pages/api-docs/toggle-button.json b/docs/pages/api-docs/toggle-button.json
@@ -18,7 +18,7 @@
     "size": {
       "type": {
         "name": "union",
-        "description": "'large'<br>&#124;&nbsp;'medium'<br>&#124;&nbsp;'small'<br>&#124;&nbsp;string"
+        "description": "'standard'<br>&#124;&nbsp;'primary'<br>&#124;&nbsp;'secondary'<br>&#124;&nbsp;'error'<br>&#124;&nbsp;'info'<br>&#124;&nbsp;'success'<br>&#124;&nbsp;'warning'<br>&#124;&nbsp;string"
       },
       "default": "'medium'"
     },

diff --git a/packages/material-ui/src/ButtonGroup/ButtonGroup.d.ts b/packages/material-ui/src/ButtonGroup/ButtonGroup.d.ts
@@ -23,7 +23,7 @@ export interface ButtonGroupTypeMap<P = {}, D extends React.ElementType = 'div'>
      * @default 'primary'
      */
     color?: OverridableStringUnion<
-      'inherit' | 'primary' | 'secondary' | 'error' | 'info' | 'success' | 'warning',
+      'inherit' | 'primary' | 'secondary',
       ButtonGroupPropsColorOverrides
     >;
     /**

diff --git a/packages/material-ui/src/ButtonGroup/ButtonGroup.js b/packages/material-ui/src/ButtonGroup/ButtonGroup.js
@@ -262,7 +262,7 @@ ButtonGroup.propTypes /* remove-proptypes */ = {
    * @default 'primary'
    */
   color: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([
-    PropTypes.oneOf(['inherit', 'primary', 'secondary', 'error', 'info', 'success', 'warning']),
+    PropTypes.oneOf(['inherit', 'primary', 'secondary']),
     PropTypes.string,
   ]),
   /**

diff --git a/packages/material-ui/src/ToggleButton/ToggleButton.d.ts b/packages/material-ui/src/ToggleButton/ToggleButton.d.ts
@@ -24,7 +24,7 @@ export type ToggleButtonTypeMap<
      * The color of the button when it is in an active state.
      * @default 'standard'
      */
-    color?: 'standard' | 'primary' | 'secondary';
+    color?: 'standard' | 'primary' | 'secondary' | 'error' | 'info' | 'success' | 'warning';
     /**
      * If `true`, the component is disabled.
      * @default false

diff --git a/packages/material-ui/src/ToggleButton/ToggleButton.js b/packages/material-ui/src/ToggleButton/ToggleButton.js
@@ -251,7 +251,7 @@ ToggleButton.propTypes /* remove-proptypes */ = {
    * @default 'medium'
    */
   size: PropTypes /* @typescript-to-proptypes-ignore */.oneOfType([
-    PropTypes.oneOf(['large', 'medium', 'small']),
+    PropTypes.oneOf(['standard', 'primary', 'secondary', 'error', 'info', 'success', 'warning']),
     PropTypes.string,
   ]),
   /**