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