cherrypick of variants pr (#15375)

* cherrypick * theme typings * updating tests * Change files
microsoft · Oct 6, 2020 · ad2fdb0 · ad2fdb0
1 parent ccc3a5a
commit ad2fdb0
Show file tree

Hide file tree

Showing 59 changed files with 2,106 additions and 3,153 deletions.
diff --git a/apps/vr-tests/src/stories/ThemeProvider.stories.tsx b/apps/vr-tests/src/stories/ThemeProvider.stories.tsx
@@ -54,12 +54,16 @@ storiesOf('ThemeProvider', module)
       <PrimaryButton>Customized styles</PrimaryButton>
     </ThemeProvider>
   ))
-  .addStory('Use tokens on new button', () => (
+  .addStory('Use variants on new button', () => (
     <ThemeProvider
       theme={{
-        tokens: {
-          button: {
-            background: 'yellow',
+        components: {
+          Button: {
+            variants: {
+              root: {
+                background: 'yellow',
+              },
+            },
           },
         },
       }}

diff --git a/change/@fluentui-examples-2020-09-25-08-11-21-feat-variant-support.json b/change/@fluentui-examples-2020-09-25-08-11-21-feat-variant-support.json
@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "Updating examples.",
+  "packageName": "@fluentui/examples",
+  "email": "[email protected]",
+  "dependentChangeType": "patch",
+  "date": "2020-09-25T15:11:20.981Z"
+}
diff --git a/change/@fluentui-react-button-2020-09-21-11-36-16-feat-variant-support.json b/change/@fluentui-react-button-2020-09-21-11-36-16-feat-variant-support.json
@@ -0,0 +1,8 @@
+{
+  "type": "minor",
+  "comment": "Updating styling to use variants.",
+  "packageName": "@fluentui/react-button",
+  "email": "[email protected]",
+  "dependentChangeType": "patch",
+  "date": "2020-09-21T18:35:57.969Z"
+}
diff --git a/change/@fluentui-react-examples-2020-09-28-08-14-06-feat-variant-support.json b/change/@fluentui-react-examples-2020-09-28-08-14-06-feat-variant-support.json
@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "Updating examples.",
+  "packageName": "@fluentui/react-examples",
+  "email": "[email protected]",
+  "dependentChangeType": "patch",
+  "date": "2020-09-28T15:14:06.563Z"
+}
diff --git a/change/@fluentui-react-internal-2020-10-01-14-55-14-feat-variants.json b/change/@fluentui-react-internal-2020-10-01-14-55-14-feat-variants.json
@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "Example updates.",
+  "packageName": "@fluentui/react-internal",
+  "email": "[email protected]",
+  "dependentChangeType": "patch",
+  "date": "2020-10-01T21:55:14.101Z"
+}
diff --git a/change/@fluentui-react-theme-provider-2020-08-17-07-55-51-fix-recursive-partial.json b/change/@fluentui-react-theme-provider-2020-08-17-07-55-51-fix-recursive-partial.json
@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "ThemeProvider: RecursivePartial now correctly works.",
+  "packageName": "@fluentui/react-theme-provider",
+  "email": "[email protected]",
+  "dependentChangeType": "patch",
+  "date": "2020-08-17T14:55:51.573Z"
+}
diff --git a/change/@fluentui-storybook-2020-09-30-12-03-48-feat-variant-support.json b/change/@fluentui-storybook-2020-09-30-12-03-48-feat-variant-support.json
@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "Updating theme used in stories",
+  "packageName": "@fluentui/storybook",
+  "email": "[email protected]",
+  "dependentChangeType": "patch",
+  "date": "2020-09-30T19:03:38.253Z"
+}
diff --git a/change/@fluentui-theme-2020-09-21-11-36-16-feat-variant-support.json b/change/@fluentui-theme-2020-09-21-11-36-16-feat-variant-support.json
@@ -0,0 +1,8 @@
+{
+  "type": "minor",
+  "comment": "Updating typings to add `Variants`.",
+  "packageName": "@fluentui/theme",
+  "email": "[email protected]",
+  "dependentChangeType": "patch",
+  "date": "2020-09-21T18:36:16.186Z"
+}
diff --git a/change/@uifabric-utilities-2020-09-30-12-03-48-feat-variant-support.json b/change/@uifabric-utilities-2020-09-30-12-03-48-feat-variant-support.json
@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "getId now can take in a blank string as prefix.",
+  "packageName": "@uifabric/utilities",
+  "email": "[email protected]",
+  "dependentChangeType": "patch",
+  "date": "2020-09-30T19:03:48.112Z"
+}
diff --git a/change/office-ui-fabric-react-2020-10-06-08-02-45-feat-variants-cherrypick.json b/change/office-ui-fabric-react-2020-10-06-08-02-45-feat-variants-cherrypick.json
@@ -0,0 +1,8 @@
+{
+  "type": "patch",
+  "comment": "Example updates.",
+  "packageName": "office-ui-fabric-react",
+  "email": "[email protected]",
+  "dependentChangeType": "patch",
+  "date": "2020-10-06T15:02:45.739Z"
+}
diff --git a/packages/office-ui-fabric-react/src/components/Button/Button.types.ts b/packages/office-ui-fabric-react/src/components/Button/Button.types.ts
@@ -151,7 +151,7 @@ export interface IButtonProps
   menuProps?: IContextualMenuProps;
 
   /**
-   * Callback that runs after Button's contextualmenu was closed (removed from the DOM)
+   * Callback that runs after Button's contextual menu was closed (removed from the DOM)
    */
   onAfterMenuDismiss?: () => void;