diff --git a/e2e/process-services/pages/dialog/create-checklist-dialog.page.ts b/e2e/process-services/pages/dialog/create-checklist-dialog.page.ts index 730135a263..f4506c565b 100644 --- a/e2e/process-services/pages/dialog/create-checklist-dialog.page.ts +++ b/e2e/process-services/pages/dialog/create-checklist-dialog.page.ts @@ -42,7 +42,7 @@ export class ChecklistDialog { } async getNameFieldPlaceholder(): Promise { - return BrowserActions.getAttribute(this.nameField, 'data-placeholder'); + return BrowserActions.getAttribute(this.nameField, 'placeholder'); } async checkCancelButtonIsEnabled(): Promise { diff --git a/e2e/process-services/pages/dialog/start-task-dialog.page.ts b/e2e/process-services/pages/dialog/start-task-dialog.page.ts index c852aa6057..da59e57125 100644 --- a/e2e/process-services/pages/dialog/start-task-dialog.page.ts +++ b/e2e/process-services/pages/dialog/start-task-dialog.page.ts @@ -58,7 +58,7 @@ export class StartTaskDialogPage { } async getAssignee(): Promise { - return BrowserActions.getAttribute(this.assignee, 'data-placeholder'); + return BrowserActions.getAttribute(this.assignee, 'placeholder'); } async selectForm(form): Promise { diff --git a/e2e/process-services/pages/task-details.page.ts b/e2e/process-services/pages/task-details.page.ts index eced879b39..07f8de2ace 100644 --- a/e2e/process-services/pages/task-details.page.ts +++ b/e2e/process-services/pages/task-details.page.ts @@ -180,7 +180,7 @@ export class TaskDetailsPage { } async getDescriptionPlaceholder(): Promise { - return BrowserActions.getAttribute(this.descriptionField, 'data-placeholder'); + return BrowserActions.getAttribute(this.descriptionField, 'placeholder'); } getDueDate(): Promise { @@ -310,7 +310,7 @@ export class TaskDetailsPage { } async getInvolvePeoplePlaceholder(): Promise { - return BrowserActions.getAttribute(this.addPeopleField, 'data-placeholder'); + return BrowserActions.getAttribute(this.addPeopleField, 'placeholder'); } async checkCancelButtonIsEnabled(): Promise { diff --git a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts index d1a80a8554..cd98744cb3 100644 --- a/lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts +++ b/lib/content-services/src/lib/search/components/search-properties/search-properties.component.ts @@ -104,7 +104,11 @@ export class SearchPropertiesComponent implements OnInit, AfterViewChecked, Sear const extraFreeSpace = 20; this._fileSizeOperatorsMaxWidth = Math.max(...this._fileSizeOperators.map((operator) => this.getOperatorNameWidth(operator, this.getCanvasFont(this.fileSizeOperatorSelectElement.nativeElement)))) + +<<<<<<< Updated upstream this.fileSizeOperatorSelectElement.nativeElement.querySelector('.mat-mdc-select-arrow').clientWidth + +======= + this.fileSizeOperatorSelectElement.nativeElement.querySelector('.mat-mdc-select-arrow-wrapper').clientWidth + +>>>>>>> Stashed changes extraFreeSpace; }); } diff --git a/lib/core/src/lib/context-menu/animations.ts b/lib/core/src/lib/context-menu/animations.ts index ecc18765b0..708296d365 100644 --- a/lib/core/src/lib/context-menu/animations.ts +++ b/lib/core/src/lib/context-menu/animations.ts @@ -33,10 +33,10 @@ export const contextMenuAnimation: ( AnimationStateMetadata | AnimationTransitio transform: 'scale(0.01, 0.01)' })), transition('void => *', sequence([ - query('.mat-menu-content', style({ opacity: 0 })), + query('.mat-mdc-menu-content', style({ opacity: 0 })), animate('100ms linear', style({ opacity: 1, transform: 'scale(1, 0.5)' })), group([ - query('.mat-menu-content', animate('400ms cubic-bezier(0.55, 0, 0.55, 0.2)', + query('.mat-mdc-menu-content', animate('400ms cubic-bezier(0.55, 0, 0.55, 0.2)', style({ opacity: 1 }) )), animate('300ms cubic-bezier(0.25, 0.8, 0.25, 1)', style({ transform: 'scale(1, 1)' })) diff --git a/lib/core/src/lib/form/components/widgets/form.theme.scss b/lib/core/src/lib/form/components/widgets/form.theme.scss index 8567ba2b07..f96bc926b4 100644 --- a/lib/core/src/lib/form/components/widgets/form.theme.scss +++ b/lib/core/src/lib/form/components/widgets/form.theme.scss @@ -73,9 +73,15 @@ ul > li > form-field > .adf-focus { /* query for Microsoft IE 11 */ @media screen and (-ms-high-contrast: active), screen and (-ms-high-contrast: none) { adf-form-field { +<<<<<<< Updated upstream .mat-mdc-input-element, .mat-mdc-select, .mat-mdc-form-field { +======= + .mat-input-element, + .mat-mdc-select, + .mat-form-field { +>>>>>>> Stashed changes display: block !important; } } diff --git a/lib/process-services/src/lib/form/widgets/dropdown/dropdown.widget.scss b/lib/process-services/src/lib/form/widgets/dropdown/dropdown.widget.scss index d0643df4cf..f34f16af3e 100644 --- a/lib/process-services/src/lib/form/widgets/dropdown/dropdown.widget.scss +++ b/lib/process-services/src/lib/form/widgets/dropdown/dropdown.widget.scss @@ -6,8 +6,13 @@ padding-top: 0; width: 100%; } +<<<<<<< Updated upstream /* TODO(mdc-migration): The following rule targets internal classes of select that may no longer apply for the MDC version. */ .mat-select-value-text { +======= + + .mat-mdc-select-value-text { +>>>>>>> Stashed changes font-size: var(--theme-body-1-font-size); } diff --git a/lib/testing/src/lib/protractor/content-services/pages/search/search-sorting-picker.page.ts b/lib/testing/src/lib/protractor/content-services/pages/search/search-sorting-picker.page.ts index 442229b9e2..aff35a9e8e 100644 --- a/lib/testing/src/lib/protractor/content-services/pages/search/search-sorting-picker.page.ts +++ b/lib/testing/src/lib/protractor/content-services/pages/search/search-sorting-picker.page.ts @@ -27,7 +27,7 @@ export class SearchSortingPickerPage { async sortBy(sortOrder: string, sortType: string | RegExp): Promise { await this.sortingDropdown.clickDropdown(); - const selectedSortingOption = element(by.cssContainingText('.mat-option-text', sortType)); + const selectedSortingOption = element(by.cssContainingText('.mdc-list-item__primary-text', sortType)); await BrowserActions.click(selectedSortingOption); await this.sortByOrder(sortOrder); } @@ -53,7 +53,7 @@ export class SearchSortingPickerPage { } async clickSortingOption(option: string): Promise { - const selectedSortingOption = element(by.cssContainingText('.mat-option-text', option)); + const selectedSortingOption = element(by.cssContainingText('.mdc-list-item__primary-text', option)); await BrowserActions.click(selectedSortingOption); } diff --git a/lib/testing/src/lib/protractor/core/pages/form/form-fields.ts b/lib/testing/src/lib/protractor/core/pages/form/form-fields.ts index 424f557e46..5eb10ca824 100644 --- a/lib/testing/src/lib/protractor/core/pages/form/form-fields.ts +++ b/lib/testing/src/lib/protractor/core/pages/form/form-fields.ts @@ -97,7 +97,7 @@ export class FormFields { async getFieldPlaceHolder(fieldId: string, locator = 'input'): Promise { const placeHolderLocator = $(`${locator}#${fieldId}`); await BrowserVisibility.waitUntilElementIsVisible(placeHolderLocator); - return BrowserActions.getAttribute(placeHolderLocator, 'data-placeholder'); + return BrowserActions.getAttribute(placeHolderLocator, 'placeholder'); } async refreshForm(): Promise { diff --git a/lib/testing/src/lib/protractor/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts b/lib/testing/src/lib/protractor/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts index b54dec0d26..a0b2d1502a 100644 --- a/lib/testing/src/lib/protractor/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts +++ b/lib/testing/src/lib/protractor/process-services-cloud/pages/edit-task-filter-cloud-component.page.ts @@ -37,8 +37,8 @@ export class EditTaskFilterCloudComponentPage { id = $('input[data-automation-id="adf-cloud-edit-task-property-taskId"]'); processDefinitionId = $('input[data-automation-id="adf-cloud-edit-task-property-processDefinitionId"]'); processInstanceId = $('input[data-automation-id="adf-cloud-edit-task-property-processInstanceId"]'); - lastModifiedFrom = $('input[data-placeholder="LastModifiedFrom"]'); - lastModifiedTo = $('input[data-placeholder="LastModifiedTo"]'); + lastModifiedFrom = $('input[placeholder="LastModifiedFrom"]'); + lastModifiedTo = $('input[placeholder="LastModifiedTo"]'); parentTaskId = $('input[data-automation-id="adf-cloud-edit-task-property-parentTaskId"]'); owner = $('input[data-automation-id="adf-cloud-edit-task-property-owner"]'); saveButton = $('[data-automation-id="adf-filter-action-save"]'); diff --git a/lib/testing/src/lib/protractor/process-services-cloud/pages/start-process-cloud-component.page.ts b/lib/testing/src/lib/protractor/process-services-cloud/pages/start-process-cloud-component.page.ts index 005cba5530..836f60b0fd 100644 --- a/lib/testing/src/lib/protractor/process-services-cloud/pages/start-process-cloud-component.page.ts +++ b/lib/testing/src/lib/protractor/process-services-cloud/pages/start-process-cloud-component.page.ts @@ -64,7 +64,7 @@ export class StartProcessCloudPage { async selectFirstOptionFromProcessDropdown(): Promise { await this.clickProcessDropdownArrow(); - const selectFirstProcessDropdown = $$('.mat-option-text').first(); + const selectFirstProcessDropdown = $$('.mdc-list-item__primary-text').first(); await BrowserActions.click(selectFirstProcessDropdown); }