neo.mjs 6.9.7 → 6.9.9

package/resources/scss/theme-neo-light/table/Container.scss

@@ -0,0 +1,10 @@
+:root .neo-theme-neo-light { // .neo-table-container
+    --table-container-border-color              : #ddd;
+    --table-container-cell-background-color     : #fff;
+    --table-container-cell-background-color-even: #f2f2f2;
+    --table-container-cell-border-bottom        : 1px solid #ddd;
+    --table-container-cell-height               : 32px;
+    --table-container-cell-padding              : 2px 10px 2px;
+    --table-container-color                     : #666;
+    --table-container-header-cell-border-bottom : 1px solid #ddd;
+}

package/resources/scss/theme-neo-light/table/View.scss

@@ -0,0 +1,13 @@
+:root .neo-theme-neo-light { // .neo-table-view
+    --table-cell-background-color-hover                    : #{lighten(#33343d, 70%)};
+    --table-cellmodel-selected-cell-background-color       : #{lighten(#64B5F6, 22%)};
+    --table-cellmodel-selected-cell-color                  : #2b2b2b;
+    --table-cellmodel-selected-column-cell-background-color: #{lighten(#4f558a, 52%)};
+    --table-cellmodel-selected-column-cell-color           : #2b2b2b;
+    --table-cellrowmodel-selected-cell-background-color    : #{lighten(#64B5F6, 22%)};
+    --table-cellrowmodel-selected-cell-color               : #2b2b2b;
+    --table-cellrowmodel-selected-row-cell-background-color: #{lighten(#4f558a, 52%)};
+    --table-cellrowmodel-selected-row-cell-color           : #2b2b2b;
+    --table-rowmodel-selected-cell-background-color        : #{lighten(#64B5F6, 22%)};
+    --table-rowmodel-selected-cell-color                   : #2b2b2b;
+}

package/resources/scss/theme-neo-light/table/header/Button.scss

@@ -0,0 +1,7 @@
+:root .neo-theme-neo-light { // .neo-table-header-button
+    --table-header-button-background-color       : #5d83a7;
+    --table-header-button-background-image       : none;
+    --table-header-button-color                  : #fff;
+    --table-header-button-glyph-color            : #fff;
+    --table-header-button-ripple-background-color: #{darken(#5d83a7, 10%)};
+}

package/resources/scss/theme-neo-light/toolbar/Base.scss

@@ -0,0 +1,4 @@
+:root .neo-theme-neo-light { // .neo-toolbar
+    --toolbar-background-color: #fff;
+    --toolbar-padding         : 5px;
+}

package/resources/scss/theme-neo-light/tree/List.scss

@@ -0,0 +1,4 @@
+:root .neo-theme-neo-light { // .neo-tree-list
+    --tree-list-color          : #666;
+    --tree-list-menu-item-color: #1c60a0;
+}

package/src/DefaultConfig.mjs

