ted/recogito-client-core
ted
/
recogito-client-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Closes #85

This commit is contained in:
Rainer Simon 2021-10-12 18:12:24 +02:00
parent db2813d0a4
commit 0b3edd41d5
6 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/editor/Editor.jsx
View File

@ -335,7 +335,7 @@ export default class Editor extends Component {
return ( return (
<Draggable <Draggable
disabled={!this.props.detachable} disabled={!this.props.detachable}
cancel=".r6o-btn, .r6o-nodrag, input, textarea" handle=".r6o-draggable"
onDrag={() => this.setState({ dragged: true })}> onDrag={() => this.setState({ dragged: true })}>
<div ref={this.element} className={this.state.dragged ? 'r6o-editor dragged' : 'r6o-editor'}> <div ref={this.element} className={this.state.dragged ? 'r6o-editor dragged' : 'r6o-editor'}>
@ -365,7 +365,8 @@ export default class Editor extends Component {
onClick={this.onCancel}>{i18n.t('Close')}</button> onClick={this.onCancel}>{i18n.t('Close')}</button>
</div> </div>
) : ( ) : (
<div className="r6o-footer"> <div
className={this.props.detachable ? "r6o-footer r6o-draggable" : "r6o-footer"}>
{ hasDelete && ( { hasDelete && (
<button <button
className="r6o-btn left delete-annotation" className="r6o-btn left delete-annotation"

2
src/editor/widgets/comment/Comment.jsx
View File

@ -66,7 +66,7 @@ const Comment = props => {
/> } /> }
<div <div
className={isMenuVisible ? "r6o-icon r6o-arrow-down r6o-nodrag r6o-menu-open" : "r6o-icon r6o-arrow-down r6o-nodrag"} className={isMenuVisible ? "r6o-icon r6o-arrow-down r6o-menu-open" : "r6o-icon r6o-arrow-down"}
onClick={() => setIsMenuVisible(!isMenuVisible)}> onClick={() => setIsMenuVisible(!isMenuVisible)}>
<ChevronDownIcon width={12} /> <ChevronDownIcon width={12} />
</div> </div>

2
src/editor/widgets/comment/DropdownMenu.jsx
View File

@ -10,7 +10,7 @@ const DropdownMenu = props => {
useClickOutside(ref, () => props.onClickOutside()); useClickOutside(ref, () => props.onClickOutside());
return ( return (
<ul ref={ref} className="r6o-comment-dropdown-menu r6o-nodrag"> <ul ref={ref} className="r6o-comment-dropdown-menu">
<li onClick={props.onEdit}>{i18n.t('Edit')}</li> <li onClick={props.onEdit}>{i18n.t('Edit')}</li>
<li onClick={props.onDelete}>{i18n.t('Delete')}</li> <li onClick={props.onDelete}>{i18n.t('Delete')}</li>
</ul> </ul>

2
src/editor/widgets/comment/TextEntryField.jsx
View File

@ -28,7 +28,7 @@ export default class TextEntryField extends Component {
return ( return (
<TextareaAutosize <TextareaAutosize
ref={this.element} ref={this.element}
className={this.props.editable ? 'r6o-editable-text r6o-nodrag' : 'r6o-editable-text'} className={this.props.editable ? 'r6o-editable-text' : 'r6o-editable-text r6o-draggable'}
value={this.props.content} value={this.props.content}
placeholder={this.props.placeholder || i18n.t('Add a comment...')} placeholder={this.props.placeholder || i18n.t('Add a comment...')}
disabled={!this.props.editable} disabled={!this.props.editable}

2
src/editor/widgets/tag/TagWidget.jsx
View File

@ -62,7 +62,7 @@ const TagWidget = props => {
} }
return ( return (
<div className="r6o-widget r6o-tag r6o-nodrag"> <div className="r6o-widget r6o-tag">
{ tags.length > 0 && { tags.length > 0 &&
<ul className="r6o-taglist"> <ul className="r6o-taglist">
{ tags.map(tag => { tags.map(tag =>

6
themes/default/editor/_editor.scss
View File

@ -131,11 +131,7 @@
margin-top:4px; margin-top:4px;
} }
.r6o-editor .r6o-nodrag * { .r6o-editor .r6o-draggable {
cursor:default !important;
}
.r6o-editor *:not(.r6o-nodrag, .r6o-btn, input, textarea) {
cursor:move; cursor:move;
} }