@lvce-editor/renderer-process 15.6.0 → 16.1.0

package/dist/rendererProcessMain.js

@@ -3436,42 +3436,6 @@ const start = async (id, options) => {
   }
 };
 
-const getTimeStamp = () => {
-  return performance.now();
-};
-
-const waitForMutation = async maxDelay => {
-  const disposables = [];
-  await Promise.race([new Promise(resolve => {
-    const timeout = setTimeout(resolve, maxDelay);
-    // @ts-expect-error
-    disposables.push(() => {
-      clearTimeout(timeout);
-    });
-  }), new Promise(resolve => {
-    const callback = mutations => {
-      resolve(undefined);
-    };
-    const observer = new MutationObserver(callback);
-    observer.observe(document.body, {
-      childList: true,
-      attributes: true,
-      characterData: true,
-      subtree: true,
-      attributeOldValue: true,
-      characterDataOldValue: true
-    });
-    // @ts-expect-error
-    disposables.push(() => {
-      observer.disconnect();
-    });
-  })]);
-  for (const disposable of disposables) {
-    // @ts-expect-error
-    disposable();
-  }
-};
-
 const getEventClass = eventType => {
   switch (eventType) {
     case Wheel:
@@ -3543,32 +3507,6 @@ const ElementActions = {
   type
 };
 
-const press = options => {
-  const element = document.activeElement;
-  keyDown(element, options);
-  keyUp(element, options);
-};
-
-const KeyBoardActions = {
-  __proto__: null,
-  press
-};
-
-const toHaveCount$1 = (elements, {
-  count
-}) => {
-  return elements.length === count;
-};
-const toBeHidden = elements => {
-  return elements.length === 0;
-};
-
-const MultiElementConditions = {
-  __proto__: null,
-  toBeHidden,
-  toHaveCount: toHaveCount$1
-};
-
 const htmlElements = ['a', 'abbr', 'address', 'area', 'article', 'aside', 'audio', 'b', 'base', 'bdo', 'body', 'br', 'button', 'canvas', 'caption', 'center', 'cite', 'code', 'col', 'colgroup', 'command', 'datalist', 'dd', 'del', 'details', 'dfn', 'dialog', 'div', 'dl', 'dt', 'em', 'embed', 'fieldset', 'figcaption', 'figure', 'footer', 'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html', 'i', 'iframe', 'img', 'input', 'ins', 'kbd', 'label', 'legend', 'li', 'link', 'map', 'mark', 'menu', 'meta', 'meter', 'nav', 'noscript', 'object', 'ol', 'optgroup', 'option', 'output', 'p', 'param', 'pre', 'progress', 'q', 'rp', 'rt', 's', 'samp', 'script', 'section', 'select', 'small', 'source', 'span', 'strong', 'sub', 'sup', 'table', 'tbody', 'td', 'textarea', 'tfoot', 'th', 'thead', 'time', 'title', 'tr', 'track', 'u', 'ul', 'var', 'video', 'wbr'];
 
 const querySelectorByText = (root, text) => {
@@ -3644,81 +3582,23 @@ const querySelectorWithOptions = (selector, {
   return element;
 };
 
-const toBeVisible = element => {
-  if (typeof element.isVisible === 'function') {
-    return element.isVisible();
-  }
-  return element.isConnected;
-};
-const toHaveValue = (element, {
-  value
-}) => {
-  return element.value === value;
-};
-const toHaveText$1 = (element, {
-  text
-}) => {
-  return element.textContent === text;
-};
-const toContainText = (element, {
-  text
-}) => {
-  return element.textContent.includes(text);
-};
-const toHaveAttribute$1 = (element, {
-  key,
-  value
-}) => {
-  const attribute = element.getAttribute(key);
-  return attribute === value;
-};
-const toHaveJSProperty$1 = (element, {
-  key,
-  value
-}) => {
-  const attribute = element[key];
-  return attribute === value;
-};
-const toBeFocused$1 = element => {
-  return element === document.activeElement;
-};
-const toHaveClass$1 = (element, {
-  className
-}) => {
-  return element.classList.contains(className);
-};
-const toHaveId$1 = (element, {
-  id
-}) => {
-  return element.id === id;
-};
-const toHaveCss$1 = (element, {
-  key,
-  value
-}) => {
-  const style = getComputedStyle(element);
-  const actualValue = style[key];
-  if (value instanceof RegExp) {
-    return value.test(actualValue);
+const performAction2 = async (locator, fnName, options) => {
+  object(locator);
+  string(fnName);
+  object(options);
+  const fn = ElementActions[fnName];
+  const element = querySelectorWithOptions(locator._selector, {
+    hasText: locator._hasText,
+    nth: locator._nth
+  });
+  if (!element) {
+    throw new Error(`element not found`);
   }
-  return actualValue === value;
+  fn(element, options);
+  return;
 };
 
-const SingleElementConditions = {
-  __proto__: null,
-  toBeFocused: toBeFocused$1,
-  toBeVisible,
-  toContainText,
-  toHaveAttribute: toHaveAttribute$1,
-  toHaveClass: toHaveClass$1,
-  toHaveCss: toHaveCss$1,
-  toHaveId: toHaveId$1,
-  toHaveJSProperty: toHaveJSProperty$1,
-  toHaveText: toHaveText$1,
-  toHaveValue
-};
-
-const toHaveText = locator => {
+const toHaveText$1 = locator => {
   const element = querySelectorWithOptions(locator._selector, {
     nth: locator._nth,
     hasText: locator._hasText
@@ -3734,7 +3614,7 @@ const toHaveText = locator => {
     actual: element.textContent
   };
 };
-const toHaveAttribute = (locator, {
+const toHaveAttribute$1 = (locator, {
   key,
   value
 }) => {
@@ -3754,7 +3634,7 @@ const toHaveAttribute = (locator, {
     actual
   };
 };
-const toHaveCount = locator => {
+const toHaveCount$1 = locator => {
   const elements = querySelector(locator._selector);
   const actualCount = elements.length;
   return {
@@ -3773,14 +3653,14 @@ const stringifyElement = element => {
   }
   return element.tagName;
 };
-const toBeFocused = locator => {
+const toBeFocused$1 = locator => {
   const activeElement = document.activeElement;
   const stringifiedActiveElement = stringifyElement(activeElement);
   return {
     actual: stringifiedActiveElement
   };
 };
-const toHaveClass = (locator, {
+const toHaveClass$1 = (locator, {
   className
 }) => {
   const [element] = querySelector(locator._selector);
@@ -3795,7 +3675,7 @@ const toHaveClass = (locator, {
     actual: className
   };
 };
-const toHaveId = locator => {
+const toHaveId$1 = locator => {
   const [element] = querySelector(locator._selector);
   if (!element) {
     return {
@@ -3808,7 +3688,7 @@ const toHaveId = locator => {
     actual: element.id
   };
 };
-const toHaveCss = (locator, {
+const toHaveCss$1 = (locator, {
   key
 }) => {
   const [element] = querySelector(locator._selector);
@@ -3825,7 +3705,7 @@ const toHaveCss = (locator, {
     actual
   };
 };
-const toHaveJSProperty = (locator, {
+const toHaveJSProperty$1 = (locator, {
   key
 }) => {
   const [element] = querySelector(locator._selector);
@@ -3843,39 +3723,115 @@ const toHaveJSProperty = (locator, {
 };
 
 const ConditionValues = {
+  __proto__: null,
+  toBeFocused: toBeFocused$1,
+  toHaveAttribute: toHaveAttribute$1,
+  toHaveClass: toHaveClass$1,
+  toHaveCount: toHaveCount$1,
+  toHaveCss: toHaveCss$1,
+  toHaveId: toHaveId$1,
+  toHaveJSProperty: toHaveJSProperty$1,
+  toHaveText: toHaveText$1
+};
+
+const press = options => {
+  const element = document.activeElement;
+  keyDown(element, options);
+  keyUp(element, options);
+};
+
+const KeyBoardActions = {
+  __proto__: null,
+  press
+};
+
+const toHaveCount = (elements, {
+  count
+}) => {
+  return elements.length === count;
+};
+const toBeHidden = elements => {
+  return elements.length === 0;
+};
+
+const MultiElementConditions = {
+  __proto__: null,
+  toBeHidden,
+  toHaveCount
+};
+
+const toBeVisible = element => {
+  if (typeof element.isVisible === 'function') {
+    return element.isVisible();
+  }
+  return element.isConnected;
+};
+const toHaveValue = (element, {
+  value
+}) => {
+  return element.value === value;
+};
+const toHaveText = (element, {
+  text
+}) => {
+  return element.textContent === text;
+};
+const toContainText = (element, {
+  text
+}) => {
+  return element.textContent.includes(text);
+};
+const toHaveAttribute = (element, {
+  key,
+  value
+}) => {
+  const attribute = element.getAttribute(key);
+  return attribute === value;
+};
+const toHaveJSProperty = (element, {
+  key,
+  value
+}) => {
+  const attribute = element[key];
+  return attribute === value;
+};
+const toBeFocused = element => {
+  return element === document.activeElement;
+};
+const toHaveClass = (element, {
+  className
+}) => {
+  return element.classList.contains(className);
+};
+const toHaveId = (element, {
+  id
+}) => {
+  return element.id === id;
+};
+const toHaveCss = (element, {
+  key,
+  value
+}) => {
+  const style = getComputedStyle(element);
+  const actualValue = style[key];
+  if (value instanceof RegExp) {
+    return value.test(actualValue);
+  }
+  return actualValue === value;
+};
+
+const SingleElementConditions = {
   __proto__: null,
   toBeFocused,
+  toBeVisible,
+  toContainText,
   toHaveAttribute,
   toHaveClass,
-  toHaveCount,
   toHaveCss,
   toHaveId,
   toHaveJSProperty,
-  toHaveText
-};
-
-// TODO this should also come in via options
-const maxTimeout$1 = 2000;
-const performAction2 = async (locator, fnName, options) => {
-  object(locator);
-  string(fnName);
-  object(options);
-  const startTime = getTimeStamp();
-  const endTime = startTime + maxTimeout$1;
-  let currentTime = startTime;
-  const fn = ElementActions[fnName];
-  while (currentTime < endTime) {
-    const element = querySelectorWithOptions(locator._selector, {
-      hasText: locator._hasText,
-      nth: locator._nth
-    });
-    if (element) {
-      fn(element, options);
-      return;
-    }
-    await waitForMutation(100);
-    currentTime = getTimeStamp();
-  }
+  toHaveText,
+  toHaveValue
 };
 
 const create$Overlay = () => {
@@ -3899,26 +3855,21 @@ const showOverlay = (state, background, text) => {
   $TestOverlay.textContent = text;
   document.body.append($TestOverlay);
 };
-const maxTimeout = 2000;
 const performAction = async (locator, fnName, options) => {
   object(locator);
   string(fnName);
   object(options);
-  const startTime = getTimeStamp();
-  const endTime = startTime + maxTimeout;
-  let currentTime = startTime;
   const fn = ElementActions[fnName];
-  while (currentTime < endTime) {
-    const element = querySelectorWithOptions(locator._selector, {
-      hasText: locator._hasText,
-      nth: locator._nth
-    });
-    if (element) {
-      fn(element, options);
-      return;
-    }
-    await waitForMutation(100);
-    currentTime = getTimeStamp();
+  const element = querySelectorWithOptions(locator._selector, {
+    hasText: locator._hasText,
+    nth: locator._nth
+  });
+  if (!element) {
+    throw new Error(`element not found`);
+  }
+  if (element) {
+    fn(element, options);
+    return;
   }
 };
 const performKeyBoardAction = (fnName, options) => {
@@ -3926,45 +3877,31 @@ const performKeyBoardAction = (fnName, options) => {
   fn(options);
 };
 const checkSingleElementCondition = async (locator, fnName, options) => {
-  const startTime = getTimeStamp();
-  const endTime = startTime + maxTimeout;
-  let currentTime = startTime;
   const fn = SingleElementConditions[fnName];
-  while (currentTime < endTime) {
-    const element = querySelectorWithOptions(locator._selector, {
-      hasText: locator._hasText,
-      nth: locator._nth
-    });
-    if (element) {
-      const successful = fn(element, options);
-      if (successful) {
-        return {
-          error: false
-        };
-      }
+  const element = querySelectorWithOptions(locator._selector, {
+    hasText: locator._hasText,
+    nth: locator._nth
+  });
+  if (element) {
+    const successful = fn(element, options);
+    if (successful) {
+      return {
+        error: false
+      };
     }
-    await waitForMutation(100);
-    currentTime = getTimeStamp();
   }
   return {
     error: true
   };
 };
 const checkMultiElementCondition = async (locator, fnName, options) => {
-  const startTime = getTimeStamp();
-  const endTime = startTime + maxTimeout;
-  let currentTime = startTime;
   const fn = MultiElementConditions[fnName];
-  while (currentTime < endTime) {
-    const elements = querySelector(locator._selector);
-    const successful = fn(elements, options);
-    if (successful) {
-      return {
-        error: false
-      };
-    }
-    await waitForMutation(100);
-    currentTime = getTimeStamp();
+  const elements = querySelector(locator._selector);
+  const successful = fn(elements, options);
+  if (successful) {
+    return {
+      error: false
+    };
   }
   return {
     error: true
@@ -6571,6 +6508,7 @@ const getSashId = $Target => {
 const Backspace$1 = 'Backspace';
 const Tab$1 = 'Tab';
 const Space$1 = ' ';
+const Space2 = 'Space';
 const Enter$1 = 'Enter';
 const Escape$1 = 'Escape';
 const PageUp$1 = 'PageUp';
@@ -6758,6 +6696,7 @@ const getKeyCode = key => {
     case Enter$1:
       return Enter;
     case Space$1:
+    case Space2:
       return Space;
     case PageUp$1:
       return PageUp;
@@ -6934,10 +6873,13 @@ const CtrlCmd = 1 << 11 >>> 0;
 const Shift = 1 << 10 >>> 0;
 const Alt = 1 << 9 >>> 0;
 
-const normalizeKey = key => {
+const normalizeKey = (key, code) => {
   if (key.length === 1) {
     return key.toLowerCase();
   }
+  if (key === 'Unidentified') {
+    return code;
+  }
   return key;
 };
 
@@ -6946,12 +6888,13 @@ const getKeyBindingIdentifier = event => {
     ctrlKey,
     shiftKey,
     altKey,
-    key
+    key,
+    code
   } = event;
   const modifierControl = ctrlKey ? CtrlCmd : 0;
   const modifierShift = shiftKey ? Shift : 0;
   const modifierAlt = altKey ? Alt : 0;
-  const normalizedKey = normalizeKey(key);
+  const normalizedKey = normalizeKey(key, code);
   const keyCode = getKeyCode(normalizedKey);
   const identifier = modifierControl | modifierShift | modifierAlt | keyCode;
   return identifier;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lvce-editor/renderer-process",
-  "version": "15.6.0",
+  "version": "16.1.0",
   "keywords": [
     "lvce-editor",
     "renderer-process"