Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-02-23 23:54:13 +08:00
Code Issues Projects Releases Packages Wiki Activity

Use the inline style transformer to reemove <style> nodes from signatures #964

Browse source
This commit is contained in:
Ben Gotow 2019-06-10 20:03:59 -05:00
parent 66d3336aef
commit 9835f4ebe7
1 changed files with 21 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
app/internal_packages/composer-signature/lib/preferences-signatures.tsx
View file

@ -11,6 +11,7 @@ import {
ISignature, ISignature,
IDefaultSignatures, IDefaultSignatures,
IAliasSet, IAliasSet,
InlineStyleTransformer,
} from 'mailspring-exports'; } from 'mailspring-exports';
import { Flexbox, EditableList } from 'mailspring-component-kit'; import { Flexbox, EditableList } from 'mailspring-component-kit';
@ -29,10 +30,20 @@ interface SignatureEditorProps {
interface SignatureEditorState {} interface SignatureEditorState {}
class SignatureEditor extends React.Component<SignatureEditorProps, SignatureEditorState> { class SignatureEditor extends React.Component<SignatureEditorProps, SignatureEditorState> {
_onBaseFieldChange = event => { _onTitleChange = event => {
const { id, value } = event.target;
const sig = this.props.signature; const sig = this.props.signature;
Actions.upsertSignature(Object.assign({}, sig, { [id]: value }), sig.id); Actions.upsertSignature({ ...sig, title: event.target.value }, sig.id);
};
_onRawBodyChange = async event => {
const sig = this.props.signature;
let body = event.target.value;
try {
body = await InlineStyleTransformer.run(body);
} catch (err) {
//no-op
}
Actions.upsertSignature({ ...sig, body }, sig.id);
}; };
_onDataFieldChange = event => { _onDataFieldChange = event => {
@ -43,7 +54,7 @@ class SignatureEditor extends React.Component<SignatureEditorProps, SignatureEdi
// display a warning UNLESS the html is an unmodified template HTML // display a warning UNLESS the html is an unmodified template HTML
if (id === 'templateName' && !sig.data.templateName && value) { if (id === 'templateName' && !sig.data.templateName && value) {
const htmlMatchesATemplate = Templates.find( const htmlMatchesATemplate = Templates.find(
t => sig.body === RenderSignatureData(Object.assign({}, sig.data, { templateName: t.name })) t => sig.body === RenderSignatureData({ ...sig.data, templateName: t.name })
); );
if (!htmlMatchesATemplate) { if (!htmlMatchesATemplate) {
const idx = remote.dialog.showMessageBox({ const idx = remote.dialog.showMessageBox({
@ -61,7 +72,7 @@ class SignatureEditor extends React.Component<SignatureEditorProps, SignatureEdi
} }
// apply change // apply change
sig.data = Object.assign({}, sig.data, { [id]: value }); sig.data = { ...sig.data, [id]: value };
// re-render // re-render
if (sig.data.templateName) { if (sig.data.templateName) {
@ -99,7 +110,7 @@ class SignatureEditor extends React.Component<SignatureEditorProps, SignatureEdi
id="title" id="title"
placeholder={localized('Name')} placeholder={localized('Name')}
value={signature.title || ''} value={signature.title || ''}
onChange={this._onBaseFieldChange} onChange={this._onTitleChange}
/> />
<div style={{ flex: 1 }} /> <div style={{ flex: 1 }} />
<SignatureAccountDefaultPicker <SignatureAccountDefaultPicker
@ -125,11 +136,11 @@ class SignatureEditor extends React.Component<SignatureEditorProps, SignatureEdi
</div>, </div>,
<textarea <textarea
id="body" id="body"
key="textarea" key={`textarea ${signature.id}`}
className="section raw-html" className="section raw-html"
spellCheck={false} spellCheck={false}
onChange={this._onBaseFieldChange} onChange={this._onRawBodyChange}
value={signature.body || ''} defaultValue={signature.body || ''}
/>, />,
] ]
: [ : [
@ -208,7 +219,7 @@ export default class PreferencesSignatures extends React.Component<{}, Preferenc
let data = {}; let data = {};
let body = null; let body = null;
if (this.state.selectedSignature) { if (this.state.selectedSignature) {
data = Object.assign({}, this.state.selectedSignature.data); data = { ...this.state.selectedSignature.data };
body = this.state.selectedSignature.body; body = this.state.selectedSignature.body;
} else { } else {
data = { data = {