@@ -236,12 +236,12 @@ const DefaultConfig = {
     useVdomWorker: true,
     /**
      * buildScripts/injectPackageVersion.mjs will update this value
-     * @default '6.9.7'
+     * @default '6.9.9'
      * @memberOf! module:Neo
      * @name config.version
      * @type String
      */
-    version: '6.9.7'
+    version: '6.9.9'
 };
 
 Object.assign(DefaultConfig, {

package/src/form/field/FileUpload.mjs

@@ -1,5 +1,6 @@
-import Base from '../../form/field/Base.mjs';
-import NeoArray from '../../util/Array.mjs';
+import Base         from '../../form/field/Base.mjs';
+import NeoArray     from '../../util/Array.mjs';
+import StringUtil   from '../../util/String.mjs';
 
 const
     sizeRE           = /^(\d+)(kb|mb|gb)?$/i,
@@ -404,15 +405,16 @@ class FileUpload extends Base {
             const
                 file     = files.item(0),
                 pointPos = file.name.lastIndexOf('.'),
-                type     = pointPos > -1 ? file.name.slice(pointPos + 1) : '';
+                type     = pointPos > -1 ? file.name.slice(pointPos + 1) : '',
+                escapedFileName = StringUtil.escapeHtml(file.name);
 
             if (me.types && !types[type]) {
-                body.cn[0].innerHTML = file.name;
+                body.cn[0].innerHTML = escapedFileName;
                 body.cn[1].innerHTML = `${me.invalidFileFormat} (.${type}) ${me.formatSize(file.size)}`;
                 me.error = me.pleaseUseTheseTypes?.replace('{allowedFileTypes}', Object.keys(types).join(' .'))
             }
             else if (file.size > me.maxSize) {
-                body.cn[0].innerHTML = file.name;
+                body.cn[0].innerHTML = escapedFileName;
                 body.cn[1].innerHTML = me.formatSize(file.size);
                 me.error = me.fileSizeMoreThan?.replace('{allowedFileSize}', String(me._maxSize).toUpperCase());
             }
@@ -444,8 +446,8 @@ class FileUpload extends Base {
         // We have to wait for the DOM to have changed, and the action button to be visible
         await new Promise(resolve => setTimeout(resolve, 100));
         me.focus(me.vdom.cn[2].id);
-
-        me.vdom.cn[1].cn[0].innerHTML = file.name;
+        
+        me.vdom.cn[1].cn[0].innerHTML = StringUtil.escapeHtml(file.name);
         me.update();
         me.state = 'uploading';
 
@@ -669,7 +671,7 @@ class FileUpload extends Base {
 
             me.documentId = document.id;
             me.fileSize = me.formatSize(document.size);
-            me.vdom.cn[1].cn[0].innerHTML = document.fileName;
+            me.vdom.cn[1].cn[0].innerHTML = StringUtil.escapeHtml(document.fileName);
             me.state = me.documentStatusMap[document.status];
         }
     }

package/src/form/field/Text.mjs

@@ -2,6 +2,7 @@ import Base         from './Base.mjs';
 import BaseTrigger  from './trigger/Base.mjs';
 import ClearTrigger from './trigger/Clear.mjs';
 import NeoArray     from '../../util/Array.mjs';
+import StringUtil   from '../../util/String.mjs';
 import VDomUtil     from '../../util/VDom.mjs';
 import VNodeUtil    from '../../util/VNode.mjs';
 
@@ -234,6 +235,14 @@ class Text extends Base {
          * @member {Function|String|null} validator=null
          */
         validator: null,
+        /**
+         * getVlue can be xssProtected and values are escaped
+         * @member {Boolean} xssProtected=false
+         */
+        xssProtected_: false,
+        /**
+         * @member {Object} _vdom
+         */
         /**
          * @member {Object} _vdom
          */
@@ -1144,6 +1153,17 @@ class Text extends Base {
         return this.id + '-trigger-' + type
     }
 
+    /**
+     * @returns {*}
+    */
+    getValue() {
+        if (this.xssProtected) {
+            return StringUtil.escapeHtml(super.getValue())
+        } else {
+            return super.getValue()
+        }
+    }
+
     /**
      * @returns {Boolean}
      */
@@ -1269,10 +1289,14 @@ class Text extends Base {
             if (centerBorderEl && me.isEmpty()) {
                 delete centerBorderEl.width;
             }
+        }
 
-            me.update()
+        if (Neo.isString(me.value)) {
+            me.value = me.value.trim()
         }
 
+        me.update();
+
         super.onFocusLeave(data)
     }
 
@@ -1288,7 +1312,11 @@ class Text extends Base {
 
         if (vnode) {
             // required for validation -> revert a wrong user input
-            vnode.vnode.attributes.value = value;
+            vnode.vnode.attributes.value = value
+        }
+
+        if (Neo.isString(value)) {
+            value = value.trim()
         }
 
         me.clean = false;

package/src/main/addon/HighlightJS.mjs

@@ -32,6 +32,7 @@ class HighlightJS extends Base {
          */
         remote: {
             app: [
+                'loadLibrary',
                 'scrollIntoView',
                 'syntaxHighlight',
                 'switchTheme',
@@ -56,14 +57,26 @@ class HighlightJS extends Base {
      */
     construct(config) {
         super.construct(config);
+    }
+
+    /**
+     * @param {Object} data
+     * @returns {Boolean}
+     */
+    async loadLibrary(data) {
+        delete data.appName;
 
         let me = this;
 
-        DomAccess.loadScript(me.highlightJsPath).then(() => {
+        me.set(data);
+
+        await DomAccess.loadScript(me.highlightJsPath).then(() => {
             DomAccess.addScript({src: me.highlightJsLineNumbersPath});
         });
 
         Stylesheet.createStyleSheet(null, 'hljs-theme', me.themePath)
+
+        return true
     }
 
     /**
@@ -83,21 +96,6 @@ class HighlightJS extends Base {
         })
     }
 
-    /**
-     * @param {Object} data
-     * @param {String} data.vnodeId
-     */
-    syntaxHighlight(data) {
-        if (hljs) {
-            let node = document.getElementById(data.vnodeId);
-
-            hljs.highlightBlock(node);
-            hljs.lineNumbersBlock(node);
-        } else {
-            console.error('highlight.js is not included inside the main thread.')
-        }
-    }
-
     /**
      * You can pass in 'light', 'dark', or a path for a custom theme
      * @param {String} theme
@@ -114,6 +112,21 @@ class HighlightJS extends Base {
         Stylesheet.createStyleSheet(null, 'hljs-theme', switchToTheme);
     }
 
+    /**
+     * @param {Object} data
+     * @param {String} data.vnodeId
+     */
+    syntaxHighlight(data) {
+        if (hljs) {
+            let node = document.getElementById(data.vnodeId);
+
+            hljs.highlightBlock(node);
+            hljs.lineNumbersBlock(node);
+        } else {
+            console.error('highlight.js is not included inside the main thread.')
+        }
+    }
+
     /**
      * @param {Object} data
      */

package/src/util/String.mjs

@@ -14,18 +14,20 @@ class StringUtil extends Base {
         '<' : '&lt;',
         '>' : '&gt;',
         '"' : '&quot;',
-        '\'': '&#039;'
+        '\'': '&apos;',
+        '$' : '&dollar;',
+        '\\': '&bsol;'
     }
     /**
      * @member {RegExp} charPattern
      * @static
      */
-    static charPattern = /[&<>"']/g
+    static charPattern = /[&<>"'$\\]/g
     /**
      * @member {RegExp} entityPattern
      * @static
      */
-    static entityPattern = /(&amp;)|(&lt;)|(&gt;)|(&quot;)|(&#039;)/g
+    static entityPattern = /(&amp;)|(&lt;)|(&gt;)|(&quot;)|(&apos;)|(&dollar;)|(&bsol;)/g
 
     static config = {
         /**

package/src/vdom/Helper.mjs

@@ -580,7 +580,8 @@ class Helper extends Base {
                     string += ` ${key}`;
                 }
             } else if (key !== 'removeDom') {
-                string += ` ${key}="${value}"`;
+
+                string += ` ${key}="${value.replaceAll('"', '"')}"`;
             }
         });