TINY-10712: Update 7.0.0 RC with new changes from main

.changes/tinymce/7.0.0.md

@@ -39,6 +39,7 @@
 - Updated deprecation/removed console message. #TINY-10694
 
 ### Removed
+- Removed `force_hex_color` option, with the default now being all colors are forced to HEX format and as lower case #TINY-10436
 - Removed the deprecated `remove_trailing_brs` option from DomParser. #TINY-10454
 - Removed `title` attribute for buttons with visible label. #TINY-10453
 - Removed `InsertOrderedList` and `InsertUnorderedList` commands from core. #TINY-10644

Jenkinsfile

@@ -153,7 +153,7 @@ def props
 
 def cacheName = "cache_${BUILD_TAG}"
 
-def testname = "tinymce_${cleanBuildName(env.BRANCH_NAME)}_test${env.BUILD_NUMBER}"
+def testPrefix = "tinymce_${cleanBuildName(env.BRANCH_NAME)}-build${env.BUILD_NUMBER}"
 
 timestamps {
   bedrockRemoteTools.nodeProducerPod(
@@ -208,8 +208,7 @@ timestamps {
     [ browser: 'edge', provider: 'lambdatest', buckets: 1 ],
     [ browser: 'chrome', provider: 'lambdatest', os: 'macOS Sonoma', buckets: 1 ],
     [ browser: 'firefox', provider: 'lambdatest', os: 'macOS Sonoma', buckets: 1 ],
-    // [ browser: 'safari', provider: 'lambdatest', os: 'macOS Sonoma', buckets: 1, version: '17' ], // TINY-10639: Investigate Safari 17 issues
-    [ browser: 'safari', provider: 'lambdatest', os: 'macOS Monterey', buckets: 1, version: '15' ],
+    [ browser: 'safari', provider: 'lambdatest', os: 'macOS Sonoma', buckets: 1 ]
   ];
 
   def processes = [:]
@@ -227,7 +226,8 @@ timestamps {
       if (platform.provider) {
         // use remote
         def name = "${os}-${platform.browser}${browserVersion}-${platform.provider}${suffix}"
-        processes[name] = runTestPod(cacheName, name, testname, platform.browser, platform.provider, platform.os, platform.version, s_bucket, s_buckets, runAllTests)
+        def testName = "${env.BUILD_NUMBER}-${os}-${platform.browser}"
+        processes[name] = runTestPod(cacheName, name, "${testPrefix}_${testName}", platform.browser, platform.provider, platform.os, platform.version, s_bucket, s_buckets, runAllTests)
       } else {
         // use local
         def name = "${os}-${platform.browser}"

build.properties

@@ -1 +1 @@
-primaryBranch=release/7
+primaryBranch=main

modules/dragster/src/test/ts/browser/datatransfer/DataTransferTest.ts

@@ -190,13 +190,7 @@ describe('browser.dragster.datatransfer.DataTransferTest', () => {
     it('TINY-9601: Files list cannot be modified', () => {
       const transfer = createDataTransfer();
       addAndAssertFile(transfer, testFile1, 1);
-      if (isSafari) {
-        // Safari doesn't throw a TypeError on native DataTransfer.files so verify using different method
-        transfer.files[0] = testFile2;
-        assert.deepEqual(transfer.files.item(0), testFile1, 'Should still be file 1');
-      } else {
-        assertFilesCannotBeModified(transfer);
-      }
+      assertFilesCannotBeModified(transfer);
     });
 
     it('TINY-9601: Files list cannot be modified when in protected mode', () => {
@@ -209,7 +203,8 @@ describe('browser.dragster.datatransfer.DataTransferTest', () => {
   });
 
   context('clearData', () => {
-    it('TINY-9601: clearData should clear data as expected', () => {
+    // TINY-10743: Skipping until clearData behaviour is resolved
+    it.skip('TINY-9601: clearData should clear data as expected', () => {
       const transfer = createDataTransfer();
 
       transfer.setData('text/plain', 'Hello');

modules/oxide/src/less/theme/components/revisionhistory/revisionhistory.less

@@ -17,9 +17,13 @@
 
 .tox {
   .tox-revisionhistory__pane {
+    padding: 0 !important;      /* Override the default padding of tox-view__pane */
+  }
+
+  .tox-revisionhistory__container {
     display: flex;
     flex-direction: column;
-    padding: 0 !important;      /* Override the default padding of tox-view__pane */
+    height: 100%;
   }
 
   .tox-revisionhistory {
@@ -67,6 +71,22 @@
       overflow-y: auto;
       padding: @revisionhistory-card-padding;
 
+      &:focus {
+        height: 100%;
+        position: relative;   // Override static which prevents z-index to have any effect
+        z-index: 1; // Ensure focus outline is on top of other buttons
+
+        &::after {
+          .keyboard-focus-outline-mixin();
+
+          border-radius: @control-border-radius;
+          bottom: 1px;
+          left: 1px;
+          right: 1px;
+          top: 1px;
+        }
+      }
+
       .tox-revisionhistory__card {
         border: @revisionhistory-border;
         border-radius: @control-border-radius;

modules/sugar/src/test/ts/browser/SelectionRangeTest.ts

@@ -122,6 +122,12 @@ UnitTest.test('WindowSelectionTest', () => {
         finish: [ 0, 1, 0 ],
         foffset: 'w'.length
       },
+      safari: {
+        start: [ 0 ],
+        soffset: 2,
+        finish: [ 0, 1, 0 ],
+        foffset: 'w'.length
+      },
       fallback: {
         start: [ 0, 1, 0 ],
         soffset: 'world'.length,
@@ -142,12 +148,6 @@ UnitTest.test('WindowSelectionTest', () => {
         soffset: 0,
         finish: [ 0 ],
         foffset: 7
-      },
-      safari: {
-        start: [ 0, 0 ],
-        soffset: ''.length,
-        finish: [ 0 ],
-        foffset: 7
       }
     },
     Situ.on(find( [ 0 ]), 0),
@@ -169,12 +169,6 @@ UnitTest.test('WindowSelectionTest', () => {
         soffset: 7,
         finish: [ 0 ],
         foffset: 0
-      },
-      safari: {
-        start: [ 0 ],
-        soffset: 7,
-        finish: [ 0, 0 ],
-        foffset: ''.length
       }
     },
     Situ.on(find( [ 0 ]), 7),
@@ -184,13 +178,6 @@ UnitTest.test('WindowSelectionTest', () => {
   checkSelection(
     'LTR selection (t I)',
     {
-      // '<p>This <strong>world</strong> is not <strong>w<em>ha[</em>t</strong> I<br><br>]wanted</p><p><br>And even more</p>';
-      safari: {
-        start: [ 0, 3, 2 ],
-        soffset: ''.length,
-        finish: [ 0 ],
-        foffset: 6
-      },
       fallback: {
         start: [ 0, 3, 1 ],
         soffset: 1,
@@ -224,6 +211,12 @@ UnitTest.test('WindowSelectionTest', () => {
         start: [ 0 ],
         soffset: 6
       },
+      safari: {
+        finish: [ 0, 3, 1 ],
+        foffset: 1,
+        start: [ 0 ],
+        soffset: 6
+      },
       spartan: {
         finish: [ 0, 3, 1 ],
         foffset: 1,
@@ -263,12 +256,6 @@ UnitTest.test('WindowSelectionTest', () => {
         soffset: 0,
         finish: [ 0 ],
         foffset: 0
-      },
-      safari: {
-        start: [ 0, 0 ],
-        soffset: 0,
-        finish: [ 0, 0 ],
-        foffset: 0
       }
     },
     Situ.on(find( [ 0 ]), 0 ),
@@ -283,12 +270,6 @@ UnitTest.test('WindowSelectionTest', () => {
         soffset: 0,
         finish: [ 0 ],
         foffset: 0
-      },
-      safari: {
-        start: [ 0, 0 ],
-        soffset: 0,
-        finish: [ 0, 0 ],
-        foffset: 0
       }
     },
     Situ.on(find( [ 0 ]), 0 ),

modules/tinymce/project.json

@@ -8,7 +8,6 @@
         "^tiny-product"
       ],
       "dependsOn": [
-        "lint",
         "^build"
       ],
       "outputs": [

modules/tinymce/src/core/main/ts/api/OptionTypes.ts

@@ -44,8 +44,6 @@ export interface ToolbarGroup {
 export type ToolbarMode = 'floating' | 'sliding' | 'scrolling' | 'wrap';
 export type ToolbarLocation = 'top' | 'bottom' | 'auto';
 
-export type ForceHexColor = 'always' | 'rgb_only' | 'off';
-
 interface BaseEditorOptions {
   a11y_advanced_options?: boolean;
   add_form_submit_trigger?: boolean;
@@ -121,7 +119,6 @@ interface BaseEditorOptions {
   font_size_style_values?: string;
   font_size_formats?: string;
   font_size_input_default_unit?: string;
-  force_hex_color?: ForceHexColor;
   forced_root_block?: string;
   forced_root_block_attrs?: Record<string, string>;
   formats?: Formats;
@@ -310,7 +307,6 @@ export interface EditorOptions extends NormalizedEditorOptions {
   font_size_style_values: string;
   forced_root_block: string;
   forced_root_block_attrs: Record<string, string>;
-  force_hex_color: ForceHexColor;
   format_noneditable_selector: string;
   height: number | string;
   highlight_on_focus: boolean;

modules/tinymce/src/core/main/ts/api/Options.ts

@@ -5,7 +5,7 @@ import * as Pattern from '../textpatterns/core/Pattern';
 import * as PatternTypes from '../textpatterns/core/PatternTypes';
 import DOMUtils from './dom/DOMUtils';
 import Editor from './Editor';
-import { EditorOptions, ForceHexColor } from './OptionTypes';
+import { EditorOptions } from './OptionTypes';
 import I18n from './util/I18n';
 import Tools from './util/Tools';
 
@@ -833,15 +833,6 @@ const register = (editor: Editor): void => {
     default: ''
   });
 
-  registerOption('force_hex_color', {
-    processor: (value) => {
-      const options: ForceHexColor[] = [ 'always', 'rgb_only', 'off' ];
-      const valid = Arr.contains(options, value);
-      return valid ? { value, valid } : { valid: false, message: `Must be one of: ${options.join(', ')}.` };
-    },
-    default: 'off',
-  });
-
   registerOption('sandbox_iframes', {
     processor: 'boolean',
     default: true
@@ -984,7 +975,6 @@ const getAllowedImageFileTypes = (editor: Editor): string[] => Tools.explode(edi
 const hasTableTabNavigation = option('table_tab_navigation');
 const getDetailsInitialState = option('details_initial_state');
 const getDetailsSerializedState = option('details_serialized_state');
-const shouldForceHexColor = option('force_hex_color');
 const shouldSandboxIframes = option('sandbox_iframes');
 const getSandboxIframesExclusions = (editor: Editor): string[] => editor.options.get('sandbox_iframes_exclusions');
 const shouldConvertUnsafeEmbeds = option('convert_unsafe_embeds');
@@ -1095,7 +1085,6 @@ export {
   getDetailsInitialState,
   getDetailsSerializedState,
   shouldUseDocumentWrite,
-  shouldForceHexColor,
   shouldSandboxIframes,
   getLicenseKey,
   getSandboxIframesExclusions,

modules/tinymce/src/core/main/ts/api/dom/DOMUtils.ts

@@ -11,7 +11,7 @@ import { GeomRect } from '../geom/Rect';
 import Entities from '../html/Entities';
 import Schema from '../html/Schema';
 import Styles, { StyleMap } from '../html/Styles';
-import { ForceHexColor, URLConverter } from '../OptionTypes';
+import { URLConverter } from '../OptionTypes';
 import { MappedEvent } from '../util/EventDispatcher';
 import Tools from '../util/Tools';
 import EventUtils, { EventUtilsCallback } from './EventUtils';
@@ -64,7 +64,6 @@ export interface DOMUtilsSettings {
   onSetAttrib: (event: SetAttribEvent) => void;
   contentCssCors: boolean;
   referrerPolicy: ReferrerPolicy;
-  force_hex_color: ForceHexColor;
 }
 
 export type Target = Node | Window;
@@ -339,7 +338,6 @@ const DOMUtils = (doc: Document, settings: Partial<DOMUtilsSettings> = {}): DOMU
   const styles = Styles({
     url_converter: settings.url_converter,
     url_converter_scope: settings.url_converter_scope,
-    force_hex_color: settings.force_hex_color,
   }, settings.schema);
 
   const events = settings.ownEvents ? new EventUtils() : EventUtils.Event;

modules/tinymce/src/core/main/ts/api/html/Styles.ts

@@ -17,9 +17,9 @@
  */
 
 import { RgbaColour, Transformations } from '@ephox/acid';
-import { Obj, Type, Unicode } from '@ephox/katamari';
+import { Obj, Unicode } from '@ephox/katamari';
 
-import { ForceHexColor, URLConverter } from '../OptionTypes';
+import { URLConverter } from '../OptionTypes';
 import Schema, { SchemaMap } from './Schema';
 
 export type StyleMap = Record<string, string | number>;
@@ -29,7 +29,6 @@ export interface StylesSettings {
   allow_svg_data_urls?: boolean;
   url_converter?: URLConverter;
   url_converter_scope?: any;
-  force_hex_color?: ForceHexColor;
 }
 
 interface Styles {
@@ -43,6 +42,7 @@ const Styles = (settings: StylesSettings = {}, schema?: Schema): Styles => {
   const urlOrStrRegExp = /(?:url(?:(?:\(\s*\"([^\"]+)\"\s*\))|(?:\(\s*\'([^\']+)\'\s*\))|(?:\(\s*([^)\s]+)\s*\))))|(?:\'([^\']+)\')|(?:\"([^\"]+)\")/gi;
   const styleRegExp = /\s*([^:]+):\s*([^;]+);?/g;
   const trimRightRegExp = /\s+$/;
+  const rgbaRegExp = /rgba *\(/i;
   const encodingLookup: Record<string, string> = {};
   let validStyles: Record<string, string[]> | undefined;
   let invalidStyles: Record<string, SchemaMap> | undefined;
@@ -265,13 +265,10 @@ const Styles = (settings: StylesSettings = {}, schema?: Schema): Styles => {
               value = value.toLowerCase();
             }
 
-            // Convert RGB/RGBA colors to HEX
-            if (Type.isString(settings.force_hex_color) && settings.force_hex_color !== 'off') {
+            // Convert RGB colors to HEX
+            if (!rgbaRegExp.test(value)) {
               RgbaColour.fromString(value).each((rgba) => {
-                //  Always convert or only convert if there will be no loss of information from the alpha channel
-                if (settings.force_hex_color === 'always' || rgba.alpha === 1) {
-                  value = Transformations.rgbaToHexString(RgbaColour.toString(rgba));
-                }
+                value = Transformations.rgbaToHexString(RgbaColour.toString(rgba)).toLowerCase();
               });
             }