Merge branch 'feat/typescript--select' of github.com:material-compone…

…nts/material-components-web into feat/typescript--select
material-components · Feb 9, 2019 · 7a7d960 · 7a7d960
2 parents fb0b996 + bc8bf0d
commit 7a7d960
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/packages/mdc-select/index.ts b/packages/mdc-select/index.ts
@@ -36,8 +36,7 @@ import {MDCSelectHelperText} from './helper-text';
 import {MDCSelectIcon} from './icon';
 import {
   FoundationMapType,
-  HelperTextFactory,
-  IconFactory,
+  HelperTextFactory, IconFactory,
   LabelFactory,
   LineRippleFactory, MenuFactory,
   OutlineFactory, SelectEventDetail,

diff --git a/packages/mdc-select/package.json b/packages/mdc-select/package.json
@@ -25,6 +25,7 @@
     "@material/ripple": "^0.44.0",
     "@material/rtl": "^0.42.0",
     "@material/shape": "^0.43.0",
+    "@material/textfield": "^0.44.0",
     "@material/theme": "^0.43.0",
     "@material/typography": "^0.44.0"
   }

diff --git a/packages/mdc-select/types.ts b/packages/mdc-select/types.ts
@@ -25,17 +25,15 @@ import {MDCFloatingLabel} from '@material/floating-label/index';
 import {MDCLineRipple} from '@material/line-ripple/index';
 import {MDCMenu} from '@material/menu/index';
 import {MDCNotchedOutline} from '@material/notched-outline/index';
-import {MDCSelectHelperTextFoundation} from './helper-text/index';
-import {MDCSelectIconFoundation} from './icon/index';
+import {MDCSelectHelperText, MDCSelectHelperTextFoundation} from './helper-text/index';
+import {MDCSelectIcon, MDCSelectIconFoundation} from './icon/index';
 
 export interface FoundationMapType {
   leadingIcon: MDCSelectIconFoundation;
   helperText: MDCSelectHelperTextFoundation;
 }
 
-export interface SelectEvent extends Event {
-  detail: SelectEventDetail;
-}
+export type SelectEvent = CustomEvent<SelectEventDetail>;
 
 export interface SelectEventDetail {
   value: string;
@@ -44,8 +42,8 @@ export interface SelectEventDetail {
 
 // TODO(acdvorak): Every component should export its own factory and event types.
 export type LineRippleFactory = (el: Element) => MDCLineRipple;
-export type HelperTextFactory = (el: Element) => MDCTextFieldHelperText;
+export type HelperTextFactory = (el: Element) => MDCSelectHelperText;
 export type MenuFactory = (el: Element) => MDCMenu;
-export type IconFactory = (el: Element) => MDCTextFieldIcon;
+export type IconFactory = (el: Element) => MDCSelectIcon;
 export type LabelFactory = (el: Element) => MDCFloatingLabel;
 export type OutlineFactory = (el: Element) => MDCNotchedOutline;