improve writer view

shuart · May 11, 2024 · 74b6ae0 · 74b6ae0
1 parent a1bf98e
commit 74b6ae0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/src/js/modules/viewports/writing_board_viewport/writing_board_viewport.js b/src/js/modules/viewports/writing_board_viewport/writing_board_viewport.js
@@ -18,7 +18,7 @@ var setCurrentTags = function () {
     var instancesRepo = createInstancesManagement()
     var instances = instancesRepo.getAll()
 
-    return instances.map(i=>({id:i.uuid, tag:i.name}))
+    return instances.map(i=>({id:i.uuid, tag:i.name, icon:"./img/icons/"+i.iconPath}))
   }
 
 var getEvaluatorData = function (event, data, instance){
@@ -168,7 +168,7 @@ var updateTable = function (event, data, instance) {
     console.log(editor.otherEntries);
 
     editor.mentionsDefs= [
-        {name:"hashtag", key:"#", attributes:["id", "tag"], attributeToDisplay:'tag'},
+        {name:"hashtag", key:"#", attributes:["id", "tag"], attributeToDisplay:'tag', imageAttributes:"icon"},
         {name:"mention", key:"@", attributes:["name", "id","email"], attributeToDisplay:'name'},
         {name:"arrow", key:"->", attributes:["id","tag"], attributeToDisplay:'tag'},
     ]
@@ -191,7 +191,11 @@ var updateTable = function (event, data, instance) {
 }
 
 var setUpTable = function (event, data, instance) {
-    updateTable(event, data, instance) 
+    updateTable(event, data, instance)
+    setTimeout(function(){
+        updateTableInstance(event, data, instance)// if use current is activated
+    }, 500)
+
     // subscribeToChanges(event, data, instance, updateTable)
     subscribeToSearchParam(event, data, instance, updateTableInstance)
 }

diff --git a/src/js/vendor/writer/mention/defaultPlugin.js b/src/js/vendor/writer/mention/defaultPlugin.js
@@ -7,9 +7,21 @@ export var getDefaultMentionPlugin = function (defs, lists, callbacks) {
 
     }
 
-    var getTagSuggestionsHTML = (items,type) => '<div class="suggestion-item-list">'+
-    items.map(i => '<div class="suggestion-item">'+i[defsMap[type].attributeToDisplay]+'</div>').join('')+
-    '</div>';
+    // var getTagSuggestionsHTML = (items,type) => '<div class="suggestion-item-list">'+
+    // items.map(i => '<div class="suggestion-item">'+i[defsMap[type].attributeToDisplay]+'</div>').join('')+
+    // '</div>';
+    var getTagSuggestionsHTML = function (items,type) {
+        if (defsMap[type].imageAttributes) {
+            return '<div class="suggestion-item-list">'+
+            items.map(i => '<div class="suggestion-item"><img style="height: 18px; margin-right: 6px;" src="'+i[defsMap[type].imageAttributes]+'">'+i[defsMap[type].attributeToDisplay]+'</div>').join('')+
+            '</div>';
+        }else{
+            return '<div class="suggestion-item-list">'+
+            items.map(i => '<div class="suggestion-item">'+i[defsMap[type].attributeToDisplay]+'</div>').join('')+
+            '</div>';
+        }
+
+    }
 
     /**
      * IMPORTANT: outer div's "suggestion-item-list" class is mandatory. The plugin uses this class for querying.