leverage ValuesOf type helper

microsoft · Jan 12, 2023 · 18ec7f8 · 18ec7f8
1 parent 4a20b5a
commit 18ec7f8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/packages/web-components/docs/api-report.md b/packages/web-components/docs/api-report.md
@@ -8,6 +8,7 @@ import { ElementStyles } from '@microsoft/fast-element';
 import { ElementViewTemplate } from '@microsoft/fast-element';
 import { FASTElement } from '@microsoft/fast-element';
 import { FASTElementDefinition } from '@microsoft/fast-element';
+import { ValuesOf } from '@microsoft/fast-foundation';
 
 // @public
 class Text_2 extends FASTElement {
@@ -33,7 +34,7 @@ export const TextAlign: {
 };
 
 // @public
-export type TextAlign = typeof TextAlign[keyof typeof TextAlign];
+export type TextAlign = ValuesOf<typeof TextAlign>;
 
 // @public
 export const TextDefinition: FASTElementDefinition<typeof Text_2>;
@@ -46,7 +47,7 @@ export const TextFont: {
 };
 
 // @public
-export type TextFont = typeof TextFont[keyof typeof TextFont];
+export type TextFont = ValuesOf<typeof TextFont>;
 
 // @public
 export const TextSize: {
@@ -63,7 +64,7 @@ export const TextSize: {
 };
 
 // @public
-export type TextSize = typeof TextSize[keyof typeof TextSize];
+export type TextSize = ValuesOf<typeof TextSize>;
 
 // @public
 export const TextStyles: ElementStyles;
@@ -82,7 +83,7 @@ export const TextWeight: {
 };
 
 // @public
-export type TextWeight = typeof TextWeight[keyof typeof TextWeight];
+export type TextWeight = ValuesOf<typeof TextWeight>;
 
 // (No @packageDocumentation comment for this package)
 

diff --git a/packages/web-components/src/text/text.options.ts b/packages/web-components/src/text/text.options.ts
@@ -1,3 +1,5 @@
+import { ValuesOf } from '@microsoft/fast-foundation';
+
 /**
  * TextSize constants
  * @public
@@ -20,7 +22,7 @@ export const TextSize = {
  * The font size and line height based on the theme tokens
  * @public
  */
-export type TextSize = typeof TextSize[keyof typeof TextSize];
+export type TextSize = ValuesOf<typeof TextSize>;
 
 /**
  * TextFont Constants
@@ -36,7 +38,7 @@ export const TextFont = {
  * Applies font family to the content
  * @public
  */
-export type TextFont = typeof TextFont[keyof typeof TextFont];
+export type TextFont = ValuesOf<typeof TextFont>;
 
 /**
  * TextWeight Constants
@@ -53,7 +55,7 @@ export const TextWeight = {
  * Applies font weight to the content
  * @public
  */
-export type TextWeight = typeof TextWeight[keyof typeof TextWeight];
+export type TextWeight = ValuesOf<typeof TextWeight>;
 
 /**
  * TextAlign Constants
@@ -70,4 +72,4 @@ export const TextAlign = {
  * Aligns the content
  * @public
  */
-export type TextAlign = typeof TextAlign[keyof typeof TextAlign];
+export type TextAlign = ValuesOf<typeof TextAlign>;