Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix mobile UI in wiki trash dialog and share dialog #7612

Merged
merged 3 commits into from
Mar 15, 2025
Merged

Fix mobile UI in wiki trash dialog and share dialog #7612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f0a86ab
01 change mobile wiki trash dialog
Michael18811380328 Mar 14, 2025
4d4888d
02 share dialog support mobile use
Michael18811380328 Mar 14, 2025
b403336
03 fix share to group click outside
Michael18811380328 Mar 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 24 additions & 21 deletions frontend/src/components/common/group-select/select-option-group.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import SearchInput from '../../search-input';
import ClickOutside from '../../click-outside';
import Option from './option';
import KeyCodes from '../../../constants/keyCodes';

Expand All @@ -26,6 +25,7 @@ class SelectOptionGroup extends Component {

componentDidMount() {
window.addEventListener('keydown', this.onHotKey);
document.addEventListener('mousedown', this.handleDocumentClick);
setTimeout(() => {
this.resetMenuStyle();
}, 1);
Expand All @@ -35,8 +35,13 @@ class SelectOptionGroup extends Component {
this.filterOptions = null;
this.timer && clearTimeout(this.timer);
window.removeEventListener('keydown', this.onHotKey);
document.removeEventListener('mousedown', this.handleDocumentClick);
}

handleDocumentClick = (e) => {
this.props.onClickOutside(e);
};

resetMenuStyle = () => {
const { isInModal, position } = this.props;
const { top, height } = this.optionGroupRef.getBoundingClientRect();
Expand Down Expand Up @@ -170,27 +175,25 @@ class SelectOptionGroup extends Component {
};
}
return (
<ClickOutside onClickOutside={this.props.onClickOutside}>
<div
className={classnames('pt-0 option-group', className ? 'option-group-' + className : '')}
ref={(ref) => this.optionGroupRef = ref}
style={style}
onMouseDown={this.onMouseDown}
>
<div className="option-group-search position-relative">
<SearchInput
className="option-search-control"
autoFocus={isInModal}
placeholder={searchPlaceholder}
onChange={this.onChangeSearch}
ref={this.searchInputRef}
/>
</div>
<div className="option-group-content" ref={(ref) => this.optionGroupContentRef = ref}>
{this.renderOptGroup(searchVal)}
</div>
<div
className={classnames('pt-0 option-group', className ? 'option-group-' + className : '')}
ref={(ref) => this.optionGroupRef = ref}
style={style}
onMouseDown={this.onMouseDown}
>
<div className="option-group-search position-relative">
<SearchInput
className="option-search-control"
autoFocus={isInModal}
placeholder={searchPlaceholder}
onChange={this.onChangeSearch}
ref={this.searchInputRef}
/>
</div>
<div className="option-group-content" ref={(ref) => this.optionGroupContentRef = ref}>
{this.renderOptGroup(searchVal)}
</div>
</ClickOutside>
</div>
);
}
}
Expand Down
51 changes: 46 additions & 5 deletions frontend/src/components/dialog/share-to-group.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import { Button } from 'reactstrap';
import { gettext, isPro, enableShareToDepartment } from '../../utils/constants';
import { seafileAPI } from '../../utils/seafile-api';
import { Utils } from '../../utils/utils';
import { Utils, isMobile } from '../../utils/utils';
import toaster from '../toast';
import SharePermissionEditor from '../select-editor/share-permission-editor';
import EventBus from '../common/event-bus';
Expand Down Expand Up @@ -40,6 +40,36 @@ class GroupItem extends React.Component {
render() {
let item = this.props.item;
let currentPermission = Utils.getSharedPermission(item);
if (isMobile) {
return (
<tr>
<td className='name'>{item.group_info.name}</td>
<td>
<SharePermissionEditor
repoID={this.props.repoID}
isTextMode={true}
autoFocus={true}
isEditIconShow={this.state.isOperationShow}
currentPermission={currentPermission}
permissions={this.props.permissions}
onPermissionChanged={this.onChangeUserPermission}
/>
</td>
<td>
<span
tabIndex="0"
role="button"
className='sf2-icon-x3 action-icon'
onClick={this.deleteShareItem}
onKeyDown={Utils.onKeyDown}
title={gettext('Delete')}
aria-label={gettext('Delete')}
>
</span>
</td>
</tr>
);
}
return (
<tr onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave} tabIndex="0" onFocus={this.onMouseEnter}>
<td className='name'>{item.group_info.name}</td>
Expand Down Expand Up @@ -352,7 +382,7 @@ class ShareToGroup extends React.Component {
};

render() {
const thead = (
let thead = (
<thead>
<tr>
<th width="47%">{gettext('Group')}</th>
Expand All @@ -361,9 +391,20 @@ class ShareToGroup extends React.Component {
</tr>
</thead>
);
if (isMobile) {
thead = (
<thead>
<tr>
<th width="43%">{gettext('Group')}</th>
<th width="35%">{gettext('Permission')}</th>
<th width="22%"></th>
</tr>
</thead>
);
}
return (
<Fragment>
<table className="w-xs-200">
<table>
{thead}
<tbody>
<tr>
Expand Down Expand Up @@ -392,7 +433,7 @@ class ShareToGroup extends React.Component {
/>
</td>
<td>
<Button color="primary" onClick={this.shareToGroup}>{gettext('Submit')}</Button>
<Button color="primary" onClick={this.shareToGroup} size={isMobile ? 'sm' : 'md'}>{gettext('Submit')}</Button>
</td>
</tr>
{this.state.errorMsg.length > 0 &&
Expand All @@ -408,7 +449,7 @@ class ShareToGroup extends React.Component {
</tbody>
</table>
<div className="share-list-container">
<table className="table-thead-hidden w-xs-200">
<table className="table-thead-hidden">
{thead}
<GroupList
repoID={this.props.repoID}
Expand Down
80 changes: 75 additions & 5 deletions frontend/src/components/dialog/share-to-user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import classnames from 'classnames';
import { gettext, isPro, cloudMode, isOrgContext } from '../../utils/constants';
import { Button } from 'reactstrap';
import { seafileAPI } from '../../utils/seafile-api';
import { Utils } from '../../utils/utils';
import { Utils, isMobile } from '../../utils/utils';
import toaster from '../toast';
import UserSelect from '../user-select';
import SharePermissionEditor from '../select-editor/share-permission-editor';
Expand Down Expand Up @@ -52,6 +52,65 @@ class UserItem extends React.Component {
let item = this.props.item;
let currentPermission = Utils.getSharedPermission(item);
const { isUserDetailsPopoverOpen } = this.state;
if (isMobile) {
return (
<tr>
<td className="name">
<div className="position-relative d-flex align-items-center">
<img
src={item.user_info.avatar_url}
width="24"
alt={item.user_info.nickname}
className="rounded-circle mr-2 cursor-pointer"
onMouseEnter={this.userAvatarOnMouseEnter}
onMouseLeave={this.userAvatarOnMouseLeave}
/>
<span>{item.user_info.nickname}</span>
{isUserDetailsPopoverOpen && (
<div className="user-details-popover p-4 position-absolute w-100 mt-1">
<div className="user-details-main pb-3">
<img
src={item.user_info.avatar_url}
width="40"
alt={item.user_info.nickname}
className="rounded-circle mr-2"
/>
<span className="user-details-name">{item.user_info.nickname}</span>
</div>
<dl className="m-0 mt-3 d-flex">
<dt className="m-0 mr-3">{gettext('Email')}</dt>
<dd className="m-0">{item.user_info.contact_email}</dd>
</dl>
</div>
)}
</div>
</td>
<td>
<SharePermissionEditor
repoID={this.props.repoID}
isTextMode={true}
autoFocus={true}
isEditIconShow={true}
currentPermission={currentPermission}
permissions={this.props.permissions}
onPermissionChanged={this.onChangeUserPermission}
/>
</td>
<td>
<span
tabIndex="0"
role="button"
className='sf2-icon-x3 action-icon'
onClick={this.deleteShareItem}
onKeyDown={Utils.onKeyDown}
title={gettext('Delete')}
aria-label={gettext('Delete')}
>
</span>
</td>
</tr>
);
}
return (
<tr onMouseEnter={this.onMouseEnter} onMouseLeave={this.onMouseLeave} tabIndex="0" onFocus={this.onMouseEnter}>
<td className="name">
Expand Down Expand Up @@ -438,7 +497,7 @@ class ShareToUser extends React.Component {
showDeptBtn = false;
}
let { sharedItems } = this.state;
const thead = (
let thead = (
<thead>
<tr>
<th width="47%">{gettext('User')}</th>
Expand All @@ -447,9 +506,20 @@ class ShareToUser extends React.Component {
</tr>
</thead>
);
if (isMobile) {
thead = (
<thead>
<tr>
<th width="43%">{gettext('User')}</th>
<th width="35%">{gettext('Permission')}</th>
<th width="22%"></th>
</tr>
</thead>
);
}
return (
<div className="share-link-container">
<table className="w-xs-200">
<table>
{thead}
<tbody>
<tr>
Expand Down Expand Up @@ -485,7 +555,7 @@ class ShareToUser extends React.Component {
/>
</td>
<td>
<Button color="primary" onClick={this.shareToUser}>{gettext('Submit')}</Button>
<Button color="primary" onClick={this.shareToUser} size={isMobile ? 'sm' : 'md'}>{gettext('Submit')}</Button>
</td>
</tr>
{this.state.errorMsg.length > 0 &&
Expand All @@ -506,7 +576,7 @@ class ShareToUser extends React.Component {
</tbody>
</table>
<div className="share-list-container">
<table className="table-thead-hidden w-xs-200">
<table className="table-thead-hidden">
{thead}
<UserList
repoID={this.props.repoID}
Expand Down
35 changes: 27 additions & 8 deletions frontend/src/pages/wiki2/wiki-trash-dialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import { Modal, ModalBody, ModalHeader } from 'reactstrap';
import dayjs from 'dayjs';
import { Utils } from '../../utils/utils';
import { Utils, isMobile } from '../../utils/utils';
import { gettext, wikiId } from '../../utils/constants';
import wikiAPI from '../../utils/wiki-api';
import ModalPortal from '../../components/modal-portal';
Expand Down Expand Up @@ -137,13 +137,22 @@ class Content extends React.Component {

constructor(props) {
super(props);
this.theadData = [
{ width: '5%', text: gettext('Name') },
{ width: '20%', text: '' },
{ width: '30%', text: gettext('Size') },
{ width: '35%', text: gettext('Delete Time') },
{ width: '10%', text: '' }
];
if (isMobile) {
this.theadData = [
{ width: '30%', text: gettext('Name') },
{ width: '20%', text: gettext('Size') },
{ width: '30%', text: gettext('Delete Time') },
{ width: '20%', text: '' }
];
} else {
this.theadData = [
{ width: '5%', text: gettext('Name') },
{ width: '20%', text: '' },
{ width: '30%', text: gettext('Size') },
{ width: '35%', text: gettext('Delete Time') },
{ width: '10%', text: '' }
];
}
}

getPreviousPage = () => {
Expand Down Expand Up @@ -251,6 +260,16 @@ class Item extends React.Component {
return null;
}
const { isAdmin } = window.wiki.config;
if (isMobile) {
return (
<tr>
<td>{item.name}</td>
<td>{Utils.bytesToSize(item.size)}</td>
<td title={dayjs(item.deleted_time).format('dddd, MMMM D, YYYY h:mm:ss A')}>{dayjs(item.deleted_time).format('YYYY-MM-DD')}</td>
<td>{isAdmin && <a href="#" onClick={this.restoreItem} role="button">{gettext('Restore')}</a>}</td>
</tr>
);
}
return (
<tr onMouseOver={this.handleMouseOver} onMouseOut={this.handleMouseOut} onFocus={this.handleMouseOver}>
<td><NavItemIcon symbol={'file'} disable={true} /></td>
Expand Down