haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-03 07:55:36 +00:00
Code Issues Releases Wiki Activity

fix admin share animation (#6060)

Browse Source
This commit is contained in:
Michael An
2024-05-09 16:24:53 +08:00
committed by GitHub
parent 143b087387
commit ccea398718
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
frontend/src/components/main-side-nav.js
View File

@@ -14,6 +14,8 @@ const propTypes = {
tabItemClick: PropTypes.func.isRequired, tabItemClick: PropTypes.func.isRequired,
}; };
const SUB_NAV_ITEM_HEIGHT = 28;
class MainSideNav extends React.Component { class MainSideNav extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);
@@ -23,8 +25,6 @@ class MainSideNav extends React.Component {
closeSideBar:false, closeSideBar:false,
groupItems: [], groupItems: [],
}; };
this.listHeight = 24; //for caculate tabheight
this.adminHeight = 0; this.adminHeight = 0;
this.filesNavHeight = 0; this.filesNavHeight = 0;
} }
@@ -43,8 +43,7 @@ class MainSideNav extends React.Component {
return group; return group;
}); });
const groupItemHeight = 28; this.filesNavHeight = (groupList.length + (canAddRepo ? 1 : 0) + (canViewOrg ? 1 : 0) + 1) * SUB_NAV_ITEM_HEIGHT;
this.filesNavHeight = (groupList.length + (canAddRepo ? 1 : 0) + (canViewOrg ? 1 : 0) + 1) * groupItemHeight;
_this.setState({ _this.setState({
groupItems: groupList.sort((a, b) => { groupItems: groupList.sort((a, b) => {
return a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1; return a.name.toLowerCase() < b.name.toLowerCase() ? -1 : 1;
@@ -98,7 +97,7 @@ class MainSideNav extends React.Component {
let height = 0; let height = 0;
if (this.state.sharedExtended) { if (this.state.sharedExtended) {
if (!this.adminHeight) { if (!this.adminHeight) {
this.adminHeight = 3 * this.listHeight; this.adminHeight = 3 * SUB_NAV_ITEM_HEIGHT;
} }
height = this.adminHeight; height = this.adminHeight;
} }
@@ -125,7 +124,7 @@ class MainSideNav extends React.Component {
); );
} }
return ( return (
<ul className={`nav sub-nav nav-pills flex-column ${this.state.sharedExtended ? 'side-panel-slide' : 'side-panel-slide-up'}`} style={style} > <ul id="share-admin-sub-nav" className={`nav sub-nav nav-pills flex-column ${this.state.sharedExtended ? 'side-panel-slide' : 'side-panel-slide-up'}`} style={style} >
{canAddRepo && ( {canAddRepo && (
<li className="nav-item"> <li className="nav-item">
<Link to={siteRoot + 'share-admin-libs/'} className={`nav-link ellipsis ${this.getActiveClass('share-admin-libs')}`} title={gettext('Libraries')} onClick={(e) => this.tabItemClick(e, 'share-admin-libs')}> <Link to={siteRoot + 'share-admin-libs/'} className={`nav-link ellipsis ${this.getActiveClass('share-admin-libs')}`} title={gettext('Libraries')} onClick={(e) => this.tabItemClick(e, 'share-admin-libs')}>

8
media/css/seahub_react.css
View File

@@ -726,9 +726,15 @@ a, a:hover { color: #ec8000; }
line-height: 1.5rem; line-height: 1.5rem;
height: auto; height: auto;
} }
.side-nav-con .sub-nav#share-admin-sub-nav .nav-item .nav-link,
.side-nav-con .sub-nav#files-sub-nav .nav-item .nav-link {
height: 28px;
line-height: 28px;
}
.side-nav-con .sub-nav#files-sub-nav .nav-item .nav-link { .side-nav-con .sub-nav#files-sub-nav .nav-item .nav-link {
padding-left: 2.25rem; padding-left: 2.25rem;
height: 28px;
display: flex; display: flex;
align-items: center; align-items: center;
} }