Skip to content

Commit

Permalink
Change files
Browse files Browse the repository at this point in the history
  • Loading branch information
@chrisdholt
chrisdholt committed May 18, 2022
1 parent e5c9299 commit 732af40
Show file tree
Hide file tree
Showing 8 changed files with 7 additions and 96 deletions.
7 changes: 7 additions & 0 deletions change/@microsoft-fast-foundation-85e04ad1-6a33-4d0e-9ec8-0017d5523bde.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "major",
"comment": "remove class and part names from slots in fast foundation templates",
"packageName": "@microsoft/fast-foundation",
"email": "[email protected]",
"dependentChangeType": "patch"
}
22 changes: 0 additions & 22 deletions packages/web-components/fast-foundation/src/combobox/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ See [listbox-option](/docs/components/listbox-option) for more information.

#### Fields

<<<<<<< HEAD
| Name | Privacy | Type | Default | Description | Inherited From |
| ------------------- | --------- | ------------------------------------- | ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------- |
| `autocomplete` | public | `ComboboxAutocomplete or undefined` | | The autocomplete attribute. | |
Expand All @@ -134,27 +133,6 @@ See [listbox-option](/docs/components/listbox-option) for more information.
| `$presentation` | public | `ComponentPresentation or null` | | A property which resolves the ComponentPresentation instance for the current component. | FoundationElement |
| `template` | public | `ElementViewTemplate or void or null` | | Sets the template of the element instance. When undefined, the element will attempt to resolve the template from the associated presentation or custom element definition. | FoundationElement |
| `styles` | public | `ElementStyles or void or null` | | Sets the default styles for the element instance. When undefined, the element will attempt to resolve default styles from the associated presentation or custom element definition. | FoundationElement |
=======
| Name | Privacy | Type | Default | Description | Inherited From |
| ------------------- | --------- | ------------------------------------------------------------------------------------------------------------------------ | ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------- |
| `autocomplete` | public | `or ComboboxAutocomplete or "inline" or "list" or "both" or "none" or undefined` | | The autocomplete attribute. | |
| `filteredOptions` | public | `ListboxOption[]` | `[]` | The collection of currently filtered options. | |
| `open` | public | `boolean` | `false` | The open attribute. | |
| `options` | public | `ListboxOption[]` | | The list of options. | Listbox |
| `placeholder` | public | `string` | | Sets the placeholder value of the element, generally used to provide a hint to the user. | |
| `positionAttribute` | public | `SelectPosition` | | The placement for the listbox when the combobox is open. | |
| `position` | public | `SelectPosition` | | The current state of the calculated position of the listbox. | |
| `value` | public | | | The value property. | |
| `proxy` | | | | | FormAssociatedCombobox |
| `length` | public | `number` | | The number of options. | Listbox |
| `typeAheadExpired` | protected | | | | Listbox |
| `disabled` | public | `boolean` | | The disabled state of the listbox. | Listbox |
| `selectedIndex` | public | `number` | `-1` | The index of the selected option. | Listbox |
| `selectedOptions` | public | `ListboxOption[]` | `[]` | A collection of the selected options. | Listbox |
| `$presentation` | public | `ComponentPresentation or null` | | A property which resolves the ComponentPresentation instance for the current component. | FoundationElement |
| `template` | public | `ElementViewTemplate or void or null` | | Sets the template of the element instance. When undefined, the element will attempt to resolve the template from the associated presentation or custom element definition. | FoundationElement |
| `styles` | public | `ElementStyles or void or null` | | Sets the default styles for the element instance. When undefined, the element will attempt to resolve default styles from the associated presentation or custom element definition. | FoundationElement |
>>>>>>> fixing build / test after rebase

#### Methods

Expand Down
10 changes: 0 additions & 10 deletions packages/web-components/fast-foundation/src/combobox/combobox.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,7 @@ export class Combobox extends FormAssociatedCombobox {
* HTML Attribute: autocomplete
*/
@attr({ attribute: "autocomplete", mode: "fromView" })
<<<<<<< HEAD
autocomplete: ComboboxAutocomplete | undefined;
=======
public autocomplete:
| ComboboxAutocomplete
| "inline"
| "list"
| "both"
| "none"
| undefined;
>>>>>>> feat: update private change handlers to protected (#5872)

/**
* Reference to the internal text input element.
Expand Down
Loading

0 comments on commit 732af40

Please sign in to comment.