Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(ui5-tabcontainer): revert responsive paddings using container logic #8279

Merged
merged 2 commits into from
Feb 20, 2024
Merged

refactor(ui5-tabcontainer): revert responsive paddings using container logic #8279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f6a7d1
feat(ui5-tabcontainer): revert responsive paddings using container logic
TeodorTaushanov Feb 13, 2024
f92069f
feat(ui5-tabcontainer): fix jsdoc error
TeodorTaushanov Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions packages/main/src/TabContainer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import {
isLeft,
isUp,
} from "@ui5/webcomponents-base/dist/Keys.js";
import MediaRange from "@ui5/webcomponents-base/dist/MediaRange.js";
import { getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js";
import type I18nBundle from "@ui5/webcomponents-base/dist/i18nBundle.js";
import { getScopedVarName } from "@ui5/webcomponents-base/dist/CustomElementsScope.js";
Expand Down Expand Up @@ -285,6 +286,14 @@ class TabContainer extends UI5Element {
@property({ type: TabContainerTabsPlacement, defaultValue: TabContainerTabsPlacement.Top })
tabsPlacement!: `${TabContainerTabsPlacement}`;

/**
* Defines the current media query size.
*
* @private
*/
@property()
mediaRange!: string;

@property({ type: Object })
_selectedTab!: Tab;

Expand Down Expand Up @@ -436,6 +445,11 @@ class TabContainer extends UI5Element {

// invalidate
this._width = this.offsetWidth;
this._updateMediaRange(this._width);
}

_updateMediaRange(width: number) {
this.mediaRange = MediaRange.getCurrentRange(MediaRange.RANGESETS.RANGE_4STEPS, width);
}

_setItemsPrivateProperties(items: Array<ITab>) {
Expand Down
29 changes: 13 additions & 16 deletions packages/main/src/themes/TabContainer.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
:host(:not([hidden])) {
display: inline-block;
width: 100%;
container-type: inline-size;
}

.ui5-tc-root {
Expand Down Expand Up @@ -150,22 +149,20 @@
padding: 1rem;
}

@container (min-width: 600px) {
.ui5-tc__header {
padding: 0 1rem;
}
:host([media-range="M"]) .ui5-tc__header,
:host([media-range="L"]) .ui5-tc__header {
padding: 0 1rem;
}

.ui5-tc__content {
padding: 1rem 2rem;
}
:host([media-range="M"]) .ui5-tc__content,
:host([media-range="L"]) .ui5-tc__content {
padding: 1rem 2rem;
}

@container (min-width: 1440px) {
.ui5-tc__header {
padding: 0 2rem;
}

.ui5-tc__content {
padding: 1rem 3rem;
}
:host([media-range="XL"]) .ui5-tc__header {
padding: 0 2rem;
}

:host([media-range="XL"]) .ui5-tc__content {
padding: 1rem 3rem;
}
14 changes: 14 additions & 0 deletions packages/main/test/specs/TabContainer.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,20 @@ describe("TabContainer general interaction", () => {
await cbPrevent.click();
});

it("tests custom media ranges", async () => {
await browser.setWindowSize(520, 1080);
assert.strictEqual(await browser.$("#tabContainerIconOnly").getAttribute("media-range"), "S", "media-range=S");

await browser.setWindowSize(650, 1080);
assert.strictEqual(await browser.$("#tabContainerIconOnly").getAttribute("media-range"), "M", "media-range=M");

await browser.setWindowSize(1350, 1080);
assert.strictEqual(await browser.$("#tabContainerIconOnly").getAttribute("media-range"), "L", "media-range=L");

await browser.setWindowSize(1650, 1080);
assert.strictEqual(await browser.$("#tabContainerIconOnly").getAttribute("media-range"), "XL", "media-range=XL");
});

it("tests if content is scrollable when tabcontainer takes limited height by its parent", async () => {
const { tcHeight, tcScrollHeight } = await browser.executeAsync(done => {
const scrollableContent = document.getElementById("tc-scrollable-child");
Expand Down