Skip to content

Commit 4ddeee1

Browse files
asynclizcopybara-github
authored andcommitted
chore: remove types folder
PiperOrigin-RevId: 532095745
1 parent 439b47f commit 4ddeee1

File tree

27 files changed

+105
-187
lines changed

27 files changed

+105
-187
lines changed

aria/aria.ts

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,3 +98,83 @@ type ARIAPropertyToAttribute<K extends string> =
9898
K extends `aria${infer Suffix}Element${infer OptS}` ?
9999
`aria-${Lowercase < Suffix >}` :
100100
K extends `aria${infer Suffix}` ? `aria-${Lowercase < Suffix >}` : K;
101+
102+
/**
103+
* An extension of `ARIAMixin` that enforces strict value types for aria
104+
* properties.
105+
*
106+
* This is needed for correct typing in render functions with lit analyzer.
107+
*
108+
* @example
109+
* render() {
110+
* const {ariaLabel} = this as ARIAMixinStrict;
111+
* return html`
112+
* <button aria-label=${ariaLabel || nothing}>
113+
* <slot></slot>
114+
* </button>
115+
* `;
116+
* }
117+
*/
118+
export interface ARIAMixinStrict extends ARIAMixin {
119+
ariaAtomic: 'true'|'false'|null;
120+
ariaAutoComplete: 'none'|'inline'|'list'|'both'|null;
121+
ariaBusy: 'true'|'false'|null;
122+
ariaChecked: 'true'|'false'|null;
123+
ariaColCount: `${number}`|null;
124+
ariaColIndex: `${number}`|null;
125+
ariaColSpan: `${number}`|null;
126+
ariaCurrent: 'page'|'step'|'location'|'date'|'time'|'true'|'false'|null;
127+
ariaDisabled: 'true'|'false'|null;
128+
ariaExpanded: 'true'|'false'|null;
129+
ariaHasPopup: 'false'|'true'|'menu'|'listbox'|'tree'|'grid'|'dialog'|null;
130+
ariaHidden: 'true'|'false'|null;
131+
ariaInvalid: 'true'|'false'|null;
132+
ariaKeyShortcuts: string|null;
133+
ariaLabel: string|null;
134+
ariaLevel: `${number}`|null;
135+
ariaLive: 'assertive'|'off'|'polite'|null;
136+
ariaModal: 'true'|'false'|null;
137+
ariaMultiLine: 'true'|'false'|null;
138+
ariaMultiSelectable: 'true'|'false'|null;
139+
ariaOrientation: 'horizontal'|'vertical'|'undefined'|null;
140+
ariaPlaceholder: string|null;
141+
ariaPosInSet: `${number}`|null;
142+
ariaPressed: 'true'|'false'|null;
143+
ariaReadOnly: 'true'|'false'|null;
144+
ariaRequired: 'true'|'false'|null;
145+
ariaRoleDescription: string|null;
146+
ariaRowCount: `${number}`|null;
147+
ariaRowIndex: `${number}`|null;
148+
ariaRowSpan: `${number}`|null;
149+
ariaSelected: 'true'|'false'|null;
150+
ariaSetSize: `${number}`|null;
151+
ariaSort: 'ascending'|'descending'|'none'|'other'|null;
152+
ariaValueMax: `${number}`|null;
153+
ariaValueMin: `${number}`|null;
154+
ariaValueNow: `${number}`|null;
155+
ariaValueText: string|null;
156+
role: ARIARole|null;
157+
}
158+
159+
/**
160+
* Valid values for `role`.
161+
*/
162+
export type ARIARole =
163+
'alert'|'alertdialog'|'button'|'checkbox'|'dialog'|'gridcell'|'link'|'log'|
164+
'marquee'|'menuitem'|'menuitemcheckbox'|'menuitemradio'|'option'|
165+
'progressbar'|'radio'|'scrollbar'|'searchbox'|'slider'|'spinbutton'|
166+
'status'|'switch'|'tab'|'tabpanel'|'textbox'|'timer'|'tooltip'|'treeitem'|
167+
'combobox'|'grid'|'listbox'|'menu'|'menubar'|'radiogroup'|'tablist'|'tree'|
168+
'treegrid'|'application'|'article'|'cell'|'columnheader'|'definition'|
169+
'directory'|'document'|'feed'|'figure'|'group'|'heading'|'img'|'list'|
170+
'listitem'|'math'|'none'|'note'|'presentation'|'region'|'row'|'rowgroup'|
171+
'rowheader'|'separator'|'table'|'term'|'text'|'toolbar'|'banner'|
172+
'complementary'|'contentinfo'|'form'|'main'|'navigation'|'region'|'search'|
173+
'doc-abstract'|'doc-acknowledgments'|'doc-afterword'|'doc-appendix'|
174+
'doc-backlink'|'doc-biblioentry'|'doc-bibliography'|'doc-biblioref'|
175+
'doc-chapter'|'doc-colophon'|'doc-conclusion'|'doc-cover'|'doc-credit'|
176+
'doc-credits'|'doc-dedication'|'doc-endnote'|'doc-endnotes'|'doc-epigraph'|
177+
'doc-epilogue'|'doc-errata'|'doc-example'|'doc-footnote'|'doc-foreword'|
178+
'doc-glossary'|'doc-glossref'|'doc-index'|'doc-introduction'|'doc-noteref'|
179+
'doc-notice'|'doc-pagebreak'|'doc-pagelist'|'doc-part'|'doc-preface'|
180+
'doc-prologue'|'doc-pullquote'|'doc-qna'|'doc-subtitle'|'doc-tip'|'doc-toc';

