From 2bb27949fd739b2a9fd179fc71714dbd18e07c6d Mon Sep 17 00:00:00 2001
From: Giga Chubinidze <giga@scinote.net>
Date: Wed, 5 Jul 2023 11:52:05 +0400
Subject: [PATCH] TinyMCE list of smaller bugs and improvements [SCI-7976]

---
 app/assets/stylesheets/tiny_mce.scss | 4 ++++
 app/javascript/packs/tiny_mce.js     | 4 ++--
 package.json                         | 2 +-
 yarn.lock                            | 8 ++++----
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/tiny_mce.scss b/app/assets/stylesheets/tiny_mce.scss
index d718dfb58..2c4f7040c 100644
--- a/app/assets/stylesheets/tiny_mce.scss
+++ b/app/assets/stylesheets/tiny_mce.scss
@@ -217,6 +217,10 @@
   display: flex !important;
 }
 
+.tox-tbtn {
+  background-color: var(--sn-white);
+}
+
 .tox .tox-pop {
   margin-top: -12px;
 
diff --git a/app/javascript/packs/tiny_mce.js b/app/javascript/packs/tiny_mce.js
index 34386b3a5..a52523684 100644
--- a/app/javascript/packs/tiny_mce.js
+++ b/app/javascript/packs/tiny_mce.js
@@ -201,7 +201,7 @@ window.TinyMCE = (() => {
         }
 
         return tinyMCE.init({
-          cache_suffix: '?v=6.3.1', // This suffix should be changed any time library is updated
+          cache_suffix: '?v=6.5.1-19', // This suffix should be changed any time library is updated
           selector,
           skin: false,
           content_css: false,
@@ -213,7 +213,7 @@ window.TinyMCE = (() => {
           },
           block_formats: 'Paragraph=p; Header 1=h1; Header 2=h2; Header 3=h3; Preformatted=pre',
           menubar: 'file edit view insert format table',
-          toolbar: window.customTinyMceToolbar || 'undo redo restoredraft | insert | styleselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table | link | forecolor backcolor | codesample | customimageuploader marvinjs | help',
+          toolbar: window.customTinyMceToolbar || 'undo redo restoredraft | insert | styleselect | bold italic | forecolor backcolor | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | table | customimageuploader | marvinjs link codesample | help',
           plugins,
           contextmenu: '',
           autoresize_bottom_margin: 20,
diff --git a/package.json b/package.json
index 8f45e4ae4..42c41d680 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,7 @@
     "sass": "1.60.0",
     "sass-loader": "^10.4.1",
     "style-loader": "2.0.0",
-    "tinymce": "^6.1.2",
+    "tinymce": "^6.5.1",
     "tui-code-snippet": "^1.5.0",
     "tui-color-picker": "^2.2.0",
     "tui-image-editor": "github:biosistemika/tui.image-editor#3_15_2_updated",
diff --git a/yarn.lock b/yarn.lock
index 94a1acdfd..d356a4b61 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6676,10 +6676,10 @@ tiny-emitter@^2.1.0:
   resolved "https://registry.yarnpkg.com/tiny-emitter/-/tiny-emitter-2.1.0.tgz#1d1a56edfc51c43e863cbb5382a72330e3555423"
   integrity sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==
 
-tinymce@^6.1.2:
-  version "6.4.1"
-  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-6.4.1.tgz#9c28f798074668d53371805fb6f1c68e582a4549"
-  integrity sha512-+/cS2AM9l6p72IBs2uolHbGsBUztLs0WslqNgFaTXtmMksTNUOhh8p08xtA/fa03UGlWEC6/EJoeV95/QDXa2A==
+tinymce@^6.5.1:
+  version "6.5.1"
+  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-6.5.1.tgz#f228bf2dc1abf28565523f359b849dad1706357d"
+  integrity sha512-J67fxJiX3tjvVqer1dg1+cOxMeE2P55ESGhaakvqGPbAUU45HnCMLSioaOsxV1KfcXustw9WJo0rtn1SNQlVKQ==
 
 tmp@^0.0.33:
   version "0.0.33"