diff --git a/packages/main/src/DatePicker.js b/packages/main/src/DatePicker.js index 90e291051f5a..21a363a5c567 100644 --- a/packages/main/src/DatePicker.js +++ b/packages/main/src/DatePicker.js @@ -11,7 +11,7 @@ import CalendarDate from "@ui5/webcomponents-localization/dist/dates/CalendarDat import ValueState from "@ui5/webcomponents-base/dist/types/ValueState.js"; import getEffectiveAriaLabelText from "@ui5/webcomponents-base/dist/util/getEffectiveAriaLabelText.js"; import { isShow, isF4 } from "@ui5/webcomponents-base/dist/Keys.js"; -import { isPhone } from "@ui5/webcomponents-base/dist/Device.js"; +import { isPhone, isIE } from "@ui5/webcomponents-base/dist/Device.js"; import { fetchI18nBundle, getI18nBundle } from "@ui5/webcomponents-base/dist/i18nBundle.js"; import "@ui5/webcomponents-icons/dist/icons/appointment-2.js"; import "@ui5/webcomponents-icons/dist/icons/decline.js"; @@ -661,6 +661,10 @@ class DatePicker extends UI5Element { return this.phone; } + get _isIE() { + return isIE(); + } + getFormat() { if (this._isPattern) { this._oDateFormat = DateFormat.getInstance({ diff --git a/packages/main/src/DatePickerPopover.hbs b/packages/main/src/DatePickerPopover.hbs index 625ae8eeefe7..a9e25ebbefc5 100644 --- a/packages/main/src/DatePickerPopover.hbs +++ b/packages/main/src/DatePickerPopover.hbs @@ -4,6 +4,7 @@ stay-open-on-scroll="{{_respPopoverConfig.stayOpenOnScroll}}" placement-type="Bottom" horizontal-align="Left" + ?disable-scrolling="{{_isIE}}" no-arrow with-padding no-stretch diff --git a/packages/main/src/Popover.js b/packages/main/src/Popover.js index c1fb83e2a6e3..08c1ed031c10 100644 --- a/packages/main/src/Popover.js +++ b/packages/main/src/Popover.js @@ -129,6 +129,17 @@ const metadata = { type: Boolean, }, + /** + * Defines whether the content is scrollable. + * + * @type {boolean} + * @defaultvalue false + * @private + */ + disableScrolling: { + type: Boolean, + }, + /** * Sets the X translation of the arrow * diff --git a/packages/main/src/themes/PopupsCommon.css b/packages/main/src/themes/PopupsCommon.css index 14f82cca8e41..d30d38544e09 100644 --- a/packages/main/src/themes/PopupsCommon.css +++ b/packages/main/src/themes/PopupsCommon.css @@ -80,3 +80,7 @@ :host(:not([header-text])) .ui5-popup-header-text { display: none; } + +:host([disable-scrolling]) .ui5-popup-content { + overflow: hidden; +}