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

Jump to bottom

feat(ui5-dynamic-page): add responsive paddings #7846

Closed
wants to merge 3 commits into from
Closed

feat(ui5-dynamic-page): add responsive paddings #7846

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a302442
feat(ui5-dynamic-page): add responsive paddings
kineticjs Nov 14, 2023
637e14d
feat(ui5-dynamic-page): merge with footer changes
kineticjs Nov 20, 2023
c143204
feat(ui5-dynamic-page): apply paddings to individual elements
kineticjs Nov 26, 2023
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
16 changes: 8 additions & 8 deletions packages/fiori/src/DynamicPage.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@

</div>

<div class="{{classes.content}}">
{{#if headerInContent}}
<slot name="headerArea"></slot>
{{/if}}
{{#if headerInContent}}
<slot name="headerArea"></slot>
{{/if}}

<div class="{{classes.content}}">
{{#unless actionsInTitle}}
<ui5-dynamic-page-header-actions
?snapped="{{headerSnapped}}"
Expand All @@ -36,7 +36,7 @@
</div>
</div>

<div class="{{classes.footer}}">
<slot name="footer"></slot>
</div>
</div>
<div class="{{classes.footer}}">
<slot name="footer"></slot>
</div>
</div>
31 changes: 31 additions & 0 deletions packages/fiori/src/DynamicPage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ import customElement from "@ui5/webcomponents-base/dist/decorators/customElement
import property from "@ui5/webcomponents-base/dist/decorators/property.js";
import slot from "@ui5/webcomponents-base/dist/decorators/slot.js";
import litRender from "@ui5/webcomponents-base/dist/renderer/LitRenderer.js";
import ResizeHandler from "@ui5/webcomponents-base/dist/delegate/ResizeHandler.js";
import type { ResizeObserverCallback } from "@ui5/webcomponents-base/dist/delegate/ResizeHandler.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 type { Timeout } from "@ui5/webcomponents-base/dist/types.js";
Expand Down Expand Up @@ -42,6 +45,12 @@ const SCROLL_DEBOUNCE_RATE = 0; // ms
class DynamicPage extends UI5Element {
static i18nBundle: I18nBundle;

constructor() {
super();

this._updateMediaRange = this.updateMediaRange.bind(this);
}

static async onDefine() {
DynamicPage.i18nBundle = await getI18nBundle("INIT_PACKAGE_VAR_NAME");
}
Expand All @@ -55,6 +64,15 @@ class DynamicPage extends UI5Element {
@property({ type: Boolean })
showFooter!: boolean;

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

@slot({ "default": true, type: HTMLElement })
content!: HTMLElement[];

Expand All @@ -71,6 +89,15 @@ class DynamicPage extends UI5Element {
iPreviousScrollAmount = 0;
_debounceInterval?: Timeout | null;
showHeaderInStickArea = false;
_updateMediaRange: ResizeObserverCallback;

onEnterDOM() {
ResizeHandler.register(this, this._updateMediaRange);
}

onExitDOM() {
ResizeHandler.deregister(this, this._updateMediaRange);
}

get classes() {
return {
Expand Down Expand Up @@ -167,6 +194,10 @@ class DynamicPage extends UI5Element {
fn();
}, delay);
}

updateMediaRange() {
this.mediaRange = MediaRange.getCurrentRange(MediaRange.RANGESETS.RANGE_4STEPS, this.getDomRef()!.offsetWidth);
}
}

DynamicPage.define();
Expand Down
39 changes: 38 additions & 1 deletion packages/fiori/src/themes/DynamicPage.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
box-sizing: border-box;
z-index: 1;
opacity: 1;
padding: 0 1rem;
}

:host([show-footer]) .ui5-dynamic-page-content {
Expand All @@ -50,6 +49,9 @@
border: 1px solid;
border-radius: 0.25rem;
background-color: #fff;
box-sizing: border-box;
width: auto;
margin: 0 0.5rem 0.5rem 0.5rem;
}

/* Footer animation */
Expand All @@ -72,4 +74,39 @@
transform: translateY(100%);
opacity: 0;
}
}

::slotted([slot="titleArea"]) {
width: auto;
}

::slotted([slot="headerArea"]) {
display: block;
}

/* Responsive paddings */

:host([media-range="S"]) .ui5-dynamic-page-content,
:host([media-range="S"]) ::slotted([slot="titleArea"]),
:host([media-range="S"]) ::slotted([slot="headerArea"]) {
padding: 0 1rem;
}

:host([media-range="S"]) ::slotted([slot="headerArea"]) {
padding-top: 0.5rem;
}

:host([media-range="M"]) .ui5-dynamic-page-content,
:host([media-range="M"]) ::slotted([slot="titleArea"]),
:host([media-range="M"]) ::slotted([slot="headerArea"]),
:host([media-range="L"]) .ui5-dynamic-page-content,
:host([media-range="L"]) ::slotted([slot="titleArea"]),
:host([media-range="L"]) ::slotted([slot="headerArea"]) {
padding: 0 2rem;
}

:host([media-range="XL"]) .ui5-dynamic-page-content,
:host([media-range="XL"]) ::slotted([slot="titleArea"]),
:host([media-range="XL"]) ::slotted([slot="headerArea"]) {
padding: 0 3rem;
}
3 changes: 0 additions & 3 deletions packages/fiori/src/themes/DynamicPageHeader.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
:host {
background: #fff;
padding-top: var(--_ui5_dynamic_page_header_padding_top);
padding-bottom: var(--_ui5_dynamic_page_header_padding_bottom);
display: block;
}

.ui5-dynamic-page-header-root {
Expand Down
4 changes: 0 additions & 4 deletions packages/fiori/src/themes/base/DynamicPageHeader-parameters.css
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion packages/fiori/src/themes/sap_belize/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import "../base/sizes-parameters.css";
@import "../base/DynamicPage-parameters.css";
@import "../base/DynamicPageTitle-parameters.css";
@import "../base/DynamicPageHeader-parameters.css";
@import "../base/Bar-parameters.css";
@import "../base/FlexibleColumnLayout-parameters.css";
@import "../base/MediaGallery-parameters.css";
Expand Down
1 change: 0 additions & 1 deletion packages/fiori/src/themes/sap_belize_hcb/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import "../base/sizes-parameters.css";
@import "../base/DynamicPage-parameters.css";
@import "../base/DynamicPageTitle-parameters.css";
@import "../base/DynamicPageHeader-parameters.css";
@import "../base/Bar-parameters.css";
@import "./FlexibleColumnLayout-parameters.css";
@import "../base/IllustratedMessage-parameters.css";
Expand Down
1 change: 0 additions & 1 deletion packages/fiori/src/themes/sap_belize_hcw/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import "../base/sizes-parameters.css";
@import "../base/DynamicPage-parameters.css";
@import "../base/DynamicPageTitle-parameters.css";
@import "../base/DynamicPageHeader-parameters.css";
@import "../base/Bar-parameters.css";
@import "./FlexibleColumnLayout-parameters.css";
@import "../base/IllustratedMessage-parameters.css";
Expand Down
1 change: 0 additions & 1 deletion packages/fiori/src/themes/sap_fiori_3/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import "../base/sizes-parameters.css";
@import "../base/DynamicPage-parameters.css";
@import "../base/DynamicPageTitle-parameters.css";
@import "../base/DynamicPageHeader-parameters.css";
@import "../base/Bar-parameters.css";
@import "../base/FlexibleColumnLayout-parameters.css";
@import "../base/IllustratedMessage-parameters.css";
Expand Down
1 change: 0 additions & 1 deletion packages/fiori/src/themes/sap_fiori_3_dark/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import "../base/sizes-parameters.css";
@import "../base/DynamicPage-parameters.css";
@import "../base/DynamicPageTitle-parameters.css";
@import "../base/DynamicPageHeader-parameters.css";
@import "../base/Bar-parameters.css";
@import "../base/FlexibleColumnLayout-parameters.css";
@import "../base/IllustratedMessage-parameters.css";
Expand Down
1 change: 0 additions & 1 deletion packages/fiori/src/themes/sap_fiori_3_hcb/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import "../base/sizes-parameters.css";
@import "../base/DynamicPage-parameters.css";
@import "../base/DynamicPageTitle-parameters.css";
@import "../base/DynamicPageHeader-parameters.css";
@import "../base/Bar-parameters.css";
@import "./FlexibleColumnLayout-parameters.css";
@import "../base/IllustratedMessage-parameters.css";
Expand Down
1 change: 0 additions & 1 deletion packages/fiori/src/themes/sap_fiori_3_hcw/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import "../base/sizes-parameters.css";
@import "../base/DynamicPage-parameters.css";
@import "../base/DynamicPageTitle-parameters.css";
@import "../base/DynamicPageHeader-parameters.css";
@import "../base/Bar-parameters.css";
@import "./FlexibleColumnLayout-parameters.css";
@import "../base/IllustratedMessage-parameters.css";
Expand Down
1 change: 0 additions & 1 deletion packages/fiori/src/themes/sap_horizon/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import "../base/sizes-parameters.css";
@import "../base/DynamicPage-parameters.css";
@import "../base/DynamicPageTitle-parameters.css";
@import "../base/DynamicPageHeader-parameters.css";
@import "../base/Bar-parameters.css";
@import "../base/FlexibleColumnLayout-parameters.css";
@import "../base/IllustratedMessage-parameters.css";
Expand Down
1 change: 0 additions & 1 deletion packages/fiori/src/themes/sap_horizon_dark/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import "../base/sizes-parameters.css";
@import "../base/DynamicPage-parameters.css";
@import "../base/DynamicPageTitle-parameters.css";
@import "../base/DynamicPageHeader-parameters.css";
@import "../base/Bar-parameters.css";
@import "../base/FlexibleColumnLayout-parameters.css";
@import "../base/IllustratedMessage-parameters.css";
Expand Down
1 change: 0 additions & 1 deletion packages/fiori/src/themes/sap_horizon_dark_exp/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import "../base/sizes-parameters.css";
@import "../base/DynamicPage-parameters.css";
@import "../base/DynamicPageTitle-parameters.css";
@import "../base/DynamicPageHeader-parameters.css";
@import "../base/Bar-parameters.css";
@import "../base/FlexibleColumnLayout-parameters.css";
@import "../base/IllustratedMessage-parameters.css";
Expand Down
1 change: 0 additions & 1 deletion packages/fiori/src/themes/sap_horizon_exp/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import "../base/sizes-parameters.css";
@import "../base/DynamicPage-parameters.css";
@import "../base/DynamicPageTitle-parameters.css";
@import "../base/DynamicPageHeader-parameters.css";
@import "../base/Bar-parameters.css";
@import "../base/FlexibleColumnLayout-parameters.css";
@import "../base/IllustratedMessage-parameters.css";
Expand Down
1 change: 0 additions & 1 deletion packages/fiori/src/themes/sap_horizon_hcb/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import "../base/sizes-parameters.css";
@import "../base/DynamicPage-parameters.css";
@import "../base/DynamicPageTitle-parameters.css";
@import "../base/DynamicPageHeader-parameters.css";
@import "../base/Bar-parameters.css";
@import "./FlexibleColumnLayout-parameters.css";
@import "../base/IllustratedMessage-parameters.css";
Expand Down
1 change: 0 additions & 1 deletion packages/fiori/src/themes/sap_horizon_hcb_exp/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import "../base/sizes-parameters.css";
@import "../base/DynamicPage-parameters.css";
@import "../base/DynamicPageTitle-parameters.css";
@import "../base/DynamicPageHeader-parameters.css";
@import "../base/Bar-parameters.css";
@import "./FlexibleColumnLayout-parameters.css";
@import "../base/IllustratedMessage-parameters.css";
Expand Down
1 change: 0 additions & 1 deletion packages/fiori/src/themes/sap_horizon_hcw/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import "../base/sizes-parameters.css";
@import "../base/DynamicPage-parameters.css";
@import "../base/DynamicPageTitle-parameters.css";
@import "../base/DynamicPageHeader-parameters.css";
@import "../base/Bar-parameters.css";
@import "./FlexibleColumnLayout-parameters.css";
@import "../base/IllustratedMessage-parameters.css";
Expand Down
1 change: 0 additions & 1 deletion packages/fiori/src/themes/sap_horizon_hcw_exp/parameters-bundle.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@import "../base/sizes-parameters.css";
@import "../base/DynamicPage-parameters.css";
@import "../base/DynamicPageTitle-parameters.css";
@import "../base/DynamicPageHeader-parameters.css";
@import "../base/Bar-parameters.css";
@import "./FlexibleColumnLayout-parameters.css";
@import "../base/IllustratedMessage-parameters.css";
Expand Down