@oat-sa/tao-core-ui 1.63.0 → 1.63.1

package/dist/figure/FigureStateActive.js

@@ -552,11 +552,13 @@ define(['jquery', 'nouislider', 'ui/resourcemgr', 'ui/tooltip', 'lodash', 'i18n'
       } = _ref2;
       const imageElem = getImageElement(widget);
       const figcaptionElem = getCaptionElement(widget);
+      const showFigure = widget.element.attr('showFigure');
       widget.$form.html(formTpl({
         baseUrl: widget.options.baseUrl || '',
         src: imageElem.attr('src'),
         alt: imageElem.attr('alt'),
-        figcaption: figcaptionElem ? figcaptionElem.body() : ''
+        figcaption: figcaptionElem ? figcaptionElem.body() : '',
+        showFigure: showFigure
       }));
       widget.$form.find('textarea#figcaption').on('focus.qti-widget', () => widget.$container.addClass('edit-figcaption')).on('blur.qti-widget', () => widget.$container.removeClass('edit-figcaption'));
 
@@ -574,7 +576,23 @@ define(['jquery', 'nouislider', 'ui/resourcemgr', 'ui/tooltip', 'lodash', 'i18n'
         togglePlaceholder
       }));
     };
-    function FigureStateActive (stateFactory, ActiveState, formTpl, formElement, inlineHelper) {
+
+    /**
+     * @param {Object} stateFactory
+     * @param {Object} ActiveState
+     * @param {Object} formTpl
+     * @param {Object} formElement
+     * @param {Object} inlineHelper
+     * @returns
+     */
+    function FigureStateActive (_ref3) {
+      let {
+        stateFactory,
+        ActiveState,
+        formTpl,
+        formElement,
+        inlineHelper
+      } = _ref3;
       /**
        * media Editor instance if has been initialized
        * @type {null}
@@ -582,7 +600,7 @@ define(['jquery', 'nouislider', 'ui/resourcemgr', 'ui/tooltip', 'lodash', 'i18n'
       let mediaEditor = null;
       let textareaObserver = null;
       let texareaHTMLElem = null;
-      const ImgStateActive = stateFactory.extend(ActiveState, function () {
+      const FigureStateActive = stateFactory.extend(ActiveState, function () {
         this.initForm();
       }, function () {
         this.widget.$form.find('textarea#figcaption').off('.qti-widget');
@@ -591,7 +609,7 @@ define(['jquery', 'nouislider', 'ui/resourcemgr', 'ui/tooltip', 'lodash', 'i18n'
         }
         this.widget.$form.empty();
       });
-      ImgStateActive.prototype.initForm = function () {
+      FigureStateActive.prototype.initForm = function () {
         initForm({
           widget: this.widget,
           formElement,
@@ -612,7 +630,7 @@ define(['jquery', 'nouislider', 'ui/resourcemgr', 'ui/tooltip', 'lodash', 'i18n'
           }
         }
       };
-      return ImgStateActive;
+      return FigureStateActive;
     }
 
     return FigureStateActive;

package/dist/mediaEditor/plugins/mediaAlignment/helper.js

@@ -1,4 +1,6 @@
-define(['exports'], function (exports) { 'use strict';
+define(['exports', 'lodash'], function (exports, _) { 'use strict';
+
+    _ = _ && Object.prototype.hasOwnProperty.call(_, 'default') ? _['default'] : _;
 
     /**
      * This program is free software; you can redistribute it and/or
@@ -17,9 +19,30 @@ define(['exports'], function (exports) { 'use strict';
      *
      * Copyright (c) 2021-2022  (original work) Open Assessment Technologies SA;
      */
-
     const FLOAT_LEFT_CLASS = 'wrap-left';
     const FLOAT_RIGHT_CLASS = 'wrap-right';
+    const searchRecurse = (parentElement, serial) => {
+      if (!parentElement) {
+        return null;
+      }
+      if (parentElement.serial === serial) {
+        return parentElement;
+      }
+      let found = null;
+      _.some(parentElement['elements'], childElement => {
+        if (childElement.serial === serial) {
+          found = parentElement;
+        } else if (childElement['elements']) {
+          found = searchRecurse(childElement, serial);
+        } else if (childElement['prompt']) {
+          found = searchRecurse(childElement.prompt.bdy, serial);
+        }
+        if (found) {
+          return true;
+        }
+      });
+      return found;
+    };
     const positionFloat = function positionFloat(widget, position) {
       if (!position) {
         return;
@@ -41,11 +64,35 @@ define(['exports'], function (exports) { 'use strict';
       // Update DOM
       widget.$container.addClass(className);
       // Update model
+      const prevClassName = widget.element.attr('class') || '';
       if (className) {
         widget.element.attr('class', className);
       } else {
         widget.element.removeAttr('class');
       }
+      if (prevClassName !== className) {
+        // Re-build Figure widget to toggle between inline/block
+        const parent = searchRecurse(widget.element.bdy.rootElement.bdy, widget.serial);
+        // avoid changes on Figure in a prompt
+        if (parent.contentModel && parent.contentModel === 'inlineStatic') {
+          _.defer(() => {
+            widget.element.data('widget').refresh();
+          });
+          return;
+        }
+        widget.element.data('widget').changeState('sleep');
+        _.defer(() => {
+          if (parent && parent.data('widget')) {
+            parent.data('widget').changeState('active');
+            _.defer(() => {
+              parent.data('widget').changeState('sleep');
+              _.defer(() => {
+                widget.element.data('widget').changeState('active');
+              });
+            });
+          }
+        });
+      }
       widget.$original.trigger('contentChange.qti-widget');
     };
     const initAlignment = function initAlignment(widget) {

package/dist/mediaEditor/plugins/mediaAlignment/mediaAlignmentComponent.js

@@ -156,7 +156,6 @@ define(['jquery', 'lodash', 'ui/component', 'handlebars', 'i18n', 'lib/dompurify
      *
      * Copyright (c) 2021-2022  (original work) Open Assessment Technologies SA;
      */
-
     const FLOAT_LEFT_CLASS = 'wrap-left';
     const FLOAT_RIGHT_CLASS = 'wrap-right';
 

package/package.json

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

package/scss/inc/_feedback.scss

@@ -148,3 +148,7 @@
 .bg-error {
     background-color: $errorBgColor;
 }
+
+textarea + .feedback-info {
+    padding: 5px;
+}

package/src/css/basic.css

@@ -1827,6 +1827,10 @@ html .txt-user-highlight {
     background-color: #f1d0d5;
 }
 
+textarea + .feedback-info, textarea + .tooltip-blue {
+    padding: 5px;
+}
+
 [class*=" col-"], [class^="col-"] {
     float: left;
     min-height: 1rem;