diff --git a/packages/terra-menu/CHANGELOG.md b/packages/terra-menu/CHANGELOG.md index 23e81ca3000..4529d98ca68 100644 --- a/packages/terra-menu/CHANGELOG.md +++ b/packages/terra-menu/CHANGELOG.md @@ -3,6 +3,8 @@ Changelog Unreleased ---------- +### Changed +* Removed fixedHeight logic from Menu. 6.24.0 - (January 28, 2020) ------------------ diff --git a/packages/terra-menu/src/Menu.jsx b/packages/terra-menu/src/Menu.jsx index ea5471f575e..fce63bd6e6f 100644 --- a/packages/terra-menu/src/Menu.jsx +++ b/packages/terra-menu/src/Menu.jsx @@ -79,12 +79,10 @@ class Menu extends React.Component { setPageDimensions(node) { if (node) { - this.pageHeight = node.clientHeight; if (this.props.contentWidth === 'auto') { this.pageWidth = node.clientWidth; } } else { - this.pageHeight = undefined; this.pageWidth = undefined; } } @@ -137,10 +135,9 @@ class Menu extends React.Component { onRequestBack={this.pop} onRequestClose={this.props.onRequestClose} isHidden={index !== visiblePage} - fixedHeight={this.pageHeight} fixedWidth={this.pageWidth} contentWidth={Popup.Opts.widths[contentWidth]} - refCallback={visiblePage === 0 ? this.setPageDimensions : null} + refCallback={this.setPageDimensions} index={index} boundingRef={boundingRef} isFocused={index === visiblePage} diff --git a/packages/terra-menu/src/_MenuContent.jsx b/packages/terra-menu/src/_MenuContent.jsx index 7053c2baab1..390d5ec41bf 100644 --- a/packages/terra-menu/src/_MenuContent.jsx +++ b/packages/terra-menu/src/_MenuContent.jsx @@ -59,10 +59,6 @@ const propTypes = { * Indicates if menu's width has been constrained by bounding container. */ isWidthBounded: PropTypes.bool, - /** - * Fixed height for content. - */ - fixedHeight: PropTypes.number, /** * Fixed width for content. */ @@ -297,7 +293,7 @@ class MenuContent extends React.Component { onKeyDown, isActive, }); - // If the child has children then it is an item group, so iterate through it's children + // If the child has children then it is an item group, so iterate through it's children } else if (item.props.children) { const children = item.props.children ? [] : undefined; React.Children.forEach(item.props.children, (child) => { @@ -336,7 +332,7 @@ class MenuContent extends React.Component { if (isFullScreen || isSubMenu) { header = this.buildHeader(isFullScreen); } - const contentHeight = this.props.isHeightBounded ? '100%' : this.props.fixedHeight; + const contentHeight = this.props.isHeightBounded && '100%'; const contentPosition = this.props.isHeightBounded ? 'relative' : 'static'; const contentWidth = this.props.isWidthBounded ? undefined : this.props.fixedWidth; /* eslint-disable jsx-a11y/no-noninteractive-element-interactions, react/forbid-dom-props */ @@ -350,7 +346,7 @@ class MenuContent extends React.Component { role="dialog" onKeyDown={this.onKeyDown} > - 0}> + {items} diff --git a/packages/terra-menu/src/terra-dev-site/test/menu/menu/SubMenu.test.jsx b/packages/terra-menu/src/terra-dev-site/test/menu/menu/SubMenu.test.jsx index 2d1644e0a1b..300234c3c28 100644 --- a/packages/terra-menu/src/terra-dev-site/test/menu/menu/SubMenu.test.jsx +++ b/packages/terra-menu/src/terra-dev-site/test/menu/menu/SubMenu.test.jsx @@ -50,6 +50,18 @@ class SubMenu extends React.Component { className="TestNestedMenu" subMenuItems={[ , + , + , + , + , + , + , + , + , + , + , + , + , ]} /> diff --git a/packages/terra-menu/tests/wdio/__snapshots__/reference/en/chrome_medium/menu-spec/Menu-Bounded[submenu].png b/packages/terra-menu/tests/wdio/__snapshots__/reference/en/chrome_medium/menu-spec/Menu-Bounded[submenu].png index 22642ee99ec..26d0a5c432f 100644 Binary files a/packages/terra-menu/tests/wdio/__snapshots__/reference/en/chrome_medium/menu-spec/Menu-Bounded[submenu].png and b/packages/terra-menu/tests/wdio/__snapshots__/reference/en/chrome_medium/menu-spec/Menu-Bounded[submenu].png differ diff --git a/packages/terra-menu/tests/wdio/__snapshots__/reference/en/chrome_medium/menu-spec/Menu_Keyboard_Navigation-Arrow_Keys[navigated_to_submenu].png b/packages/terra-menu/tests/wdio/__snapshots__/reference/en/chrome_medium/menu-spec/Menu_Keyboard_Navigation-Arrow_Keys[navigated_to_submenu].png index f14c520e046..2fc5f8366ca 100644 Binary files a/packages/terra-menu/tests/wdio/__snapshots__/reference/en/chrome_medium/menu-spec/Menu_Keyboard_Navigation-Arrow_Keys[navigated_to_submenu].png and b/packages/terra-menu/tests/wdio/__snapshots__/reference/en/chrome_medium/menu-spec/Menu_Keyboard_Navigation-Arrow_Keys[navigated_to_submenu].png differ diff --git a/packages/terra-menu/tests/wdio/__snapshots__/reference/en/chrome_medium/menu-spec/Menu_Keyboard_Navigation-Enter_Key[navigated_to_submenu].png b/packages/terra-menu/tests/wdio/__snapshots__/reference/en/chrome_medium/menu-spec/Menu_Keyboard_Navigation-Enter_Key[navigated_to_submenu].png index f14c520e046..2fc5f8366ca 100644 Binary files a/packages/terra-menu/tests/wdio/__snapshots__/reference/en/chrome_medium/menu-spec/Menu_Keyboard_Navigation-Enter_Key[navigated_to_submenu].png and b/packages/terra-menu/tests/wdio/__snapshots__/reference/en/chrome_medium/menu-spec/Menu_Keyboard_Navigation-Enter_Key[navigated_to_submenu].png differ diff --git a/packages/terra-menu/tests/wdio/__snapshots__/reference/en/chrome_medium/menu-spec/Menu_with_a_submenu[submenu].png b/packages/terra-menu/tests/wdio/__snapshots__/reference/en/chrome_medium/menu-spec/Menu_with_a_submenu[submenu].png index f4f8357a024..40cbeece11e 100644 Binary files a/packages/terra-menu/tests/wdio/__snapshots__/reference/en/chrome_medium/menu-spec/Menu_with_a_submenu[submenu].png and b/packages/terra-menu/tests/wdio/__snapshots__/reference/en/chrome_medium/menu-spec/Menu_with_a_submenu[submenu].png differ diff --git a/packages/terra-menu/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/menu-spec/Menu-Bounded[submenu].png b/packages/terra-menu/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/menu-spec/Menu-Bounded[submenu].png index c3f045d387f..5fdd1cbf2e1 100644 Binary files a/packages/terra-menu/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/menu-spec/Menu-Bounded[submenu].png and b/packages/terra-menu/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/menu-spec/Menu-Bounded[submenu].png differ diff --git a/packages/terra-menu/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/menu-spec/Menu_Keyboard_Navigation-Arrow_Keys[navigated_to_submenu].png b/packages/terra-menu/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/menu-spec/Menu_Keyboard_Navigation-Arrow_Keys[navigated_to_submenu].png index edd217f7fce..f9199fbab57 100644 Binary files a/packages/terra-menu/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/menu-spec/Menu_Keyboard_Navigation-Arrow_Keys[navigated_to_submenu].png and b/packages/terra-menu/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/menu-spec/Menu_Keyboard_Navigation-Arrow_Keys[navigated_to_submenu].png differ diff --git a/packages/terra-menu/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/menu-spec/Menu_Keyboard_Navigation-Enter_Key[navigated_to_submenu].png b/packages/terra-menu/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/menu-spec/Menu_Keyboard_Navigation-Enter_Key[navigated_to_submenu].png index edd217f7fce..f9199fbab57 100644 Binary files a/packages/terra-menu/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/menu-spec/Menu_Keyboard_Navigation-Enter_Key[navigated_to_submenu].png and b/packages/terra-menu/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/menu-spec/Menu_Keyboard_Navigation-Enter_Key[navigated_to_submenu].png differ diff --git a/packages/terra-menu/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/menu-spec/Menu_with_a_submenu[submenu].png b/packages/terra-menu/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/menu-spec/Menu_with_a_submenu[submenu].png index 15d743d4e1d..3cbe536e262 100644 Binary files a/packages/terra-menu/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/menu-spec/Menu_with_a_submenu[submenu].png and b/packages/terra-menu/tests/wdio/__snapshots__/reference/orion-fusion-theme/en/chrome_medium/menu-spec/Menu_with_a_submenu[submenu].png differ