@oat-sa/tao-core-ui 3.13.5 → 3.14.0

package/dist/ckeditor/ckConfigurator.js

@@ -130,7 +130,7 @@ define(['jquery', 'lodash', 'ui/ckeditor/dtdHandler', 'ckeditor', 'context', 'mo
         }],
         htmlField: [{
           name: 'basicstyles',
-          items: ['Bold', 'Italic', 'Strike', 'Underline']
+          items: ['Bold', 'Italic', 'Underline']
         }, {
           name: 'exponent',
           items: ['Subscript', 'Superscript']
@@ -203,6 +203,24 @@ define(['jquery', 'lodash', 'ui/ckeditor/dtdHandler', 'ckeditor', 'context', 'mo
             class: 'txt-underline'
           }
         },
+        coreStyles_strike: {
+          element: 'span',
+          attributes: {
+            class: 'txt-strike'
+          }
+        },
+        coreStyles_subscript: {
+          element: 'sub',
+          attributes: {
+            class: 'txt-subscript'
+          }
+        },
+        coreStyles_superscript: {
+          element: 'sup',
+          attributes: {
+            class: 'txt-superscript'
+          }
+        },
         coreStyles_highlight: {
           element: 'span',
           attributes: {
@@ -379,10 +397,17 @@ define(['jquery', 'lodash', 'ui/ckeditor/dtdHandler', 'ckeditor', 'context', 'mo
               insertAfter: 'SpecialChar'
             };
           }
-          if (options.underline) {
-            positionedPlugins.TaoUnderline = {
-              insertAfter: 'Italic'
-            };
+          if (context.featureFlags && context.featureFlags.FEATURE_FLAG_CKEDITOR_DECORATIONS) {
+            if (options.strike) {
+              positionedPlugins.TaoStrike = {
+                insertAfter: 'Italic'
+              };
+            }
+            if (options.underline) {
+              positionedPlugins.TaoUnderline = {
+                insertAfter: options.strike ? 'TaoStrike' : 'Italic'
+              };
+            }
           }
           if (options.highlight) {
             if (options.underline) {
@@ -458,7 +483,7 @@ define(['jquery', 'lodash', 'ui/ckeditor/dtdHandler', 'ckeditor', 'context', 'mo
         }
 
         // forward the options to ckConfig, exclude local options
-        config = _.assign({}, _.cloneDeep(originalConfig), ckConfig, _.omit(options, ['qtiImage', 'qtiInclude', 'underline', 'highlight', 'mathJax', 'toolbar', 'positionedPlugins']));
+        config = _.assign({}, _.cloneDeep(originalConfig), ckConfig, _.omit(options, ['qtiImage', 'qtiInclude', 'underline', 'strike', 'highlight', 'mathJax', 'toolbar', 'positionedPlugins']));
 
         // debugger: has this config been used?
         //config.aaaConfigurationHasBeenLoadedFromConfigurator = true;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@oat-sa/tao-core-ui",
-    "version": "3.13.5",
+    "version": "3.14.0",
     "displayName": "TAO Core UI",
     "description": "UI libraries of TAO",
     "scripts": {

package/scss/ckeditor/skins/tao/scss/editor.scss

@@ -93,9 +93,24 @@ legend.cke_voice_label {
 // added to make _u_ in ck QTI compatible
 .txt-underline {
   text-decoration: underline;
+  text-underline-offset: 0.4em;
   font-size : inherit;
 }
 
+.txt-dashed {
+  text-decoration: underline dashed;
+  text-underline-offset: 0.4em;
+}
+
+.txt-wavy {
+  text-decoration: underline wavy;
+  text-underline-offset: 0.4em;
+}
+
+.txt-strike {
+  text-decoration: line-through;
+}
+
 .txt-highlight {
   padding: 0 5px;
   background: #FF6416;

package/scss/inc/_base.scss

@@ -499,9 +499,32 @@ body {
         text-decoration: underline;
         font-size: inherit;
     }
-    .writing-mode-vertical-rl .txt-underline {
-        text-underline-position: right;
+    .txt-dashed {
+        text-decoration: underline dashed;
+        text-underline-offset: 0.4em;
     }
+
+    .txt-wavy {
+        text-decoration: underline wavy;
+        text-underline-offset: 0.4em;
+    }
+
+    .txt-strike {
+        text-decoration: line-through;
+    }
+    
+    .writing-mode-vertical-rl {
+        .txt-underline {
+            text-underline-position: right;
+        }
+        .txt-subscript {
+            right: -0.6em;
+        }
+        .txt-superscript {
+            left: -0.6em;
+        }
+    }
+
     .writing-mode-vertical-rl[data-useragent-browser='safari'] .txt-underline {
         // for Safari < 18.2 which doesn't support "text-underline-position: right"
         text-decoration: none;

package/src/ckeditor/ckConfigurator.js

@@ -61,7 +61,6 @@ const ckConfigurator = (function () {
             {
                 name: 'language',
                 items: ['Language']
-
             },
             {
                 name: 'styles',
@@ -69,7 +68,16 @@ const ckConfigurator = (function () {
             },
             {
                 name: 'paragraph',
-                items: ['NumberedList', 'BulletedList', '-', 'Blockquote', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock']
+                items: [
+                    'NumberedList',
+                    'BulletedList',
+                    '-',
+                    'Blockquote',
+                    'JustifyLeft',
+                    'JustifyCenter',
+                    'JustifyRight',
+                    'JustifyBlock'
+                ]
             },
             {
                 name: 'interactionsource',
@@ -174,7 +182,7 @@ const ckConfigurator = (function () {
         htmlField: [
             {
                 name: 'basicstyles',
-                items: ['Bold', 'Italic', 'Strike', 'Underline']
+                items: ['Bold', 'Italic', 'Underline']
             },
             {
                 name: 'exponent',
@@ -262,6 +270,20 @@ const ckConfigurator = (function () {
             element: 'span',
             attributes: { class: 'txt-underline' }
         },
+        coreStyles_strike: {
+            element: 'span',
+            attributes: {
+                class: 'txt-strike'
+            }
+        },
+        coreStyles_subscript: {
+            element: 'sub',
+            attributes: { class: 'txt-subscript' }
+        },
+        coreStyles_superscript: {
+            element: 'sup',
+            attributes: { class: 'txt-superscript' }
+        },
         coreStyles_highlight: {
             element: 'span',
             attributes: { class: 'txt-highlight' }
@@ -655,8 +677,17 @@ const ckConfigurator = (function () {
             if (options.qtiInclude) {
                 positionedPlugins.TaoQtiInclude = { insertAfter: 'SpecialChar' };
             }
-            if (options.underline) {
-                positionedPlugins.TaoUnderline = { insertAfter: 'Italic' };
+            if (context.featureFlags && context.featureFlags.FEATURE_FLAG_CKEDITOR_DECORATIONS) {
+                if (options.strike) {
+                    positionedPlugins.TaoStrike = {
+                        insertAfter: 'Italic'
+                    };
+                }
+                if (options.underline) {
+                    positionedPlugins.TaoUnderline = {
+                        insertAfter: options.strike ? 'TaoStrike' : 'Italic'
+                    };
+                }
             }
             if (options.highlight) {
                 if (options.underline) {
@@ -725,6 +756,7 @@ const ckConfigurator = (function () {
                 'qtiImage',
                 'qtiInclude',
                 'underline',
+                'strike',
                 'highlight',
                 'mathJax',
                 'toolbar',

package/src/css/basic.css

@@ -1462,9 +1462,28 @@ html .txt-underline {
   text-decoration: underline;
   font-size: inherit;
 }
+html .txt-dashed {
+  -webkit-text-decoration: underline dashed;
+          text-decoration: underline dashed;
+  text-underline-offset: 0.4em;
+}
+html .txt-wavy {
+  -webkit-text-decoration: underline wavy;
+          text-decoration: underline wavy;
+  text-underline-offset: 0.4em;
+}
+html .txt-strike {
+  text-decoration: line-through;
+}
 html .writing-mode-vertical-rl .txt-underline {
   text-underline-position: right;
 }
+html .writing-mode-vertical-rl .txt-subscript {
+  right: -0.6em;
+}
+html .writing-mode-vertical-rl .txt-superscript {
+  left: -0.6em;
+}
 html .writing-mode-vertical-rl[data-useragent-browser=safari] .txt-underline {
   text-decoration: none;
   border-right: 1px solid currentColor;
@@ -5264,9 +5283,26 @@ legend.cke_voice_label {
 
 .txt-underline {
   text-decoration: underline;
+  text-underline-offset: 0.4em;
   font-size: inherit;
 }
 
+.txt-dashed {
+  -webkit-text-decoration: underline dashed;
+          text-decoration: underline dashed;
+  text-underline-offset: 0.4em;
+}
+
+.txt-wavy {
+  -webkit-text-decoration: underline wavy;
+          text-decoration: underline wavy;
+  text-underline-offset: 0.4em;
+}
+
+.txt-strike {
+  text-decoration: line-through;
+}
+
 .txt-highlight {
   padding: 0 5px;
   background: #FF6416;