diff --git a/src/component/Component.js b/src/component/Component.js index f25ac2f..56aff20 100644 --- a/src/component/Component.js +++ b/src/component/Component.js @@ -82,14 +82,21 @@ class Component extends StyleAndScriptStoringComponent { * @param {boolean} horizontal Defines if the Component should overflow horizontally (default: false) * @returns {Component} */ - overflow(vertical = true, horizontal = false) { - if (vertical) { + overflow(vertical = true, horizontal = false ) { + if (vertical || horizontal) { + this._modifier.join( + new Modifier() + .removeStyleRule("flex") + .setStyleRule("overflow", "hidden auto") + ); this.subscribeOnGenerate(CommonCompelGroups.OVERFLOWING); - this._modifier._modifications["overflow-y"] = "auto"; + } + + if (vertical) { + this._modifier._modifications["overflow-y"] = "hidden auto"; } if (horizontal) { - this.subscribeOnGenerate(CommonCompelGroups.OVERFLOWING); - this._modifier._modifications["overflow-x"] = "auto"; + this._modifier._modifications["overflow-x"] = "hidden auto"; } return this; } diff --git a/src/component/FlexContainerComponent.js b/src/component/FlexContainerComponent.js index 29fda2f..13a0264 100644 --- a/src/component/FlexContainerComponent.js +++ b/src/component/FlexContainerComponent.js @@ -60,9 +60,8 @@ class FlexContainerComponent extends Component { }) .forEach(icomp => { icomp._modifier = new Modifier() - .setStyleRule("flex", "none") + .removeStyleRule("flex") .join(icomp._modifier); - }); } return super.childContext(innerComponent);