Add option to rotate images
cf. https://github.com/vector-im/riot-web/issues/9257 Add rotate clockwise/counterclockwise buttons to <ImageView> Signed-off-by: YaoiFangirl420 <48789208+YaoiFangirl420@users.noreply.github.com>pull/21833/head
parent
c3d3dd1fd7
commit
9bd1ba60f5
|
@ -80,7 +80,24 @@ limitations under the License.
|
||||||
// hack for mx_Dialog having a top padding of 40px
|
// hack for mx_Dialog having a top padding of 40px
|
||||||
top: 40px;
|
top: 40px;
|
||||||
right: 0px;
|
right: 0px;
|
||||||
padding: 35px;
|
padding-top: 35px;
|
||||||
|
padding-right: 35px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_ImageView_rotateClockwise {
|
||||||
|
position: absolute;
|
||||||
|
top: 40px;
|
||||||
|
right: 70px;
|
||||||
|
padding-top: 35px;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.mx_ImageView_rotateCounterClockwise {
|
||||||
|
position: absolute;
|
||||||
|
top: 40px;
|
||||||
|
right: 105px;
|
||||||
|
padding-top: 35px;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-rotate-ccw"><polyline points="1 4 1 10 7 10"></polyline><path d="M3.51 15a9 9 0 1 0 2.13-9.36L1 10"></path></svg>
|
After Width: | Height: | Size: 311 B |
|
@ -0,0 +1 @@
|
||||||
|
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="white" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-rotate-cw"><polyline points="23 4 23 10 17 10"></polyline><path d="M20.49 15a9 9 0 1 1-2.12-9.36L23 10"></path></svg>
|
After Width: | Height: | Size: 315 B |
|
@ -27,10 +27,8 @@ const Modal = require('../../../Modal');
|
||||||
const sdk = require('../../../index');
|
const sdk = require('../../../index');
|
||||||
import { _t } from '../../../languageHandler';
|
import { _t } from '../../../languageHandler';
|
||||||
|
|
||||||
module.exports = React.createClass({
|
export default class ImageView extends React.Component {
|
||||||
displayName: 'ImageView',
|
static propTypes = {
|
||||||
|
|
||||||
propTypes: {
|
|
||||||
src: React.PropTypes.string.isRequired, // the source of the image being displayed
|
src: React.PropTypes.string.isRequired, // the source of the image being displayed
|
||||||
name: React.PropTypes.string, // the main title ('name') for the image
|
name: React.PropTypes.string, // the main title ('name') for the image
|
||||||
link: React.PropTypes.string, // the link (if any) applied to the name of the image
|
link: React.PropTypes.string, // the link (if any) applied to the name of the image
|
||||||
|
@ -44,27 +42,32 @@ module.exports = React.createClass({
|
||||||
// properties above, which let us use lightboxes to display images which aren't associated
|
// properties above, which let us use lightboxes to display images which aren't associated
|
||||||
// with events.
|
// with events.
|
||||||
mxEvent: React.PropTypes.object,
|
mxEvent: React.PropTypes.object,
|
||||||
},
|
};
|
||||||
|
|
||||||
|
constructor(props) {
|
||||||
|
super(props);
|
||||||
|
this.state = { rotationDegrees: 0 }
|
||||||
|
}
|
||||||
|
|
||||||
// XXX: keyboard shortcuts for managing dialogs should be done by the modal
|
// XXX: keyboard shortcuts for managing dialogs should be done by the modal
|
||||||
// dialog base class somehow, surely...
|
// dialog base class somehow, surely...
|
||||||
componentDidMount: function() {
|
componentDidMount() {
|
||||||
document.addEventListener("keydown", this.onKeyDown);
|
document.addEventListener("keydown", this.onKeyDown);
|
||||||
},
|
}
|
||||||
|
|
||||||
componentWillUnmount: function() {
|
componentWillUnmount() {
|
||||||
document.removeEventListener("keydown", this.onKeyDown);
|
document.removeEventListener("keydown", this.onKeyDown);
|
||||||
},
|
}
|
||||||
|
|
||||||
onKeyDown: function(ev) {
|
onKeyDown = (ev) => {
|
||||||
if (ev.keyCode == 27) { // escape
|
if (ev.keyCode == 27) { // escape
|
||||||
ev.stopPropagation();
|
ev.stopPropagation();
|
||||||
ev.preventDefault();
|
ev.preventDefault();
|
||||||
this.props.onFinished();
|
this.props.onFinished();
|
||||||
}
|
}
|
||||||
},
|
};
|
||||||
|
|
||||||
onRedactClick: function() {
|
onRedactClick = () => {
|
||||||
const ConfirmRedactDialog = sdk.getComponent("dialogs.ConfirmRedactDialog");
|
const ConfirmRedactDialog = sdk.getComponent("dialogs.ConfirmRedactDialog");
|
||||||
Modal.createTrackedDialog('Confirm Redact Dialog', 'Image View', ConfirmRedactDialog, {
|
Modal.createTrackedDialog('Confirm Redact Dialog', 'Image View', ConfirmRedactDialog, {
|
||||||
onFinished: (proceed) => {
|
onFinished: (proceed) => {
|
||||||
|
@ -83,17 +86,29 @@ module.exports = React.createClass({
|
||||||
}).done();
|
}).done();
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
},
|
};
|
||||||
|
|
||||||
getName: function() {
|
getName = () => {
|
||||||
let name = this.props.name;
|
let name = this.props.name;
|
||||||
if (name && this.props.link) {
|
if (name && this.props.link) {
|
||||||
name = <a href={ this.props.link } target="_blank" rel="noopener">{ name }</a>;
|
name = <a href={ this.props.link } target="_blank" rel="noopener">{ name }</a>;
|
||||||
}
|
}
|
||||||
return name;
|
return name;
|
||||||
},
|
};
|
||||||
|
|
||||||
render: function() {
|
rotateCounterClockwise = () => {
|
||||||
|
const cur = this.state.rotationDegrees;
|
||||||
|
const rotationDegrees = (cur - 90) % 360;
|
||||||
|
this.setState({ rotationDegrees });
|
||||||
|
};
|
||||||
|
|
||||||
|
rotateClockwise = () => {
|
||||||
|
const cur = this.state.rotationDegrees;
|
||||||
|
const rotationDegrees = (cur + 90) % 360;
|
||||||
|
this.setState({ rotationDegrees });
|
||||||
|
};
|
||||||
|
|
||||||
|
render() {
|
||||||
/*
|
/*
|
||||||
// In theory max-width: 80%, max-height: 80% on the CSS should work
|
// In theory max-width: 80%, max-height: 80% on the CSS should work
|
||||||
// but in practice, it doesn't, so do it manually:
|
// but in practice, it doesn't, so do it manually:
|
||||||
|
@ -122,7 +137,8 @@ module.exports = React.createClass({
|
||||||
height: displayHeight
|
height: displayHeight
|
||||||
};
|
};
|
||||||
*/
|
*/
|
||||||
let style; let res;
|
let style = {};
|
||||||
|
let res;
|
||||||
|
|
||||||
if (this.props.width && this.props.height) {
|
if (this.props.width && this.props.height) {
|
||||||
style = {
|
style = {
|
||||||
|
@ -168,15 +184,26 @@ module.exports = React.createClass({
|
||||||
</div>);
|
</div>);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const rotationDegrees = this.state.rotationDegrees;
|
||||||
|
const effectiveStyle = {transform: `rotate(${rotationDegrees}deg)`, ...style};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="mx_ImageView">
|
<div className="mx_ImageView">
|
||||||
<div className="mx_ImageView_lhs">
|
<div className="mx_ImageView_lhs">
|
||||||
</div>
|
</div>
|
||||||
<div className="mx_ImageView_content">
|
<div className="mx_ImageView_content">
|
||||||
<img src={this.props.src} title={this.props.name} style={style} />
|
<img src={this.props.src} title={this.props.name} style={effectiveStyle} className="mainImage" />
|
||||||
<div className="mx_ImageView_labelWrapper">
|
<div className="mx_ImageView_labelWrapper">
|
||||||
<div className="mx_ImageView_label">
|
<div className="mx_ImageView_label">
|
||||||
<AccessibleButton className="mx_ImageView_cancel" onClick={ this.props.onFinished }><img src={require("../../../../res/img/cancel-white.svg")} width="18" height="18" alt={ _t('Close') } /></AccessibleButton>
|
<AccessibleButton className="mx_ImageView_rotateCounterClockwise" onClick={ this.rotateCounterClockwise }>
|
||||||
|
<img src={require("../../../../res/img/rotate-ccw.svg")} alt={ 'Rotate counter-clockwise' } width="18" height="18" />
|
||||||
|
</AccessibleButton>
|
||||||
|
<AccessibleButton className="mx_ImageView_rotateClockwise" onClick={ this.rotateClockwise }>
|
||||||
|
<img src={require("../../../../res/img/rotate-cw.svg")} alt={ 'Rotate clockwise' } width="18" height="18" />
|
||||||
|
</AccessibleButton>
|
||||||
|
<AccessibleButton className="mx_ImageView_cancel" onClick={ this.props.onFinished }>
|
||||||
|
<img src={require("../../../../res/img/cancel-white.svg")} width="18" height="18" alt={ _t('Close') } />
|
||||||
|
</AccessibleButton>
|
||||||
<div className="mx_ImageView_shim">
|
<div className="mx_ImageView_shim">
|
||||||
</div>
|
</div>
|
||||||
<div className="mx_ImageView_name">
|
<div className="mx_ImageView_name">
|
||||||
|
@ -199,5 +226,5 @@ module.exports = React.createClass({
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
},
|
}
|
||||||
});
|
}
|
||||||
|
|
Loading…
Reference in New Issue