fix merge issues

adobecom · Jan 10, 2025 · 49db0a1 · 49db0a1
1 parent e498d50
commit 49db0a1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/studio/src/constants.js b/studio/src/constants.js
@@ -25,3 +25,5 @@ export const ANALYTICS_LINK_IDS = [
 // TODO remove these?
 export const EVENT_CHANGE = 'change';
 export const EVENT_INPUT = 'input';
+
+export const EVENT_OST_SELECT = 'ost-select';
diff --git a/studio/src/editor-panel.js b/studio/src/editor-panel.js
@@ -166,6 +166,7 @@ export default class EditorPanel extends LitElement {
 
     handleKeyDown(event) {
         if (event.code === 'Escape') this.close();
+        if (!event.ctrlKey) return;
         if (event.code === 'ArrowLeft' && event.shiftKey)
             this.updatePosition('left');
         if (event.code === 'ArrowRight' && event.shiftKey)

diff --git a/studio/src/rte/ost.js b/studio/src/rte/ost.js
@@ -1,6 +1,5 @@
 import { html } from 'lit';
-import { CHECKOUT_CTA_TEXTS } from '../constants.js';
-import { EVENT_OST_SELECT } from '../events.js';
+import { CHECKOUT_CTA_TEXTS, EVENT_OST_SELECT } from '../constants.js';
 
 let ostRoot = document.getElementById('ost');
 let closeFunction;

diff --git a/studio/src/rte/rte-field.js b/studio/src/rte/rte-field.js
@@ -13,7 +13,7 @@ import {
 } from './ost.js';
 
 import prosemirrorStyles from './prosemirror.css.js';
-import { EVENT_OST_SELECT } from '../events.js';
+import { EVENT_OST_SELECT } from '../constants.js';
 import throttle from '../utils/throttle.js';
 
 const CUSTOM_ELEMENT_CHECKOUT_LINK = 'checkout-link';
@@ -697,6 +697,7 @@ class RteField extends LitElement {
     }
 
     #updateLength() {
+        console.log(this.editorView.dom.innerText);
         this.length = this.editorView.dom.innerText.length;
     }
 

diff --git a/studio/test/rte/ost.test.js b/studio/test/rte/ost.test.js
@@ -1,7 +1,7 @@
 import { expect } from '@esm-bundle/chai';
 import sinon from 'sinon';
 
-import { EVENT_OST_SELECT } from '../../src/events.js';
+import { EVENT_OST_SELECT } from '../../src/constants.js';
 
 describe('onSelect', () => {
     let dispatchEventStub;