diff --git a/change/@microsoft-fast-foundation-85e04ad1-6a33-4d0e-9ec8-0017d5523bde.json b/change/@microsoft-fast-foundation-85e04ad1-6a33-4d0e-9ec8-0017d5523bde.json new file mode 100644 index 00000000000..4bad6fdfbce --- /dev/null +++ b/change/@microsoft-fast-foundation-85e04ad1-6a33-4d0e-9ec8-0017d5523bde.json @@ -0,0 +1,7 @@ +{ + "type": "major", + "comment": "remove class and part names from slots in fast foundation templates", + "packageName": "@microsoft/fast-foundation", + "email": "chhol@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/packages/web-components/fast-foundation/src/combobox/README.md b/packages/web-components/fast-foundation/src/combobox/README.md index fe5af329590..3f5fa3124cd 100644 --- a/packages/web-components/fast-foundation/src/combobox/README.md +++ b/packages/web-components/fast-foundation/src/combobox/README.md @@ -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. | | @@ -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 diff --git a/packages/web-components/fast-foundation/src/combobox/combobox.ts b/packages/web-components/fast-foundation/src/combobox/combobox.ts index 9913ef0c78a..c40b19fbaf1 100644 --- a/packages/web-components/fast-foundation/src/combobox/combobox.ts +++ b/packages/web-components/fast-foundation/src/combobox/combobox.ts @@ -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. diff --git a/packages/web-components/fast-foundation/src/data-grid/README.md b/packages/web-components/fast-foundation/src/data-grid/README.md index ea3b08bc320..8a1cc2991d6 100644 --- a/packages/web-components/fast-foundation/src/data-grid/README.md +++ b/packages/web-components/fast-foundation/src/data-grid/README.md @@ -161,7 +161,6 @@ export const myDataGrid = DataGrid.compose({ #### Fields -<<<<<<< HEAD | Name | Privacy | Type | Default | Description | Inherited From | | ------------------------ | ------- | ------------------------------------- | ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------- | | `gridTemplateColumns` | public | `string` | | String that gets applied to the the css gridTemplateColumns attribute for the row | | @@ -174,30 +173,12 @@ export const myDataGrid = DataGrid.compose({ | `$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 | -| ------------------------ | ------- | -------------------------------------------------------------- | ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------- | -| `gridTemplateColumns` | public | `string` | | String that gets applied to the the css gridTemplateColumns attribute for the row | | -| `rowType` | public | `DataGridRowTypes or "default" or "header" or "sticky-header"` | | The type of row | | -| `rowData` | public | `object or null` | `null` | The base data for this row | | -| `columnDefinitions` | public | `ColumnDefinition[] or null` | `null` | The column definitions of the row | | -| `cellItemTemplate` | public | `ItemViewTemplate or undefined` | | The template used to render cells in generated rows. | | -| `headerCellItemTemplate` | public | `ItemViewTemplate or undefined` | | The template used to render header cells in generated rows. | | -| `rowIndex` | public | `number` | | The index of the row in the parent grid. This is typically set programmatically by the parent grid. | | -| `$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 | ->>>>>>> fixes build-break caused by rebase #### Methods | Name | Privacy | Description | Parameters | Return | Inherited From | | ---------------------------- | --------- | ----------- | ------------------ | ------ | ----------------- | | `gridTemplateColumnsChanged` | protected | | | `void` | | -<<<<<<< HEAD -======= -| `rowTypeChanged` | protected | | | `void` | | ->>>>>>> feat: update private change handlers to protected (#5872) | `rowDataChanged` | protected | | | `void` | | | `handleFocusout` | public | | `e: FocusEvent` | `void` | | | `handleCellFocus` | public | | `e: Event` | `void` | | @@ -256,7 +237,6 @@ export const myDataGrid = DataGrid.compose({ #### Fields -<<<<<<< HEAD | Name | Privacy | Type | Default | Description | Inherited From | | ------------------------ | ------- | ------------------------------------- | ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------- | | `noTabbing` | public | `boolean` | `false` | When true the component will not add itself to the tab queue. Default is false. | | @@ -273,34 +253,12 @@ export const myDataGrid = DataGrid.compose({ | `$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 | -| ------------------------ | ------- | ---------------------------------------------------------- | ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------- | -| `noTabbing` | public | `boolean` | `false` | When true the component will not add itself to the tab queue. Default is false. | | -| `generateHeader` | public | `GenerateHeaderOptions or "none" or "default" or "sticky"` | | Whether the grid should automatically generate a header row and its type | | -| `gridTemplateColumns` | public | `string` | | String that gets applied to the the css gridTemplateColumns attribute of child rows | | -| `rowsData` | public | `object[]` | `[]` | The data being displayed in the grid | | -| `columnDefinitions` | public | `ColumnDefinition[] or null` | `null` | The column definitions of the grid | | -| `rowItemTemplate` | public | `ItemViewTemplate` | | The template to use for the programmatic generation of rows | | -| `cellItemTemplate` | public | `ItemViewTemplate or undefined` | | The template used to render cells in generated rows. | | -| `headerCellItemTemplate` | public | `ItemViewTemplate or undefined` | | The template used to render header cells in generated rows. | | -| `focusRowIndex` | public | `number` | `0` | The index of the row that will receive focus the next time the grid is focused. This value changes as focus moves to different rows within the grid. Changing this value when focus is already within the grid moves focus to the specified row. | | -| `focusColumnIndex` | public | `number` | `0` | The index of the column that will receive focus the next time the grid is focused. This value changes as focus moves to different rows within the grid. Changing this value when focus is already within the grid moves focus to the specified column. | | -| `rowElementTag` | public | `string` | | Set by the component templates. | | -| `$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 | ->>>>>>> fixes build-break caused by rebase #### Methods | Name | Privacy | Description | Parameters | Return | Inherited From | | ---------------------------- | --------- | ----------- | ---------- | ------ | ----------------- | | `noTabbingChanged` | protected | | | `void` | | -<<<<<<< HEAD -======= -| `generateHeaderChanged` | protected | | | `void` | | ->>>>>>> feat: update private change handlers to protected (#5872) | `gridTemplateColumnsChanged` | protected | | | `void` | | | `rowsDataChanged` | protected | | | `void` | | | `columnDefinitionsChanged` | protected | | | `void` | | diff --git a/packages/web-components/fast-foundation/src/data-grid/data-grid-row.ts b/packages/web-components/fast-foundation/src/data-grid/data-grid-row.ts index edbf37d59d2..dd348ac27d9 100644 --- a/packages/web-components/fast-foundation/src/data-grid/data-grid-row.ts +++ b/packages/web-components/fast-foundation/src/data-grid/data-grid-row.ts @@ -48,14 +48,8 @@ export class DataGridRow extends FoundationElement { * HTML Attribute: row-type */ @attr({ attribute: "row-type" }) -<<<<<<< HEAD public rowType: DataGridRowTypes = DataGridRowTypes.default; private rowTypeChanged(): void { -======= - public rowType: DataGridRowTypes | "default" | "header" | "sticky-header" = - DataGridRowTypes.default; - protected rowTypeChanged(): void { ->>>>>>> feat: update private change handlers to protected (#5872) if (this.$fastController.isConnected) { this.updateItemTemplate(); } diff --git a/packages/web-components/fast-foundation/src/data-grid/data-grid.ts b/packages/web-components/fast-foundation/src/data-grid/data-grid.ts index 5b3bb4d7a0c..e8993f4ef78 100644 --- a/packages/web-components/fast-foundation/src/data-grid/data-grid.ts +++ b/packages/web-components/fast-foundation/src/data-grid/data-grid.ts @@ -162,14 +162,8 @@ export class DataGrid extends FoundationElement { * HTML Attribute: generate-header */ @attr({ attribute: "generate-header" }) -<<<<<<< HEAD public generateHeader: GenerateHeaderOptions = GenerateHeaderOptions.default; private generateHeaderChanged(): void { -======= - public generateHeader: GenerateHeaderOptions | "none" | "default" | "sticky" = - GenerateHeaderOptions.default; - protected generateHeaderChanged(): void { ->>>>>>> feat: update private change handlers to protected (#5872) if (this.$fastController.isConnected) { this.toggleGeneratedHeader(); } diff --git a/packages/web-components/fast-foundation/src/text-field/text-field.ts b/packages/web-components/fast-foundation/src/text-field/text-field.ts index 50a62fe1b27..e3c95cf230d 100644 --- a/packages/web-components/fast-foundation/src/text-field/text-field.ts +++ b/packages/web-components/fast-foundation/src/text-field/text-field.ts @@ -84,14 +84,8 @@ export class TextField extends FormAssociatedTextField { * HTML Attribute: type */ @attr -<<<<<<< HEAD public type: TextFieldType = TextFieldType.text; private typeChanged(): void { -======= - public type: TextFieldType | "email" | "password" | "tel" | "text" | "url" = - TextFieldType.text; - protected typeChanged(): void { ->>>>>>> feat: update private change handlers to protected (#5872) if (this.proxy instanceof HTMLInputElement) { this.proxy.type = this.type; this.validate(); diff --git a/packages/web-components/fast-foundation/src/tooltip/README.md b/packages/web-components/fast-foundation/src/tooltip/README.md index a4ad979f95b..7b9240cba50 100644 --- a/packages/web-components/fast-foundation/src/tooltip/README.md +++ b/packages/web-components/fast-foundation/src/tooltip/README.md @@ -88,10 +88,6 @@ export const myTooltip = Tooltip.compose({ | ------------------------ | --------- | ----------- | ------------------------------- | ------ | ----------------- | | `visibleChanged` | protected | | | `void` | | | `anchorChanged` | protected | | | `void` | | -<<<<<<< HEAD -======= -| `positionChanged` | protected | | | `void` | | ->>>>>>> feat: update private change handlers to protected (#5872) | `anchorElementChanged` | protected | | `oldValue: HTMLElement or null` | `void` | | | `viewportElementChanged` | protected | | | `void` | | | `templateChanged` | protected | | | `void` | FoundationElement |