Web:Delete scale props in Submenu, BottomLine width to 100%.
This commit is contained in:
parent
659217ffd6
commit
dd35e54ca6
@ -126,14 +126,12 @@ const InfoPanelHeaderContent = (props) => {
|
||||
style={{ width: "100%" }}
|
||||
data={roomsSubmenu}
|
||||
forsedActiveItemId={roomsView}
|
||||
scale={true}
|
||||
/>
|
||||
) : (
|
||||
<Submenu
|
||||
style={{ width: "100%" }}
|
||||
data={personalSubmenu}
|
||||
forsedActiveItemId={fileView}
|
||||
scale={true}
|
||||
/>
|
||||
)}
|
||||
</div>
|
||||
|
@ -21,7 +21,6 @@ const Submenu = (props) => {
|
||||
startSelect = 0,
|
||||
forsedActiveItemId,
|
||||
onSelect,
|
||||
scale,
|
||||
...rest
|
||||
} = props;
|
||||
if (!data) return null;
|
||||
@ -106,7 +105,7 @@ const Submenu = (props) => {
|
||||
<div className="sticky">
|
||||
<SubmenuRoot>
|
||||
<SubmenuScrollbarSize />
|
||||
<SubmenuScroller scale={scale}>
|
||||
<SubmenuScroller>
|
||||
<StyledSubmenuItems ref={submenuItemsRef} role="list">
|
||||
{data.map((d) => {
|
||||
const isActive =
|
||||
@ -145,10 +144,9 @@ const Submenu = (props) => {
|
||||
);
|
||||
})}
|
||||
</StyledSubmenuItems>
|
||||
{!scale && <StyledSubmenuBottomLine className="bottom-line" />}
|
||||
</SubmenuScroller>
|
||||
</SubmenuRoot>
|
||||
{scale && <StyledSubmenuBottomLine className="bottom-line" />}
|
||||
<StyledSubmenuBottomLine className="bottom-line" />
|
||||
</div>
|
||||
<div className="sticky-indent"></div>
|
||||
|
||||
@ -166,8 +164,6 @@ Submenu.propTypes = {
|
||||
startSelect: PropTypes.oneOfType([PropTypes.object, PropTypes.number]),
|
||||
/** Property that allows explicitly selecting content passed through an external operation */
|
||||
forsedActiveItemId: PropTypes.any,
|
||||
/** Scales the width of the bottom line to 100%. */
|
||||
scale: PropTypes.bool,
|
||||
/** Sets a callback function that is triggered when the submenu item is selected */
|
||||
onSelect: PropTypes.func,
|
||||
};
|
||||
|
@ -128,13 +128,6 @@ export const SubmenuScroller = styled.div`
|
||||
}
|
||||
overflow-x: auto;
|
||||
overflow-y: hidden;
|
||||
|
||||
${(props) =>
|
||||
!props.scale &&
|
||||
css`
|
||||
display: grid;
|
||||
flex: 0 1 auto;
|
||||
`}
|
||||
`;
|
||||
|
||||
export const SubmenuRoot = styled.div`
|
||||
|
Loading…
Reference in New Issue
Block a user