95d15b7863
The js-sdk's placement of the notification change was unreliable and could cause stuck notifications. The new location (piggybacking the Notifier) is a lot more reliable. The tinting has been changed fairly invasively in order to support the changing of the `fill` attribute. What was happening before was the `fill` property would happily get set to the forced color value, but when it came time to reset it it wouldn't be part of the colors array and fail the check, therefore never being changed back. By using a second field we can ensure we are checking the not-forced value where possible, falling back to the potentially forced value if needed. In addition to fixing which color the Tinter was checking against, something noticed during development is that `this.colors` might not always be a set of hex color codes. This is problematic when the attribute we're looking to replace is a rgb color code but we're only looking at `keyHex` - the value won't be reset. It appears as though this happens when people use custom tinting in places as `this.colors` often gets set to the rgb values throughout the file. To fix it, we just check against `keyHex` and `keyRgb`.
101 lines
2.9 KiB
JavaScript
101 lines
2.9 KiB
JavaScript
/*
|
|
Copyright 2015 OpenMarket Ltd
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
'use strict';
|
|
|
|
const React = require('react');
|
|
const ReactDOM = require("react-dom");
|
|
import PropTypes from 'prop-types';
|
|
const Tinter = require("../../../Tinter");
|
|
|
|
var TintableSvg = React.createClass({
|
|
displayName: 'TintableSvg',
|
|
|
|
propTypes: {
|
|
src: PropTypes.string.isRequired,
|
|
width: PropTypes.string.isRequired,
|
|
height: PropTypes.string.isRequired,
|
|
className: PropTypes.string,
|
|
forceColors: PropTypes.arrayOf(PropTypes.string),
|
|
},
|
|
|
|
statics: {
|
|
// list of currently mounted TintableSvgs
|
|
mounts: {},
|
|
idSequence: 0,
|
|
},
|
|
|
|
componentWillMount: function() {
|
|
this.fixups = [];
|
|
},
|
|
|
|
componentDidMount: function() {
|
|
this.id = TintableSvg.idSequence++;
|
|
TintableSvg.mounts[this.id] = this;
|
|
},
|
|
|
|
componentWillUnmount: function() {
|
|
delete TintableSvg.mounts[this.id];
|
|
},
|
|
|
|
componentDidUpdate: function(prevProps, prevState) {
|
|
if (prevProps.forceColors !== this.props.forceColors) {
|
|
this.calcAndApplyFixups(this.refs.svgContainer);
|
|
}
|
|
},
|
|
|
|
tint: function() {
|
|
// TODO: only bother running this if the global tint settings have changed
|
|
// since we loaded!
|
|
Tinter.applySvgFixups(this.fixups);
|
|
},
|
|
|
|
onLoad: function(event) {
|
|
this.calcAndApplyFixups(event.target);
|
|
},
|
|
|
|
calcAndApplyFixups: function(target) {
|
|
if (!target) return;
|
|
// console.log("TintableSvg.calcAndApplyFixups for " + this.props.src);
|
|
this.fixups = Tinter.calcSvgFixups([target], this.props.forceColors);
|
|
Tinter.applySvgFixups(this.fixups);
|
|
},
|
|
|
|
render: function() {
|
|
return (
|
|
<object className={"mx_TintableSvg " + (this.props.className ? this.props.className : "")}
|
|
type="image/svg+xml"
|
|
data={this.props.src}
|
|
width={this.props.width}
|
|
height={this.props.height}
|
|
onLoad={this.onLoad}
|
|
tabIndex="-1"
|
|
ref="svgContainer"
|
|
/>
|
|
);
|
|
},
|
|
});
|
|
|
|
// Register with the Tinter so that we will be told if the tint changes
|
|
Tinter.registerTintable(function() {
|
|
if (TintableSvg.mounts) {
|
|
Object.keys(TintableSvg.mounts).forEach((id) => {
|
|
TintableSvg.mounts[id].tint();
|
|
});
|
|
}
|
|
});
|
|
|
|
module.exports = TintableSvg;
|