diff --git a/.github/workflows/release-rc-auto.yaml b/.github/workflows/release-rc-auto.yaml index e13ba826f9d8..5d1045bc9c09 100644 --- a/.github/workflows/release-rc-auto.yaml +++ b/.github/workflows/release-rc-auto.yaml @@ -1,44 +1,44 @@ -name: Release RC version [auto] +# name: Release RC version [auto] -on: - schedule: - - cron: "00 08 * * THU" +# on: +# schedule: +# - cron: "00 08 * * THU" -jobs: - build-and-release: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - token: ${{ secrets.UI5_WEBCOMP_BOT_GH_TOKEN }} - fetch-depth: 0 - - uses: actions/setup-node@v4.0.1 - with: - node-version: 18 - cache: 'yarn' +# jobs: +# build-and-release: +# runs-on: ubuntu-latest +# steps: +# - uses: actions/checkout@v4 +# with: +# token: ${{ secrets.UI5_WEBCOMP_BOT_GH_TOKEN }} +# fetch-depth: 0 +# - uses: actions/setup-node@v4.0.1 +# with: +# node-version: 18 +# cache: 'yarn' - - name: Install - run: yarn --frozen-lockfile +# - name: Install +# run: yarn --frozen-lockfile - - name: Version Bump - env: - NPM_USERNAME: ${{ secrets.NPM_USER }} - NPM_EMAIL: ${{ secrets.NPM_EMAIL }} - NPM_AUTH_TOKEN: ${{ secrets.NPM_RELEASE_AUTH_TOKEN }} - GH_TOKEN: ${{ secrets.UI5_WEBCOMP_BOT_GH_TOKEN }} - run: | - npm config set //registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN} - git config user.name "${{ secrets.UI5_WEBCOMP_BOT_NAME }}" - git config user.email "${{ secrets.UI5_WEBCOMP_BOT_EMAIL }}" - yarn lerna version --conventional-prerelease --force-publish --yes --exact --create-release github +# - name: Version Bump +# env: +# NPM_USERNAME: ${{ secrets.NPM_USER }} +# NPM_EMAIL: ${{ secrets.NPM_EMAIL }} +# NPM_AUTH_TOKEN: ${{ secrets.NPM_RELEASE_AUTH_TOKEN }} +# GH_TOKEN: ${{ secrets.UI5_WEBCOMP_BOT_GH_TOKEN }} +# run: | +# npm config set //registry.npmjs.org/:_authToken=${NPM_AUTH_TOKEN} +# git config user.name "${{ secrets.UI5_WEBCOMP_BOT_NAME }}" +# git config user.email "${{ secrets.UI5_WEBCOMP_BOT_EMAIL }}" +# yarn lerna version --conventional-prerelease --force-publish --yes --exact --create-release github - - name: Build - run: yarn ci:releasebuild +# - name: Build +# run: yarn ci:releasebuild - - name: Publish - env: - NPM_USERNAME: ${{ secrets.NPM_USER }} - NPM_EMAIL: ${{ secrets.NPM_EMAIL }} - NPM_AUTH_TOKEN: ${{ secrets.NPM_RELEASE_AUTH_TOKEN }} - GH_TOKEN: ${{ secrets.UI5_WEBCOMP_BOT_GH_TOKEN }} - run: yarn lerna publish from-git --yes \ No newline at end of file +# - name: Publish +# env: +# NPM_USERNAME: ${{ secrets.NPM_USER }} +# NPM_EMAIL: ${{ secrets.NPM_EMAIL }} +# NPM_AUTH_TOKEN: ${{ secrets.NPM_RELEASE_AUTH_TOKEN }} +# GH_TOKEN: ${{ secrets.UI5_WEBCOMP_BOT_GH_TOKEN }} +# run: yarn lerna publish from-git --yes diff --git a/CHANGELOG.md b/CHANGELOG.md index b419d8cc8525..00b0b1d6f7e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,57 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-rc.2](https://github.com/SAP/ui5-webcomponents/compare/v2.0.0-rc.1...v2.0.0-rc.2) (2024-04-18) + + +### Bug Fixes + +* **u5-dialog:** soft keyboard is correctly opened on iOS devices ([#8583](https://github.com/SAP/ui5-webcomponents/issues/8583)) ([6cf1d74](https://github.com/SAP/ui5-webcomponents/commit/6cf1d746e59352430d0d086cf0814dc7ce7fdb9c)) +* **ui5-calendar, ui5-daterange-picker:** align range selection styling with vd specification ([#8585](https://github.com/SAP/ui5-webcomponents/issues/8585)) ([d4f0e0e](https://github.com/SAP/ui5-webcomponents/commit/d4f0e0e93bc9dcd9c4261b2c3eed37cf4f85435f)) +* **ui5-menu-item:** apply scoping to internal `Icon` ([#8751](https://github.com/SAP/ui5-webcomponents/issues/8751)) ([ce55755](https://github.com/SAP/ui5-webcomponents/commit/ce55755c05a5588759d751da9749dbde0bbba722)) +* **ui5-popover:** fix popover going out of the viewport ([#8735](https://github.com/SAP/ui5-webcomponents/issues/8735)) ([bca8f2a](https://github.com/SAP/ui5-webcomponents/commit/bca8f2a3ff15d002ce778bf85e1d2dd8da789059)) +* **ui5-progress-indicator:** hidden value design ([#8545](https://github.com/SAP/ui5-webcomponents/issues/8545)) ([bf094d3](https://github.com/SAP/ui5-webcomponents/commit/bf094d3df92311d7d051b10aff8167b832e84d26)) +* **ui5-responsive-popover:** fix dialog initial focus ([#8774](https://github.com/SAP/ui5-webcomponents/issues/8774)) ([27b522f](https://github.com/SAP/ui5-webcomponents/commit/27b522f145d21be814cc5f02ee74674c8e3db745)) +* **ui5-shellbar:** aligned specs ([#8694](https://github.com/SAP/ui5-webcomponents/issues/8694)) ([c5ec720](https://github.com/SAP/ui5-webcomponents/commit/c5ec720c8fd362b6fe2f502d473bec5fc4071b38)) +* **ui5-shellbar:** assistant icon color fixed ([#8713](https://github.com/SAP/ui5-webcomponents/issues/8713)) ([e501ac8](https://github.com/SAP/ui5-webcomponents/commit/e501ac8147bb979319a6e055ba98458650884112)) +* **ui5-side-navigation:** import overflow icon ([#8736](https://github.com/SAP/ui5-webcomponents/issues/8736)) ([8bc1bb4](https://github.com/SAP/ui5-webcomponents/commit/8bc1bb4698e71c66e1fb59508e115b9e612912fb)) +* **ui5-side-navigation:** replace items and fixedItems union type with SideNavigationItemBase ([#8740](https://github.com/SAP/ui5-webcomponents/issues/8740)) ([b589486](https://github.com/SAP/ui5-webcomponents/commit/b58948676049565410592700b1796475f1ea94fa)) +* **ui5-split-button:** add correct opacity when disabled ([#8738](https://github.com/SAP/ui5-webcomponents/issues/8738)) ([399144e](https://github.com/SAP/ui5-webcomponents/commit/399144e8b186dd61d2eb23ed42e5050335e5ecd7)), closes [#8615](https://github.com/SAP/ui5-webcomponents/issues/8615) +* **ui5-tabcontainer:** prevent endless resizing when moving after last overflow item ([#8725](https://github.com/SAP/ui5-webcomponents/issues/8725)) ([c33ba40](https://github.com/SAP/ui5-webcomponents/commit/c33ba404c559109a2dfe2166722f03f2c5c6b691)) +* **ui5-tabcontainer:** replace default slot union type with interface ([#8734](https://github.com/SAP/ui5-webcomponents/issues/8734)) ([ac6b44f](https://github.com/SAP/ui5-webcomponents/commit/ac6b44f9eaeb1604f1bbd4ae6f37e6dec817c1ef)) + + +### Code Refactoring + +* **ui5-multi-combobox:** rename property allowCustomValues to noValidation ([#8765](https://github.com/SAP/ui5-webcomponents/issues/8765)) ([bb27acb](https://github.com/SAP/ui5-webcomponents/commit/bb27acbc2f8321219d99c7732d8536a00ae38272)) +* **ui5-textarea:** rename property growingMaxLines to growingMaxRows ([#8756](https://github.com/SAP/ui5-webcomponents/issues/8756)) ([3fd33ab](https://github.com/SAP/ui5-webcomponents/commit/3fd33aba0164e0a5c06bd44d057157a1dd54b522)), closes [#8461](https://github.com/SAP/ui5-webcomponents/issues/8461) + + +### Features + +* **ui5-avatar-group:** update focus handling ([#8550](https://github.com/SAP/ui5-webcomponents/issues/8550)) ([0bb5c9d](https://github.com/SAP/ui5-webcomponents/commit/0bb5c9d8632092d875fa6333d817475aa73f1e71)), closes [#8320](https://github.com/SAP/ui5-webcomponents/issues/8320) +* **ui5-barcode-scanner-dialog:** add support for close and open events ([#8753](https://github.com/SAP/ui5-webcomponents/issues/8753)) ([1ae2142](https://github.com/SAP/ui5-webcomponents/commit/1ae2142aa6ba2c587126e49422724658686d2344)), closes [#8695](https://github.com/SAP/ui5-webcomponents/issues/8695) +* **ui5-date-*:** adapt date and time controls to timezone feature ([#8610](https://github.com/SAP/ui5-webcomponents/issues/8610)) ([1acae01](https://github.com/SAP/ui5-webcomponents/commit/1acae010eb81f4d50368587b66c8840bdf886d04)), closes [#8461](https://github.com/SAP/ui5-webcomponents/issues/8461) +* **ui5-li:** add support for F2 key ([#8619](https://github.com/SAP/ui5-webcomponents/issues/8619)) ([24c3807](https://github.com/SAP/ui5-webcomponents/commit/24c380758f88b3f66dce46e2f57297634b42a85a)), closes [#7736](https://github.com/SAP/ui5-webcomponents/issues/7736) +* **ui5-link:** introduce `tooltip` property ([#8670](https://github.com/SAP/ui5-webcomponents/issues/8670)) ([ef64000](https://github.com/SAP/ui5-webcomponents/commit/ef640006e466a9a3e01bb9d241c3a3fc2962d8d0)) +* **ui5-message-strip:** introduce custom colors ([#8757](https://github.com/SAP/ui5-webcomponents/issues/8757)) ([d30f424](https://github.com/SAP/ui5-webcomponents/commit/d30f4240df5922888854d027dfcff732b5316ccc)) + + +### BREAKING CHANGES + +* **ui5-multi-combobox:** The `allowCustomValues` property have been renamed to `noValidation`. +If you have previously used the `allowCustomValues` property +`` +Now use noValidation instead: +`` + +Related to: https://github.com/SAP/ui5-webcomponents/issues/8461 +* **ui5-textarea:** The `growingMaxLines` property have been renamed to `growingMaxRows`. + + + + + # [2.0.0-rc.1](https://github.com/SAP/ui5-webcomponents/compare/v2.0.0-rc.0...v2.0.0-rc.1) (2024-04-11) diff --git a/docs/2-advanced/07-accessibility.md b/docs/2-advanced/07-accessibility.md index 77360e1f00be..9c3aa64ff896 100644 --- a/docs/2-advanced/07-accessibility.md +++ b/docs/2-advanced/07-accessibility.md @@ -80,6 +80,7 @@ The mapping of the accessibility APIs to ARIA attributes is described in the fol | `checked` | `aria-checked` | Defines whether the component is checked. | | `level`, `headerLevel` | `aria-level` | Defines the heading level of a title. Available options are: "H6" to "H1". | | `interactive` | `tabindex` | Defines if the component is interactive (focusable and pressable). | +| `tooltip` | `title` | Defines the tooltip of the component. ### accessibleName diff --git a/docs/5-development/05-testing-UI5-Web-Components.md b/docs/5-development/05-testing-UI5-Web-Components.md index a63cf3ba31bf..8ddeafffc7f4 100644 --- a/docs/5-development/05-testing-UI5-Web-Components.md +++ b/docs/5-development/05-testing-UI5-Web-Components.md @@ -1,6 +1,6 @@ # Testing UI5 Web Components -**Note:** All examples in this tutorial are taken from the demo UI5 Web Component (`ui5-demo`), generated by the package initialization script. +**Note:** All examples in this tutorial are taken from the demo UI5 Web Component (`ui5-demo`), generated by the package initialization script. For more information on creating a new package with a demo web component inside, click [here](./01-custom-UI5-Web-Components-Packages.md). ## 1. Prerequisites @@ -8,7 +8,7 @@ For more information on creating a new package with a demo web component inside, The test framework of choice for UI5 Web Components is [WebdriverIO](https://webdriver.io/) or WDIO for short. It has a straightforward API - [https://webdriver.io/docs/api.html](https://webdriver.io/docs/api.html), and has excellent support for Web Components. -The browser of choice for test execution is [Google Chrome](https://www.google.com/chrome/), respectively the WebDriver used is [ChromeDriver](https://chromedriver.chromium.org/). +The browser of choice for test execution is [Google Chrome](https://www.google.com/chrome/), respectively the WebDriver used is [ChromeDriver](https://chromedriver.chromium.org/). #### Managing ChromeDriver @@ -18,24 +18,24 @@ You can install it with `npm`: - `npm i --save-dev chromedriver` or with `yarn`: - - `yarn add -D chromedriver` + - `yarn add -D chromedriver` Google Chrome and ChromeDriver need to be the same version to work together. Whenever you update Google Chrome on your system (or it updates automatically, if allowed), you are expected to also update ChromeDriver to the respective version. ## 2. Running the tests -## 2.1 Test configuration +## 2.1 Test configuration The configuration for WDIO can be found in the `config/` directory under `wdio.conf.js`. -As explained [here](./01-custom-UI5-Web-Components-Packages.md) in the section about the `config/` directory, you can +As explained [here](./01-custom-UI5-Web-Components-Packages.md) in the section about the `config/` directory, you can customize, or even completely replace the default configuration. However, before doing so, please note the following two benefits of working with the default configuration, provided by UI5 Web Components: - - Hooks, synchronizing the execution of all relevant WDIO commands (e.g. `click`, `url`, `$`, `$$`) with the rendering of the framework to + - Hooks, synchronizing the execution of all relevant WDIO commands (e.g. `click`, `url`, `$`, `$$`) with the rendering of the framework to ensure consistency when reading or changing the state of the components. - - Additional API methods: `setProperty`, `setAttribute`, `removeAttribute`, `hasClass`. + - Additional API methods: `setProperty`, `setAttribute`, `removeAttribute`, `hasClass`. So our recommendation would be to modify it, if necessary, but not completely replace it. @@ -76,7 +76,7 @@ describe("ui5-demo rendering", async () => { assert.ok(innerContent, "content rendered"); }); }); -``` +``` Key points: - Load the test page with the `browser.url` command. You can do this once for each test suite or for each individual test. @@ -89,7 +89,7 @@ Key points: For WDIO capabilities, see: - Official API: [https://webdriver.io/docs/api.html](https://webdriver.io/docs/api.html). - - Additional commands provided in our standard WDIO configuration: `setProperty`, `setAttribute`, `removeAttribute`, `hasClass`. + - Additional commands provided in our standard WDIO configuration: `setProperty`, `setAttribute`, `removeAttribute`, `hasClass`. **Note:** The standard WDIO configuration we provide automatically synchronizes all test commands' execution with the framework rendering cycle. Therefore, in the example above, the `shadow$` command will internally wait for all rendering to be over before being executed. The @@ -102,11 +102,11 @@ Debugging with WDIO is really simple. Just follow these 3 steps: 1. Change the WDIO configuration file `config/wdio.conf.js` to disable `headless` mode for Google Chrome as follows: From: - + ```js module.exports = require("@ui5/webcomponents-tools/components-package/wdio.js"); ``` - + to: ```js @@ -114,7 +114,7 @@ Debugging with WDIO is really simple. Just follow these 3 steps: result.config.capabilities[0]["goog:chromeOptions"].args = ['--disable-gpu']; // From: ['--disable-gpu', '--headless'] module.exports = result; ``` - + If you happen to debug often, it's recommended to keep the file in this format and just comment out the middle line when you're done debugging. 2. Set a breakpoint with `browser.debug` somewhere in your test: @@ -126,29 +126,29 @@ Debugging with WDIO is really simple. Just follow these 3 steps: assert.ok(innerContent, "content rendered"); }); ``` - + For more on `debug`, see [https://webdriver.io/docs/api/browser/debug.html](https://webdriver.io/docs/api/browser/debug.html). 3. Run the single test spec and wait for the browser to open and pause on your breakpoint: - Run the dev server, if you haven't already: - - `yarn start` - - or - + + `yarn start` + + or + `npm run start`. - Run the single test spec: - - `yarn test test/specs/Demo.spec.js` - - or - + + `yarn test test/specs/Demo.spec.js` + + or + `npm run test test/specs/Demo.spec.js`. - -Google Chrome will then open in a new window, controlled by WDIO via the ChromeDriver, and your test will pause on your -breakpoint of choice. Proceed to debug normally. + +Google Chrome will then open in a new window, controlled by WDIO via the ChromeDriver, and your test will pause on your +breakpoint of choice. Proceed to debug normally. ## 5. Best practices for writing tests @@ -176,7 +176,7 @@ Use: Preferred: ```js assert.ok(await browser.$().isExisting()) -``` +``` instead of: diff --git a/docs/Migrating to version 2.0 guide.md b/docs/Migrating to version 2.0 guide.md index 0d6fb0eca058..a587adfa8d58 100644 --- a/docs/Migrating to version 2.0 guide.md +++ b/docs/Migrating to version 2.0 guide.md @@ -1,5 +1,7 @@ # UI5 Web Components 2.0 migration guide +This documentation will assist you in seamlessly transitioning from UI5 Web Components v1.x to the latest version, UI5 Web Components 2.0. + ## General and Framework @@ -230,6 +232,19 @@ Now use `selectionMode` and `Single`, `Multiple` instead: ``` +### ui5-multi-combobox + +| Changed item | Old | New | +|------------------------------|------------|---------------| +| Property | `allowCustomValues` | `noValidation` | + +- The `allowCustomValues` property has been renamed to `noValidation`. + If you have previously used the `allowCustomValues` property + `` + Now use noValidation instead: + `` + + ### ui5-option | Changed item | Old | New | @@ -365,6 +380,13 @@ Now use: someTabSeparator.getDomRefInStrip(); ``` +### ui5-textarea + +| Changed item | Old | New | +|--------------|-----------|---------------------------------------------------------------------| +| Property | `growingMaxLines` | `growingMaxRows` | + + - The `growingMaxLines` property has been renamed to `growingMaxRows`. ### ui5-tree @@ -398,6 +420,33 @@ Now, import the `ui5-bar` from `main`: import "@ui5/webcomponents/dist/Bar.js"; ``` +### ui5-barcode-scanner-dialog + +| Changed item | Old | New | +|---------------|-----------|-----------------| +| Public method | `show()` | `open` property | +| Public method | `close()` | `open` property | + +- The `show` and `close` public methods have been removed. Use the public property `open` instead. + +For example, if you used: + +```js +d.show(); +... +d.close(); +``` + +use: + +```js +d.open = true; +... +d.open = false; +``` + +instead. + ### ui5-illustrated-message | Changed item | Old | New | @@ -464,4 +513,4 @@ import type UploadCollectionItem from "@ui5/webcomponents-fiori/dist/UploadColle | Icon | `add-polygone` | `add-polygon` | - Removed `soccor` icon. Use `soccer` instead. - - Removed `add-polygone` icon. Use `add-polygon` instead. \ No newline at end of file + - Removed `add-polygone` icon. Use `add-polygon` instead. diff --git a/lerna.json b/lerna.json index d19da24a6dfe..6fbc28aedbd5 100644 --- a/lerna.json +++ b/lerna.json @@ -13,7 +13,7 @@ "packages/website", "packages/create-package" ], - "version": "2.0.0-rc.1", + "version": "2.0.0-rc.2", "command": { "publish": { "allowBranch": "*", diff --git a/packages/base/CHANGELOG.md b/packages/base/CHANGELOG.md index f1fe91c4571a..b11dd2a3330d 100644 --- a/packages/base/CHANGELOG.md +++ b/packages/base/CHANGELOG.md @@ -3,6 +3,23 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-rc.2](https://github.com/SAP/ui5-webcomponents/compare/v2.0.0-rc.1...v2.0.0-rc.2) (2024-04-18) + + +### Bug Fixes + +* **u5-dialog:** soft keyboard is correctly opened on iOS devices ([#8583](https://github.com/SAP/ui5-webcomponents/issues/8583)) ([6cf1d74](https://github.com/SAP/ui5-webcomponents/commit/6cf1d746e59352430d0d086cf0814dc7ce7fdb9c)) +* **ui5-popover:** fix popover going out of the viewport ([#8735](https://github.com/SAP/ui5-webcomponents/issues/8735)) ([bca8f2a](https://github.com/SAP/ui5-webcomponents/commit/bca8f2a3ff15d002ce778bf85e1d2dd8da789059)) + + +### Features + +* **ui5-li:** add support for F2 key ([#8619](https://github.com/SAP/ui5-webcomponents/issues/8619)) ([24c3807](https://github.com/SAP/ui5-webcomponents/commit/24c380758f88b3f66dce46e2f57297634b42a85a)), closes [#7736](https://github.com/SAP/ui5-webcomponents/issues/7736) + + + + + # [2.0.0-rc.1](https://github.com/SAP/ui5-webcomponents/compare/v2.0.0-rc.0...v2.0.0-rc.1) (2024-04-11) diff --git a/packages/base/package.json b/packages/base/package.json index 0730ee1b3ad6..e04fbca2d1e7 100644 --- a/packages/base/package.json +++ b/packages/base/package.json @@ -1,6 +1,6 @@ { "name": "@ui5/webcomponents-base", - "version": "2.0.0-rc.1", + "version": "2.0.0-rc.2", "description": "UI5 Web Components: webcomponents.base", "author": "SAP SE (https://www.sap.com)", "license": "Apache-2.0", @@ -45,8 +45,8 @@ }, "devDependencies": { "@openui5/sap.ui.core": "1.120.5", - "@ui5/webcomponents-tools": "2.0.0-rc.1", - "chromedriver": "^122.0.6", + "@ui5/webcomponents-tools": "2.0.0-rc.2", + "chromedriver": "^123.0.3", "clean-css": "^5.2.2", "copy-and-watch": "^0.1.5", "cross-env": "^7.0.3", diff --git a/packages/base/src/Boot.ts b/packages/base/src/Boot.ts index 500a01f1fcaf..3b2474fb1496 100644 --- a/packages/base/src/Boot.ts +++ b/packages/base/src/Boot.ts @@ -84,9 +84,8 @@ const boot = async (): Promise => { * @param { string } theme */ const onThemeRegistered = (theme: string) => { - const currentTheme = getTheme(); - if (booted && theme === currentTheme) { - applyTheme(currentTheme); + if (booted && theme === getTheme()) { // getTheme should only be called if "booted" is true + applyTheme(getTheme()); } }; diff --git a/packages/base/src/Keys.ts b/packages/base/src/Keys.ts index 796c84527b22..fb7c2ee3d4c8 100644 --- a/packages/base/src/Keys.ts +++ b/packages/base/src/Keys.ts @@ -206,6 +206,10 @@ const isShow = (event: KeyboardEvent): boolean => { return (event.keyCode === KeyCodes.F4 && !hasModifierKeys(event)) || (event.keyCode === KeyCodes.ARROW_DOWN && checkModifierKeys(event, /* Ctrl */ false, /* Alt */ true, /* Shift */ false)); }; +const isF2 = (event: KeyboardEvent): boolean => { + return event.key === "F2" && !hasModifierKeys(event); +}; + const isF4 = (event: KeyboardEvent): boolean => { return event.key === "F4" && !hasModifierKeys(event); }; @@ -282,6 +286,7 @@ export { isBackSpace, isDelete, isShow, + isF2, isF4, isF4Shift, isF6Previous, diff --git a/packages/base/src/config/Theme.ts b/packages/base/src/config/Theme.ts index a3e3d8cc0467..34c8a26ee9ab 100644 --- a/packages/base/src/config/Theme.ts +++ b/packages/base/src/config/Theme.ts @@ -3,7 +3,7 @@ import { reRenderAllUI5Elements } from "../Render.js"; import applyTheme from "../theming/applyTheme.js"; import getThemeDesignerTheme from "../theming/getThemeDesignerTheme.js"; import { DEFAULT_THEME, SUPPORTED_THEMES } from "../generated/AssetParameters.js"; -import { isBooted } from "../Boot.js"; +import { boot, isBooted } from "../Boot.js"; let curTheme: string; @@ -80,6 +80,11 @@ const isLegacyThemeFamily = () => { return !currentTheme.startsWith("sap_horizon"); }; +const isLegacyThemeFamilyAsync = async () => { + await boot(); + return isLegacyThemeFamily(); +}; + const isKnownTheme = (theme: string) => SUPPORTED_THEMES.includes(theme); export { @@ -87,5 +92,6 @@ export { setTheme, isTheme, isLegacyThemeFamily, + isLegacyThemeFamilyAsync, getDefaultTheme, }; diff --git a/packages/create-package/CHANGELOG.md b/packages/create-package/CHANGELOG.md index f1d2da683405..17555c365515 100644 --- a/packages/create-package/CHANGELOG.md +++ b/packages/create-package/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-rc.2](https://github.com/SAP/ui5-webcomponents/compare/v2.0.0-rc.1...v2.0.0-rc.2) (2024-04-18) + +**Note:** Version bump only for package @ui5/create-webcomponents-package + + + + + # [2.0.0-rc.1](https://github.com/SAP/ui5-webcomponents/compare/v2.0.0-rc.0...v2.0.0-rc.1) (2024-04-11) **Note:** Version bump only for package @ui5/create-webcomponents-package diff --git a/packages/create-package/package.json b/packages/create-package/package.json index a67366dca538..f51ef00762e5 100644 --- a/packages/create-package/package.json +++ b/packages/create-package/package.json @@ -1,6 +1,6 @@ { "name": "@ui5/create-webcomponents-package", - "version": "2.0.0-rc.1", + "version": "2.0.0-rc.2", "description": "UI5 Web Components: create package", "author": "SAP SE (https://www.sap.com)", "license": "Apache-2.0", diff --git a/packages/fiori/CHANGELOG.md b/packages/fiori/CHANGELOG.md index cf8d00e0d8ee..53be60d9b3e0 100644 --- a/packages/fiori/CHANGELOG.md +++ b/packages/fiori/CHANGELOG.md @@ -3,6 +3,25 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-rc.2](https://github.com/SAP/ui5-webcomponents/compare/v2.0.0-rc.1...v2.0.0-rc.2) (2024-04-18) + + +### Bug Fixes + +* **ui5-shellbar:** aligned specs ([#8694](https://github.com/SAP/ui5-webcomponents/issues/8694)) ([c5ec720](https://github.com/SAP/ui5-webcomponents/commit/c5ec720c8fd362b6fe2f502d473bec5fc4071b38)) +* **ui5-shellbar:** assistant icon color fixed ([#8713](https://github.com/SAP/ui5-webcomponents/issues/8713)) ([e501ac8](https://github.com/SAP/ui5-webcomponents/commit/e501ac8147bb979319a6e055ba98458650884112)) +* **ui5-side-navigation:** import overflow icon ([#8736](https://github.com/SAP/ui5-webcomponents/issues/8736)) ([8bc1bb4](https://github.com/SAP/ui5-webcomponents/commit/8bc1bb4698e71c66e1fb59508e115b9e612912fb)) +* **ui5-side-navigation:** replace items and fixedItems union type with SideNavigationItemBase ([#8740](https://github.com/SAP/ui5-webcomponents/issues/8740)) ([b589486](https://github.com/SAP/ui5-webcomponents/commit/b58948676049565410592700b1796475f1ea94fa)) + + +### Features + +* **ui5-barcode-scanner-dialog:** add support for close and open events ([#8753](https://github.com/SAP/ui5-webcomponents/issues/8753)) ([1ae2142](https://github.com/SAP/ui5-webcomponents/commit/1ae2142aa6ba2c587126e49422724658686d2344)), closes [#8695](https://github.com/SAP/ui5-webcomponents/issues/8695) + + + + + # [2.0.0-rc.1](https://github.com/SAP/ui5-webcomponents/compare/v2.0.0-rc.0...v2.0.0-rc.1) (2024-04-11) diff --git a/packages/fiori/package.json b/packages/fiori/package.json index e82e26fff5da..826f4668a7a5 100644 --- a/packages/fiori/package.json +++ b/packages/fiori/package.json @@ -1,6 +1,6 @@ { "name": "@ui5/webcomponents-fiori", - "version": "2.0.0-rc.1", + "version": "2.0.0-rc.2", "description": "UI5 Web Components: webcomponents.fiori", "ui5": { "webComponentsPackage": true @@ -46,14 +46,14 @@ "directory": "packages/fiori" }, "dependencies": { - "@ui5/webcomponents": "2.0.0-rc.1", - "@ui5/webcomponents-base": "2.0.0-rc.1", - "@ui5/webcomponents-icons": "2.0.0-rc.1", - "@ui5/webcomponents-theming": "2.0.0-rc.1", + "@ui5/webcomponents": "2.0.0-rc.2", + "@ui5/webcomponents-base": "2.0.0-rc.2", + "@ui5/webcomponents-icons": "2.0.0-rc.2", + "@ui5/webcomponents-theming": "2.0.0-rc.2", "@zxing/library": "^0.17.1" }, "devDependencies": { - "@ui5/webcomponents-tools": "2.0.0-rc.1", - "chromedriver": "^122.0.6" + "@ui5/webcomponents-tools": "2.0.0-rc.2", + "chromedriver": "^123.0.3" } } diff --git a/packages/fiori/src/ViewSettingsDialog.hbs b/packages/fiori/src/ViewSettingsDialog.hbs index e6cf95712680..abdf133fbe84 100644 --- a/packages/fiori/src/ViewSettingsDialog.hbs +++ b/packages/fiori/src/ViewSettingsDialog.hbs @@ -58,21 +58,23 @@ @ui5-item-click="{{_onSortOrderChange}}" sort-order accessible-name-ref="{{_id}}-label"> - {{_sortOrderLabel}} + {{#each _currentSettings.sortOrder}} {{this.text}} {{/each}} + - {{_sortByLabel}} + {{#each _currentSettings.sortBy}} {{this.text}} {{/each}} + {{/if}} @@ -96,12 +98,13 @@ {{else}} - {{_filterByLabel}} + {{#each filterItems}} {{this.text}} {{/each}} + {{/if}} {{/if}} diff --git a/packages/fiori/src/ViewSettingsDialog.ts b/packages/fiori/src/ViewSettingsDialog.ts index 2635eb92da7a..5c4138bc566e 100644 --- a/packages/fiori/src/ViewSettingsDialog.ts +++ b/packages/fiori/src/ViewSettingsDialog.ts @@ -11,7 +11,7 @@ import type { ChangeInfo } from "@ui5/webcomponents-base/dist/UI5Element.js"; import Dialog from "@ui5/webcomponents/dist/Dialog.js"; import Button from "@ui5/webcomponents/dist/Button.js"; import Label from "@ui5/webcomponents/dist/Label.js"; -import GroupHeaderListItem from "@ui5/webcomponents/dist/GroupHeaderListItem.js"; +import ListItemGroup from "@ui5/webcomponents/dist/ListItemGroup.js"; import List from "@ui5/webcomponents/dist/List.js"; import type { ListItemClickEventDetail } from "@ui5/webcomponents/dist/List.js"; import StandardListItem from "@ui5/webcomponents/dist/StandardListItem.js"; @@ -114,7 +114,7 @@ type VSDInternalSettings = { Label, List, StandardListItem, - GroupHeaderListItem, + ListItemGroup, SegmentedButton, SegmentedButtonItem, ], diff --git a/packages/fiori/src/i18n/messagebundle_et.properties b/packages/fiori/src/i18n/messagebundle_et.properties index 51325d5c29bd..a58ebf73146e 100644 --- a/packages/fiori/src/i18n/messagebundle_et.properties +++ b/packages/fiori/src/i18n/messagebundle_et.properties @@ -270,4 +270,4 @@ SIDE_NAVIGATION_LIST_ITEMS_ARIA_ROLE_DESC=Navigeerimisloendi puuelement SIDE_NAVIGATION_OVERFLOW_ACCESSIBLE_NAME=Rohkem üksuseid -SIDE_NAVIGATION_GROUP_HEADER_DESC=Grupipäis +SIDE_NAVIGATION_GROUP_HEADER_DESC=Jaotise päis diff --git a/packages/fiori/src/themes/ViewSettingsDialog.css b/packages/fiori/src/themes/ViewSettingsDialog.css index 985ccdc4d9f7..11abe3338609 100644 --- a/packages/fiori/src/themes/ViewSettingsDialog.css +++ b/packages/fiori/src/themes/ViewSettingsDialog.css @@ -65,7 +65,7 @@ height: 100%; } -[ui5-li-groupheader] { +[ui5-li-group]::part(header) { overflow: hidden; } diff --git a/packages/icons-business-suite/CHANGELOG.md b/packages/icons-business-suite/CHANGELOG.md index da6124535d07..5a24ed1f89f9 100644 --- a/packages/icons-business-suite/CHANGELOG.md +++ b/packages/icons-business-suite/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-rc.2](https://github.com/SAP/ui5-webcomponents/compare/v2.0.0-rc.1...v2.0.0-rc.2) (2024-04-18) + +**Note:** Version bump only for package @ui5/webcomponents-icons-business-suite + + + + + # [2.0.0-rc.1](https://github.com/SAP/ui5-webcomponents/compare/v2.0.0-rc.0...v2.0.0-rc.1) (2024-04-11) **Note:** Version bump only for package @ui5/webcomponents-icons-business-suite diff --git a/packages/icons-business-suite/package.json b/packages/icons-business-suite/package.json index 986eaff97ae5..cc323b33a5a5 100644 --- a/packages/icons-business-suite/package.json +++ b/packages/icons-business-suite/package.json @@ -1,6 +1,6 @@ { "name": "@ui5/webcomponents-icons-business-suite", - "version": "2.0.0-rc.1", + "version": "2.0.0-rc.2", "description": "UI5 Web Components: SAP Fiori Tools icon set", "author": "SAP SE (https://www.sap.com)", "license": "Apache-2.0", @@ -28,9 +28,9 @@ "directory": "packages/icons-business-suite" }, "dependencies": { - "@ui5/webcomponents-base": "2.0.0-rc.1" + "@ui5/webcomponents-base": "2.0.0-rc.2" }, "devDependencies": { - "@ui5/webcomponents-tools": "2.0.0-rc.1" + "@ui5/webcomponents-tools": "2.0.0-rc.2" } } diff --git a/packages/icons-tnt/CHANGELOG.md b/packages/icons-tnt/CHANGELOG.md index 565dfaeda610..656fb89083c5 100644 --- a/packages/icons-tnt/CHANGELOG.md +++ b/packages/icons-tnt/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-rc.2](https://github.com/SAP/ui5-webcomponents/compare/v2.0.0-rc.1...v2.0.0-rc.2) (2024-04-18) + +**Note:** Version bump only for package @ui5/webcomponents-icons-tnt + + + + + # [2.0.0-rc.1](https://github.com/SAP/ui5-webcomponents/compare/v2.0.0-rc.0...v2.0.0-rc.1) (2024-04-11) **Note:** Version bump only for package @ui5/webcomponents-icons-tnt diff --git a/packages/icons-tnt/package.json b/packages/icons-tnt/package.json index 3d677d765fbe..ea479bc89176 100644 --- a/packages/icons-tnt/package.json +++ b/packages/icons-tnt/package.json @@ -1,6 +1,6 @@ { "name": "@ui5/webcomponents-icons-tnt", - "version": "2.0.0-rc.1", + "version": "2.0.0-rc.2", "description": "UI5 Web Components: SAP Fiori Tools icon set", "author": "SAP SE (https://www.sap.com)", "license": "Apache-2.0", @@ -28,9 +28,9 @@ "directory": "packages/icons-tnt" }, "dependencies": { - "@ui5/webcomponents-base": "2.0.0-rc.1" + "@ui5/webcomponents-base": "2.0.0-rc.2" }, "devDependencies": { - "@ui5/webcomponents-tools": "2.0.0-rc.1" + "@ui5/webcomponents-tools": "2.0.0-rc.2" } } diff --git a/packages/icons/CHANGELOG.md b/packages/icons/CHANGELOG.md index ce967ae7e6fa..b2c9cdfeff6c 100644 --- a/packages/icons/CHANGELOG.md +++ b/packages/icons/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-rc.2](https://github.com/SAP/ui5-webcomponents/compare/v2.0.0-rc.1...v2.0.0-rc.2) (2024-04-18) + +**Note:** Version bump only for package @ui5/webcomponents-icons + + + + + # [2.0.0-rc.1](https://github.com/SAP/ui5-webcomponents/compare/v2.0.0-rc.0...v2.0.0-rc.1) (2024-04-11) **Note:** Version bump only for package @ui5/webcomponents-icons diff --git a/packages/icons/package.json b/packages/icons/package.json index b4f910201c1d..a39991f3c265 100644 --- a/packages/icons/package.json +++ b/packages/icons/package.json @@ -1,6 +1,6 @@ { "name": "@ui5/webcomponents-icons", - "version": "2.0.0-rc.1", + "version": "2.0.0-rc.2", "description": "UI5 Web Components: webcomponents.SAP-icons", "author": "SAP SE (https://www.sap.com)", "license": "Apache-2.0", @@ -28,9 +28,9 @@ "directory": "packages/icons" }, "dependencies": { - "@ui5/webcomponents-base": "2.0.0-rc.1" + "@ui5/webcomponents-base": "2.0.0-rc.2" }, "devDependencies": { - "@ui5/webcomponents-tools": "2.0.0-rc.1" + "@ui5/webcomponents-tools": "2.0.0-rc.2" } } diff --git a/packages/localization/CHANGELOG.md b/packages/localization/CHANGELOG.md index 6c50c50c912b..9408594fcc8b 100644 --- a/packages/localization/CHANGELOG.md +++ b/packages/localization/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-rc.2](https://github.com/SAP/ui5-webcomponents/compare/v2.0.0-rc.1...v2.0.0-rc.2) (2024-04-18) + +**Note:** Version bump only for package @ui5/webcomponents-localization + + + + + # [2.0.0-rc.1](https://github.com/SAP/ui5-webcomponents/compare/v2.0.0-rc.0...v2.0.0-rc.1) (2024-04-11) **Note:** Version bump only for package @ui5/webcomponents-localization diff --git a/packages/localization/package.json b/packages/localization/package.json index cc98fba4aa58..7ee48461d74d 100644 --- a/packages/localization/package.json +++ b/packages/localization/package.json @@ -1,6 +1,6 @@ { "name": "@ui5/webcomponents-localization", - "version": "2.0.0-rc.1", + "version": "2.0.0-rc.2", "description": "Localization for UI5 Web Components", "author": "SAP SE (https://www.sap.com)", "license": "Apache-2.0", @@ -33,15 +33,15 @@ "@babel/generator": "^7.23.6", "@babel/parser": "^7.23.6", "@openui5/sap.ui.core": "1.120.5", - "@ui5/webcomponents-tools": "2.0.0-rc.1", + "@ui5/webcomponents-tools": "2.0.0-rc.2", "babel-plugin-amd-to-esm": "^2.0.3", - "chromedriver": "^122.0.6", + "chromedriver": "^123.0.3", "estree-walk": "^2.2.0", "mkdirp": "^1.0.4", "resolve": "^1.20.0" }, "dependencies": { "@types/openui5": "^1.113.0", - "@ui5/webcomponents-base": "2.0.0-rc.1" + "@ui5/webcomponents-base": "2.0.0-rc.2" } } diff --git a/packages/main/CHANGELOG.md b/packages/main/CHANGELOG.md index 794fe8204fa6..55298e9fe4f0 100644 --- a/packages/main/CHANGELOG.md +++ b/packages/main/CHANGELOG.md @@ -3,6 +3,51 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +# [2.0.0-rc.2](https://github.com/SAP/ui5-webcomponents/compare/v2.0.0-rc.1...v2.0.0-rc.2) (2024-04-18) + + +### Bug Fixes + +* **u5-dialog:** soft keyboard is correctly opened on iOS devices ([#8583](https://github.com/SAP/ui5-webcomponents/issues/8583)) ([6cf1d74](https://github.com/SAP/ui5-webcomponents/commit/6cf1d746e59352430d0d086cf0814dc7ce7fdb9c)) +* **ui5-calendar, ui5-daterange-picker:** align range selection styling with vd specification ([#8585](https://github.com/SAP/ui5-webcomponents/issues/8585)) ([d4f0e0e](https://github.com/SAP/ui5-webcomponents/commit/d4f0e0e93bc9dcd9c4261b2c3eed37cf4f85435f)) +* **ui5-menu-item:** apply scoping to internal `Icon` ([#8751](https://github.com/SAP/ui5-webcomponents/issues/8751)) ([ce55755](https://github.com/SAP/ui5-webcomponents/commit/ce55755c05a5588759d751da9749dbde0bbba722)) +* **ui5-progress-indicator:** hidden value design ([#8545](https://github.com/SAP/ui5-webcomponents/issues/8545)) ([bf094d3](https://github.com/SAP/ui5-webcomponents/commit/bf094d3df92311d7d051b10aff8167b832e84d26)) +* **ui5-responsive-popover:** fix dialog initial focus ([#8774](https://github.com/SAP/ui5-webcomponents/issues/8774)) ([27b522f](https://github.com/SAP/ui5-webcomponents/commit/27b522f145d21be814cc5f02ee74674c8e3db745)) +* **ui5-split-button:** add correct opacity when disabled ([#8738](https://github.com/SAP/ui5-webcomponents/issues/8738)) ([399144e](https://github.com/SAP/ui5-webcomponents/commit/399144e8b186dd61d2eb23ed42e5050335e5ecd7)), closes [#8615](https://github.com/SAP/ui5-webcomponents/issues/8615) +* **ui5-tabcontainer:** prevent endless resizing when moving after last overflow item ([#8725](https://github.com/SAP/ui5-webcomponents/issues/8725)) ([c33ba40](https://github.com/SAP/ui5-webcomponents/commit/c33ba404c559109a2dfe2166722f03f2c5c6b691)) +* **ui5-tabcontainer:** replace default slot union type with interface ([#8734](https://github.com/SAP/ui5-webcomponents/issues/8734)) ([ac6b44f](https://github.com/SAP/ui5-webcomponents/commit/ac6b44f9eaeb1604f1bbd4ae6f37e6dec817c1ef)) + + +### Code Refactoring + +* **ui5-multi-combobox:** rename property allowCustomValues to noValidation ([#8765](https://github.com/SAP/ui5-webcomponents/issues/8765)) ([bb27acb](https://github.com/SAP/ui5-webcomponents/commit/bb27acbc2f8321219d99c7732d8536a00ae38272)) +* **ui5-textarea:** rename property growingMaxLines to growingMaxRows ([#8756](https://github.com/SAP/ui5-webcomponents/issues/8756)) ([3fd33ab](https://github.com/SAP/ui5-webcomponents/commit/3fd33aba0164e0a5c06bd44d057157a1dd54b522)), closes [#8461](https://github.com/SAP/ui5-webcomponents/issues/8461) + + +### Features + +* **ui5-avatar-group:** update focus handling ([#8550](https://github.com/SAP/ui5-webcomponents/issues/8550)) ([0bb5c9d](https://github.com/SAP/ui5-webcomponents/commit/0bb5c9d8632092d875fa6333d817475aa73f1e71)), closes [#8320](https://github.com/SAP/ui5-webcomponents/issues/8320) +* **ui5-date-*:** adapt date and time controls to timezone feature ([#8610](https://github.com/SAP/ui5-webcomponents/issues/8610)) ([1acae01](https://github.com/SAP/ui5-webcomponents/commit/1acae010eb81f4d50368587b66c8840bdf886d04)), closes [#8461](https://github.com/SAP/ui5-webcomponents/issues/8461) +* **ui5-li:** add support for F2 key ([#8619](https://github.com/SAP/ui5-webcomponents/issues/8619)) ([24c3807](https://github.com/SAP/ui5-webcomponents/commit/24c380758f88b3f66dce46e2f57297634b42a85a)), closes [#7736](https://github.com/SAP/ui5-webcomponents/issues/7736) +* **ui5-link:** introduce `tooltip` property ([#8670](https://github.com/SAP/ui5-webcomponents/issues/8670)) ([ef64000](https://github.com/SAP/ui5-webcomponents/commit/ef640006e466a9a3e01bb9d241c3a3fc2962d8d0)) +* **ui5-message-strip:** introduce custom colors ([#8757](https://github.com/SAP/ui5-webcomponents/issues/8757)) ([d30f424](https://github.com/SAP/ui5-webcomponents/commit/d30f4240df5922888854d027dfcff732b5316ccc)) + + +### BREAKING CHANGES + +* **ui5-multi-combobox:** The `allowCustomValues` property have been renamed to `noValidation`. +If you have previously used the `allowCustomValues` property +`` +Now use noValidation instead: +`` + +Related to: https://github.com/SAP/ui5-webcomponents/issues/8461 +* **ui5-textarea:** The `growingMaxLines` property have been renamed to `growingMaxRows`. + + + + + # [2.0.0-rc.1](https://github.com/SAP/ui5-webcomponents/compare/v2.0.0-rc.0...v2.0.0-rc.1) (2024-04-11) diff --git a/packages/main/README.md b/packages/main/README.md index a9264a37aee4..044cdcd7d018 100644 --- a/packages/main/README.md +++ b/packages/main/README.md @@ -45,7 +45,7 @@ Provides general purpose UI building blocks such as buttons, labels, inputs and | List | `ui5-list` | `import "@ui5/webcomponents/dist/List.js";` | | List - Standard Item | `ui5-li` | `import "@ui5/webcomponents/dist/StandardListItem.js";` | | List - Custom Item | `ui5-li-custom` | `import "@ui5/webcomponents/dist/CustomListItem.js";` | -| List - Group Header Item | `ui5-li-groupheader` | `import "@ui5/webcomponents/dist/GroupHeaderListItem.js";` | +| List - Group Item | `ui5-li-group` | `import "@ui5/webcomponents/dist/ListItemGroup.js";` | | Menu | `ui5-menu ` | `import "@ui5/webcomponents/dist/Menu.js";` | | Message Strip | `ui5-message-strip` | `import "@ui5/webcomponents/dist/MessageStrip.js";` | | Multi ComboBox | `ui5-multi-combobox` | `import "@ui5/webcomponents/dist/MultiComboBox.js";` | diff --git a/packages/main/package.json b/packages/main/package.json index ec314212836e..a368283e74d5 100644 --- a/packages/main/package.json +++ b/packages/main/package.json @@ -1,6 +1,6 @@ { "name": "@ui5/webcomponents", - "version": "2.0.0-rc.1", + "version": "2.0.0-rc.2", "description": "UI5 Web Components: webcomponents.main", "ui5": { "webComponentsPackage": true @@ -48,15 +48,15 @@ "directory": "packages/main" }, "dependencies": { - "@ui5/webcomponents-base": "2.0.0-rc.1", - "@ui5/webcomponents-icons": "2.0.0-rc.1", - "@ui5/webcomponents-icons-business-suite": "2.0.0-rc.1", - "@ui5/webcomponents-icons-tnt": "2.0.0-rc.1", - "@ui5/webcomponents-localization": "2.0.0-rc.1", - "@ui5/webcomponents-theming": "2.0.0-rc.1" + "@ui5/webcomponents-base": "2.0.0-rc.2", + "@ui5/webcomponents-icons": "2.0.0-rc.2", + "@ui5/webcomponents-icons-business-suite": "2.0.0-rc.2", + "@ui5/webcomponents-icons-tnt": "2.0.0-rc.2", + "@ui5/webcomponents-localization": "2.0.0-rc.2", + "@ui5/webcomponents-theming": "2.0.0-rc.2" }, "devDependencies": { - "@ui5/webcomponents-tools": "2.0.0-rc.1", - "chromedriver": "^122.0.6" + "@ui5/webcomponents-tools": "2.0.0-rc.2", + "chromedriver": "^123.0.3" } } diff --git a/packages/main/src/Badge.ts b/packages/main/src/Badge.ts index 5795d045a082..b736e1091c0e 100644 --- a/packages/main/src/Badge.ts +++ b/packages/main/src/Badge.ts @@ -79,11 +79,11 @@ import badgeCss from "./generated/themes/Badge.css.js"; class Badge extends UI5Element { /** * Defines the design type of the component. - * @default "Set3" + * @default "Neutral" * @public * @since 1.22.0 */ - @property({ defaultValue: BadgeDesign.Set3 }) + @property({ defaultValue: BadgeDesign.Neutral }) design!: `${BadgeDesign}`; /** diff --git a/packages/main/src/Carousel.ts b/packages/main/src/Carousel.ts index ecd6f9c84e1a..d5e829934cac 100644 --- a/packages/main/src/Carousel.ts +++ b/packages/main/src/Carousel.ts @@ -56,7 +56,7 @@ type CarouselNavigateEventDetail = { * * There are several ways to perform navigation: * - * - on desktop - the user can navigate using the navigation arrows or with keyboard shorcuts. + * - on desktop - the user can navigate using the navigation arrows or with keyboard shortcuts. * - on mobile - the user can use swipe gestures. * * ### Usage @@ -110,7 +110,7 @@ type CarouselNavigateEventDetail = { /** * Fired whenever the page changes due to user interaction, * when the user clicks on the navigation arrows or while resizing, - * based on the `items-per-page-l`, `items-per-page-m` and `items-per-page-s` properties. + * based on the `items-per-page` property. * @param {Integer} selectedIndex the current selected index * @public * @since 1.0.0-rc.7 @@ -152,28 +152,19 @@ class Carousel extends UI5Element { cyclic!: boolean; /** - * Defines the number of items per page on small size (up to 640px). One item per page shown by default. - * @default 1 - * @public - */ - @property({ validator: Integer, defaultValue: 1 }) - itemsPerPageS!: number; - - /** - * Defines the number of items per page on medium size (from 640px to 1024px). One item per page shown by default. - * @default 1 - * @public - */ - @property({ validator: Integer, defaultValue: 1 }) - itemsPerPageM!: number; - - /** - * Defines the number of items per page on large size (more than 1024px). One item per page shown by default. - * @default 1 + * Defines the number of items per page depending on the carousel width. + * + * - 'S' for screens smaller than 600 pixels. + * - 'M' for screens greater than or equal to 600 pixels and smaller than 1024 pixels. + * - 'L' for screens greater than or equal to 1024 pixels and smaller than 1440 pixels. + * - 'XL' for screens greater than or equal to 1440 pixels. + * + * One item per page is shown by default. + * @default "S1 M1 L1 XL1" * @public */ - @property({ validator: Integer, defaultValue: 1 }) - itemsPerPageL!: number; + @property({ type: String, defaultValue: "S1 M1 L1 XL1" }) + itemsPerPage!: string; /** * Defines the visibility of the navigation arrows. @@ -549,19 +540,41 @@ class Carousel extends UI5Element { } get effectiveItemsPerPage(): number { + const itemsPerPageArray = this.itemsPerPage.split(" "); + let itemsPerPageSizeS = 1, + itemsPerPageSizeM = 1, + itemsPerPageSizeL = 1, + itemsPerPageSizeXL = 1; + + itemsPerPageArray.forEach(element => { + if (element.startsWith("S")) { + itemsPerPageSizeS = Number(element.slice(1)) || 1; + } else if (element.startsWith("M")) { + itemsPerPageSizeM = Number(element.slice(1)) || 1; + } else if (element.startsWith("L")) { + itemsPerPageSizeL = Number(element.slice(1)) || 1; + } else if (element.startsWith("XL")) { + itemsPerPageSizeXL = Number(element.slice(2)) || 1; + } + }); + if (!this._width) { - return this.itemsPerPageL; + return itemsPerPageSizeL; + } + + if (this._width < 600) { + return itemsPerPageSizeS; } - if (this._width <= 640) { - return this.itemsPerPageS; + if (this._width >= 600 && this._width < 1024) { + return itemsPerPageSizeM; } - if (this._width <= 1024) { - return this.itemsPerPageM; + if (this._width >= 1024 && this._width < 1440) { + return itemsPerPageSizeL; } - return this.itemsPerPageL; + return itemsPerPageSizeXL; } isItemInViewport(index: number): boolean { diff --git a/packages/main/src/ComboBox.ts b/packages/main/src/ComboBox.ts index b1b2c1e57724..609d3a91cb5a 100644 --- a/packages/main/src/ComboBox.ts +++ b/packages/main/src/ComboBox.ts @@ -76,7 +76,7 @@ import BusyIndicator from "./BusyIndicator.js"; import Button from "./Button.js"; import StandardListItem from "./StandardListItem.js"; import ComboBoxGroupItem from "./ComboBoxGroupItem.js"; -import GroupHeaderListItem from "./GroupHeaderListItem.js"; +import ListItemGroupHeader from "./ListItemGroupHeader.js"; import ComboBoxFilter from "./types/ComboBoxFilter.js"; import type FormSupportT from "./features/InputElementsFormSupport.js"; import PopoverHorizontalAlign from "./types/PopoverHorizontalAlign.js"; @@ -173,7 +173,7 @@ type ComboBoxSelectionChangeEventDetail = { BusyIndicator, Button, StandardListItem, - GroupHeaderListItem, + ListItemGroupHeader, Popover, ComboBoxGroupItem, Input, diff --git a/packages/main/src/ComboBoxPopover.hbs b/packages/main/src/ComboBoxPopover.hbs index de2e642b64b0..46ff802245ce 100644 --- a/packages/main/src/ComboBoxPopover.hbs +++ b/packages/main/src/ComboBoxPopover.hbs @@ -70,7 +70,7 @@ > {{#each _filteredItems}} {{#if isGroupItem}} - {{ this.text }} + {{ this.text }} {{else}} {{> listItem}} {{/if}} diff --git a/packages/main/src/CustomListItem.ts b/packages/main/src/CustomListItem.ts index e2f8e6f2fef5..73c0b44f4f82 100644 --- a/packages/main/src/CustomListItem.ts +++ b/packages/main/src/CustomListItem.ts @@ -1,4 +1,4 @@ -import { isTabNext, isTabPrevious } from "@ui5/webcomponents-base/dist/Keys.js"; +import { isTabNext, isTabPrevious, isF2 } from "@ui5/webcomponents-base/dist/Keys.js"; import type { ClassMap } from "@ui5/webcomponents-base/dist/types.js"; import customElement from "@ui5/webcomponents-base/dist/decorators/customElement.js"; import property from "@ui5/webcomponents-base/dist/decorators/property.js"; @@ -43,14 +43,14 @@ class CustomListItem extends ListItem { @property() declare accessibleName: string; - _onkeydown(e: KeyboardEvent) { + async _onkeydown(e: KeyboardEvent) { const isTab = isTabNext(e) || isTabPrevious(e); - if (!isTab && !this.focused) { + if (!isTab && !this.focused && !isF2(e)) { return; } - super._onkeydown(e); + await super._onkeydown(e); } _onkeyup(e: KeyboardEvent) { diff --git a/packages/main/src/Icon.hbs b/packages/main/src/Icon.hbs index f61e443d878d..07a98c2da017 100644 --- a/packages/main/src/Icon.hbs +++ b/packages/main/src/Icon.hbs @@ -10,8 +10,6 @@ aria-label="{{effectiveAccessibleName}}" aria-hidden={{effectiveAriaHidden}} xmlns="http://www.w3.org/2000/svg" - @focusin={{_onfocusin}} - @focusout={{_onfocusout}} @keydown={{_onkeydown}} @keyup={{_onkeyup}} > diff --git a/packages/main/src/Icon.ts b/packages/main/src/Icon.ts index c008d1431577..9310f9101488 100644 --- a/packages/main/src/Icon.ts +++ b/packages/main/src/Icon.ts @@ -6,6 +6,7 @@ import property from "@ui5/webcomponents-base/dist/decorators/property.js"; import { getIconData, getIconDataSync, IconData } from "@ui5/webcomponents-base/dist/asset-registries/Icons.js"; import { getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js"; import type { I18nText } from "@ui5/webcomponents-base/dist/i18nBundle.js"; +import { isDesktop } from "@ui5/webcomponents-base/dist/Device.js"; import { isSpace, isEnter } from "@ui5/webcomponents-base/dist/Keys.js"; import executeTemplate from "@ui5/webcomponents-base/dist/renderer/executeTemplate.js"; import IconTemplate from "./generated/templates/IconTemplate.lit.js"; @@ -208,12 +209,6 @@ class Icon extends UI5Element implements IIcon { @property({ type: Object, defaultValue: undefined, noAttribute: true }) accData?: I18nText; - /** - * @private - */ - @property({ type: Boolean }) - focused!: boolean; - /** * @private */ @@ -231,19 +226,6 @@ class Icon extends UI5Element implements IIcon { viewBox?: string; customSvg?: object; - _onfocusout?: ((event: FocusEvent) => void); - _onfocusin?: ((event: FocusEvent) => void); - - _onFocusInHandler() { - if (this.interactive) { - this.focused = true; - } - } - - _onFocusOutHandler() { - this.focused = false; - } - _onkeydown(e: KeyboardEvent) { if (!this.interactive) { return; @@ -303,6 +285,12 @@ class Icon extends UI5Element implements IIcon { return this.effectiveAccessibleName ? "img" : PRESENTATION_ROLE; } + onEnterDOM() { + if (isDesktop()) { + this.setAttribute("desktop", ""); + } + } + async onBeforeRendering() { const name = this.name; if (!name) { @@ -341,9 +329,6 @@ class Icon extends UI5Element implements IIcon { this.ltr = iconData.ltr; this.packageName = iconData.packageName; - this._onfocusout = this.interactive ? this._onFocusOutHandler.bind(this) : undefined; - this._onfocusin = this.interactive ? this._onFocusInHandler.bind(this) : undefined; - if (this.accessibleName) { this.effectiveAccessibleName = this.accessibleName; } else if (this.accData) { diff --git a/packages/main/src/Input.ts b/packages/main/src/Input.ts index 76e0aa3a8e6d..76317cea7fe9 100644 --- a/packages/main/src/Input.ts +++ b/packages/main/src/Input.ts @@ -937,6 +937,7 @@ class Input extends UI5Element implements SuggestionComponent, IFormElement { } this._openSuggestionsPopover = false; + this.open = false; this._clearPopoverFocusAndSelection(); if (!this._clearIconClicked) { diff --git a/packages/main/src/InputPopover.hbs b/packages/main/src/InputPopover.hbs index 00419f05d33c..a7cabaafdf97 100644 --- a/packages/main/src/InputPopover.hbs +++ b/packages/main/src/InputPopover.hbs @@ -96,7 +96,7 @@ {{#each suggestionObjects}} {{#if groupItem}} - {{{ this.text }}} + {{{ this.text }}} {{else}} ; + items!: Array; /** * Defines the component header. @@ -459,6 +460,11 @@ class List extends UI5Element { _beforeElement?: HTMLElement | null; _afterElement?: HTMLElement | null; + onItemFocusedBound: (e: CustomEvent) => void; + onForwardAfterBound: (e: CustomEvent) => void; + onForwardBeforeBound: (e: CustomEvent) => void; + onItemTabIndexChangeBound: (e: CustomEvent) => void; + static async onDefine() { List.i18nBundle = await getI18nBundle("@ui5/webcomponents"); } @@ -490,6 +496,21 @@ class List extends UI5Element { // Indicates the List bottom most part has been detected by the IntersectionObserver // for the first time. this.initialIntersection = true; + + this.onItemFocusedBound = this.onItemFocused.bind(this); + this.onForwardAfterBound = this.onForwardAfter.bind(this); + this.onForwardBeforeBound = this.onForwardBefore.bind(this); + this.onItemTabIndexChangeBound = this.onItemTabIndexChange.bind(this); + } + + /** + * Returns an array containing the list item instances without the groups in a flat structure. + * @default [] + * @since 2.0.0 + * @public + */ + get listItems(): ListItemBase[] { + return this.getItems(); } onEnterDOM() { @@ -504,10 +525,12 @@ class List extends UI5Element { } onBeforeRendering() { + this.detachGroupHeaderEvents(); this.prepareListItems(); } onAfterRendering() { + this.attachGroupHeaderEvents(); if (this.growsOnScroll) { this.observeListEnd(); } else if (this.listEndObserved) { @@ -520,6 +543,30 @@ class List extends UI5Element { } } + attachGroupHeaderEvents() { + // events fired by the group headers are not bubbling through the shadow + // dom of the groups because of capture: false of the custom events + this.getItems().forEach(item => { + if (item.hasAttribute("ui5-li-group-header")) { + item.addEventListener("ui5-_focused", this.onItemFocusedBound as EventListener); + item.addEventListener("ui5-_forward-after", this.onForwardAfterBound as EventListener); + item.addEventListener("ui5-_forward-before", this.onForwardBeforeBound as EventListener); + item.addEventListener("ui5-_tabindex-change", this.onItemTabIndexChangeBound as EventListener); + } + }); + } + + detachGroupHeaderEvents() { + this.getItems().forEach(item => { + if (item.hasAttribute("ui5-li-group-header")) { + item.removeEventListener("ui5-_focused", this.onItemFocusedBound as EventListener); + item.removeEventListener("ui5-_forward-after", this.onForwardAfterBound as EventListener); + item.removeEventListener("ui5-_forward-before", this.onForwardBeforeBound as EventListener); + item.removeEventListener("ui5-_tabindex-change", this.onItemTabIndexChangeBound as EventListener); + } + }); + } + attachForResize() { if (!this.resizeListenerAttached) { this.resizeListenerAttached = true; @@ -766,7 +813,20 @@ class List extends UI5Element { } getItems(): Array { - return this.getSlottedNodes("items"); + // drill down when we see ui5-li-group and get the items + const items: ListItemBase[] = []; + const slottedItems = this.getSlottedNodes("items"); + + slottedItems.forEach(item => { + if (item instanceof ListItemGroup) { + const groupItems = [item.groupHeaderItem, ...item.items].filter(Boolean); + items.push(...groupItems); + } else { + items.push(item); + } + }); + + return items; } getItemsForProcessing(): Array { diff --git a/packages/main/src/ListItem.ts b/packages/main/src/ListItem.ts index 106b8f2bd099..be8fb7d498b0 100644 --- a/packages/main/src/ListItem.ts +++ b/packages/main/src/ListItem.ts @@ -1,6 +1,9 @@ import customElement from "@ui5/webcomponents-base/dist/decorators/customElement.js"; import { getEventMark } from "@ui5/webcomponents-base/dist/MarkedEvents.js"; -import { isSpace, isEnter, isDelete } from "@ui5/webcomponents-base/dist/Keys.js"; +import { + isSpace, isEnter, isDelete, isF2, +} from "@ui5/webcomponents-base/dist/Keys.js"; +import { getFirstFocusableElement } from "@ui5/webcomponents-base/dist/util/FocusableElements.js"; import { getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js"; import type { PassiveEventListenerObject } from "@ui5/webcomponents-base/dist/types.js"; import type I18nBundle from "@ui5/webcomponents-base/dist/i18nBundle.js"; @@ -287,7 +290,7 @@ abstract class ListItem extends ListItemBase { document.removeEventListener("touchend", this.deactivate); } - _onkeydown(e: KeyboardEvent) { + async _onkeydown(e: KeyboardEvent) { super._onkeydown(e); const itemActive = this.type === ListItemType.Active, @@ -304,6 +307,15 @@ abstract class ListItem extends ListItemBase { if (isEnter(e)) { this.fireItemPress(e); } + + if (isF2(e)) { + const focusDomRef = this.getFocusDomRef()!; + if (this.focused) { + (await getFirstFocusableElement(focusDomRef))?.focus(); // start content editing + } else { + focusDomRef.focus(); // stop content editing + } + } } _onkeyup(e: KeyboardEvent) { diff --git a/packages/main/src/ListItemBase.ts b/packages/main/src/ListItemBase.ts index 80a5a6a6deae..8a1001493f2a 100644 --- a/packages/main/src/ListItemBase.ts +++ b/packages/main/src/ListItemBase.ts @@ -16,7 +16,7 @@ import draggableElementStyles from "./generated/themes/DraggableElement.css.js"; /** * @class * A class to serve as a foundation - * for the `ListItem` and `GroupHeaderListItem` classes. + * for the `ListItem` and `ListItemGroupHeader` classes. * @constructor * @abstract * @extends UI5Element diff --git a/packages/main/src/ListItemGroup.hbs b/packages/main/src/ListItemGroup.hbs new file mode 100644 index 000000000000..ddc04efa436c --- /dev/null +++ b/packages/main/src/ListItemGroup.hbs @@ -0,0 +1,12 @@ +
    + {{#if hasHeader}} + + {{#if hasFormattedHeader}} + + {{else}} + {{headerText}} + {{/if}} + + {{/if}} + +
\ No newline at end of file diff --git a/packages/main/src/ListItemGroup.ts b/packages/main/src/ListItemGroup.ts new file mode 100644 index 000000000000..f95250344e38 --- /dev/null +++ b/packages/main/src/ListItemGroup.ts @@ -0,0 +1,91 @@ +import slot from "@ui5/webcomponents-base/dist/decorators/slot.js"; +import property from "@ui5/webcomponents-base/dist/decorators/property.js"; +import customElement from "@ui5/webcomponents-base/dist/decorators/customElement.js"; +import litRender from "@ui5/webcomponents-base/dist/renderer/LitRenderer.js"; +import UI5Element from "@ui5/webcomponents-base/dist/UI5Element.js"; +import ListItemBase from "./ListItemBase.js"; + +// Template +import ListItemGroupTemplate from "./generated/templates/ListItemGroupTemplate.lit.js"; + +// Styles +import ListItemGroupCss from "./generated/themes/ListItemGroup.css.js"; +import StandardListItem from "./StandardListItem.js"; +import ListItemGroupHeader from "./ListItemGroupHeader.js"; + +/** + * @class + * ### Overview + * The `ui5-li-group` is a special list item, used only to create groups of list items. + * + * This is the item to use inside a `ui5-list`. + * + * ### ES6 Module Import + * `import "@ui5/webcomponents/dist/ListItemGroup.js";` + * @csspart header - Used to style the header item of the group + * @constructor + * @extends UI5Element + * @public + * @since 2.0 + */ +@customElement({ + tag: "ui5-li-group", + renderer: litRender, + languageAware: true, + template: ListItemGroupTemplate, + styles: [ListItemGroupCss], + dependencies: [StandardListItem, ListItemGroupHeader], +}) +class ListItemGroup extends UI5Element { + /** + * Defines the header text of the ui5-li-group. + * @public + * @default "" + */ + @property() + headerText!: string; + + /** + * Defines the accessible name of the header. + * @public + * @default "" + */ + @property({ type: String }) + headerAccessibleName!: string; + + /** + * Defines the items of the ui5-li-group. + * @public + */ + @slot({ + "default": true, + invalidateOnChildChange: true, + type: HTMLElement, + }) + items!: Array; + + /** + * Defines the header of the component. + * + * **Note:** Using this slot, the default header text of group and the value of `headerText` property will be overwritten. + * @public + */ + @slot({ type: HTMLElement }) + header!: Array; + + get groupHeaderItem() { + return this.shadowRoot!.querySelector("[ui5-li-group-header]")!; + } + + get hasHeader(): boolean { + return !!this.headerText || this.hasFormattedHeader; + } + + get hasFormattedHeader(): boolean { + return !!this.header.length; + } +} + +ListItemGroup.define(); + +export default ListItemGroup; diff --git a/packages/main/src/GroupHeaderListItem.hbs b/packages/main/src/ListItemGroupHeader.hbs similarity index 100% rename from packages/main/src/GroupHeaderListItem.hbs rename to packages/main/src/ListItemGroupHeader.hbs diff --git a/packages/main/src/GroupHeaderListItem.ts b/packages/main/src/ListItemGroupHeader.ts similarity index 63% rename from packages/main/src/GroupHeaderListItem.ts rename to packages/main/src/ListItemGroupHeader.ts index 26f2e87a2d5e..89af699cb49e 100644 --- a/packages/main/src/GroupHeaderListItem.ts +++ b/packages/main/src/ListItemGroupHeader.ts @@ -7,35 +7,34 @@ import ListItemBase from "./ListItemBase.js"; import { GROUP_HEADER_TEXT } from "./generated/i18n/i18n-defaults.js"; // Template -import GroupHeaderListItemTemplate from "./generated/templates/GroupHeaderListItemTemplate.lit.js"; +import ListItemGroupHeaderTemplate from "./generated/templates/ListItemGroupHeaderTemplate.lit.js"; // Styles -import groupheaderListItemCss from "./generated/themes/GroupHeaderListItem.css.js"; +import ListItemGroupHeaderCss from "./generated/themes/ListItemGroupHeader.css.js"; /** * @class - * The `ui5-li-groupheader` is a special list item, used only to separate other list items into logical groups. + * The `ui5-li-group-header` is a special list item, used only to separate other list items into logical groups. * @slot {Node[]} default - Defines the text of the component. * * **Note:** Although this slot accepts HTML Elements, it is strongly recommended that you only use text in order to preserve the intended design. * @constructor * @extends ListItemBase - * @public + * @private */ @customElement({ - tag: "ui5-li-groupheader", + tag: "ui5-li-group-header", languageAware: true, - template: GroupHeaderListItemTemplate, - styles: [ListItemBase.styles, groupheaderListItemCss], + template: ListItemGroupHeaderTemplate, + styles: [ListItemBase.styles, ListItemGroupHeaderCss], }) -class GroupHeaderListItem extends ListItemBase { +class ListItemGroupHeader extends ListItemBase { /** * Defines the text alternative of the component. * * **Note:** If not provided a default text alternative will be set, if present. * @default "" * @public - * @since 1.0.0-rc.15 */ @property() accessibleName!: string; @@ -47,7 +46,7 @@ class GroupHeaderListItem extends ListItemBase { } get groupHeaderText() { - return GroupHeaderListItem.i18nBundle.getText(GROUP_HEADER_TEXT); + return ListItemGroupHeader.i18nBundle.getText(GROUP_HEADER_TEXT); } get ariaLabelText() { @@ -55,10 +54,10 @@ class GroupHeaderListItem extends ListItemBase { } static async onDefine() { - GroupHeaderListItem.i18nBundle = await getI18nBundle("@ui5/webcomponents"); + ListItemGroupHeader.i18nBundle = await getI18nBundle("@ui5/webcomponents"); } } -GroupHeaderListItem.define(); +ListItemGroupHeader.define(); -export default GroupHeaderListItem; +export default ListItemGroupHeader; diff --git a/packages/main/src/MessageStrip.ts b/packages/main/src/MessageStrip.ts index 5a4ac3f5c420..6ad738686462 100644 --- a/packages/main/src/MessageStrip.ts +++ b/packages/main/src/MessageStrip.ts @@ -25,6 +25,7 @@ import { MESSAGE_STRIP_WARNING, MESSAGE_STRIP_SUCCESS, MESSAGE_STRIP_INFORMATION, + MESSAGE_STRIP_CUSTOM, } from "./generated/i18n/i18n-defaults.js"; // Styles @@ -35,13 +36,8 @@ enum DesignClassesMapping { Positive = "ui5-message-strip-root--positive", Negative = "ui5-message-strip-root--negative", Warning = "ui5-message-strip-root--warning", -} - -enum IconMapping { - Information = "information", - Positive = "sys-enter-2", - Negative = "error", - Warning = "alert", + ColorSet1 = "ui5-message-strip-root--color-set-1", + ColorSet2 = "ui5-message-strip-root--color-set-2", } type DesignTypeAnnouncemnt = Record; @@ -108,9 +104,24 @@ class MessageStrip extends UI5Element { }) design!: `${MessageStripDesign}`; + /** + * Defines the color scheme of the component. + * There are 10 predefined schemes. + * To use one you can set a number from `"1"` to `"10"`. The `colorScheme` `"1"` will be set by default. + * + * @default "1" + * @public + * @since 2.0 + */ + @property({ defaultValue: "1" }) + colorScheme!: string; + /** * Defines whether the MessageStrip will show an icon in the beginning. * You can directly provide an icon with the `icon` slot. Otherwise, the default icon for the type will be used. + * + * * **Note:** If MessageStripDesign.ColorSet1 or MessageStripDesign.ColorSet2 value is set to the design property, default icon will not be presented. + * * @default false * @public * @since 1.0.0-rc.15 @@ -158,6 +169,8 @@ class MessageStrip extends UI5Element { Positive: getTranslation(MESSAGE_STRIP_SUCCESS), Negative: getTranslation(MESSAGE_STRIP_ERROR), Warning: getTranslation(MESSAGE_STRIP_WARNING), + ColorSet1: getTranslation(MESSAGE_STRIP_CUSTOM), + ColorSet2: getTranslation(MESSAGE_STRIP_CUSTOM), }; } @@ -189,7 +202,18 @@ class MessageStrip extends UI5Element { } get standardIconName() { - return IconMapping[this.design]; + switch (this.design) { + case MessageStripDesign.Warning: + return "alert"; + case MessageStripDesign.Positive: + return "sys-enter-2"; + case MessageStripDesign.Negative: + return "error"; + case MessageStripDesign.Information: + return "information"; + default: + return null; + } } get designClasses() { diff --git a/packages/main/src/MultiComboBox.ts b/packages/main/src/MultiComboBox.ts index 588eda20c7c6..5d75d7806829 100644 --- a/packages/main/src/MultiComboBox.ts +++ b/packages/main/src/MultiComboBox.ts @@ -59,7 +59,7 @@ import { getEffectiveAriaLabelText } from "@ui5/webcomponents-base/dist/util/Ari import { getScopedVarName } from "@ui5/webcomponents-base/dist/CustomElementsScope.js"; import MultiComboBoxItem from "./MultiComboBoxItem.js"; import MultiComboBoxGroupItem from "./MultiComboBoxGroupItem.js"; -import GroupHeaderListItem from "./GroupHeaderListItem.js"; +import ListItemGroupHeader from "./ListItemGroupHeader.js"; import Tokenizer, { ClipboardDataOperation } from "./Tokenizer.js"; import type { TokenizerTokenDeleteEventDetail } from "./Tokenizer.js"; import Token from "./Token.js"; @@ -194,7 +194,7 @@ type MultiComboboxItemWithSelection = { Popover, List, StandardListItem, - GroupHeaderListItem, + ListItemGroupHeader, ToggleButton, Button, CheckBox, @@ -271,7 +271,7 @@ class MultiComboBox extends UI5Element { * @public */ @property({ type: Boolean }) - allowCustomValues!: boolean; + noValidation!: boolean; /** * Defines whether the component is in disabled state. @@ -499,7 +499,7 @@ class MultiComboBox extends UI5Element { const target = e.target as Input; const value = target.value; - if (!this.allowCustomValues && !this._filterItems(value).length) { + if (!this.noValidation && !this._filterItems(value).length) { this._dialogInputValueState = ValueState.Error; } else { this._dialogInputValueState = this.valueState; @@ -603,7 +603,7 @@ class MultiComboBox extends UI5Element { this._effectiveValueState = this.valueState; - if (!filteredItems.length && value && !this.allowCustomValues) { + if (!filteredItems.length && value && !this.noValidation) { const newValue = this.valueBeforeAutoComplete || this._inputLastValue; input.value = newValue; @@ -871,7 +871,7 @@ class MultiComboBox extends UI5Element { this.value = this.valueBeforeAutoComplete; } - if (!this.allowCustomValues || (!this.open && this.allowCustomValues)) { + if (!this.noValidation || (!this.open && this.noValidation)) { this.value = this._lastValue; } } @@ -1084,7 +1084,7 @@ class MultiComboBox extends UI5Element { async _handleArrowDown() { const isOpen = this._getRespPopover().open; - const firstListItem = this.list?.items[0]; + const firstListItem = this.list?.listItems[0]; if (isOpen) { firstListItem && this.list?._itemNavigation.setCurrentItem(firstListItem); @@ -1348,7 +1348,7 @@ class MultiComboBox extends UI5Element { } // sync list items and cb items - this.syncItems((e.target as List).items); + this.syncItems((e.target as List).listItems); // don't call selection change right after selection as user can cancel it on phone if (!isPhone()) { @@ -1625,7 +1625,7 @@ class MultiComboBox extends UI5Element { } } - if (!this.allowCustomValues) { + if (!this.noValidation) { this.value = ""; } @@ -1706,7 +1706,7 @@ class MultiComboBox extends UI5Element { this._tokenizer.expanded = this.open; // remove the value if user focus out the input and focus is not going in the popover - if (!isPhone() && !this.allowCustomValues && !focusIsGoingInPopover) { + if (!isPhone() && !this.noValidation && !focusIsGoingInPopover) { this.value = ""; } } diff --git a/packages/main/src/MultiComboBoxPopover.hbs b/packages/main/src/MultiComboBoxPopover.hbs index f99a6f8b007c..30d6d809b9dd 100644 --- a/packages/main/src/MultiComboBoxPopover.hbs +++ b/packages/main/src/MultiComboBoxPopover.hbs @@ -71,7 +71,7 @@ {{#each selectedItems}} {{#if isGroupItem}} - {{ this.text }} + {{ this.text }} {{else}} {{> listItem}} {{/if}} @@ -81,7 +81,7 @@ {{#each _filteredItems}} {{#if isGroupItem}} - {{ this.text }} + {{ this.text }} {{else}} {{> listItem}} {{/if}} diff --git a/packages/main/src/ResponsivePopover.hbs b/packages/main/src/ResponsivePopover.hbs index 73c348d9414c..13f1252ea9c1 100644 --- a/packages/main/src/ResponsivePopover.hbs +++ b/packages/main/src/ResponsivePopover.hbs @@ -5,7 +5,8 @@ accessible-name-ref={{accessibleNameRef}} accessible-role={{accessibleRole}} stretch - _disable-initial-focus + ?_disable-initial-focus="{{_disableInitialFocus}}" + initial-focus="{{initialFocus}}" @ui5-before-open="{{_beforeDialogOpen}}" @ui5-after-open="{{_propagateDialogEvent}}" @ui5-before-close="{{_propagateDialogEvent}}" diff --git a/packages/main/src/SuggestionGroupItem.ts b/packages/main/src/SuggestionGroupItem.ts index c259d879a028..717c72a63068 100644 --- a/packages/main/src/SuggestionGroupItem.ts +++ b/packages/main/src/SuggestionGroupItem.ts @@ -1,7 +1,7 @@ import UI5Element from "@ui5/webcomponents-base/dist/UI5Element.js"; import property from "@ui5/webcomponents-base/dist/decorators/property.js"; import customElement from "@ui5/webcomponents-base/dist/decorators/customElement.js"; -import GroupHeaderListItem from "./GroupHeaderListItem.js"; +import ListItemGroupHeader from "./ListItemGroupHeader.js"; import type { IInputSuggestionItem } from "./Input.js"; /** @@ -17,7 +17,7 @@ import type { IInputSuggestionItem } from "./Input.js"; */ @customElement({ tag: "ui5-suggestion-group-item", - dependencies: [GroupHeaderListItem], + dependencies: [ListItemGroupHeader], }) class SuggestionGroupItem extends UI5Element implements IInputSuggestionItem { /** diff --git a/packages/main/src/TextArea.ts b/packages/main/src/TextArea.ts index 66afe1c6186d..604dc4428a54 100644 --- a/packages/main/src/TextArea.ts +++ b/packages/main/src/TextArea.ts @@ -61,7 +61,7 @@ type ExceededText = { * * ### Overview * - * The `ui5-textarea` component is used to enter multiple lines of text. + * The `ui5-textarea` component is used to enter multiple rows of text. * * When empty, it can hold a placeholder similar to a `ui5-input`. * You can define the rows of the `ui5-textarea` and also determine specific behavior when handling long texts. @@ -172,7 +172,7 @@ class TextArea extends UI5Element implements IFormElement { valueState!: `${ValueState}`; /** - * Defines the number of visible text lines for the component. + * Defines the number of visible text rows for the component. * * **Notes:** * @@ -216,12 +216,12 @@ class TextArea extends UI5Element implements IFormElement { growing!: boolean; /** - * Defines the maximum number of lines that the component can grow. + * Defines the maximum number of rows that the component can grow. * @default 0 * @public */ @property({ validator: Integer, defaultValue: 0 }) - growingMaxLines!: number; + growingMaxRows!: number; /** * Determines the name with which the component will be submitted in an HTML form. @@ -450,7 +450,7 @@ class TextArea extends UI5Element implements IFormElement { _setCSSParams() { this.style.setProperty("--_textarea_rows", this.rows ? String(this.rows) : "2"); - this.style.setProperty("--_textarea_growing_max_lines", String(this.growingMaxLines)); + this.style.setProperty("--_textarea_growing_max_rows", String(this.growingMaxRows)); } toggleValueStateMessage(toggle: boolean) { diff --git a/packages/main/src/TreeItemBase.ts b/packages/main/src/TreeItemBase.ts index 468a5139eca5..4f186ccccc92 100644 --- a/packages/main/src/TreeItemBase.ts +++ b/packages/main/src/TreeItemBase.ts @@ -284,8 +284,8 @@ class TreeItemBase extends ListItem { this.fireEvent("toggle", { item: this }); } - _onkeydown(e: KeyboardEvent) { - super._onkeydown(e); + async _onkeydown(e: KeyboardEvent) { + await super._onkeydown(e); if (!this._fixed && this.showToggleButton && isRight(e)) { if (!this.expanded) { diff --git a/packages/main/src/TreeItemCustom.ts b/packages/main/src/TreeItemCustom.ts index 3714cdddb75b..ae62a57d82f2 100644 --- a/packages/main/src/TreeItemCustom.ts +++ b/packages/main/src/TreeItemCustom.ts @@ -1,7 +1,7 @@ import customElement from "@ui5/webcomponents-base/dist/decorators/customElement.js"; import property from "@ui5/webcomponents-base/dist/decorators/property.js"; import slot from "@ui5/webcomponents-base/dist/decorators/slot.js"; -import { isTabNext, isTabPrevious } from "@ui5/webcomponents-base/dist/Keys.js"; +import { isTabNext, isTabPrevious, isF2 } from "@ui5/webcomponents-base/dist/Keys.js"; import TreeItemBase from "./TreeItemBase.js"; // Template @@ -50,14 +50,14 @@ class TreeItemCustom extends TreeItemBase { @slot() content!: Array; - _onkeydown(e: KeyboardEvent) { + async _onkeydown(e: KeyboardEvent) { const isTab = isTabNext(e) || isTabPrevious(e); - if (!isTab && !this.focused) { + if (!isTab && !this.focused && !isF2(e)) { return; } - super._onkeydown(e); + await super._onkeydown(e); } _onkeyup(e: KeyboardEvent) { diff --git a/packages/main/src/bundle.esm.ts b/packages/main/src/bundle.esm.ts index ffe86dc3cc12..0a5d22e26d35 100644 --- a/packages/main/src/bundle.esm.ts +++ b/packages/main/src/bundle.esm.ts @@ -74,7 +74,7 @@ import announce from "@ui5/webcomponents-base/dist/util/InvisibleMessage.js"; import { ignoreCustomElements, shouldIgnoreCustomElement } from "@ui5/webcomponents-base/dist/IgnoreCustomElements.js"; // SAP Icons -import accept from "@ui5/webcomponents-icons/dist/accept.js"; +import accept, { getPathData } from "@ui5/webcomponents-icons/dist/accept.js"; import acceptv4 from "@ui5/webcomponents-icons/dist/v4/accept.js"; import acceptv5 from "@ui5/webcomponents-icons/dist/v5/accept.js"; // SAP TNT Icons @@ -176,7 +176,8 @@ import List from "./List.js"; // console.log({List}) import StandardListItem from "./StandardListItem.js"; import CustomListItem from "./CustomListItem.js"; -import GroupHeaderListItem from "./GroupHeaderListItem.js"; +import ListItemGroupHeader from "./ListItemGroupHeader.js"; +import ListItemGroup from "./ListItemGroup.js"; // Features import "./features/InputElementsFormSupport.js"; @@ -220,6 +221,7 @@ const testAssets = { detachThemeLoaded, getIconNames, getIconAccessibleName, + getAcceptIconPathData: getPathData, renderFinished, defaultTexts, getExportedIconsValues: () => icons, diff --git a/packages/main/src/features/InputSuggestions.ts b/packages/main/src/features/InputSuggestions.ts index 7c3b21de329a..fa0d1bb6e463 100644 --- a/packages/main/src/features/InputSuggestions.ts +++ b/packages/main/src/features/InputSuggestions.ts @@ -15,7 +15,7 @@ import SuggestionGroupItem from "../SuggestionGroupItem.js"; import Button from "../Button.js"; import Icon from "../Icon.js"; import Popover from "../Popover.js"; -import GroupHeaderListItem from "../GroupHeaderListItem.js"; +import ListItemGroupHeader from "../ListItemGroupHeader.js"; import SuggestionListItem from "../SuggestionListItem.js"; import { @@ -665,7 +665,7 @@ class Suggestions { ResponsivePopover, List, SuggestionListItem, - GroupHeaderListItem, + ListItemGroupHeader, Button, Icon, Popover, diff --git a/packages/main/src/i18n/messagebundle.properties b/packages/main/src/i18n/messagebundle.properties index bae83acfb3f8..b379c60957ba 100644 --- a/packages/main/src/i18n/messagebundle.properties +++ b/packages/main/src/i18n/messagebundle.properties @@ -247,6 +247,9 @@ MESSAGE_STRIP_SUCCESS=Success Information Bar #XACT: ARIA announcement for the MessageStrip's "Information" state MESSAGE_STRIP_INFORMATION=Information Bar +#XACT: ARIA announcement for the MessageStrip's "Custom" state +MESSAGE_STRIP_CUSTOM=Custom Information Bar + #XFLD: MultiComboBox dialog button MULTICOMBOBOX_DIALOG_OK_BUTTON=OK diff --git a/packages/main/src/themes/Badge.css b/packages/main/src/themes/Badge.css index 58fffe1ad57b..6cc6a2b1fdbc 100644 --- a/packages/main/src/themes/Badge.css +++ b/packages/main/src/themes/Badge.css @@ -96,90 +96,90 @@ /* Set3 (BTP) Design Type */ /* Scheme 1 */ -.ui5-badge-root { +:host([design="Set3"]) .ui5-badge-root { background-color: var(--ui5-badge-color-scheme-1-background); border-color: var(--ui5-badge-color-scheme-1-border); color: var(--ui5-badge-color-scheme-1-color); } /* Scheme 2 */ -:host([color-scheme="2"]) .ui5-badge-root { +:host([design="Set3"][color-scheme="2"]) .ui5-badge-root { background-color: var(--ui5-badge-color-scheme-2-background); border-color: var(--ui5-badge-color-scheme-2-border); color: var(--ui5-badge-color-scheme-2-color); } /* Scheme 3 */ -:host([color-scheme="3"]) .ui5-badge-root { +:host([design="Set3"][color-scheme="3"]) .ui5-badge-root { background-color: var(--ui5-badge-color-scheme-3-background); border-color: var(--ui5-badge-color-scheme-3-border); color: var(--ui5-badge-color-scheme-3-color); } /* Scheme 4 */ -:host([color-scheme="4"]) .ui5-badge-root { +:host([design="Set3"][color-scheme="4"]) .ui5-badge-root { background-color: var(--ui5-badge-color-scheme-4-background); border-color: var(--ui5-badge-color-scheme-4-border); color: var(--ui5-badge-color-scheme-4-color); } /* Scheme 5 */ -:host([color-scheme="5"]) .ui5-badge-root { +:host([design="Set3"][color-scheme="5"]) .ui5-badge-root { background-color: var(--ui5-badge-color-scheme-5-background); border-color: var(--ui5-badge-color-scheme-5-border); color: var(--ui5-badge-color-scheme-5-color); } /* Scheme 6 */ -:host([color-scheme="6"]) .ui5-badge-root { +:host([design="Set3"][color-scheme="6"]) .ui5-badge-root { background-color: var(--ui5-badge-color-scheme-6-background); border-color: var(--ui5-badge-color-scheme-6-border); color: var(--ui5-badge-color-scheme-6-color); } /* Scheme 7 */ -:host([color-scheme="7"]) .ui5-badge-root { +:host([design="Set3"][color-scheme="7"]) .ui5-badge-root { background-color: var(--ui5-badge-color-scheme-7-background); border-color: var(--ui5-badge-color-scheme-7-border); color: var(--ui5-badge-color-scheme-7-color); } /* Scheme 8 */ -:host([color-scheme="8"]) .ui5-badge-root { +:host([design="Set3"][color-scheme="8"]) .ui5-badge-root { background-color: var(--ui5-badge-color-scheme-8-background); border-color: var(--ui5-badge-color-scheme-8-border); color: var(--ui5-badge-color-scheme-8-color); } /* Scheme 9 */ -:host([color-scheme="9"]) .ui5-badge-root { +:host([design="Set3"][color-scheme="9"]) .ui5-badge-root { background-color: var(--ui5-badge-color-scheme-9-background); border-color: var(--ui5-badge-color-scheme-9-border); color: var(--ui5-badge-color-scheme-9-color); } /* Scheme 10 */ -:host([color-scheme="10"]) .ui5-badge-root { +:host([design="Set3"][color-scheme="10"]) .ui5-badge-root { background-color: var(--ui5-badge-color-scheme-10-background); border-color: var(--ui5-badge-color-scheme-10-border); color: var(--ui5-badge-color-scheme-10-color); } /* Value State Design Types */ -:host([design="Neutral"]) .ui5-badge-root { +.ui5-badge-root { background-color: var(--sapNeutralBackground); border-color: var(--sapNeutralBorderColor); color: var(--sapTextColor); text-shadow: var(--ui5-badge-text-shadow); } -:host([interactive][design="Neutral"]) .ui5-badge-root:hover { +:host([interactive]) .ui5-badge-root:hover { background-color: var(--sapButton_Neutral_Hover_Background); border-color: var(--sapButton_Neutral_Hover_BorderColor); color: var(--sapButton_Neutral_Hover_TextColor); } -:host([interactive][design="Neutral"]) .ui5-badge-root:active { +:host([interactive]) .ui5-badge-root:active { background-color: var(--sapButton_Neutral_Active_Background); border-color: var(--sapButton_Neutral_Active_BorderColor); color: var(--sapButton_Active_TextColor); diff --git a/packages/main/src/themes/Icon.css b/packages/main/src/themes/Icon.css index e9296cf8b6b7..612dfd3277a8 100644 --- a/packages/main/src/themes/Icon.css +++ b/packages/main/src/themes/Icon.css @@ -50,7 +50,8 @@ color: var(--sapPositiveElementColor); } -:host([interactive][focused]) .ui5-icon-root { +:host([interactive][desktop]) .ui5-icon-root:focus-within, +:host([interactive]) .ui5-icon-root:focus-visible { outline: var(--sapContent_FocusWidth) var(--sapContent_FocusStyle) var(--sapContent_FocusColor); border-radius: var(--ui5-icon-focus-border-radius); } diff --git a/packages/main/src/themes/ListItemGroup.css b/packages/main/src/themes/ListItemGroup.css new file mode 100644 index 000000000000..0724ef812705 --- /dev/null +++ b/packages/main/src/themes/ListItemGroup.css @@ -0,0 +1,13 @@ +@import "./InvisibleTextStyles.css"; + +:host { + height: var(--_ui5_group_header_list_item_height); + background: var(--ui5-group-header-listitem-background-color); + color: var(--sapList_TableGroupHeaderTextColor); +} + +.ui5-group-li-root { + padding: 0; + margin: 0; + list-style-type: none; +} diff --git a/packages/main/src/themes/GroupHeaderListItem.css b/packages/main/src/themes/ListItemGroupHeader.css similarity index 95% rename from packages/main/src/themes/GroupHeaderListItem.css rename to packages/main/src/themes/ListItemGroupHeader.css index c14c0d7fd64d..364b3d475192 100644 --- a/packages/main/src/themes/GroupHeaderListItem.css +++ b/packages/main/src/themes/ListItemGroupHeader.css @@ -27,3 +27,7 @@ font-weight: bold; font-family: var(--sapFontHeaderFamily); } + +.ui5-li-content { + width: 100%; +} \ No newline at end of file diff --git a/packages/main/src/themes/MessageStrip.css b/packages/main/src/themes/MessageStrip.css index 588ebb8bdae1..4b5e5e77da3a 100644 --- a/packages/main/src/themes/MessageStrip.css +++ b/packages/main/src/themes/MessageStrip.css @@ -88,4 +88,157 @@ position: absolute; top: var(--_ui5_message_strip_close_button_top); inset-inline-end: var(--_ui5_message_strip_close_button_right); +} + +:host([color-scheme="1"]) .ui5-message-strip-root--color-set-1, +:host(:not([color-scheme])[design="ColorSet1"]) .ui5-message-strip-root--color-set-1 { + background-color: var(--sapIndicationColor_1_Background); + border-color: var(--sapIndicationColor_1_BorderColor); +} + +:host([color-scheme="2"]) .ui5-message-strip-root--color-set-1 { + background-color: var(--sapIndicationColor_2_Background); + border-color: var(--sapIndicationColor_2_BorderColor); +} + +:host([color-scheme="3"]) .ui5-message-strip-root--color-set-1 { + background-color: var(--sapIndicationColor_3_Background); + border-color: var(--sapIndicationColor_3_BorderColor); +} + +:host([color-scheme="4"]) .ui5-message-strip-root--color-set-1 { + background-color: var(--sapIndicationColor_4_Background); + border-color: var(--sapIndicationColor_4_BorderColor); +} + +:host([color-scheme="5"]) .ui5-message-strip-root--color-set-1 { + background-color: var(--sapIndicationColor_5_Background); + border-color: var(--sapIndicationColor_5_BorderColor); +} + +:host([color-scheme="6"]) .ui5-message-strip-root--color-set-1 { + background-color: var(--sapIndicationColor_6_Background); + border-color: var(--sapIndicationColor_6_BorderColor); +} + +:host([color-scheme="7"]) .ui5-message-strip-root--color-set-1 { + background-color: var(--sapIndicationColor_7_Background); + border-color: var(--sapIndicationColor_7_BorderColor); +} + +:host([color-scheme="8"]) .ui5-message-strip-root--color-set-1 { + background-color: var(--sapIndicationColor_8_Background); + border-color: var(--sapIndicationColor_8_BorderColor); +} + +:host([color-scheme="9"]) .ui5-message-strip-root--color-set-1 { + background-color: var(--sapIndicationColor_9_Background); + border-color: var(--sapIndicationColor_9_BorderColor); +} + +:host([color-scheme="10"]) .ui5-message-strip-root--color-set-1 { + background-color: var(--sapIndicationColor_10_Background); + border-color: var(--sapIndicationColor_10_BorderColor); +} + +:host([color-scheme="1"]) .ui5-message-strip-root--color-set-2, +:host(:not([color-scheme])[design="ColorSet2"]) .ui5-message-strip-root--color-set-2 { + background-color: var(--_ui5_message_strip_scheme_1_set_2_background); + border-color: var(--_ui5_message_strip_scheme_1_set_2_border_color) +} + +:host([color-scheme="2"]) .ui5-message-strip-root--color-set-2 { + background-color: var(--_ui5_message_strip_scheme_2_set_2_background); + border-color: var(--_ui5_message_strip_scheme_2_set_2_border_color); +} + +:host([color-scheme="3"]) .ui5-message-strip-root--color-set-2 { + background-color: var(--_ui5_message_strip_scheme_3_set_2_background); + border-color: var(--_ui5_message_strip_scheme_3_set_2_border_color); +} + +:host([color-scheme="4"]) .ui5-message-strip-root--color-set-2 { + background-color: var(--_ui5_message_strip_scheme_4_set_2_background); + border-color: var(--_ui5_message_strip_scheme_4_set_2_border_color); +} + +:host([color-scheme="5"]) .ui5-message-strip-root--color-set-2 { + background-color: var(--_ui5_message_strip_scheme_5_set_2_background); + border-color: var(--_ui5_message_strip_scheme_5_set_2_border_color); +} + +:host([color-scheme="6"]) .ui5-message-strip-root--color-set-2 { + background-color: var(--_ui5_message_strip_scheme_6_set_2_background); + border-color: var(--_ui5_message_strip_scheme_6_set_2_border_color); +} + +:host([color-scheme="7"]) .ui5-message-strip-root--color-set-2 { + background-color: var(--_ui5_message_strip_scheme_7_set_2_background); + border-color: var(--_ui5_message_strip_scheme_7_set_2_border_color); +} + +:host([color-scheme="8"]) .ui5-message-strip-root--color-set-2 { + background-color: var(--_ui5_message_strip_scheme_8_set_2_background); + border-color: var(--_ui5_message_strip_scheme_8_set_2_border_color); +} + +:host([color-scheme="9"]) .ui5-message-strip-root--color-set-2 { + background-color: var(--_ui5_message_strip_scheme_9_set_2_background); + border-color: var(--_ui5_message_strip_scheme_9_set_2_border_color); +} + +:host([color-scheme="10"]) .ui5-message-strip-root--color-set-2 { + background-color: var(--_ui5_message_strip_scheme_10_set_2_background); + border-color: var(--_ui5_message_strip_scheme_10_set_2_border_color); +} + +:host([design="ColorSet1"]) .ui5-message-strip-root .ui5-message-strip-text { + color: var(--sapContent_ContrastTextColor); + text-shadow: var(--sapContent_ContrastTextShadow); +} + +:host([design="ColorSet1"]) .ui5-message-strip-root ::slotted([slot="icon"]){ + color: var(--sapContent_ContrastIconColor); + text-shadow: var(--sapContent_ContrastTextShadow); +} + +:host([design="ColorSet2"]) .ui5-message-strip-root .ui5-message-strip-text { + color: var(--sapTextColor); +} + +:host([design="ColorSet1"]) .ui5-message-strip-close-button { + color: var(--_ui5_message_strip_close_button_color_set_1_color); +} + +:host([design="ColorSet2"]) .ui5-message-strip-close-button, +:host([design="ColorSet2"]) .ui5-message-strip-root ::slotted([slot="icon"]) { + color: var(--sapContent_IconColor); +} + +:host([design="ColorSet1"]) .ui5-message-strip-close-button:hover { + border-color: var(--sapContent_ContrastIconColor); + background-color: var(--_ui5_message_strip_close_button_color_set_1_background); + color: var(--_ui5_message_strip_close_button_color_set_1_hover_color); + text-shadow: var(--sapContent_ContrastTextShadow); +} + +:host([design="ColorSet2"]) .ui5-message-strip-close-button:hover { + background-color: var(--_ui5_message_strip_close_button_color_set_2_background); + border-color: var(--sapContent_IconColor); + color: var(--sapContent_IconColor); +} + +:host([design="ColorSet1"]) .ui5-message-strip-close-button:active { + background: none; + border-color: var(--sapContent_ContrastIconColor); +} + +:host([design="ColorSet2"]) .ui5-message-strip-close-button:active { + background: none; + border-color: var(--sapContent_IconColor); +} + +:host([design="ColorSet1"]) .ui5-message-strip-close-button::part(button):after, +:host([design="ColorSet1"]) .ui5-message-strip-close-button::part(button):before { + border-color: var(--sapContent_ContrastFocusColor); } \ No newline at end of file diff --git a/packages/main/src/themes/ProgressIndicator.css b/packages/main/src/themes/ProgressIndicator.css index 749170e36c06..670b7db3a612 100644 --- a/packages/main/src/themes/ProgressIndicator.css +++ b/packages/main/src/themes/ProgressIndicator.css @@ -10,6 +10,12 @@ padding-inline-end: var(--_ui5_progress_indicator_padding_end); } +:host(:not([hidden])[hide-value]) { + padding-top: var(--_ui5_progress_indicator_padding_novalue); + padding-bottom: var(--_ui5_progress_indicator_padding_novalue); + +} + .ui5-progress-indicator-root { display: flex; align-items: center; @@ -38,7 +44,6 @@ box-sizing: border-box; border: var(--_ui5_progress_indicator_bar_border_max); border-radius: var(--_ui5_progress_indicator_bar_border_radius); - z-index: 1; } .ui5-progress-indicator-min-value .ui5-progress-indicator-bar, diff --git a/packages/main/src/themes/TextArea.css b/packages/main/src/themes/TextArea.css index c29961c1fcea..754d6ea5f82b 100644 --- a/packages/main/src/themes/TextArea.css +++ b/packages/main/src/themes/TextArea.css @@ -178,26 +178,26 @@ min-height: calc(2 * var(--_ui5_textarea_line_height) * var(--sapFontSize) + var(--_ui5_textarea_padding_top) + var(--_ui5_textarea_padding_bottom)); } -:host([growing]):not([growing-max-lines]) .ui5-textarea-inner { +:host([growing]):not([growing-max-rows]) .ui5-textarea-inner { max-height: 100%; } -:host([growing-max-lines]) .ui5-textarea-mirror { - max-height: calc((var(--_textarea_growing_max_lines) * var(--_ui5_textarea_line_height)) * var(--sapFontSize) + var(--_ui5_textarea_padding_top) + var(--_ui5_textarea_padding_bottom)); +:host([growing-max-rows]) .ui5-textarea-mirror { + max-height: calc((var(--_textarea_growing_max_rows) * var(--_ui5_textarea_line_height)) * var(--sapFontSize) + var(--_ui5_textarea_padding_top) + var(--_ui5_textarea_padding_bottom)); } :host([rows="1"]) .ui5-textarea-inner { min-height: calc(var(--_ui5_textarea_line_height) * var(--sapFontSize) + var(--_ui5_textarea_padding_top) + var(--_ui5_textarea_padding_bottom)); } -:host([growing-max-lines="1"]) .ui5-textarea-inner, :host([growing-max-lines="1"]) .ui5-textarea-mirror { +:host([growing-max-rows="1"]) .ui5-textarea-inner, :host([growing-max-rows="1"]) .ui5-textarea-mirror { max-height: calc(var(--_ui5_textarea_line_height) * var(--sapFontSize) + var(--_ui5_textarea_padding_top) + var(--_ui5_textarea_padding_bottom)); min-height: calc(var(--_ui5_textarea_line_height) * var(--sapFontSize) + var(--_ui5_textarea_padding_top) + var(--_ui5_textarea_padding_bottom)); } -:host([rows="1"][growing-max-lines]) .ui5-textarea-inner, :host([rows="1"][growing-max-lines]) .ui5-textarea-mirror { +:host([rows="1"][growing-max-rows]) .ui5-textarea-inner, :host([rows="1"][growing-max-rows]) .ui5-textarea-mirror { min-height: calc(var(--_ui5_textarea_line_height) * var(--sapFontSize) + var(--_ui5_textarea_padding_top) + var(--_ui5_textarea_padding_bottom)); - max-height: calc((var(--_textarea_growing_max_lines) * var(--_ui5_textarea_line_height)) * var(--sapFontSize) + var(--_ui5_textarea_padding_top) + var(--_ui5_textarea_padding_bottom)); + max-height: calc((var(--_textarea_growing_max_rows) * var(--_ui5_textarea_line_height)) * var(--sapFontSize) + var(--_ui5_textarea_padding_top) + var(--_ui5_textarea_padding_bottom)); } :host([rows="1"][value-state="Error"]:not([readonly]):not([disabled])) .ui5-textarea-inner, @@ -213,8 +213,8 @@ min-height: calc(var(--_textarea_rows) * var(--_ui5_textarea_line_height) * var(--sapFontSize) + var(--_ui5_textarea_padding_top_error_warning) + var(--_ui5_textarea_padding_bottom_error_warning)); } -:host([growing-max-lines="1"][value-state="Error"]) .ui5-textarea-inner, :host([growing-max-lines="1"][value-state="Error"]) .ui5-textarea-mirror -:host([growing-max-lines="1"][value-state="Warning"]) .ui5-textarea-inner, :host([growing-max-lines="1"][value-state="Warning"]) .ui5-textarea-mirror { +:host([growing-max-rows="1"][value-state="Error"]) .ui5-textarea-inner, :host([growing-max-rows="1"][value-state="Error"]) .ui5-textarea-mirror +:host([growing-max-rows="1"][value-state="Warning"]) .ui5-textarea-inner, :host([growing-max-rows="1"][value-state="Warning"]) .ui5-textarea-mirror { max-height: var(--_ui5_textarea_line_height) * var(--sapFontSize) + var(--_ui5_textarea_padding_top_error_warning) + var(--_ui5_textarea_padding_bottom_error_warning); min-height: var(--_ui5_textarea_line_height) * var(--sapFontSize) + var(--_ui5_textarea_padding_top_error_warning) + var(--_ui5_textarea_padding_bottom_error_warning); } @@ -230,7 +230,7 @@ min-height: calc(var(--_ui5_textarea_line_height) * var(--sapFontSize) + var(--_ui5_textarea_padding_top_information) + var(--_ui5_textarea_padding_bottom_information)); } -:host([growing-max-lines="1"][value-state="Information"]) .ui5-textarea-inner, :host([growing-max-lines="1"][value-state="Information"]) .ui5-textarea-mirror { +:host([growing-max-rows="1"][value-state="Information"]) .ui5-textarea-inner, :host([growing-max-rows="1"][value-state="Information"]) .ui5-textarea-mirror { max-height: var(--_ui5_textarea_line_height) * var(--sapFontSize) + var(--_ui5_textarea_padding_top__ui5_textarea_padding_top_information) + var(--_ui5_textarea_padding_bottom__ui5_textarea_padding_top_information); min-height: var(--_ui5_textarea_line_height) * var(--sapFontSize) + var(--_ui5_textarea_padding_top_error_warning) + var(--_ui5_textarea_padding_bottom_information); } diff --git a/packages/main/src/themes/base/GroupHeaderListItem-parameters.css b/packages/main/src/themes/base/ListItemGroupHeader-parameters.css similarity index 100% rename from packages/main/src/themes/base/GroupHeaderListItem-parameters.css rename to packages/main/src/themes/base/ListItemGroupHeader-parameters.css diff --git a/packages/main/src/themes/base/MessageStrip-parameters.css b/packages/main/src/themes/base/MessageStrip-parameters.css index 8feb1a683c07..40a065e7842a 100644 --- a/packages/main/src/themes/base/MessageStrip-parameters.css +++ b/packages/main/src/themes/base/MessageStrip-parameters.css @@ -15,4 +15,29 @@ --_ui5_message_strip_focus_offset: -2px; --_ui5_message_strip_close_button_top: 0.125rem; --_ui5_message_strip_close_button_right: 0.125rem; + /* Next two variables below are hardcoded values of sapButton_Lite_Hover_Background parameter with specified opacity*/ + --_ui5_message_strip_close_button_color_set_1_background: #eaecee4d; + --_ui5_message_strip_close_button_color_set_2_background: #eaecee80; + --_ui5_message_strip_close_button_color_set_1_color: var(--sapButton_Emphasized_TextColor); + --_ui5_message_strip_close_button_color_set_1_hover_color: var(--sapButton_Emphasized_TextColor); + --_ui5_message_strip_scheme_1_set_2_background: var(--sapIndicationColor_1b); + --_ui5_message_strip_scheme_1_set_2_border_color: var(--sapIndicationColor_1b_BorderColor); + --_ui5_message_strip_scheme_2_set_2_background: var(--sapIndicationColor_2b); + --_ui5_message_strip_scheme_2_set_2_border_color: var(--sapIndicationColor_2b_BorderColor); + --_ui5_message_strip_scheme_3_set_2_background: var(--sapIndicationColor_3b); + --_ui5_message_strip_scheme_3_set_2_border_color: var(--sapIndicationColor_3b_BorderColor); + --_ui5_message_strip_scheme_4_set_2_background: var(--sapIndicationColor_4b); + --_ui5_message_strip_scheme_4_set_2_border_color: var(--sapIndicationColor_4b_BorderColor); + --_ui5_message_strip_scheme_5_set_2_background: var(--sapIndicationColor_5b); + --_ui5_message_strip_scheme_5_set_2_border_color: var(--sapIndicationColor_5b_BorderColor); + --_ui5_message_strip_scheme_6_set_2_background: var(--sapIndicationColor_6b); + --_ui5_message_strip_scheme_6_set_2_border_color: var(--sapIndicationColor_6b_BorderColor); + --_ui5_message_strip_scheme_7_set_2_background: var(--sapIndicationColor_7b); + --_ui5_message_strip_scheme_7_set_2_border_color: var(--sapIndicationColor_7b_BorderColor); + --_ui5_message_strip_scheme_8_set_2_background: var(--sapIndicationColor_8b); + --_ui5_message_strip_scheme_8_set_2_border_color: var(--sapIndicationColor_8b_BorderColor); + --_ui5_message_strip_scheme_9_set_2_background: var(--sapIndicationColor_9b); + --_ui5_message_strip_scheme_9_set_2_border_color: var(--sapIndicationColor_9b_BorderColor); + --_ui5_message_strip_scheme_10_set_2_background: var(--sapIndicationColor_10b); + --_ui5_message_strip_scheme_10_set_2_border_color: var(--sapIndicationColor_10b_BorderColor); } diff --git a/packages/main/src/themes/base/ProgressIndicator-parameters.css b/packages/main/src/themes/base/ProgressIndicator-parameters.css index 396a353d520a..fc96bac4f3e8 100644 --- a/packages/main/src/themes/base/ProgressIndicator-parameters.css +++ b/packages/main/src/themes/base/ProgressIndicator-parameters.css @@ -21,12 +21,14 @@ --_ui5_progress_indicator_side_points_visibility: none; + --_ui5_progress_indicator_padding_novalue: 0; + --_ui5_progress_indicator_host_height: 1rem; --_ui5_progress_indicator_host_min_height: 1rem; --_ui5_progress_indicator_root_border_radius: 0.5rem; --_ui5_progress_indicator_root_height: 100%; --_ui5_progress_indicator_root_overflow: hidden; - + --_ui5_progress_indicator_bar_height: 100%; --_ui5_progress_indicator_bar_border_radius: 0.5rem 0 0 0.5rem; diff --git a/packages/main/src/themes/sap_belize/parameters-bundle.css b/packages/main/src/themes/sap_belize/parameters-bundle.css index 5dc6b25af662..4b40ff247475 100644 --- a/packages/main/src/themes/sap_belize/parameters-bundle.css +++ b/packages/main/src/themes/sap_belize/parameters-bundle.css @@ -17,7 +17,7 @@ @import "../base/ColorPalette-parameters.css"; @import "../base/ColorPicker-parameters.css"; @import "../base/FileUploader-parameters.css"; -@import "../base/GroupHeaderListItem-parameters.css"; +@import "../base/ListItemGroupHeader-parameters.css"; @import "./Input-parameters.css"; @import "./InputIcon-parameters.css"; @import "../base/Link-parameters.css"; diff --git a/packages/main/src/themes/sap_belize_hcb/MessageStrip-parameters.css b/packages/main/src/themes/sap_belize_hcb/MessageStrip-parameters.css index 4320261d3d0c..f810e9b9d983 100644 --- a/packages/main/src/themes/sap_belize_hcb/MessageStrip-parameters.css +++ b/packages/main/src/themes/sap_belize_hcb/MessageStrip-parameters.css @@ -6,4 +6,26 @@ --_ui5_message_strip_icon_top: 0.375rem; --_ui5_message_strip_focus_width: 0.125rem; --_ui5_message_strip_focus_offset: -2px; + --_ui5_message_strip_close_button_color_set_1_background: var(--sapButton_Lite_Hover_Background); + --_ui5_message_strip_close_button_color_set_2_background: var(--sapButton_Lite_Hover_Background); + --_ui5_message_strip_scheme_1_set_2_background: var(--sapIndicationColor_1_Background); + --_ui5_message_strip_scheme_1_set_2_border_color: var(--sapIndicationColor_1_BorderColor); + --_ui5_message_strip_scheme_2_set_2_background: var(--sapIndicationColor_2_Background); + --_ui5_message_strip_scheme_2_set_2_border_color: var(--sapIndicationColor_2_BorderColor); + --_ui5_message_strip_scheme_3_set_2_background: var(--sapIndicationColor_3_Background); + --_ui5_message_strip_scheme_3_set_2_border_color: var(--sapIndicationColor_3_BorderColor); + --_ui5_message_strip_scheme_4_set_2_background: var(--sapIndicationColor_4_Background); + --_ui5_message_strip_scheme_4_set_2_border_color: var(--sapIndicationColor_4_BorderColor); + --_ui5_message_strip_scheme_5_set_2_background: var(--sapIndicationColor_5_Background); + --_ui5_message_strip_scheme_5_set_2_border_color: var(--sapIndicationColor_5_BorderColor); + --_ui5_message_strip_scheme_6_set_2_background: var(--sapIndicationColor_6_Background); + --_ui5_message_strip_scheme_6_set_2_border_color: var(--sapIndicationColor_6_BorderColor); + --_ui5_message_strip_scheme_7_set_2_background: var(--sapIndicationColor_7_Background); + --_ui5_message_strip_scheme_7_set_2_border_color: var(--sapIndicationColor_7_BorderColor); + --_ui5_message_strip_scheme_8_set_2_background: var(--sapIndicationColor_8_Background); + --_ui5_message_strip_scheme_8_set_2_border_color: var(--sapIndicationColor_8_BorderColor); + --_ui5_message_strip_scheme_9_set_2_background: var(--sapIndicationColor_9_Background); + --_ui5_message_strip_scheme_9_set_2_border_color: var(--sapIndicationColor_9_BorderColor); + --_ui5_message_strip_scheme_10_set_2_background: var(--sapIndicationColor_10_Background); + --_ui5_message_strip_scheme_10_set_2_border_color: var(--sapIndicationColor_10_BorderColor); } \ No newline at end of file diff --git a/packages/main/src/themes/sap_belize_hcb/parameters-bundle.css b/packages/main/src/themes/sap_belize_hcb/parameters-bundle.css index d1e49d879868..40ab202f4f7f 100644 --- a/packages/main/src/themes/sap_belize_hcb/parameters-bundle.css +++ b/packages/main/src/themes/sap_belize_hcb/parameters-bundle.css @@ -17,7 +17,7 @@ @import "./DayPicker-parameters.css"; @import "../base/Dialog-parameters.css"; @import "./FileUploader-parameters.css"; -@import "../base/GroupHeaderListItem-parameters.css"; +@import "../base/ListItemGroupHeader-parameters.css"; @import "./Input-parameters.css"; @import "./InputIcon-parameters.css"; @import "./Link-parameters.css"; diff --git a/packages/main/src/themes/sap_belize_hcw/MessageStrip-parameters.css b/packages/main/src/themes/sap_belize_hcw/MessageStrip-parameters.css index 4320261d3d0c..f810e9b9d983 100644 --- a/packages/main/src/themes/sap_belize_hcw/MessageStrip-parameters.css +++ b/packages/main/src/themes/sap_belize_hcw/MessageStrip-parameters.css @@ -6,4 +6,26 @@ --_ui5_message_strip_icon_top: 0.375rem; --_ui5_message_strip_focus_width: 0.125rem; --_ui5_message_strip_focus_offset: -2px; + --_ui5_message_strip_close_button_color_set_1_background: var(--sapButton_Lite_Hover_Background); + --_ui5_message_strip_close_button_color_set_2_background: var(--sapButton_Lite_Hover_Background); + --_ui5_message_strip_scheme_1_set_2_background: var(--sapIndicationColor_1_Background); + --_ui5_message_strip_scheme_1_set_2_border_color: var(--sapIndicationColor_1_BorderColor); + --_ui5_message_strip_scheme_2_set_2_background: var(--sapIndicationColor_2_Background); + --_ui5_message_strip_scheme_2_set_2_border_color: var(--sapIndicationColor_2_BorderColor); + --_ui5_message_strip_scheme_3_set_2_background: var(--sapIndicationColor_3_Background); + --_ui5_message_strip_scheme_3_set_2_border_color: var(--sapIndicationColor_3_BorderColor); + --_ui5_message_strip_scheme_4_set_2_background: var(--sapIndicationColor_4_Background); + --_ui5_message_strip_scheme_4_set_2_border_color: var(--sapIndicationColor_4_BorderColor); + --_ui5_message_strip_scheme_5_set_2_background: var(--sapIndicationColor_5_Background); + --_ui5_message_strip_scheme_5_set_2_border_color: var(--sapIndicationColor_5_BorderColor); + --_ui5_message_strip_scheme_6_set_2_background: var(--sapIndicationColor_6_Background); + --_ui5_message_strip_scheme_6_set_2_border_color: var(--sapIndicationColor_6_BorderColor); + --_ui5_message_strip_scheme_7_set_2_background: var(--sapIndicationColor_7_Background); + --_ui5_message_strip_scheme_7_set_2_border_color: var(--sapIndicationColor_7_BorderColor); + --_ui5_message_strip_scheme_8_set_2_background: var(--sapIndicationColor_8_Background); + --_ui5_message_strip_scheme_8_set_2_border_color: var(--sapIndicationColor_8_BorderColor); + --_ui5_message_strip_scheme_9_set_2_background: var(--sapIndicationColor_9_Background); + --_ui5_message_strip_scheme_9_set_2_border_color: var(--sapIndicationColor_9_BorderColor); + --_ui5_message_strip_scheme_10_set_2_background: var(--sapIndicationColor_10_Background); + --_ui5_message_strip_scheme_10_set_2_border_color: var(--sapIndicationColor_10_BorderColor); } \ No newline at end of file diff --git a/packages/main/src/themes/sap_belize_hcw/parameters-bundle.css b/packages/main/src/themes/sap_belize_hcw/parameters-bundle.css index ef7e68355226..98aa6d6ceac6 100644 --- a/packages/main/src/themes/sap_belize_hcw/parameters-bundle.css +++ b/packages/main/src/themes/sap_belize_hcw/parameters-bundle.css @@ -17,7 +17,7 @@ @import "./DayPicker-parameters.css"; @import "../base/Dialog-parameters.css"; @import "./FileUploader-parameters.css"; -@import "../base/GroupHeaderListItem-parameters.css"; +@import "../base/ListItemGroupHeader-parameters.css"; @import "./Input-parameters.css"; @import "./InputIcon-parameters.css"; @import "./Link-parameters.css"; diff --git a/packages/main/src/themes/sap_fiori_3/MessageStrip-parameters.css b/packages/main/src/themes/sap_fiori_3/MessageStrip-parameters.css new file mode 100644 index 000000000000..76f5334e632a --- /dev/null +++ b/packages/main/src/themes/sap_fiori_3/MessageStrip-parameters.css @@ -0,0 +1,7 @@ +@import "../base/MessageStrip-parameters.css"; + +:root{ + /* Next two variables below are hardcoded values of sapButton_Lite_Hover_Background parameter with specified opacity*/ + --_ui5_message_strip_close_button_color_set_1_background: #ebf5fe4d; + --_ui5_message_strip_close_button_color_set_2_background: #ebf5fe80; +} \ No newline at end of file diff --git a/packages/main/src/themes/sap_fiori_3/parameters-bundle.css b/packages/main/src/themes/sap_fiori_3/parameters-bundle.css index 18385a745337..dc6753e75307 100644 --- a/packages/main/src/themes/sap_fiori_3/parameters-bundle.css +++ b/packages/main/src/themes/sap_fiori_3/parameters-bundle.css @@ -16,7 +16,7 @@ @import "./DayPicker-parameters.css"; @import "../base/FileUploader-parameters.css"; @import "../base/Dialog-parameters.css"; -@import "../base/GroupHeaderListItem-parameters.css"; +@import "../base/ListItemGroupHeader-parameters.css"; @import "./Input-parameters.css"; @import "../base/InputIcon-parameters.css"; @import "./Link-parameters.css"; @@ -24,7 +24,7 @@ @import "../base/ListItemBase-parameters.css"; @import "../base/Menu-parameters.css"; @import "./MonthPicker-parameters.css"; -@import "../base/MessageStrip-parameters.css"; +@import "./MessageStrip-parameters.css"; @import "../base/Panel-parameters.css"; @import "../base/Popover-parameters.css"; @import "../base/PopupsCommon-parameters.css"; diff --git a/packages/main/src/themes/sap_fiori_3_dark/MessageStrip-parameters.css b/packages/main/src/themes/sap_fiori_3_dark/MessageStrip-parameters.css new file mode 100644 index 000000000000..5940d46165ef --- /dev/null +++ b/packages/main/src/themes/sap_fiori_3_dark/MessageStrip-parameters.css @@ -0,0 +1,9 @@ +@import "../base/MessageStrip-parameters.css"; + +:root{ + /* Next two variables below are hardcoded values of sapButton_Lite_Hover_Background parameter with specified opacity*/ + --_ui5_message_strip_close_button_color_set_1_background: #062e4f1a; + --_ui5_message_strip_close_button_color_set_2_background: #062e4f80; + --_ui5_message_strip_close_button_color_set_1_color: var(--sapContent_ContrastIconColor); + --_ui5_message_strip_close_button_color_set_1_hover_color: var(--sapContent_ContrastIconColor); +} \ No newline at end of file diff --git a/packages/main/src/themes/sap_fiori_3_dark/parameters-bundle.css b/packages/main/src/themes/sap_fiori_3_dark/parameters-bundle.css index 684cba0701ba..a8534cf93e49 100644 --- a/packages/main/src/themes/sap_fiori_3_dark/parameters-bundle.css +++ b/packages/main/src/themes/sap_fiori_3_dark/parameters-bundle.css @@ -16,7 +16,7 @@ @import "./DayPicker-parameters.css"; @import "../base/Dialog-parameters.css"; @import "../base/FileUploader-parameters.css"; -@import "../base/GroupHeaderListItem-parameters.css"; +@import "../base/ListItemGroupHeader-parameters.css"; @import "./Input-parameters.css"; @import "../base/InputIcon-parameters.css"; @import "./Link-parameters.css"; @@ -24,7 +24,7 @@ @import "../base/ListItemBase-parameters.css"; @import "../base/Menu-parameters.css"; @import "./MonthPicker-parameters.css"; -@import "../base/MessageStrip-parameters.css"; +@import "./MessageStrip-parameters.css"; @import "../base/Panel-parameters.css"; @import "../base/Popover-parameters.css"; @import "../base/PopupsCommon-parameters.css"; diff --git a/packages/main/src/themes/sap_fiori_3_hcb/MessageStrip-parameters.css b/packages/main/src/themes/sap_fiori_3_hcb/MessageStrip-parameters.css index 42c3060562c0..49dd8512f4db 100644 --- a/packages/main/src/themes/sap_fiori_3_hcb/MessageStrip-parameters.css +++ b/packages/main/src/themes/sap_fiori_3_hcb/MessageStrip-parameters.css @@ -6,4 +6,26 @@ --_ui5_message_strip_icon_top: 0.375rem; --_ui5_message_strip_focus_width: 0.125rem; --_ui5_message_strip_focus_offset: -4px; + --_ui5_message_strip_close_button_color_set_1_background: var(--sapButton_Lite_Hover_Background); + --_ui5_message_strip_close_button_color_set_2_background: var(--sapButton_Lite_Hover_Background); + --_ui5_message_strip_scheme_1_set_2_background: var(--sapIndicationColor_1_Background); + --_ui5_message_strip_scheme_1_set_2_border_color: var(--sapIndicationColor_1_BorderColor); + --_ui5_message_strip_scheme_2_set_2_background: var(--sapIndicationColor_2_Background); + --_ui5_message_strip_scheme_2_set_2_border_color: var(--sapIndicationColor_2_BorderColor); + --_ui5_message_strip_scheme_3_set_2_background: var(--sapIndicationColor_3_Background); + --_ui5_message_strip_scheme_3_set_2_border_color: var(--sapIndicationColor_3_BorderColor); + --_ui5_message_strip_scheme_4_set_2_background: var(--sapIndicationColor_4_Background); + --_ui5_message_strip_scheme_4_set_2_border_color: var(--sapIndicationColor_4_BorderColor); + --_ui5_message_strip_scheme_5_set_2_background: var(--sapIndicationColor_5_Background); + --_ui5_message_strip_scheme_5_set_2_border_color: var(--sapIndicationColor_5_BorderColor); + --_ui5_message_strip_scheme_6_set_2_background: var(--sapIndicationColor_6_Background); + --_ui5_message_strip_scheme_6_set_2_border_color: var(--sapIndicationColor_6_BorderColor); + --_ui5_message_strip_scheme_7_set_2_background: var(--sapIndicationColor_7_Background); + --_ui5_message_strip_scheme_7_set_2_border_color: var(--sapIndicationColor_7_BorderColor); + --_ui5_message_strip_scheme_8_set_2_background: var(--sapIndicationColor_8_Background); + --_ui5_message_strip_scheme_8_set_2_border_color: var(--sapIndicationColor_8_BorderColor); + --_ui5_message_strip_scheme_9_set_2_background: var(--sapIndicationColor_9_Background); + --_ui5_message_strip_scheme_9_set_2_border_color: var(--sapIndicationColor_9_BorderColor); + --_ui5_message_strip_scheme_10_set_2_background: var(--sapIndicationColor_10_Background); + --_ui5_message_strip_scheme_10_set_2_border_color: var(--sapIndicationColor_10_BorderColor); } \ No newline at end of file diff --git a/packages/main/src/themes/sap_fiori_3_hcb/parameters-bundle.css b/packages/main/src/themes/sap_fiori_3_hcb/parameters-bundle.css index 7ac931e43937..06b3831eceb3 100644 --- a/packages/main/src/themes/sap_fiori_3_hcb/parameters-bundle.css +++ b/packages/main/src/themes/sap_fiori_3_hcb/parameters-bundle.css @@ -17,7 +17,7 @@ @import "./DayPicker-parameters.css"; @import "./Dialog-parameters.css"; @import "./FileUploader-parameters.css"; -@import "../base/GroupHeaderListItem-parameters.css"; +@import "../base/ListItemGroupHeader-parameters.css"; @import "./Input-parameters.css"; @import "../base/InputIcon-parameters.css"; @import "./Link-parameters.css"; diff --git a/packages/main/src/themes/sap_fiori_3_hcw/MessageStrip-parameters.css b/packages/main/src/themes/sap_fiori_3_hcw/MessageStrip-parameters.css index 42c3060562c0..49dd8512f4db 100644 --- a/packages/main/src/themes/sap_fiori_3_hcw/MessageStrip-parameters.css +++ b/packages/main/src/themes/sap_fiori_3_hcw/MessageStrip-parameters.css @@ -6,4 +6,26 @@ --_ui5_message_strip_icon_top: 0.375rem; --_ui5_message_strip_focus_width: 0.125rem; --_ui5_message_strip_focus_offset: -4px; + --_ui5_message_strip_close_button_color_set_1_background: var(--sapButton_Lite_Hover_Background); + --_ui5_message_strip_close_button_color_set_2_background: var(--sapButton_Lite_Hover_Background); + --_ui5_message_strip_scheme_1_set_2_background: var(--sapIndicationColor_1_Background); + --_ui5_message_strip_scheme_1_set_2_border_color: var(--sapIndicationColor_1_BorderColor); + --_ui5_message_strip_scheme_2_set_2_background: var(--sapIndicationColor_2_Background); + --_ui5_message_strip_scheme_2_set_2_border_color: var(--sapIndicationColor_2_BorderColor); + --_ui5_message_strip_scheme_3_set_2_background: var(--sapIndicationColor_3_Background); + --_ui5_message_strip_scheme_3_set_2_border_color: var(--sapIndicationColor_3_BorderColor); + --_ui5_message_strip_scheme_4_set_2_background: var(--sapIndicationColor_4_Background); + --_ui5_message_strip_scheme_4_set_2_border_color: var(--sapIndicationColor_4_BorderColor); + --_ui5_message_strip_scheme_5_set_2_background: var(--sapIndicationColor_5_Background); + --_ui5_message_strip_scheme_5_set_2_border_color: var(--sapIndicationColor_5_BorderColor); + --_ui5_message_strip_scheme_6_set_2_background: var(--sapIndicationColor_6_Background); + --_ui5_message_strip_scheme_6_set_2_border_color: var(--sapIndicationColor_6_BorderColor); + --_ui5_message_strip_scheme_7_set_2_background: var(--sapIndicationColor_7_Background); + --_ui5_message_strip_scheme_7_set_2_border_color: var(--sapIndicationColor_7_BorderColor); + --_ui5_message_strip_scheme_8_set_2_background: var(--sapIndicationColor_8_Background); + --_ui5_message_strip_scheme_8_set_2_border_color: var(--sapIndicationColor_8_BorderColor); + --_ui5_message_strip_scheme_9_set_2_background: var(--sapIndicationColor_9_Background); + --_ui5_message_strip_scheme_9_set_2_border_color: var(--sapIndicationColor_9_BorderColor); + --_ui5_message_strip_scheme_10_set_2_background: var(--sapIndicationColor_10_Background); + --_ui5_message_strip_scheme_10_set_2_border_color: var(--sapIndicationColor_10_BorderColor); } \ No newline at end of file diff --git a/packages/main/src/themes/sap_fiori_3_hcw/parameters-bundle.css b/packages/main/src/themes/sap_fiori_3_hcw/parameters-bundle.css index 5cfe6d0004ea..25b6f2f29222 100644 --- a/packages/main/src/themes/sap_fiori_3_hcw/parameters-bundle.css +++ b/packages/main/src/themes/sap_fiori_3_hcw/parameters-bundle.css @@ -16,7 +16,7 @@ @import "./DayPicker-parameters.css"; @import "./Dialog-parameters.css"; @import "./FileUploader-parameters.css"; -@import "../base/GroupHeaderListItem-parameters.css"; +@import "../base/ListItemGroupHeader-parameters.css"; @import "./Input-parameters.css"; @import "../base/InputIcon-parameters.css"; @import "./Link-parameters.css"; diff --git a/packages/main/src/themes/sap_horizon/ProgressIndicatorLayout-parameters.css b/packages/main/src/themes/sap_horizon/ProgressIndicatorLayout-parameters.css index def22cb54948..51c57854ccc3 100644 --- a/packages/main/src/themes/sap_horizon/ProgressIndicatorLayout-parameters.css +++ b/packages/main/src/themes/sap_horizon/ProgressIndicatorLayout-parameters.css @@ -9,8 +9,9 @@ --_ui5_progress_indicator_side_points_visibility: block; --_ui5_progress_indicator_padding: 1.25rem 0 0.75rem 0; + --_ui5_progress_indicator_padding_novalue: 0.3125rem; --_ui5_progress_indicator_padding_end: 1.25rem; - + --_ui5_progress_indicator_host_height: unset; --_ui5_progress_indicator_host_min_height: unset; --_ui5_progress_indicator_host_box_sizing: border-box; @@ -31,7 +32,7 @@ --_ui5_progress_indicator_icon_position: absolute; --_ui5_progress_indicator_icon_right_position: -1.25rem; - + --_ui5_progress_indicator_value_margin: 0 0 0.1875rem 0; --_ui5_progress_indicator_value_position: absolute; --_ui5_progress_indicator_value_top_position: -1.3125rem; diff --git a/packages/main/src/themes/sap_horizon/parameters-bundle.css b/packages/main/src/themes/sap_horizon/parameters-bundle.css index 02c50b93116f..d97d6f8d72c7 100644 --- a/packages/main/src/themes/sap_horizon/parameters-bundle.css +++ b/packages/main/src/themes/sap_horizon/parameters-bundle.css @@ -19,7 +19,7 @@ @import "../base/Dialog-parameters.css"; @import "./Dialog-parameters.css"; @import "./FileUploader-parameters.css"; -@import "../base/GroupHeaderListItem-parameters.css"; +@import "../base/ListItemGroupHeader-parameters.css"; @import "./Icon-parameters.css"; @import "./Input-parameters.css"; @import "./InputIcon-parameters.css"; diff --git a/packages/main/src/themes/sap_horizon_dark/MessageStrip-parameters.css b/packages/main/src/themes/sap_horizon_dark/MessageStrip-parameters.css index 961d7491116e..d987518a6f7d 100644 --- a/packages/main/src/themes/sap_horizon_dark/MessageStrip-parameters.css +++ b/packages/main/src/themes/sap_horizon_dark/MessageStrip-parameters.css @@ -2,4 +2,9 @@ :root{ --_ui5_message_strip_close_button_right: 0.1875rem; + /* Next two variables below are hardcoded values of sapButton_Lite_Hover_Background parameter with specified opacity*/ + --_ui5_message_strip_close_button_color_set_1_background: #222b351a; + --_ui5_message_strip_close_button_color_set_2_background: #222b3580; + --_ui5_message_strip_close_button_color_set_1_color: var(--sapContent_ContrastIconColor); + --_ui5_message_strip_close_button_color_set_1_hover_color: var(--sapContent_ContrastIconColor); } \ No newline at end of file diff --git a/packages/main/src/themes/sap_horizon_dark/parameters-bundle.css b/packages/main/src/themes/sap_horizon_dark/parameters-bundle.css index 722144d41511..3d4ec45a6168 100644 --- a/packages/main/src/themes/sap_horizon_dark/parameters-bundle.css +++ b/packages/main/src/themes/sap_horizon_dark/parameters-bundle.css @@ -19,7 +19,7 @@ @import "../base/Dialog-parameters.css"; @import "./Dialog-parameters.css"; @import "./FileUploader-parameters.css"; -@import "../base/GroupHeaderListItem-parameters.css"; +@import "../base/ListItemGroupHeader-parameters.css"; @import "./Icon-parameters.css"; @import "./Input-parameters.css"; @import "./InputIcon-parameters.css"; diff --git a/packages/main/src/themes/sap_horizon_dark_exp/parameters-bundle.css b/packages/main/src/themes/sap_horizon_dark_exp/parameters-bundle.css index e8494929964f..a0dcc250e4c2 100644 --- a/packages/main/src/themes/sap_horizon_dark_exp/parameters-bundle.css +++ b/packages/main/src/themes/sap_horizon_dark_exp/parameters-bundle.css @@ -18,7 +18,7 @@ @import "../base/Dialog-parameters.css"; @import "./Dialog-parameters.css"; @import "./FileUploader-parameters.css"; -@import "../base/GroupHeaderListItem-parameters.css"; +@import "../base/ListItemGroupHeader-parameters.css"; @import "./Icon-parameters.css"; @import "./Input-parameters.css"; @import "./InputIcon-parameters.css"; diff --git a/packages/main/src/themes/sap_horizon_exp/ProgressIndicatorLayout-parameters.css b/packages/main/src/themes/sap_horizon_exp/ProgressIndicatorLayout-parameters.css index def22cb54948..51c57854ccc3 100644 --- a/packages/main/src/themes/sap_horizon_exp/ProgressIndicatorLayout-parameters.css +++ b/packages/main/src/themes/sap_horizon_exp/ProgressIndicatorLayout-parameters.css @@ -9,8 +9,9 @@ --_ui5_progress_indicator_side_points_visibility: block; --_ui5_progress_indicator_padding: 1.25rem 0 0.75rem 0; + --_ui5_progress_indicator_padding_novalue: 0.3125rem; --_ui5_progress_indicator_padding_end: 1.25rem; - + --_ui5_progress_indicator_host_height: unset; --_ui5_progress_indicator_host_min_height: unset; --_ui5_progress_indicator_host_box_sizing: border-box; @@ -31,7 +32,7 @@ --_ui5_progress_indicator_icon_position: absolute; --_ui5_progress_indicator_icon_right_position: -1.25rem; - + --_ui5_progress_indicator_value_margin: 0 0 0.1875rem 0; --_ui5_progress_indicator_value_position: absolute; --_ui5_progress_indicator_value_top_position: -1.3125rem; diff --git a/packages/main/src/themes/sap_horizon_exp/parameters-bundle.css b/packages/main/src/themes/sap_horizon_exp/parameters-bundle.css index d5f7c3be830c..9c338c383449 100644 --- a/packages/main/src/themes/sap_horizon_exp/parameters-bundle.css +++ b/packages/main/src/themes/sap_horizon_exp/parameters-bundle.css @@ -18,7 +18,7 @@ @import "../base/Dialog-parameters.css"; @import "./Dialog-parameters.css"; @import "./FileUploader-parameters.css"; -@import "../base/GroupHeaderListItem-parameters.css"; +@import "../base/ListItemGroupHeader-parameters.css"; @import "./Icon-parameters.css"; @import "./Input-parameters.css"; @import "./InputIcon-parameters.css"; diff --git a/packages/main/src/themes/sap_horizon_hcb/MessageStrip-parameters.css b/packages/main/src/themes/sap_horizon_hcb/MessageStrip-parameters.css index cb10efb0581b..b93dc67abb69 100644 --- a/packages/main/src/themes/sap_horizon_hcb/MessageStrip-parameters.css +++ b/packages/main/src/themes/sap_horizon_hcb/MessageStrip-parameters.css @@ -7,4 +7,26 @@ --_ui5_message_strip_focus_width: 0.125rem; --_ui5_message_strip_focus_offset: -4px; --_ui5_message_strip_close_button_right: 0.125rem; + --_ui5_message_strip_close_button_color_set_1_background: var(--sapButton_Lite_Hover_Background); + --_ui5_message_strip_close_button_color_set_2_background: var(--sapButton_Lite_Hover_Background); + --_ui5_message_strip_scheme_1_set_2_background: var(--sapIndicationColor_1_Background); + --_ui5_message_strip_scheme_1_set_2_border_color: var(--sapIndicationColor_1_BorderColor); + --_ui5_message_strip_scheme_2_set_2_background: var(--sapIndicationColor_2_Background); + --_ui5_message_strip_scheme_2_set_2_border_color: var(--sapIndicationColor_2_BorderColor); + --_ui5_message_strip_scheme_3_set_2_background: var(--sapIndicationColor_3_Background); + --_ui5_message_strip_scheme_3_set_2_border_color: var(--sapIndicationColor_3_BorderColor); + --_ui5_message_strip_scheme_4_set_2_background: var(--sapIndicationColor_4_Background); + --_ui5_message_strip_scheme_4_set_2_border_color: var(--sapIndicationColor_4_BorderColor); + --_ui5_message_strip_scheme_5_set_2_background: var(--sapIndicationColor_5_Background); + --_ui5_message_strip_scheme_5_set_2_border_color: var(--sapIndicationColor_5_BorderColor); + --_ui5_message_strip_scheme_6_set_2_background: var(--sapIndicationColor_6_Background); + --_ui5_message_strip_scheme_6_set_2_border_color: var(--sapIndicationColor_6_BorderColor); + --_ui5_message_strip_scheme_7_set_2_background: var(--sapIndicationColor_7_Background); + --_ui5_message_strip_scheme_7_set_2_border_color: var(--sapIndicationColor_7_BorderColor); + --_ui5_message_strip_scheme_8_set_2_background: var(--sapIndicationColor_8_Background); + --_ui5_message_strip_scheme_8_set_2_border_color: var(--sapIndicationColor_8_BorderColor); + --_ui5_message_strip_scheme_9_set_2_background: var(--sapIndicationColor_9_Background); + --_ui5_message_strip_scheme_9_set_2_border_color: var(--sapIndicationColor_9_BorderColor); + --_ui5_message_strip_scheme_10_set_2_background: var(--sapIndicationColor_10_Background); + --_ui5_message_strip_scheme_10_set_2_border_color: var(--sapIndicationColor_10_BorderColor); } \ No newline at end of file diff --git a/packages/main/src/themes/sap_horizon_hcb/parameters-bundle.css b/packages/main/src/themes/sap_horizon_hcb/parameters-bundle.css index 7cd659e5ff69..67f43f5ab43c 100644 --- a/packages/main/src/themes/sap_horizon_hcb/parameters-bundle.css +++ b/packages/main/src/themes/sap_horizon_hcb/parameters-bundle.css @@ -17,7 +17,7 @@ @import "./DayPicker-parameters.css"; @import "./Dialog-parameters.css"; @import "./FileUploader-parameters.css"; -@import "../base/GroupHeaderListItem-parameters.css"; +@import "../base/ListItemGroupHeader-parameters.css"; @import "./Input-parameters.css"; @import "./InputIcon-parameters.css"; @import "./Link-parameters.css"; diff --git a/packages/main/src/themes/sap_horizon_hcb_exp/parameters-bundle.css b/packages/main/src/themes/sap_horizon_hcb_exp/parameters-bundle.css index bc85943428de..6a6c1ce408f0 100644 --- a/packages/main/src/themes/sap_horizon_hcb_exp/parameters-bundle.css +++ b/packages/main/src/themes/sap_horizon_hcb_exp/parameters-bundle.css @@ -16,7 +16,7 @@ @import "./DayPicker-parameters.css"; @import "./Dialog-parameters.css"; @import "./FileUploader-parameters.css"; -@import "../base/GroupHeaderListItem-parameters.css"; +@import "../base/ListItemGroupHeader-parameters.css"; @import "./Input-parameters.css"; @import "./InputIcon-parameters.css"; @import "./Link-parameters.css"; diff --git a/packages/main/src/themes/sap_horizon_hcw/MessageStrip-parameters.css b/packages/main/src/themes/sap_horizon_hcw/MessageStrip-parameters.css index cb10efb0581b..b93dc67abb69 100644 --- a/packages/main/src/themes/sap_horizon_hcw/MessageStrip-parameters.css +++ b/packages/main/src/themes/sap_horizon_hcw/MessageStrip-parameters.css @@ -7,4 +7,26 @@ --_ui5_message_strip_focus_width: 0.125rem; --_ui5_message_strip_focus_offset: -4px; --_ui5_message_strip_close_button_right: 0.125rem; + --_ui5_message_strip_close_button_color_set_1_background: var(--sapButton_Lite_Hover_Background); + --_ui5_message_strip_close_button_color_set_2_background: var(--sapButton_Lite_Hover_Background); + --_ui5_message_strip_scheme_1_set_2_background: var(--sapIndicationColor_1_Background); + --_ui5_message_strip_scheme_1_set_2_border_color: var(--sapIndicationColor_1_BorderColor); + --_ui5_message_strip_scheme_2_set_2_background: var(--sapIndicationColor_2_Background); + --_ui5_message_strip_scheme_2_set_2_border_color: var(--sapIndicationColor_2_BorderColor); + --_ui5_message_strip_scheme_3_set_2_background: var(--sapIndicationColor_3_Background); + --_ui5_message_strip_scheme_3_set_2_border_color: var(--sapIndicationColor_3_BorderColor); + --_ui5_message_strip_scheme_4_set_2_background: var(--sapIndicationColor_4_Background); + --_ui5_message_strip_scheme_4_set_2_border_color: var(--sapIndicationColor_4_BorderColor); + --_ui5_message_strip_scheme_5_set_2_background: var(--sapIndicationColor_5_Background); + --_ui5_message_strip_scheme_5_set_2_border_color: var(--sapIndicationColor_5_BorderColor); + --_ui5_message_strip_scheme_6_set_2_background: var(--sapIndicationColor_6_Background); + --_ui5_message_strip_scheme_6_set_2_border_color: var(--sapIndicationColor_6_BorderColor); + --_ui5_message_strip_scheme_7_set_2_background: var(--sapIndicationColor_7_Background); + --_ui5_message_strip_scheme_7_set_2_border_color: var(--sapIndicationColor_7_BorderColor); + --_ui5_message_strip_scheme_8_set_2_background: var(--sapIndicationColor_8_Background); + --_ui5_message_strip_scheme_8_set_2_border_color: var(--sapIndicationColor_8_BorderColor); + --_ui5_message_strip_scheme_9_set_2_background: var(--sapIndicationColor_9_Background); + --_ui5_message_strip_scheme_9_set_2_border_color: var(--sapIndicationColor_9_BorderColor); + --_ui5_message_strip_scheme_10_set_2_background: var(--sapIndicationColor_10_Background); + --_ui5_message_strip_scheme_10_set_2_border_color: var(--sapIndicationColor_10_BorderColor); } \ No newline at end of file diff --git a/packages/main/src/themes/sap_horizon_hcw/parameters-bundle.css b/packages/main/src/themes/sap_horizon_hcw/parameters-bundle.css index 2228dccb72cf..c9df811421f8 100644 --- a/packages/main/src/themes/sap_horizon_hcw/parameters-bundle.css +++ b/packages/main/src/themes/sap_horizon_hcw/parameters-bundle.css @@ -17,7 +17,7 @@ @import "./DayPicker-parameters.css"; @import "./Dialog-parameters.css"; @import "./FileUploader-parameters.css"; -@import "../base/GroupHeaderListItem-parameters.css"; +@import "../base/ListItemGroupHeader-parameters.css"; @import "./Input-parameters.css"; @import "./InputIcon-parameters.css"; @import "./Link-parameters.css"; diff --git a/packages/main/src/themes/sap_horizon_hcw_exp/parameters-bundle.css b/packages/main/src/themes/sap_horizon_hcw_exp/parameters-bundle.css index 0809ab038251..6c0117f1ba67 100644 --- a/packages/main/src/themes/sap_horizon_hcw_exp/parameters-bundle.css +++ b/packages/main/src/themes/sap_horizon_hcw_exp/parameters-bundle.css @@ -16,7 +16,7 @@ @import "./DayPicker-parameters.css"; @import "./Dialog-parameters.css"; @import "./FileUploader-parameters.css"; -@import "../base/GroupHeaderListItem-parameters.css"; +@import "../base/ListItemGroupHeader-parameters.css"; @import "./Input-parameters.css"; @import "./InputIcon-parameters.css"; @import "./Link-parameters.css"; diff --git a/packages/main/src/types/MessageStripDesign.ts b/packages/main/src/types/MessageStripDesign.ts index eff729625016..6ac9469766f1 100644 --- a/packages/main/src/types/MessageStripDesign.ts +++ b/packages/main/src/types/MessageStripDesign.ts @@ -26,6 +26,18 @@ enum MessageStripDesign { * @public */ Warning = "Warning", + + /** + * Message uses custom color set 1 + * @public + */ + ColorSet1 = "ColorSet1", + + /** + * Message uses custom color set 2 + * @public + */ + ColorSet2 = "ColorSet2", } export default MessageStripDesign; diff --git a/packages/main/test/pages/Badge.html b/packages/main/test/pages/Badge.html index a0e8cc61f4d5..2fa53eb55fb2 100644 --- a/packages/main/test/pages/Badge.html +++ b/packages/main/test/pages/Badge.html @@ -27,7 +27,7 @@ Default color truncate truncate truncate
- + bigger width
@@ -39,40 +39,52 @@ Interactive

- +
- - In Process + + In Process 1 - + + In Process 0 + + + In Process 7 + + + In Process 2 + + + In Process 3 + + - + - + Pending - same line - + same line + - +
- + Pending - + P wrapping-type="true" wrapping-type="true" - + Some long text with more lines text wrapping-type="true" diff --git a/packages/main/test/pages/Badge.js b/packages/main/test/pages/Badge.js index 18e47bf61cac..efdb7931b205 100644 --- a/packages/main/test/pages/Badge.js +++ b/packages/main/test/pages/Badge.js @@ -57,10 +57,10 @@ function initializeBadges() { const set3Content = document.querySelector("#set3Content"); colorSchemes.forEach((value) => { - set3Content.insertAdjacentHTML("beforeend", `Set 3 - Value - ${value}`); + set3Content.insertAdjacentHTML("beforeend", `Set 3 - Value - ${value}`); set3Content.insertAdjacentHTML("beforeend", `Set 3 - Value - ${value}`); - set3Content.insertAdjacentHTML("beforeend", `Set 3 - Value - ${value}`); + set3Content.insertAdjacentHTML("beforeend", `Set 3 - Value - ${value}`); set3Content.insertAdjacentHTML("beforeend", `Set 3 - Value - ${value}`); set3Content.insertAdjacentHTML("beforeend", "

"); diff --git a/packages/main/test/pages/Carousel.html b/packages/main/test/pages/Carousel.html index 9a318b4f13cd..7944f32f971f 100644 --- a/packages/main/test/pages/Carousel.html +++ b/packages/main/test/pages/Carousel.html @@ -10,10 +10,10 @@ - - - + + + Template Based Segmentation @@ -43,9 +43,9 @@ - - + + Template Based Segmentation @@ -75,9 +75,9 @@ - - + + Template Based Segmentation @@ -129,15 +129,11 @@ - - - + + + Template Based Segmentation @@ -167,9 +163,9 @@ - - + + Template Based Segmentation @@ -199,9 +195,9 @@ - - + + Template Based Segmentation @@ -252,9 +248,10 @@ - + - + Template Based Segmentation @@ -285,7 +282,8 @@ - + Template Based Segmentation @@ -316,7 +314,8 @@ - + Template Based Segmentation @@ -365,9 +364,9 @@ - - + + Template Based Segmentation @@ -378,17 +377,18 @@ - - New Items - Voluptate do eu cupidatat - elit est culpa. Reprehenderit eiusmod voluptate ex est dolor nostrud Lorem Lorem do nisi laborum veniam. - Sint do non culpa aute occaecat labore ipsum veniam minim tempor est. Duis pariatur aute culpa irure ad - excepteur pariatur culpa culpa ea duis occaecat aute irure. Ipsum velit culpa non exercitation ex - laboris deserunt in eu non officia in. Laborum sunt aliqua labore cupidatat sunt labore. - Laptop Lenovo - IPhone 3 + + + Voluptate do eu cupidatat + elit est culpa. Reprehenderit eiusmod voluptate ex est dolor nostrud Lorem Lorem do nisi laborum veniam. + Sint do non culpa aute occaecat labore ipsum veniam minim tempor est. Duis pariatur aute culpa irure ad + excepteur pariatur culpa culpa ea duis occaecat aute irure. Ipsum velit culpa non exercitation ex + laboris deserunt in eu non officia in. Laborum sunt aliqua labore cupidatat sunt labore. + Laptop Lenovo + IPhone 3 + @@ -401,7 +401,7 @@ - + Button 1 Button 2 Button 3 @@ -415,13 +415,13 @@ Carousel with one page The arrows and dots are not displayed - + Button 1 Button 2 Button 3 - + Button 1 Button 2 Button 3 @@ -434,7 +434,7 @@ - + Button 1 Button 2 Button 3 @@ -464,14 +464,15 @@ Carousel with hidden page indicator and hidden navigation arrows arrows-placement="Navigation" - + Button 1 Button 2 Button 3 F7 keyboard navigation testing - +
Page 1
@@ -499,7 +500,7 @@
Button 2
- +
@@ -535,9 +536,10 @@
Content Part - used to align the content items - + - + Template Based Segmentation @@ -564,12 +566,7 @@ - + @@ -578,12 +575,7 @@ - + @@ -611,6 +603,72 @@

Many Buttons Carousel

Button 8 Button 9
+ + Items per page + + + + + + Template Based Segmentation + Segmentation Models + Marketing plans + + + + + + + + Personal Development + Finance + Communications Skills + + + + + + + + Alain + Chevalier + Monique + Legrand + Michael + Adams + + + + + + + + Richard + Wilson + Elena + Petrova + John + Miller + + + + + + + + Richard + Wilson + Elena + Petrova + John + Miller + + + + - + \ No newline at end of file diff --git a/packages/main/test/pages/Components.html b/packages/main/test/pages/Components.html index fe586f1a1dbf..d1834a8290cc 100644 --- a/packages/main/test/pages/Components.html +++ b/packages/main/test/pages/Components.html @@ -50,10 +50,11 @@ -