IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web:Common:Navigation: fixed root item height

Browse Source
This commit is contained in:
Timofey Boyko 2021-10-18 18:03:30 +08:00
parent 42780a5480
commit defb0a387d
2 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
packages/asc-web-common/components/Navigation/sub-components/drop-box.js
View File

@ -152,7 +152,7 @@ const DropBox = React.forwardRef(
const countItems = navigationItems.length;
const getItemSize = (index) => {
if (index === countItems - 1) return 29;
if (index === countItems - 1) return 31;
return isMobile || IsMobileUtils() || isTabletUtils() ? 36 : 30;
};
@ -160,41 +160,13 @@ const DropBox = React.forwardRef(
const itemsHeight = navigationItems.map((item, index) => getItemSize(index));
const currentHeight = itemsHeight.reduce((a, b) => a + b);
console.log(
currentHeight,
window.innerHeight,
currentHeight + 30 > window.innerHeight - 110
? window.innerHeight - 110
: currentHeight + 20,
);
return currentHeight + 30 > window.innerHeight - 110
? window.innerHeight - 110
: currentHeight + 20;
// 22 is padding-bottom last item
// 109 is nav height + height section header
return currentHeight + 22 > window.innerHeight - 109
? window.innerHeight - 109
: currentHeight + 22;
}, [height]);
// useEffect(() => {
// const items = [];
// const itemsText = [];
// const sectionWidth = document.getElementById('section').offsetWidth;
// navigationItems.forEach((item) => {
// items.push(document.getElementById(item.id));
// itemsText.push(document.getElementById(`item-text-${item.id}`));
// });
// let maxTextWidth = 0;
// itemsText.forEach((item) => {
// item.offsetWidth > maxTextWidth ? (maxTextWidth = item.offsetWidth) : null;
// });
// if (sectionWidth < maxTextWidth + 57) {
// setCurrentWidth(sectionWidth);
// } else {
// setCurrentWidth(maxTextWidth + 57);
// }
// items.forEach((item, index) => {});
// }, []);
return (
<StyledBox ref={ref} width={width} height={getListHeight()} changeWidth={changeWidth}>
<StyledContainer canCreate={canCreate}>

3
packages/asc-web-common/components/Navigation/sub-components/item.js
View File

@ -36,9 +36,8 @@ const StyledIconWrapper = styled.div`
const StyledText = styled(Text)`
margin-left: 10px;
/* line-height: 20px; */
position: relative;
bottom: -1px;
bottom: ${(props) => (props.isRoot ? '-2px' : '-1px')};
`;
const Item = ({ id, title, isRoot, onClick, ...rest }) => {