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.

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

fix(ui5-dialog): no longer gets clipped in short screen height in IE #2429

Merged
merged 1 commit into from
Nov 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions packages/main/src/Dialog.js
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,10 @@ class Dialog extends Popup {
return true;
}

get _displayProp() {
return "flex";
}

get classes() {
return {
root: {
Expand Down
10 changes: 7 additions & 3 deletions packages/main/src/Popup.js
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,10 @@ class Popup extends UI5Element {
return staticAreaStyles;
}

get _displayProp() {
return "block";
}

/**
* Prevents the user from interacting with the content under the block layer
*/
Expand Down Expand Up @@ -393,11 +397,11 @@ class Popup extends UI5Element {
}

/**
* Sets "block" display to the popup
* Sets "block" display to the popup. The property can be overriden by derivatives of Popup.
* @protected
*/
show() {
this.style.display = "block";
this.style.display = this._displayProp;
}


Expand All @@ -417,7 +421,7 @@ class Popup extends UI5Element {
}

/**
* Implement this getter with relevant logic regarding the modality of the popup (f.e. based on a public property)
* Implement this getter with relevant logic regarding the modality of the popup (e.g. based on a public property)
*
* @protected
* @abstract
Expand Down