Merge pull request civicrm#30489 from civicrm/5.75

5.75 to master

Civi/Angular/Page/Modules.php

@@ -113,7 +113,13 @@ public static function buildAngularModules($event) {
   public function digestJs($files) {
     $scripts = [];
     foreach ($files as $file) {
-      $scripts[] = \CRM_Utils_JS::stripComments(file_get_contents($file));
+      $content = file_get_contents($file);
+      if (str_contains($file, 'monaco-editor')) {
+        $scripts[] = $content;
+      }
+      else {
+        $scripts[] = \CRM_Utils_JS::stripComments($content);
+      }
     }
     $scripts = \CRM_Utils_JS::dedupeClosures(
       $scripts,

ang/crmMonaco.js

@@ -71,23 +71,6 @@
             });
           }
 
-          // FIXME: This makes vertical scrolling much better, but horizontal is still weird.
-          var origOverflow;
-          function bodyScrollSuspend() {
-            if (origOverflow !== undefined) return;
-            origOverflow = $('body').css('overflow');
-            $('body').css('overflow', 'hidden');
-          }
-          function bodyScrollRestore() {
-            if (origOverflow === undefined) return;
-            $('body').css('overflow', origOverflow);
-            origOverflow = undefined;
-          }
-          editorEl.on('mouseenter', bodyScrollSuspend);
-          editorEl.on('mouseleave', bodyScrollRestore);
-          editor.onDidFocusEditorWidget(bodyScrollSuspend);
-          editor.onDidBlurEditorWidget(bodyScrollRestore);
-
           crmMonaco.editor = editor;
 
           $scope.$on('$destroy', function () {

composer.json

@@ -218,7 +218,7 @@
         "ignore": [".*", "*.json", "*.md", "Makefile", "*/*"]
       },
       "monaco-editor": {
-        "url": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.25.2.tgz",
+        "url": "https://registry.npmjs.org/monaco-editor/-/monaco-editor-0.49.0.tgz",
         "path": "bower_components/monaco-editor",
         "ignore": ["dev", "esm"]
       },