Skip to content

#5838 Added checks for RichText() before initializing squire in Secure Reply message box #5845

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

Merged
merged 5 commits into from
Sep 30, 2024
Merged

#5838 Added checks for RichText() before initializing squire in Secure Reply message box #5845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
54d349c
Added checks for RichText() before initializing squire
martgil Sep 26, 2024
061beed
fix failing test
martgil Sep 26, 2024
fb7af2d
pr review: fix squire initialization
martgil Sep 27, 2024
bc75487
refactor
martgil Sep 27, 2024
4a41603
refactor
martgil Sep 29, 2024
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
12 changes: 10 additions & 2 deletions extension/chrome/elements/compose-modules/compose-input-module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ export class ComposeInputModule extends ViewModule<ComposeView> {
}

public setHandlers = () => {
this.configureRichTextFormatting();
this.view.S.cached('add_intro').on(
'click',
this.view.setHandler(el => this.actionAddIntroHandler(el), this.view.errModule.handle(`add intro`))
);
this.initSquire(this.isRichText());
// Set lastDraftBody to current empty squire content ex: <div><br></div>)
// https://github.com/FlowCrypt/flowcrypt-browser/issues/5184
this.view.draftModule.setLastDraftBody(this.squire.getHTML());
Expand All @@ -54,7 +54,7 @@ export class ComposeInputModule extends ViewModule<ComposeView> {
};

public removeRichTextFormatting = () => {
if (this.view.inputModule.isRichText()) {
if (this.isRichText()) {
this.initSquire(false, true);
}
};
Expand Down Expand Up @@ -105,6 +105,14 @@ export class ComposeInputModule extends ViewModule<ComposeView> {
return isInputLimitExceeded;
};

private configureRichTextFormatting = () => {
if (this.isRichText()) {
this.addRichTextFormatting();
} else {
this.removeRichTextFormatting();
}
};

private initSquire = (addLinks: boolean, removeExistingLinks = false) => {
const squireHtml = this.squire?.getHTML();
const el = this.view.S.cached('input_text').get(0);
Expand Down
2 changes: 1 addition & 1 deletion test/source/tests/compose.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1686,7 +1686,7 @@ export const defineComposeTests = (testVariant: TestVariant, testWithBrowser: Te
expect(await composePage.read('.swal2-html-container')).to.include('Send empty message?');
await composePage.waitAndClick('.swal2-cancel');
const footer = await composePage.read('@input-body');
expect(footer).to.eq('\n\n\n\n--\n\nflowcrypt.compatibility test footer with an img\n\nand second line\n');
expect(footer).to.eq('\n\n\n--\nflowcrypt.compatibility test footer with an img\nand second line');
await composePage.waitAndClick(`@action-send`);
expect(await composePage.read('.swal2-html-container')).to.include('Send empty message?');
await composePage.waitAndClick('.swal2-cancel');
Expand Down
Loading