@applitools/driver
Advanced tools
Comparing version 1.9.21 to 1.9.22
@@ -261,12 +261,9 @@ "use strict"; | ||
} | ||
async elements(elementOrSelector) { | ||
if (this._spec.isElement(elementOrSelector)) { | ||
return [new element_1.Element({ spec: this._spec, context: this, element: elementOrSelector, logger: this._logger })]; | ||
} | ||
else if (specUtils.isSelector(this._spec, elementOrSelector)) { | ||
async elements(selectorOrElement) { | ||
if (specUtils.isSelector(this._spec, selectorOrElement)) { | ||
if (this.isRef) { | ||
return [new element_1.Element({ spec: this._spec, context: this, selector: elementOrSelector, logger: this._logger })]; | ||
return [new element_1.Element({ spec: this._spec, context: this, selector: selectorOrElement, logger: this._logger })]; | ||
} | ||
this._logger.log('Finding elements by selector: ', elementOrSelector); | ||
const root = await this.root(elementOrSelector); | ||
this._logger.log('Finding elements by selector: ', selectorOrElement); | ||
const root = await this.root(selectorOrElement); | ||
if (!root) | ||
@@ -287,2 +284,5 @@ return []; | ||
} | ||
else if (this._spec.isElement(selectorOrElement)) { | ||
return [new element_1.Element({ spec: this._spec, context: this, element: selectorOrElement, logger: this._logger })]; | ||
} | ||
else { | ||
@@ -289,0 +289,0 @@ throw new TypeError('Cannot find elements using argument of unknown type!'); |
@@ -276,3 +276,3 @@ "use strict"; | ||
async findElements(selector, rootElement) { | ||
const elements = this._elements.get(selector); | ||
const elements = this._elements.get(typeof selector === 'string' ? selector : selector.id); | ||
return elements | ||
@@ -279,0 +279,0 @@ ? elements.filter(element => element.parentContextId === this._contextId && |
@@ -33,2 +33,4 @@ "use strict"; | ||
function isElement(element) { | ||
if ((element === null || element === void 0 ? void 0 : element.notting) === true) | ||
return false; | ||
return utils.types.has(element, 'id'); | ||
@@ -38,3 +40,5 @@ } | ||
function isSelector(selector) { | ||
return utils.types.isString(selector) || utils.types.has(selector, ['using', 'value']); | ||
if ((selector === null || selector === void 0 ? void 0 : selector.notting) === true) | ||
return false; | ||
return (utils.types.isString(selector) || utils.types.has(selector, ['using', 'value']) || (selector === null || selector === void 0 ? void 0 : selector.forceSelector) === true); | ||
} | ||
@@ -41,0 +45,0 @@ exports.isSelector = isSelector; |
{ | ||
"name": "@applitools/driver", | ||
"version": "1.9.21", | ||
"version": "1.9.22", | ||
"description": "Applitools universal framework wrapper", | ||
@@ -5,0 +5,0 @@ "keywords": [ |
@@ -57,3 +57,3 @@ import type * as types from '@applitools/types'; | ||
element(elementOrSelector: TElement | types.Selector<TSelector>): Promise<Element<TDriver, TContext, TElement, TSelector>>; | ||
elements(elementOrSelector: TElement | types.Selector<TSelector>): Promise<Element<TDriver, TContext, TElement, TSelector>[]>; | ||
elements(selectorOrElement: types.Selector<TSelector> | TElement): Promise<Element<TDriver, TContext, TElement, TSelector>[]>; | ||
waitFor(selector: types.Selector<TSelector>, options?: types.WaitOptions): Promise<Element<TDriver, TContext, TElement, TSelector>>; | ||
@@ -60,0 +60,0 @@ execute(script: ((args: any) => any) | string, arg?: any): Promise<any>; |
215982
3395