Merge branch 'release-1.53.0'

oat-sa · Mar 18, 2022 · 6bbf0f7 · 6bbf0f7
2 parents a0ee3d3 + 548e9b9
commit 6bbf0f7
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@oat-sa/tao-core-ui",
-    "version": "1.52.0",
+    "version": "1.53.0",
     "displayName": "TAO Core UI",
     "description": "UI libraries of TAO",
     "scripts": {

diff --git a/src/itemButtonList.js b/src/itemButtonList.js
@@ -52,6 +52,7 @@ const cssSelectors = {
  * @property {String} scoreType - 'correct'/'incorrect'/null
  * @property {String} icon - 'info'/'flagged'/null
  * @property {Boolean} disabled
+ * @property {String} [title] - optional tooltip
  */
 /**
  * Item Button List

diff --git a/src/itemButtonList/tpl/itemButtonList.tpl b/src/itemButtonList/tpl/itemButtonList.tpl
@@ -3,6 +3,7 @@
     <li class="buttonlist-item {{status}}{{#if scoreType}} {{scoreType}}{{/if}}{{#if disabled}} disabled{{/if}}" data-id="{{id}}">
         <button class="buttonlist-btn"
                 role="link"
+                {{#if title}}title="{{title}}"{{/if}}
                 aria-label="{{ariaLabel}}"
                 {{#if disabled}}aria-disabled="true"{{/if}}
                 data-id="{{id}}">

diff --git a/test/itemButtonList/test.js b/test/itemButtonList/test.js
@@ -95,7 +95,8 @@ define([
             "status": "answered",
             "icon": null,
             "ariaLabel": "Question 1",
-            "scoreType": "correct"
+            "scoreType": "correct",
+            "title": "This is the first question"
         },
         {
             "id": "item-2",
@@ -147,7 +148,7 @@ define([
         };
         let instance;
 
-        assert.expect(18);
+        assert.expect(19);
 
         // Create an instance with autorendering
         instance = itemButtonList(config);
@@ -224,6 +225,12 @@ define([
             basicItems.filter(item => item.icon === 'flagged').length,
             'The itemButtonList instance has rendered the correct number of flagged icon buttons'
         );
+        //Check title tooltip
+        assert.equal(
+            instance.getElement().find('button')[0].title,
+            basicItems[0].title,
+            'The itemButtonList instance has rendered the button with the correct tooltip'
+        );
 
         instance.destroy();
 
@@ -491,7 +498,8 @@ define([
                 "status": "answered",
                 "icon": null,
                 "ariaLabel": "Question 1",
-                "scoreType": "correct"
+                "scoreType": "correct",
+                "title": "This is the first question"
             },
             {
                 "id": "item-2",
@@ -500,7 +508,8 @@ define([
                 "status": "viewed",
                 "icon": null,
                 "ariaLabel": "Question 2",
-                "scoreType": null
+                "scoreType": null,
+                "title": "This is the second question"
             },
             {
                 "id": "item-3",