fix: change override design token logic (#2384)

now sets design token values via functions exposed by fluent to ensure they are used inside nested cards Co-authored-by: Musale Martin <[email protected]>
microsoftgraph · Jun 2, 2023 · ed6c9b3 · ed6c9b3
1 parent 0d38a72
commit ed6c9b3
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 34 deletions.
diff --git a/index.html b/index.html
@@ -49,9 +49,9 @@ <h2>mgt-login</h2>
       <h2>mgt-person me query two lines card on click with presence</h2>
       <!-- <mgt-person person-query="me" view="twoLines" person-card="click" show-presence></mgt-person> -->
       <mgt-person-card person-query="me"></mgt-person-card>
-      <!-- <h2>mgt-people-picker</h2>
+      <h2>mgt-people-picker</h2>
       <mgt-people-picker></mgt-people-picker>
-      <h2>mgt-teams-channel-picker</h2>
+      <!-- <h2>mgt-teams-channel-picker</h2>
       <mgt-teams-channel-picker></mgt-teams-channel-picker>
       <h2>mgt-tasks</h2>
       <mgt-tasks></mgt-tasks>

diff --git a/packages/mgt-components/src/components/mgt-people-picker/mgt-people-picker.ts b/packages/mgt-components/src/components/mgt-people-picker/mgt-people-picker.ts
@@ -767,6 +767,7 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
     const startSlot = this.selectedPeople?.length > 0 ? selectedPeopleTemplate : searchIcon;
     return html`
       <fluent-text-field
+        autocomplete="off
         appearance="outline"
         slot="anchor"
         id="people-picker-input"
@@ -945,7 +946,7 @@ export class MgtPeoplePicker extends MgtTemplatedComponent {
                 aria-label="${ariaLabel}"
                 class="searched-people-list-result"
                 role="option"
-                @click="${e => this.handleSuggestionClick(person)}">
+                @click="${_ => this.handleSuggestionClick(person)}">
                   ${this.renderPersonResult(person)}
                </li>
              `;

diff --git a/packages/mgt-components/src/styles/theme-manager.ts b/packages/mgt-components/src/styles/theme-manager.ts
@@ -7,7 +7,25 @@
 
 import {
   accentBaseColor,
+  accentFillActive,
+  accentFillFocus,
+  accentFillHover,
+  accentFillRest,
+  accentForegroundActive,
+  accentForegroundFocus,
+  accentForegroundHover,
+  accentForegroundRest,
+  accentStrokeControlActive,
+  accentStrokeControlFocus,
+  accentStrokeControlHover,
+  accentStrokeControlRest,
   baseLayerLuminance,
+  foregroundOnAccentActive,
+  foregroundOnAccentFocus,
+  foregroundOnAccentHover,
+  foregroundOnAccentRecipe,
+  foregroundOnAccentRest,
+  foregroundOnAccentRestLarge,
   neutralBaseColor,
   StandardLuminance,
   SwatchRGB
@@ -56,7 +74,10 @@ type ColorScheme = {
    */
   baseLayerLuminance: number;
 
-  designTokenOverrides?: Record<string, string>;
+  /**
+   * Optional function to override design tokens
+   */
+  designTokenOverrides?: (element: HTMLElement) => void;
 };
 
 /**
@@ -69,14 +90,7 @@ const applyColorScheme = (settings: ColorScheme, element: HTMLElement = document
   accentBaseColor.setValueFor(element, SwatchRGB.from(parseColorHexRGB(settings.accentBaseColor)));
   neutralBaseColor.setValueFor(element, SwatchRGB.from(parseColorHexRGB(settings.neutralBaseColor)));
   baseLayerLuminance.setValueFor(element, settings.baseLayerLuminance);
-  // put this work on the macro queue so that it happens after promise based/reactive work of setting the base colors above
-  if (settings.designTokenOverrides) {
-    setTimeout(() => {
-      Object.entries(settings.designTokenOverrides).forEach(([key, value]) => {
-        element.style.setProperty(key, value);
-      });
-    });
-  }
+  settings.designTokenOverrides?.(element);
 };
 
 /**
@@ -104,28 +118,24 @@ const getThemeSettings = (theme: Theme): ColorScheme => {
         accentBaseColor: '#479ef5',
         neutralBaseColor: '#adadad',
         baseLayerLuminance: StandardLuminance.DarkMode,
-        designTokenOverrides: {
-          '--accent-fill-rest': '#115ea3',
-          '--accent-fill-hover': '#0f6cbd',
-          '--accent-fill-active': '#0c3b5e',
-          '--accent-fill-focus': '#0f548c',
-          '--accent-foreground-rest': '#479EF5',
-          '--accent-foreground-hover': '#62abf5',
-          '--accent-foreground-active': '#2886de',
-          '--accent-foreground-focus': '#479ef5',
-          '--accent-stroke-control-rest': '#115ea3',
-          '--accent-stroke-control-hover': '#0f6cbd',
-          '--accent-stroke-control-active': '#0c3b5e',
-          '--accent-stroke-control-focus': '#0f548c',
-          // foreground on accents
-          '--foreground-on-accent-rest': '#ffffff',
-          '--foreground-on-accent-active': '#ffffff',
-          '--foreground-on-accent-rest-large': '#ffffff',
-          '--foreground-on-accent-hover': '#ffffff',
-          '--foreground-on-accent-hover-large': '#ffffff',
-          '--foreground-on-accent-active-large': '#ffffff',
-          '--foreground-on-accent-focus': '#ffffff',
-          '--foreground-on-accent-focus-large': '#ffffff'
+        designTokenOverrides: element => {
+          accentFillRest.setValueFor(element, SwatchRGB.from(parseColorHexRGB('#115ea3')));
+          accentFillHover.setValueFor(element, SwatchRGB.from(parseColorHexRGB('#0f6cbd')));
+          accentFillActive.setValueFor(element, SwatchRGB.from(parseColorHexRGB('#0c3b5e')));
+          accentFillFocus.setValueFor(element, SwatchRGB.from(parseColorHexRGB('#0f548c')));
+          accentForegroundRest.setValueFor(element, SwatchRGB.from(parseColorHexRGB('#479EF5')));
+          accentForegroundHover.setValueFor(element, SwatchRGB.from(parseColorHexRGB('#62abf5')));
+          accentForegroundActive.setValueFor(element, SwatchRGB.from(parseColorHexRGB('#2886de')));
+          accentForegroundFocus.setValueFor(element, SwatchRGB.from(parseColorHexRGB('#479ef5')));
+          accentStrokeControlRest.setValueFor(element, SwatchRGB.from(parseColorHexRGB('#115ea3')));
+          accentStrokeControlHover.setValueFor(element, SwatchRGB.from(parseColorHexRGB('#0f6cbd')));
+          accentStrokeControlActive.setValueFor(element, SwatchRGB.from(parseColorHexRGB('#0c3b5e')));
+          accentStrokeControlFocus.setValueFor(element, SwatchRGB.from(parseColorHexRGB('#0f548c')));
+          foregroundOnAccentActive.setValueFor(element, SwatchRGB.from(parseColorHexRGB('#ffffff')));
+          foregroundOnAccentRest.setValueFor(element, SwatchRGB.from(parseColorHexRGB('#ffffff')));
+          foregroundOnAccentRestLarge.setValueFor(element, SwatchRGB.from(parseColorHexRGB('#ffffff')));
+          foregroundOnAccentHover.setValueFor(element, SwatchRGB.from(parseColorHexRGB('#ffffff')));
+          foregroundOnAccentFocus.setValueFor(element, SwatchRGB.from(parseColorHexRGB('#ffffff')));
         }
       };
     case 'light':