From 21a7abde4eadf4025bde44b613ed8feecf54d2e1 Mon Sep 17 00:00:00 2001
From: Philip Kuo <phkuo@microsoft.com>
Date: Wed, 15 Nov 2017 19:02:53 -0800
Subject: [PATCH 1/3] fix colors

---
 packages/styling/src/interfaces/ISemanticColors.ts | 2 +-
 packages/styling/src/styles/theme.ts               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/styling/src/interfaces/ISemanticColors.ts b/packages/styling/src/interfaces/ISemanticColors.ts
index 62c541a429e30f..22fbc6cd798cb6 100644
--- a/packages/styling/src/interfaces/ISemanticColors.ts
+++ b/packages/styling/src/interfaces/ISemanticColors.ts
@@ -238,7 +238,7 @@ export interface ISemanticColors {
   /**
    * The default text color for list item titles and text in column fields.
    */
-  listTextColor: string;
+  listText: string;
 
   /**
    * The background color of a hovered list item.
diff --git a/packages/styling/src/styles/theme.ts b/packages/styling/src/styles/theme.ts
index ad11e2f1701352..e086c1c9c49151 100644
--- a/packages/styling/src/styles/theme.ts
+++ b/packages/styling/src/styles/theme.ts
@@ -125,7 +125,7 @@ function _makeSemanticColorsFromPalette(p: IPalette, isInverted: boolean): ISema
     menuHeader: p.themePrimary,
 
     listBackground: p.white,
-    listTextColor: p.neutralPrimary,
+    listText: p.neutralPrimary,
     listItemBackgroundHovered: p.neutralLighter,
     listItemBackgroundChecked: p.neutralLight,
     listItemBackgroundCheckedHovered: p.neutralQuaternaryAlt

From ec627f441d546e96e18c2d1e95d5a234f8840e3a Mon Sep 17 00:00:00 2001
From: Philip Kuo <phkuo@microsoft.com>
Date: Wed, 15 Nov 2017 19:20:48 -0800
Subject: [PATCH 2/3] change file

---
 .../styling/phkuo-fixListText_2017-11-16-03-20.json   | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 common/changes/@uifabric/styling/phkuo-fixListText_2017-11-16-03-20.json

diff --git a/common/changes/@uifabric/styling/phkuo-fixListText_2017-11-16-03-20.json b/common/changes/@uifabric/styling/phkuo-fixListText_2017-11-16-03-20.json
new file mode 100644
index 00000000000000..6277f3c506bd4e
--- /dev/null
+++ b/common/changes/@uifabric/styling/phkuo-fixListText_2017-11-16-03-20.json
@@ -0,0 +1,11 @@
+{
+  "changes": [
+    {
+      "packageName": "@uifabric/styling",
+      "comment": "Theming: fix listText semantic slot",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@uifabric/styling",
+  "email": "phkuo@microsoft.com"
+}
\ No newline at end of file

From 7525d0e1c5033794a503af5192773028cc90d651 Mon Sep 17 00:00:00 2001
From: Philip Kuo <phkuo@microsoft.com>
Date: Thu, 16 Nov 2017 19:20:45 -0800
Subject: [PATCH 3/3] deprecate slots correctly

---
 .../ThemeGenerator/ThemeGeneratorPage.tsx     |  2 +-
 .../styling/src/interfaces/ISemanticColors.ts |  6 +++++
 packages/styling/src/styles/theme.ts          | 22 ++++++++++++++++---
 3 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/packages/office-ui-fabric-react/src/components/ThemeGenerator/ThemeGeneratorPage.tsx b/packages/office-ui-fabric-react/src/components/ThemeGenerator/ThemeGeneratorPage.tsx
index d53881665f8639..976e5f8ed86fa8 100644
--- a/packages/office-ui-fabric-react/src/components/ThemeGenerator/ThemeGeneratorPage.tsx
+++ b/packages/office-ui-fabric-react/src/components/ThemeGenerator/ThemeGeneratorPage.tsx
@@ -481,7 +481,7 @@ export class ThemeGeneratorPage extends BaseComponent<any, IThemeGeneratorPageSt
     }
     document.body.style.backgroundColor = themeAsJson.backgroundColor;
     document.body.style.color = themeAsJson.bodyText;
-    loadTheme({ palette: themeAsJson });
+    console.log('Full theme... ', loadTheme({ palette: themeAsJson }));
   }
 
   @autobind
diff --git a/packages/styling/src/interfaces/ISemanticColors.ts b/packages/styling/src/interfaces/ISemanticColors.ts
index 22fbc6cd798cb6..4241f9d0fd1acd 100644
--- a/packages/styling/src/interfaces/ISemanticColors.ts
+++ b/packages/styling/src/interfaces/ISemanticColors.ts
@@ -254,4 +254,10 @@ export interface ISemanticColors {
    * The background color of a checked and hovered list item.
    */
   listItemBackgroundCheckedHovered: string;
+
+  //// DEPRECATED SLOTS
+  // Do not use these slots, they are only maintained for backwards compatibility.
+
+  /** DEPRECATED use listText instead */
+  listTextColor: string;
 }
\ No newline at end of file
diff --git a/packages/styling/src/styles/theme.ts b/packages/styling/src/styles/theme.ts
index e086c1c9c49151..0f697410f9f657 100644
--- a/packages/styling/src/styles/theme.ts
+++ b/packages/styling/src/styles/theme.ts
@@ -66,21 +66,26 @@ export function createTheme(theme: IPartialTheme): ITheme {
     newPalette.accent = newPalette.themePrimary;
   }
 
+  // mix in custom overrides with good slots first, since custom overrides might be used in fixing deprecated slots
+  let newSemanticColors = { ..._makeSemanticColorsFromPalette(newPalette, !!theme.isInverted), ...theme.semanticColors };
+  newSemanticColors = { ..._fixDeprecatedSlots(newSemanticColors), ...theme.semanticColors };
+
   return {
     palette: newPalette,
     fonts: {
       ...DefaultFontStyles,
       ...theme.fonts
     },
-    semanticColors: { ..._makeSemanticColorsFromPalette(newPalette, !!theme.isInverted), ...theme.semanticColors },
+    semanticColors: newSemanticColors,
     isInverted: !!theme.isInverted
   } as ITheme;
 }
 
 // Generates all the semantic slot colors based on the Fabric palette.
 // We'll use these as fallbacks for semantic slots that the passed in theme did not define.
+// This does NOT fix deprecated slots.
 function _makeSemanticColorsFromPalette(p: IPalette, isInverted: boolean): ISemanticColors {
-  return {
+  let toReturn: ISemanticColors = {
     bodyBackground: p.white,
     bodyText: p.neutralPrimary,
     bodyTextChecked: p.black,
@@ -128,6 +133,17 @@ function _makeSemanticColorsFromPalette(p: IPalette, isInverted: boolean): ISema
     listText: p.neutralPrimary,
     listItemBackgroundHovered: p.neutralLighter,
     listItemBackgroundChecked: p.neutralLight,
-    listItemBackgroundCheckedHovered: p.neutralQuaternaryAlt
+    listItemBackgroundCheckedHovered: p.neutralQuaternaryAlt,
+
+    // Deprecated slots, fixed by _fixDeprecatedSlots()
+    listTextColor: ''
   };
+
+  return toReturn;
 }
+
+function _fixDeprecatedSlots(s: ISemanticColors): ISemanticColors {
+  s.listTextColor = s.listText;
+
+  return s;
+}
\ No newline at end of file