Merge branch 'release/v8.3.0' into feature/mobile-svg

vendor/ace/component/AceEditor.js

@@ -5,8 +5,6 @@
     *   events: {
     *       onChangeValue // text in editor is changed
     *       onEditorReady // editor is ready for use
-    *       onMouseUp
-    *       onMouseMove
     *       onLoad // frame with editor is loaded
     *   }
     * }
@@ -18,13 +16,14 @@
             parentEl = document.getElementById(placeholderId),
             iframe;
 
-        var _setValue = function(value, readonly) {
+        var _setValue = function(value, currentPos, readonly) {
             _postMessage(iframe.contentWindow, {
                 command: 'setValue',
                 referer: 'ace-editor',
                 data: {
                     value: value,
-                    readonly: readonly
+                    readonly: readonly,
+                    currentPos: currentPos
                 }
             });
         };
@@ -81,16 +80,6 @@
                         handler = events['onEditorReady'];
                         data = cmd.data;
                         break;
-                    case 'mouseUp':
-                    case 'mouseMove':
-                        handler = events[cmd.command==='mouseUp' ? 'onMouseUp' : 'onMouseMove'];
-                        var rect = parentEl.getBoundingClientRect(),
-                            offset = {
-                                top: rect.top + window.pageYOffset,
-                                left: rect.left + window.pageXOffset
-                            };
-                        data = [cmd.data.x + offset.left, cmd.data.y + offset.top]
-                        break;
                 }
                 if (handler && typeof handler == "function") {
                     res = handler.call(_self, {target: _self, data: data});

vendor/ace/component/AceEditorCode.js

@@ -88,11 +88,13 @@ ace.config.loadModule('ace/ext/tern', function () {
     });
 });
 
+var firstLineNumber = 1;
 if (!window.isIE) {
     ace.config.loadModule('ace/ext/language_tools', function () {
         editor.setOptions({
             enableBasicAutocompletion: false,
-            enableLiveAutocompletion: true
+            enableLiveAutocompletion: true,
+            firstLineNumber: firstLineNumber
         });
     });
 }
@@ -116,7 +118,7 @@ var _postMessage = function(msg) {
         if (window.isDisable) return;
         _postMessage({
             command: 'changeValue',
-            data: editor.getValue(),
+            data: { value: editor.getValue(), pos: editor.getCursorPosition() },
             referer: 'ace-editor'
         });
     });
@@ -130,7 +132,8 @@ var _postMessage = function(msg) {
         if (!data.readonly) {
             editor.focus();
             editor.selection.clearSelection();
-            editor.scrollToRow(0);
+            editor.moveCursorToPosition(data.currentPos ? data.currentPos : {row: 0, column : 0});
+            editor.scrollToLine((data.currentPos ? data.currentPos.row : 0) + firstLineNumber, true);
         }
         window.isDisable = false;
     };
@@ -264,36 +267,9 @@ var _postMessage = function(msg) {
     };
 
     var fn = function(e) { _onMessage(e); };
-
-    var onMouseUp = function(e) {
-        _postMessage({
-            command: 'mouseUp',
-            data: {
-                x: (undefined === e.clientX) ? e.pageX : e.clientX,
-                y: (undefined === e.clientY) ? e.pageY : e.clientY
-            },
-            referer: 'ace-editor'
-        });
-    };
-
-    var onMouseMove = function(e) {
-        _postMessage({
-            command: 'mouseMove',
-            data: {
-                x: (undefined === e.clientX) ? e.pageX : e.clientX,
-                y: (undefined === e.clientY) ? e.pageY : e.clientY
-            },
-            referer: 'ace-editor'
-        });
-    };
-
     if (window.attachEvent) {
         window.attachEvent('onmessage', fn);
-        window.attachEvent("onmouseup", onMouseUp);
-        window.attachEvent("onmousemove", onMouseMove);
     } else {
         window.addEventListener('message', fn, false);
-        window.addEventListener("mouseup", onMouseUp, false);
-        window.addEventListener("mousemove", onMouseMove, false);
     }
 })(window, undefined);

vendor/ace/component/example.html

@@ -50,8 +50,8 @@
     var aceEditor;
 
     var onChangeValue = function (event) {
-        document.getElementById('editorLog').innerText = event.data;
-        console.log("onChangeValue");
+        document.getElementById('editorLog').innerText = event.data ? event.data.value : '';
+        console.log("onChangeValue at position(" + event.data.pos.row + ", " + event.data.pos.column + ")");
     };
 
     var onEditorReady = function (event) {
@@ -65,14 +65,6 @@
                              );
     };
 
-    var onMouseUp = function (event) {
-        console.log("onMouseUp");
-    };
-
-    var onMouseMove = function (event) {
-        console.log("onMouseMove");
-    };
-
     var onLoad = function (event) {
         console.log("onLoad");
     };
@@ -82,8 +74,6 @@
         events: {
             onChangeValue: onChangeValue,
             onEditorReady: onEditorReady,
-            onMouseUp: onMouseUp,
-            onMouseMove: onMouseMove,
             onLoad: onLoad
         }
     };

vendor/framework7-react/package.json

@@ -79,6 +79,7 @@
     "postcss-loader": "^7.3.4",
     "postcss-preset-env": "^9.4.0",
     "style-loader": "^3.3.3",
+    "svg-sprite-loader": "^6.0.11",
     "terser-webpack-plugin": "^5.3.10",
     "url-loader": "^4.1.1",
     "webpack": "^5.90.1",