button/lib/button.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import {classMap} from 'lit/directives/class-map.js';
1313
import {when} from 'lit/directives/when.js';
1414
import {html as staticHtml, literal} from 'lit/static-html.js';
1515

16+
import {ARIAMixinStrict} from '../../aria/aria.js';
1617
import {requestUpdateOnAriaChange} from '../../aria/delegate.js';
1718
import {dispatchActivationClick, isActivationClick} from '../../controller/events.js';
1819
import {ripple} from '../../ripple/directive.js';
1920
import {MdRipple} from '../../ripple/ripple.js';
20-
import {ARIAMixinStrict} from '../../types/aria.js';
2121

2222
/**
2323
* A button component.

checkbox/lib/checkbox.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ import {property, query, queryAsync, state} from 'lit/decorators.js';
1212
import {classMap} from 'lit/directives/class-map.js';
1313
import {when} from 'lit/directives/when.js';
1414

15+
import {ARIAMixinStrict} from '../../aria/aria.js';
1516
import {requestUpdateOnAriaChange} from '../../aria/delegate.js';
1617
import {dispatchActivationClick, isActivationClick, redispatchEvent} from '../../controller/events.js';
1718
import {FormController, getFormValue} from '../../controller/form-controller.js';
1819
import {stringConverter} from '../../controller/string-converter.js';
1920
import {ripple} from '../../ripple/directive.js';
2021
import {MdRipple} from '../../ripple/ripple.js';
21-
import {ARIAMixinStrict} from '../../types/aria.js';
2222

2323
/**
2424
* A checkbox component.

chips/lib/assist-chip.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import '../../elevation/elevation.js';
99
import {html, nothing} from 'lit';
1010
import {property} from 'lit/decorators.js';
1111

12+
import {ARIAMixinStrict} from '../../aria/aria.js';
1213
import {ripple} from '../../ripple/directive.js';
13-
import {ARIAMixinStrict} from '../../types/aria.js';
1414

1515
import {Chip} from './chip.js';
1616

chips/lib/filter-chip.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import '../../elevation/elevation.js';
99
import {html, nothing, PropertyValues, svg} from 'lit';
1010
import {property} from 'lit/decorators.js';
1111

12+
import {ARIAMixinStrict} from '../../aria/aria.js';
1213
import {ripple} from '../../ripple/directive.js';
13-
import {ARIAMixinStrict} from '../../types/aria.js';
1414

1515
import {Chip} from './chip.js';
1616
import {renderRemoveButton} from './trailing-actions.js';

chips/lib/input-chip.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import {html, nothing} from 'lit';
88
import {property} from 'lit/decorators.js';
99

10+
import {ARIAMixinStrict} from '../../aria/aria.js';
1011
import {ripple} from '../../ripple/directive.js';
11-
import {ARIAMixinStrict} from '../../types/aria.js';
1212

1313
import {Chip} from './chip.js';
1414
import {renderRemoveButton} from './trailing-actions.js';

circularprogress/lib/circular-progress.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import {html, LitElement, nothing} from 'lit';
88
import {property} from 'lit/decorators.js';
99
import {classMap} from 'lit/directives/class-map.js';
1010

11+
import {ARIAMixinStrict} from '../../aria/aria.js';
1112
import {requestUpdateOnAriaChange} from '../../aria/delegate.js';
12-
import {ARIAMixinStrict} from '../../types/aria.js';
1313

1414
/**
1515
* A circular progress component.

fab/lib/shared.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ import {property, queryAsync, state} from 'lit/decorators.js';
1313
import {classMap} from 'lit/directives/class-map.js';
1414
import {when} from 'lit/directives/when.js';
1515

16+
import {ARIAMixinStrict} from '../../aria/aria.js';
1617
import {requestUpdateOnAriaChange} from '../../aria/delegate.js';
1718
import {ripple} from '../../ripple/directive.js';
1819
import {MdRipple} from '../../ripple/ripple.js';
19-
import {ARIAMixinStrict} from '../../types/aria.js';
2020

2121
/**
2222
* Sizes variants available to non-extended FABs.

iconbutton/lib/icon-button.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ import {classMap} from 'lit/directives/class-map.js';
1313
import {when} from 'lit/directives/when.js';
1414
import {html as staticHtml, literal} from 'lit/static-html.js';
1515

16+
import {ARIAMixinStrict} from '../../aria/aria.js';
1617
import {requestUpdateOnAriaChange} from '../../aria/delegate.js';
1718
import {isRtl} from '../../controller/is-rtl.js';
1819
import {ripple} from '../../ripple/directive.js';
1920
import {MdRipple} from '../../ripple/ripple.js';
20-
import {ARIAMixinStrict} from '../../types/aria.js';
2121

2222
type LinkTarget = '_blank'|'_parent'|'_self'|'_top';
2323

linearprogress/lib/linear-progress.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import {property, query, state} from 'lit/decorators.js';
99
import {classMap} from 'lit/directives/class-map.js';
1010
import {styleMap} from 'lit/directives/style-map.js';
1111

12+
import {ARIAMixinStrict} from '../../aria/aria.js';
1213
import {requestUpdateOnAriaChange} from '../../aria/delegate.js';
13-
import {ARIAMixinStrict} from '../../types/aria.js';
1414

1515
/**
1616
* A linear progress component.

0 commit comments

Comments
 (0)