[Flexible Layouts] Flexible Layout styling fixes #7319
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| /***************************************************************************** | ||
| * Open MCT, Copyright (c) 2014-2023, United States Government | ||
| * as represented by the Administrator of the National Aeronautics and Space | ||
| * Administration. All rights reserved. | ||
| * | ||
| * Open MCT is licensed under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * http://www.apache.org/licenses/LICENSE-2.0. | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations | ||
| * under the License. | ||
| * | ||
| * Open MCT includes source code licensed under additional open source | ||
| * licenses. See the Open Source Licenses file (LICENSES.md) included with | ||
| * this source code distribution or the Licensing information page available | ||
| * at runtime from the About dialog for additional information. | ||
| *****************************************************************************/ | ||
|
|
||
| import { expect } from '../pluginFixtures.js'; | ||
|
|
||
| /** | ||
| * Converts a hex color value to its RGB equivalent. | ||
| * | ||
| * @param {string} hex - The hex color value. | ||
ozyx marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| * @returns {string} The RGB equivalent of the hex color. | ||
| */ | ||
| function hexToRGB(hex) { | ||
| const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex); | ||
| return result | ||
| ? `rgb(${parseInt(result[1], 16)}, ${parseInt(result[2], 16)}, ${parseInt(result[3], 16)})` | ||
| : null; | ||
| } | ||
|
|
||
| /** | ||
| * Sets the background and text color of a given element. | ||
| * | ||
| * @param {import('@playwright/test').Page} page - The Playwright page object. | ||
| * @param {string} borderColorHex - The hex value of the border color to set, or 'No Style'. | ||
| * @param {string} backgroundColorHex - The hex value of the background color to set, or 'No Style'. | ||
| * @param {string} textColorHex - The hex value of the text color to set, or 'No Style'. | ||
| * @param {import('@playwright/test').Locator} locator - The Playwright locator for the element whose style is to be set. | ||
| */ | ||
| async function setStyles(page, borderColorHex, backgroundColorHex, textColorHex, locator) { | ||
| await locator.click(); // Assuming the locator is clickable and opens the style setting UI | ||
| await page.getByLabel('Set border color').click(); | ||
| await page.getByLabel(borderColorHex).click(); | ||
| await page.getByLabel('Set background color').click(); | ||
| await page.getByLabel(backgroundColorHex).click(); | ||
| await page.getByLabel('Set text color').click(); | ||
| await page.getByLabel(textColorHex).click(); | ||
| } | ||
|
Comment on lines
+38
to
+55
|
||
|
|
||
| /** | ||
| * Checks if the styles of an element match the expected values. | ||
| * | ||
| * @param {string} expectedBorderColor - The expected border color in RGB format. Default is '#e6b8af' or 'rgb(230, 184, 175)' | ||
| * @param {string} expectedBackgroundColor - The expected background color in RGB format. | ||
| * @param {string} expectedTextColor - The expected text color in RGB format. Default is #aaaaaa or 'rgb(170, 170, 170)' | ||
| * @param {import('@playwright/test').Locator} locator - The Playwright locator for the element whose style is to be checked. | ||
| */ | ||
| async function checkStyles( | ||
| expectedBorderColor, | ||
| expectedBackgroundColor, | ||
| expectedTextColor, | ||
| locator | ||
| ) { | ||
| const layoutStyles = await locator.evaluate((el) => { | ||
| return { | ||
| border: window.getComputedStyle(el).getPropertyValue('border-top-color'), //infer the left, right, and bottom | ||
| background: window.getComputedStyle(el).getPropertyValue('background-color'), | ||
| fontColor: window.getComputedStyle(el).getPropertyValue('color') | ||
| }; | ||
| }); | ||
| expect(layoutStyles.border).toContain(expectedBorderColor); | ||
| expect(layoutStyles.background).toContain(expectedBackgroundColor); | ||
| expect(layoutStyles.fontColor).toContain(expectedTextColor); | ||
| } | ||
|
|
||
| /** | ||
| * Checks if the font Styles of an element match the expected values. | ||
| * | ||
| * @param {string} expectedFontSize - The expected border color in RGB format. Default is '#e6b8af' or 'rgb(230, 184, 175)' | ||
| * @param {string} expectedFontType - The expected text color in RGB format. Default is #aaaaaa or 'rgb(170, 170, 170)' | ||
| * @param {import('@playwright/test').Locator} locator - The Playwright locator for the element whose style is to be checked. | ||
| */ | ||
| async function checkFontStyles(expectedFontSize, expectedFontType, locator) { | ||
| const layoutStyles = await locator.evaluate((el) => { | ||
| return { | ||
| fontSize: window.getComputedStyle(el).getPropertyValue('font-size'), | ||
| fontType: window.getComputedStyle(el).getPropertyValue('font-family') | ||
| }; | ||
| }); | ||
| expect(layoutStyles.fontSize).toContain(expectedFontSize); | ||
| expect(layoutStyles.fontFamily).toContain(expectedFontType); | ||
| } | ||
|
|
||
| export { checkFontStyles, checkStyles, hexToRGB, setStyles }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| /***************************************************************************** | ||
| * Open MCT, Copyright (c) 2014-2023, United States Government | ||
| * as represented by the Administrator of the National Aeronautics and Space | ||
| * Administration. All rights reserved. | ||
| * | ||
| * Open MCT is licensed under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * http://www.apache.org/licenses/LICENSE-2.0. | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
| * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
| * License for the specific language governing permissions and limitations | ||
| * under the License. | ||
| * | ||
| * Open MCT includes source code licensed under additional open source | ||
| * licenses. See the Open Source Licenses file (LICENSES.md) included with | ||
| * this source code distribution or the Licensing information page available | ||
| * at runtime from the About dialog for additional information. | ||
| *****************************************************************************/ | ||
|
|
||
| /** | ||
| * This test is dedicated to test conditional styling | ||
| */ | ||
|
|
||
| import { test } from '../../../../pluginFixtures.js'; | ||
|
|
||
| test.describe('Conditional Styling', () => { | ||
| test.fixme( | ||
| 'Conditional Styling can be applied to Flex Layout and its children', | ||
| async ({ page }) => { | ||
| //test | ||
| } | ||
| ); | ||
| test.fixme( | ||
| 'Conditional Styling can be applied to Overlay Plot and its children', | ||
| async ({ page }) => { | ||
| //test | ||
| } | ||
| ); | ||
| test.fixme( | ||
| 'Conditional Styling changes the styling of the object the condition changes state', | ||
| async ({ page }) => { | ||
| //test | ||
| } | ||
| ); | ||
| }); |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
drive-by to make it easier to work with flex layouts
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this is so cool