Improvements to Text Editor and Relation Fields

Author: Hyleeh

js/classes/media.js

@@ -1,9 +1,11 @@
+import { IconPicture } from '@codexteam/icons';
+
 export default class Media {
 
 	static get toolbox() {
 		return {
 			title: 'Media',
-			icon: '<svg width="16" height="13" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 640 512"><path fill="currentColor" d="M608 0H160a32 32 0 0 0-32 32v96h160V64h192v320h128a32 32 0 0 0 32-32V32a32 32 0 0 0-32-32zM232 103a9 9 0 0 1-9 9h-30a9 9 0 0 1-9-9V73a9 9 0 0 1 9-9h30a9 9 0 0 1 9 9zm352 208a9 9 0 0 1-9 9h-30a9 9 0 0 1-9-9v-30a9 9 0 0 1 9-9h30a9 9 0 0 1 9 9zm0-104a9 9 0 0 1-9 9h-30a9 9 0 0 1-9-9v-30a9 9 0 0 1 9-9h30a9 9 0 0 1 9 9zm0-104a9 9 0 0 1-9 9h-30a9 9 0 0 1-9-9V73a9 9 0 0 1 9-9h30a9 9 0 0 1 9 9zm-168 57H32a32 32 0 0 0-32 32v288a32 32 0 0 0 32 32h384a32 32 0 0 0 32-32V192a32 32 0 0 0-32-32zM96 224a32 32 0 1 1-32 32 32 32 0 0 1 32-32zm288 224H64v-32l64-64 32 32 128-128 96 96z"></path></svg>'
+			icon: IconPicture
 		}
 	}
 

js/components/fields/RelationField.vue

@@ -141,8 +141,9 @@ export default {
 			}
 		},
 		getItemName(item) {
-			const namekey = this.options.namekey ? this.options.namekey : 'name'
-			return this.translated ? item[namekey][this.$root.appLocale] : item[namekey]
+			const namekey = this.options.namekey ? this.options.namekey : 'name',
+				  idkey = this.options.idkey ? this.options.idkey : 'id'
+			return '#' + item[idkey] + ' — ' + (this.translated ? item[namekey][this.$root.appLocale] : item[namekey])
 		},
 		invokeEnter() {
 			if(this.selectedItem != null) {

js/components/fields/TextEditorField.vue

@@ -30,7 +30,7 @@ import Table from '@editorjs/table'
 import Underline from '@editorjs/underline'
 import Warning from '@editorjs/warning'
 import Hyperlink from 'editorjs-hyperlink'
-import Style from 'editorjs-style'
+import { StyleInlineTool } from 'editorjs-style'
 
 import Media from '../../classes/media'
 
@@ -122,7 +122,7 @@ export default {
 				marker: Marker,
 				underline: Underline,
 				hyperlink: Hyperlink,
-				style: Style
+				style: StyleInlineTool
 			},
 			i18n: {
 				messages: {

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "umomega-foundation",
-    "version": "1.21.2",
+    "version": "1.21.4",
     "description": "UI Foundation For umΩ Apps",
     "sass": "foundation-ui.sass",
     "main": "foundation-ui.js",
@@ -54,8 +54,8 @@
         "axios": "^0.27.2",
         "axios-progress-bar": "^1.2.0",
         "cash-dom": "^8.1.1",
-        "editorjs-hyperlink": "^1.0.6",
-        "editorjs-style": "^2.2.0",
+        "editorjs-hyperlink": "github:Hyleeh/editorjs-hyperlink",
+        "editorjs-style": "^3.0.0",
         "lang.js": "^1.1.14",
         "luxon": "^1.28.0",
         "moment": "^2.29.4",