Merge branch '4.0.0-dev' into remove-html-markup-for-woo

Author: sanjana4khan

assets/core/scss/mixins/_buttons.scss

@@ -21,7 +21,7 @@
   box-shadow: $tutor-button-border-shadow;
   @include tutor-transition();
 
-  svg {
+  svg:not([class]) {
     color: currentColor;
   }
 

assets/core/scss/themes/_dark.scss

@@ -3,7 +3,7 @@
 
 @use '../tokens' as *;
 
-[data-theme='dark'] {
+[data-tutor-theme='dark'] {
   // =============================================================================
   // SURFACE COLORS
   // =============================================================================

assets/core/scss/themes/_light.scss

@@ -4,7 +4,7 @@
 @use '../tokens' as *;
 
 :root,
-[data-theme="light"] {
+[data-tutor-theme="light"] {
   // =============================================================================
   // SURFACE COLORS
   // =============================================================================

assets/core/ts/components/calendar.ts

@@ -71,7 +71,7 @@ const TUTOR_CALENDAR_VALUES = {
   apply: 'apply',
   clear: 'clear',
   calendarZIndex: '100001',
-  themeAttrDetect: 'body[data-theme]',
+  themeAttrDetect: 'body[data-tutor-theme]',
   calendarClasses: 'vc tutor-vc-calendar',
 } as const;
 

assets/core/ts/components/modal.ts

@@ -96,7 +96,7 @@ export const modal = (config: ModalConfig = { ...DEFAULT_CONFIG }) => ({
     modal.classList.add('tutor-modal-content');
 
     return {
-      'x-trap.noscroll.inert.noautofocus': 'open',
+      'x-trap.noscroll.inert': 'open',
       '@click.outside': this.isCloseable ? 'close()' : '',
       'x-show': 'open',
       'x-transition:enter': 'tutor-modal-content-enter',

assets/core/ts/components/wp-editor.ts

@@ -112,6 +112,18 @@ export const wpEditor = (config: WPEditorConfig): WPEditorComponent => {
           editor.on('focus', () => {
             this.$el.dispatchEvent(new CustomEvent(TUTOR_CUSTOM_EVENTS.WP_EDITOR_FOCUS, { bubbles: true }));
           });
+
+          // Handle Cmd/Ctrl + Enter for form submission
+          editor.on('keydown', (e: KeyboardEvent) => {
+            if ((e.metaKey || e.ctrlKey) && e.keyCode === 13) {
+              e.preventDefault();
+              this.syncEditorToForm();
+              const formEl = this.$el.closest('form');
+              if (formEl) {
+                formEl.requestSubmit();
+              }
+            }
+          });
         } else {
           // Retry after a short delay
           setTimeout(checkEditor, 100);

assets/core/ts/services/Preference.ts

@@ -9,7 +9,7 @@ class PreferenceService {
   private readonly BASE_FONT_SIZE = 16;
   private readonly SCALE_PERCENTAGE_BASE = 100;
   private readonly STYLE_ID = 'tutor-font-scale';
-  private readonly DATA_THEME_ATTR = 'data-theme';
+  private readonly DATA_THEME_ATTR = 'data-tutor-theme';
 
   constructor() {
     this.mediaQuery = window.matchMedia('(prefers-color-scheme: dark)');