Skip to content

chore: Update tinymce version to 6.8.3 in package.json and yarn.lock #36909

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
rahulbarwal merged 5 commits into from
Oct 17, 2024
Merged

chore: Update tinymce version to 6.8.3 in package.json and yarn.lock #36909

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
9ddbdb3
chore: Update tinymce version to 6.8.3 in package.json and yarn.lock
rahulbarwal Oct 16, 2024
5ba8d8f
fix: Update text color selection in RichTextEditor
rahulbarwal Oct 17, 2024
dfb7919
chore: Update limited-tests.txt with new spec names for RichTextEditor
rahulbarwal Oct 17, 2024
8128891
Merge branch 'release' of https://github.com/appsmithorg/appsmith int…
rahulbarwal Oct 17, 2024
8aa96b6
Revert "chore: Update limited-tests.txt with new spec names for RichT…
rahulbarwal Oct 17, 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
2 changes: 1 addition & 1 deletion app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor3_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ describe(
});

it("3. Verify applying style in one line should be observed in next line", function () {
agHelper.GetNClick(locators._richText_Text_Color);
agHelper.GetNClick(locators._richText_Text_Color("Black"));
agHelper.GetNClick(locators._richText_color("Red"));
agHelper
.GetElement(
Expand Down
14 changes: 7 additions & 7 deletions app/client/cypress/e2e/Regression/ClientSide/Widgets/RTE/RichTextEditor_2_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,18 +137,18 @@ describe(
cy.get('[aria-label="Underline"]').should("exist");

//Check if button for Background Color is rendered only once within the Toolbar of RTE widget
cy.get('[data-mce-name="backcolor"]').should("have.length", 1);
cy.get('[aria-label="Background color Black"]').should("have.length", 1);

//Check if button for Text Color is rendered only once within the Toolbar of RTE widget
cy.get('[data-mce-name="forecolor"]').should("have.length", 1);
cy.get('[aria-label="Text color Black"]').should("have.length", 1);
});

it("6. Check if able to add an emoji through toolbar", () => {
cy.get('[data-mce-name="overflow-button"]').click({ force: true });
cy.wait(500);
cy.get('[data-mce-name="emoticons"]').click({ force: true });
cy.wait(500);
cy.get('[data-mce-tooltip="grinning"]').click({ force: true });
cy.get('[aria-label="Reveal or hide additional toolbar items"]').click({
force: true,
});
cy.get('[aria-label="Emojis"]').click({ force: true });
cy.get('[aria-label="grinning"]').click({ force: true });
const getEditorContent = (win) => {
const tinyMceId = "rte-component-vw4zehojqt";
const editor = win.tinymce.EditorManager.get(tinyMceId);
Expand Down
10 changes: 5 additions & 5 deletions app/client/cypress/support/Objects/CommonLocators.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,12 +316,12 @@ export class CommonLocators {
`.uppy-Informer p:contains('${msg}')`;
_fileUploadAddMore = ".uppy-DashboardContent-addMore";
_buttonText = ".bp3-button-text";
_richText_TitleBlock = "[data-mce-name='blocks']";
_richText_Heading = "[aria-label='Heading 1']";
_richText_TitleBlock = "[aria-label='Block Paragraph']";
_richText_Heading = "[title='Heading 1']";
_richText_Label_Text = ".tox-tbtn__select-label";
_richText_Text_Color =
'[data-mce-name="forecolor"] .tox-split-button__chevron';
_richText_color = (value: string) => `[data-mce-name="${value}"]`;
_richText_Text_Color = (color: string) =>
`[aria-label="Text color ${color}"] .tox-split-button__chevron`;
_richText_color = (value: string) => `[title="${value}"]`;
_richText_line = "#tinymce p span";
_treeSelectedContent = ".rc-tree-select-selection-item-content";
_switcherIcon = ".switcher-icon";
Expand Down
2 changes: 1 addition & 1 deletion app/client/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@
"tailwindcss": "^3.3.3",
"tern": "^0.21.0",
"tinycolor2": "^1.4.2",
"tinymce": "^7.3.0",
"tinymce": "6.8.3",
"toposort": "^2.0.2",
"tslib": "^2.3.1",
"typescript": "^5.5.4",
Expand Down
11 changes: 9 additions & 2 deletions app/client/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12995,7 +12995,7 @@ __metadata:
tailwindcss: ^3.3.3
tern: ^0.21.0
tinycolor2: ^1.4.2
tinymce: ^7.3.0
tinymce: 6.8.3
toposort: ^2.0.2
ts-jest: 29.1.0
ts-jest-mock-import-meta: ^0.12.0
Expand Down Expand Up @@ -32225,7 +32225,14 @@ __metadata:
languageName: node
linkType: hard

"tinymce@npm:^7.0.0 || ^6.0.0 || ^5.5.1, tinymce@npm:^7.3.0":
"tinymce@npm:6.8.3":
version: 6.8.3
resolution: "tinymce@npm:6.8.3"
checksum: 2ce922ceb60636778afb21a493e99d561e73f82c5fb331a4f666d973129ca27277bc1b6332d6932ab8fe0a379b1f201285f143a2d72646a813fda88a0dec5312
languageName: node
linkType: hard

"tinymce@npm:^7.0.0 || ^6.0.0 || ^5.5.1":
version: 7.3.0
resolution: "tinymce@npm:7.3.0"
checksum: 8c2205e8f316ae86c713ba09d8072921050011fbb6a28060c02c53d79d34d470995f286b478966e42c767d5905fd9d89a808338d63ac63a0ea0f96a017b020e2
Expand Down