@oracle/oraclejet-webdriver 15.0.4 → 15.0.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/elements/OjWebElement.js +10 -7
- package/elements/OjWebElement.js.map +1 -1
- package/elements/OjWebElement.ts +7 -8
- package/elements/oj-accordion/OjAccordion.js.map +1 -1
- package/elements/oj-accordion/OjAccordion.ts +0 -1
- package/elements/oj-checkboxset/OjCheckboxset.js.map +1 -1
- package/elements/oj-checkboxset/OjCheckboxset.ts +2 -2
- package/elements/oj-combobox-many/OjComboboxMany.js.map +1 -1
- package/elements/oj-combobox-many/OjComboboxMany.ts +1 -2
- package/elements/oj-data-grid/OjDataGrid.js +0 -2
- package/elements/oj-data-grid/OjDataGrid.js.map +1 -1
- package/elements/oj-data-grid/OjDataGrid.ts +4 -6
- package/elements/oj-dialog/OjDialog.js.map +1 -1
- package/elements/oj-dialog/OjDialog.ts +0 -2
- package/elements/oj-drawer-popup/OjDrawerPopup.js.map +1 -1
- package/elements/oj-drawer-popup/OjDrawerPopup.ts +0 -1
- package/elements/oj-input-search/OjInputSearch.js.map +1 -1
- package/elements/oj-input-search/OjInputSearch.ts +0 -1
- package/elements/oj-input-text/OjInputText.js.map +1 -1
- package/elements/oj-input-text/OjInputText.ts +0 -2
- package/elements/oj-list-view/OjListView.js +3 -8
- package/elements/oj-list-view/OjListView.js.map +1 -1
- package/elements/oj-list-view/OjListView.ts +3 -8
- package/elements/oj-menu/OjMenu.js.map +1 -1
- package/elements/oj-menu/OjMenu.ts +1 -1
- package/elements/oj-navigation-list/OjNavigationList.js +3 -6
- package/elements/oj-navigation-list/OjNavigationList.js.map +1 -1
- package/elements/oj-navigation-list/OjNavigationList.ts +10 -11
- package/elements/oj-radioset/OjRadioset.js.map +1 -1
- package/elements/oj-radioset/OjRadioset.ts +1 -1
- package/elements/oj-select-many/OjSelectMany.js.map +1 -1
- package/elements/oj-select-many/OjSelectMany.ts +1 -2
- package/elements/oj-stream-list/OjStreamList.js.map +1 -1
- package/elements/oj-stream-list/OjStreamList.ts +0 -1
- package/elements/oj-switch/OjSwitch.ts +1 -1
- package/elements/oj-table/OjTable.js +25 -20
- package/elements/oj-table/OjTable.js.map +1 -1
- package/elements/oj-table/OjTable.ts +25 -21
- package/elements/oj-text-area/OjTextArea.js.map +1 -1
- package/elements/oj-text-area/OjTextArea.ts +0 -1
- package/lib/OjFetch.js +11 -18
- package/lib/OjFetch.js.map +1 -1
- package/lib/OjFetch.ts +15 -20
- package/lib/ScreenshotManager.js +5 -11
- package/lib/ScreenshotManager.js.map +1 -1
- package/lib/ScreenshotManager.ts +5 -11
- package/lib/driver-manager.js +15 -8
- package/lib/driver-manager.js.map +1 -1
- package/lib/driver-manager.ts +18 -10
- package/lib/driver-override.js +3 -2
- package/lib/driver-override.js.map +1 -1
- package/lib/driver-override.ts +11 -10
- package/lib/slot-proxy.js +24 -12
- package/lib/slot-proxy.js.map +1 -1
- package/lib/slot-proxy.ts +27 -15
- package/package.json +6 -7
- package/wdtsdoc/classes/elements.OjAccordion.html +3 -3
- package/wdtsdoc/classes/elements.OjActionCard.html +3 -3
- package/wdtsdoc/classes/elements.OjButton.html +3 -3
- package/wdtsdoc/classes/elements.OjButtonsetMany.html +3 -3
- package/wdtsdoc/classes/elements.OjButtonsetOne.html +3 -3
- package/wdtsdoc/classes/elements.OjChart.html +3 -3
- package/wdtsdoc/classes/elements.OjCheckboxset.html +5 -5
- package/wdtsdoc/classes/elements.OjCollapsible.html +3 -3
- package/wdtsdoc/classes/elements.OjColorPalette.html +3 -3
- package/wdtsdoc/classes/elements.OjColorSpectrum.html +3 -3
- package/wdtsdoc/classes/elements.OjComboboxMany.html +3 -3
- package/wdtsdoc/classes/elements.OjComboboxOne.html +3 -3
- package/wdtsdoc/classes/elements.OjConveyorBelt.html +3 -3
- package/wdtsdoc/classes/elements.OjDataGrid.html +7 -27
- package/wdtsdoc/classes/elements.OjDatePicker.html +3 -3
- package/wdtsdoc/classes/elements.OjDateTimePicker.html +3 -3
- package/wdtsdoc/classes/elements.OjDiagram.html +3 -3
- package/wdtsdoc/classes/elements.OjDialog.html +3 -3
- package/wdtsdoc/classes/elements.OjDrawerLayout.html +3 -3
- package/wdtsdoc/classes/elements.OjDrawerPopup.html +3 -3
- package/wdtsdoc/classes/elements.OjFilePicker.html +3 -3
- package/wdtsdoc/classes/elements.OjFilmStrip.html +3 -3
- package/wdtsdoc/classes/elements.OjGantt.html +3 -3
- package/wdtsdoc/classes/elements.OjIndexer.html +3 -3
- package/wdtsdoc/classes/elements.OjInputDate.html +3 -3
- package/wdtsdoc/classes/elements.OjInputDateTime.html +3 -3
- package/wdtsdoc/classes/elements.OjInputNumber.html +3 -3
- package/wdtsdoc/classes/elements.OjInputPassword.html +3 -3
- package/wdtsdoc/classes/elements.OjInputSearch.html +3 -3
- package/wdtsdoc/classes/elements.OjInputText.html +3 -3
- package/wdtsdoc/classes/elements.OjInputTime.html +3 -3
- package/wdtsdoc/classes/elements.OjLabel.html +3 -3
- package/wdtsdoc/classes/elements.OjLedGauge.html +3 -3
- package/wdtsdoc/classes/elements.OjLegend.html +3 -3
- package/wdtsdoc/classes/elements.OjListView.html +3 -3
- package/wdtsdoc/classes/elements.OjMasonryLayout.html +3 -3
- package/wdtsdoc/classes/elements.OjMenu.html +3 -3
- package/wdtsdoc/classes/elements.OjMenuButton.html +3 -3
- package/wdtsdoc/classes/elements.OjMessage.html +3 -3
- package/wdtsdoc/classes/elements.OjNBox.html +3 -3
- package/wdtsdoc/classes/elements.OjNavigationList.html +3 -3
- package/wdtsdoc/classes/elements.OjPagingControl.html +3 -3
- package/wdtsdoc/classes/elements.OjPictoChart.html +3 -3
- package/wdtsdoc/classes/elements.OjPopup.html +3 -3
- package/wdtsdoc/classes/elements.OjProgress.html +3 -3
- package/wdtsdoc/classes/elements.OjProgressList.html +3 -3
- package/wdtsdoc/classes/elements.OjRadioset.html +3 -3
- package/wdtsdoc/classes/elements.OjRatingGauge.html +3 -3
- package/wdtsdoc/classes/elements.OjRefresher.html +3 -3
- package/wdtsdoc/classes/elements.OjRowExpander.html +3 -3
- package/wdtsdoc/classes/elements.OjSelectMany.html +3 -3
- package/wdtsdoc/classes/elements.OjSelectOne.html +3 -3
- package/wdtsdoc/classes/elements.OjSelectSingle.html +3 -3
- package/wdtsdoc/classes/elements.OjSelector.html +3 -3
- package/wdtsdoc/classes/elements.OjSlider.html +3 -3
- package/wdtsdoc/classes/elements.OjSparkChart.html +3 -3
- package/wdtsdoc/classes/elements.OjStatusMeterGauge.html +3 -3
- package/wdtsdoc/classes/elements.OjStreamList.html +3 -3
- package/wdtsdoc/classes/elements.OjSunburst.html +3 -3
- package/wdtsdoc/classes/elements.OjSwipeActions.html +3 -3
- package/wdtsdoc/classes/elements.OjSwitch.html +5 -5
- package/wdtsdoc/classes/elements.OjTabBar.html +3 -3
- package/wdtsdoc/classes/elements.OjTable.html +3 -3
- package/wdtsdoc/classes/elements.OjTagCloud.html +3 -3
- package/wdtsdoc/classes/elements.OjTextArea.html +3 -3
- package/wdtsdoc/classes/elements.OjThematicMap.html +3 -3
- package/wdtsdoc/classes/elements.OjTimeAxis.html +3 -3
- package/wdtsdoc/classes/elements.OjTimeline.html +3 -3
- package/wdtsdoc/classes/elements.OjTrain.html +3 -3
- package/wdtsdoc/classes/elements.OjTreeView.html +3 -3
- package/wdtsdoc/classes/elements.OjTreemap.html +3 -3
- package/wdtsdoc/classes/elements.OjWaterfallLayout.html +3 -3
- package/wdtsdoc/classes/elements.OjWebElement.html +3 -3
- package/wdtsdoc/classes/index.DriverManager.html +3 -3
- package/wdtsdoc/classes/index.Expectation.html +3 -3
- package/wdtsdoc/functions/elements.ojAccordion-1.html +3 -3
- package/wdtsdoc/functions/elements.ojActionCard-1.html +3 -3
- package/wdtsdoc/functions/elements.ojButton-1.html +3 -3
- package/wdtsdoc/functions/elements.ojButtonsetMany-1.html +3 -3
- package/wdtsdoc/functions/elements.ojButtonsetOne-1.html +3 -3
- package/wdtsdoc/functions/elements.ojChart-1.html +3 -3
- package/wdtsdoc/functions/elements.ojCheckboxset-1.html +3 -3
- package/wdtsdoc/functions/elements.ojCollapsible-1.html +3 -3
- package/wdtsdoc/functions/elements.ojColorPalette-1.html +3 -3
- package/wdtsdoc/functions/elements.ojColorSpectrum-1.html +3 -3
- package/wdtsdoc/functions/elements.ojComboboxMany-1.html +3 -3
- package/wdtsdoc/functions/elements.ojComboboxOne-1.html +3 -3
- package/wdtsdoc/functions/elements.ojConveyorBelt-1.html +3 -3
- package/wdtsdoc/functions/elements.ojDataGrid-1.html +3 -3
- package/wdtsdoc/functions/elements.ojDatePicker-1.html +3 -3
- package/wdtsdoc/functions/elements.ojDateTimePicker-1.html +3 -3
- package/wdtsdoc/functions/elements.ojDiagram-1.html +3 -3
- package/wdtsdoc/functions/elements.ojDialog-1.html +3 -3
- package/wdtsdoc/functions/elements.ojDrawerLayout-1.html +3 -3
- package/wdtsdoc/functions/elements.ojDrawerPopup-1.html +3 -3
- package/wdtsdoc/functions/elements.ojFilePicker-1.html +3 -3
- package/wdtsdoc/functions/elements.ojFilmStrip-1.html +3 -3
- package/wdtsdoc/functions/elements.ojGantt-1.html +3 -3
- package/wdtsdoc/functions/elements.ojIndexer-1.html +3 -3
- package/wdtsdoc/functions/elements.ojInputDate-1.html +3 -3
- package/wdtsdoc/functions/elements.ojInputDateTime-1.html +3 -3
- package/wdtsdoc/functions/elements.ojInputNumber-1.html +3 -3
- package/wdtsdoc/functions/elements.ojInputPassword-1.html +3 -3
- package/wdtsdoc/functions/elements.ojInputSearch-1.html +3 -3
- package/wdtsdoc/functions/elements.ojInputText-1.html +3 -3
- package/wdtsdoc/functions/elements.ojInputTime-1.html +3 -3
- package/wdtsdoc/functions/elements.ojLabel-1.html +3 -3
- package/wdtsdoc/functions/elements.ojLedGauge-1.html +3 -3
- package/wdtsdoc/functions/elements.ojLegend-1.html +3 -3
- package/wdtsdoc/functions/elements.ojListView-1.html +3 -3
- package/wdtsdoc/functions/elements.ojMasonryLayout-1.html +3 -3
- package/wdtsdoc/functions/elements.ojMenu-1.html +3 -3
- package/wdtsdoc/functions/elements.ojMenuButton-1.html +3 -3
- package/wdtsdoc/functions/elements.ojMessage-1.html +3 -3
- package/wdtsdoc/functions/elements.ojNBox-1.html +3 -3
- package/wdtsdoc/functions/elements.ojNavigationList-1.html +3 -3
- package/wdtsdoc/functions/elements.ojPagingControl-1.html +3 -3
- package/wdtsdoc/functions/elements.ojPictoChart-1.html +3 -3
- package/wdtsdoc/functions/elements.ojPopup-1.html +3 -3
- package/wdtsdoc/functions/elements.ojProgress-1.html +3 -3
- package/wdtsdoc/functions/elements.ojProgressList-1.html +3 -3
- package/wdtsdoc/functions/elements.ojRadioset-1.html +3 -3
- package/wdtsdoc/functions/elements.ojRatingGauge-1.html +3 -3
- package/wdtsdoc/functions/elements.ojRefresher-1.html +3 -3
- package/wdtsdoc/functions/elements.ojRowExpander-1.html +3 -3
- package/wdtsdoc/functions/elements.ojSelectMany-1.html +3 -3
- package/wdtsdoc/functions/elements.ojSelectOne-1.html +3 -3
- package/wdtsdoc/functions/elements.ojSelectSingle-1.html +3 -3
- package/wdtsdoc/functions/elements.ojSelector-1.html +3 -3
- package/wdtsdoc/functions/elements.ojSlider-1.html +3 -3
- package/wdtsdoc/functions/elements.ojSparkChart-1.html +3 -3
- package/wdtsdoc/functions/elements.ojStatusMeterGauge-1.html +3 -3
- package/wdtsdoc/functions/elements.ojStreamList-1.html +3 -3
- package/wdtsdoc/functions/elements.ojSunburst-1.html +3 -3
- package/wdtsdoc/functions/elements.ojSwipeActions-1.html +3 -3
- package/wdtsdoc/functions/elements.ojSwitch-1.html +3 -3
- package/wdtsdoc/functions/elements.ojTabBar-1.html +3 -3
- package/wdtsdoc/functions/elements.ojTable-1.html +3 -3
- package/wdtsdoc/functions/elements.ojTagCloud-1.html +3 -3
- package/wdtsdoc/functions/elements.ojTextArea-1.html +3 -3
- package/wdtsdoc/functions/elements.ojThematicMap-1.html +3 -3
- package/wdtsdoc/functions/elements.ojTimeAxis-1.html +3 -3
- package/wdtsdoc/functions/elements.ojTimeline-1.html +3 -3
- package/wdtsdoc/functions/elements.ojTrain-1.html +3 -3
- package/wdtsdoc/functions/elements.ojTreeView-1.html +3 -3
- package/wdtsdoc/functions/elements.ojTreemap-1.html +3 -3
- package/wdtsdoc/functions/elements.ojWaterfallLayout-1.html +3 -3
- package/wdtsdoc/functions/elements.ojWebElement-1.html +3 -3
- package/wdtsdoc/functions/index.ScreenshotManager.create.html +3 -3
- package/wdtsdoc/functions/index.ScreenshotManager.get.html +3 -3
- package/wdtsdoc/functions/index.ScreenshotManager.set.html +3 -3
- package/wdtsdoc/functions/index.fetchKeyByFilter.html +3 -3
- package/wdtsdoc/functions/index.register.html +3 -3
- package/wdtsdoc/functions/index.slotProxy-1.html +3 -3
- package/wdtsdoc/index.html +4 -4
- package/wdtsdoc/interfaces/index.DriverLike.html +3 -3
- package/wdtsdoc/interfaces/index.SlotProxy.html +3 -3
- package/wdtsdoc/modules/elements.html +3 -3
- package/wdtsdoc/modules/index.ScreenshotManager.html +3 -3
- package/wdtsdoc/modules/index.html +3 -3
- package/wdtsdoc/variables/index.default.html +3 -3
package/elements/OjWebElement.js
CHANGED
|
@@ -45,6 +45,10 @@ class OjWebElement extends selenium_webdriver_1.WebElement {
|
|
|
45
45
|
*/
|
|
46
46
|
constructor(el, locators) {
|
|
47
47
|
super(el.getDriver(), el.getId());
|
|
48
|
+
/**
|
|
49
|
+
* Used by whenReady to avoid whenBusyContextReady being repeatedly called
|
|
50
|
+
*/
|
|
51
|
+
this._skipBusyContext = false;
|
|
48
52
|
this._locators = locators;
|
|
49
53
|
}
|
|
50
54
|
/**
|
|
@@ -103,6 +107,7 @@ class OjWebElement extends selenium_webdriver_1.WebElement {
|
|
|
103
107
|
* @inheritdoc
|
|
104
108
|
*/
|
|
105
109
|
async getRect() {
|
|
110
|
+
// @ts-ignore
|
|
106
111
|
if (super.getRect) {
|
|
107
112
|
// selenium-webdriver 4.x+
|
|
108
113
|
//get the active screenshotManager instance to take and save screenshot before action
|
|
@@ -118,6 +123,7 @@ class OjWebElement extends selenium_webdriver_1.WebElement {
|
|
|
118
123
|
*/
|
|
119
124
|
async getSize() {
|
|
120
125
|
// Deprecated in selenium-webdriver 4.x--needed for 3.x/4.x compat
|
|
126
|
+
// @ts-ignore
|
|
121
127
|
if (super.getSize) {
|
|
122
128
|
//get the active screenshotManager instance to take and save screenshot before action
|
|
123
129
|
const screenshotManager = __1.ScreenshotManager.get();
|
|
@@ -220,7 +226,7 @@ class OjWebElement extends selenium_webdriver_1.WebElement {
|
|
|
220
226
|
* @inheritdoc
|
|
221
227
|
*/
|
|
222
228
|
async takeScreenshot(optScroll) {
|
|
223
|
-
const ss = OjWebElement.trapStaleElement(this, super.takeScreenshot, optScroll);
|
|
229
|
+
const ss = OjWebElement.trapStaleElement(this, super.takeScreenshot, optScroll || false);
|
|
224
230
|
return ss;
|
|
225
231
|
}
|
|
226
232
|
/**
|
|
@@ -300,7 +306,7 @@ class OjWebElement extends selenium_webdriver_1.WebElement {
|
|
|
300
306
|
* the size of the element.
|
|
301
307
|
*/
|
|
302
308
|
hasSize() {
|
|
303
|
-
return new selenium_webdriver_1.Condition(`<${this._locators.tagName}> has a non-zero size`, async (
|
|
309
|
+
return new selenium_webdriver_1.Condition(`<${this._locators.tagName}> has a non-zero size`, async () => {
|
|
304
310
|
const rect = await this.getSize();
|
|
305
311
|
return rect.height > 0 && rect.width > 0;
|
|
306
312
|
});
|
|
@@ -418,11 +424,8 @@ exports.OjWebElement = OjWebElement;
|
|
|
418
424
|
* @param by The By locator with which to find the element
|
|
419
425
|
*/
|
|
420
426
|
async function ojWebElement(driver, by) {
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
return new OjWebElement(el, null);
|
|
424
|
-
}
|
|
425
|
-
return el;
|
|
427
|
+
// in a JET app, driver.findElement will always return Promise<OjWebElement>
|
|
428
|
+
return driver.findElement(by);
|
|
426
429
|
}
|
|
427
430
|
exports.ojWebElement = ojWebElement;
|
|
428
431
|
//# sourceMappingURL=OjWebElement.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OjWebElement.js","sourceRoot":"","sources":["../../elements/OjWebElement.ts"],"names":[],"mappings":";;;AAAA,2DAY4B;AAC5B,2BAA0D;AAC1D,wDAAsD;AACtD,kEAAiE;AAEjE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AACH,MAAa,YAAa,SAAQ,+BAAU;IAc1C;;;;;OAKG;IACH,YAAY,EAAc,EAAE,QAAyB;QACnD,KAAK,CAAC,EAAE,CAAC,SAAS,EAAE,EAAE,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"OjWebElement.js","sourceRoot":"","sources":["../../elements/OjWebElement.ts"],"names":[],"mappings":"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"}
|
package/elements/OjWebElement.ts
CHANGED
|
@@ -54,7 +54,7 @@ export class OjWebElement extends WebElement {
|
|
|
54
54
|
/**
|
|
55
55
|
* Used by whenReady to avoid whenBusyContextReady being repeatedly called
|
|
56
56
|
*/
|
|
57
|
-
private _skipBusyContext
|
|
57
|
+
private _skipBusyContext = false;
|
|
58
58
|
/**
|
|
59
59
|
* Cached browser name
|
|
60
60
|
*/
|
|
@@ -136,6 +136,7 @@ export class OjWebElement extends WebElement {
|
|
|
136
136
|
* @inheritdoc
|
|
137
137
|
*/
|
|
138
138
|
public async getRect(): Promise<IRectangle> {
|
|
139
|
+
// @ts-ignore
|
|
139
140
|
if (super.getRect) {
|
|
140
141
|
// selenium-webdriver 4.x+
|
|
141
142
|
//get the active screenshotManager instance to take and save screenshot before action
|
|
@@ -154,6 +155,7 @@ export class OjWebElement extends WebElement {
|
|
|
154
155
|
*/
|
|
155
156
|
public async getSize(): Promise<ISize> {
|
|
156
157
|
// Deprecated in selenium-webdriver 4.x--needed for 3.x/4.x compat
|
|
158
|
+
// @ts-ignore
|
|
157
159
|
if (super.getSize) {
|
|
158
160
|
//get the active screenshotManager instance to take and save screenshot before action
|
|
159
161
|
const screenshotManager = sm.get();
|
|
@@ -280,7 +282,7 @@ export class OjWebElement extends WebElement {
|
|
|
280
282
|
const ss = OjWebElement.trapStaleElement<string, [boolean]>(
|
|
281
283
|
this,
|
|
282
284
|
super.takeScreenshot,
|
|
283
|
-
optScroll
|
|
285
|
+
optScroll || false
|
|
284
286
|
);
|
|
285
287
|
return ss;
|
|
286
288
|
}
|
|
@@ -377,7 +379,7 @@ export class OjWebElement extends WebElement {
|
|
|
377
379
|
protected hasSize(): Condition<Promise<boolean>> {
|
|
378
380
|
return new Condition<Promise<boolean>>(
|
|
379
381
|
`<${this._locators.tagName}> has a non-zero size`,
|
|
380
|
-
async (
|
|
382
|
+
async () => {
|
|
381
383
|
const rect = await this.getSize();
|
|
382
384
|
return rect.height > 0 && rect.width > 0;
|
|
383
385
|
}
|
|
@@ -553,9 +555,6 @@ export interface ElementLocators {
|
|
|
553
555
|
* @param by The By locator with which to find the element
|
|
554
556
|
*/
|
|
555
557
|
export async function ojWebElement(driver: DriverLike, by: By): Promise<OjWebElement> {
|
|
556
|
-
|
|
557
|
-
|
|
558
|
-
return new OjWebElement(el, null);
|
|
559
|
-
}
|
|
560
|
-
return el;
|
|
558
|
+
// in a JET app, driver.findElement will always return Promise<OjWebElement>
|
|
559
|
+
return driver.findElement(by) as unknown as Promise<OjWebElement>;
|
|
561
560
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OjAccordion.js","sourceRoot":"","sources":["../../../elements/oj-accordion/OjAccordion.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"OjAccordion.js","sourceRoot":"","sources":["../../../elements/oj-accordion/OjAccordion.ts"],"names":[],"mappings":";;;AAAA,uDAAoD;AAEpD;;;;GAIG;AACH,MAAa,WAAY,SAAQ,iCAAe;CAAG;AAAnD,kCAAmD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OjCheckboxset.js","sourceRoot":"","sources":["../../../elements/oj-checkboxset/OjCheckboxset.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AACxD,
|
|
1
|
+
{"version":3,"file":"OjCheckboxset.js","sourceRoot":"","sources":["../../../elements/oj-checkboxset/OjCheckboxset.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AACxD,2DAA4D;AAE5D;;;;GAIG;AACH,MAAa,aAAc,SAAQ,qCAAiB;IAClD;;;;;;OAMG;IACH,KAAK,CAAC,WAAW,CAAC,KAAY;QAC5B,uCAAuC;QACvC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC,EAAE;YAClC,2DAA2D;YAC3D,OAAO,OAAO,CAAC,MAAM,CACnB,IAAI,0BAAK,CAAC,2BAA2B,CACnC,iFAAiF,CAClF,CACF,CAAC;SACH;QAED,+BAA+B;QAC/B,qBAAqB;QACrB,wEAAwE;QACxE,6EAA6E;QAC7E,4EAA4E;QAC5E,sEAAsE;QACtE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAAC,KAAK,CAAC,CAAC;QAE3D,8EAA8E;QAC9E,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;YACnD,MAAM,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,wBAAG,CAAC,KAAK,CAAC,CAAC;SACvC;QAED,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAClC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;YAChD,MAAM,CAAC,KAAK,EAAE,UAAU,CAAC,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAC7D,IAAI,KAAK,IAAI,IAAI,EAAE;gBACjB,2EAA2E;gBAC3E,yBAAyB;gBACzB,OAAO,OAAO,CAAC,MAAM,CACnB,IAAI,0BAAK,CAAC,oBAAoB,CAAC,kBAAkB,KAAK,CAAC,CAAC,CAAC,wBAAwB,CAAC,CACnF,CAAC;aACH;YAED,gDAAgD;YAChD,IAAI,CAAC,UAAU,EAAE;gBACf,MAAM,KAAK,CAAC,QAAQ,CAAC,wBAAG,CAAC,KAAK,CAAC,CAAC;aACjC;SACF;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,cAAc;QAC1B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC5C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC5C,OAAO,CAAC,CAAC,UAAU,IAAI,UAAU,CAAC,CAAC;IACrC,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,WAAW,CAAC,KAAU;QAClC,MAAM,KAAK,GAAG,EAAE,KAAK,EAAE,yBAAyB,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;QACjE,OAAO,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CACzC;;;;;;;;;;;KAWD,EACC,IAAI,EACJ,KAAK,CACN,CAAC;IACJ,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,uBAAuB,CAAC,cAAqB,EAAE;QAC3D,OAAO,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CACzC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAqCD,EACC,IAAI,EACJ,WAAW,CACZ,CAAC;IACJ,CAAC;CACF;AAvID,sCAuIC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { OjCheckboxsetBase } from './OjCheckboxsetBase';
|
|
2
|
-
import {
|
|
2
|
+
import { error, Key, WebElement } from 'selenium-webdriver';
|
|
3
3
|
|
|
4
4
|
/**
|
|
5
5
|
* The component WebElement for [oj-checkboxset](../../jsdocs/oj.ojCheckboxset.html).
|
|
@@ -14,7 +14,7 @@ export class OjCheckboxset extends OjCheckboxsetBase {
|
|
|
14
14
|
* @throws {ElementNotInteractableError} if the API is called when the control is readonly or disabled
|
|
15
15
|
* @throws {InvalidArgumentError} if the value parameter contains non-existent values
|
|
16
16
|
*/
|
|
17
|
-
async changeValue(value: any[]) {
|
|
17
|
+
async changeValue(value: any[]): Promise<void> {
|
|
18
18
|
// Check if the control is interactable
|
|
19
19
|
if (!(await this.isInteractable())) {
|
|
20
20
|
// Cannot interact when the control is disabled or readonly
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OjComboboxMany.js","sourceRoot":"","sources":["../../../elements/oj-combobox-many/OjComboboxMany.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"OjComboboxMany.js","sourceRoot":"","sources":["../../../elements/oj-combobox-many/OjComboboxMany.ts"],"names":[],"mappings":";;;AAAA,6DAA0D;AAE1D;;;;GAIG;AACH,MAAa,cAAe,SAAQ,uCAAkB;IACpD;;;;;OAKG;IACH,KAAK,CAAC,WAAW,CAAC,KAAwB;QACxC,mCAAmC;QACnC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAAC,sBAAsB,EAAE,IAAI,CAAC,CAAC;QACnE,uCAAuC;QACvC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,IAAI,CAAC,CAAC,QAAQ,IAAI,QAAQ,CAAC,EAAE;YAC3B,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAElC,IAAI,KAAK,IAAI,IAAI,EAAE;gBACjB,uEAAuE;gBACvE,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;gBACtC,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAClC,OAAO;aACR;YAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,kBAAkB,CAC1D;;;;;;;;;;;;;;;;;;;SAmBC,EACD,IAAI,EACJ,KAAK,CACN,CAAC;YAEF,kDAAkD;YAClD,IAAI,UAAU,KAAK,KAAK,EAAE;gBACxB,OAAO,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;gBACpF,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;aACxC;SACF;IACH,CAAC;IAED;;;OAGG;IACH,KAAK;QACH,OAAO,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED;;;;;OAKG;IACK,oBAAoB,CAAC,KAAwB;QACnD,OAAO,IAAI,CAAC,WAAW,CAAoB,OAAO,EAAE,KAAK,CAAC,CAAC;IAC7D,CAAC;CACF;AAzED,wCAyEC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { By } from 'selenium-webdriver';
|
|
2
1
|
import { OjComboboxManyBase } from './OjComboboxManyBase';
|
|
3
2
|
|
|
4
3
|
/**
|
|
@@ -77,6 +76,6 @@ export class OjComboboxMany extends OjComboboxManyBase {
|
|
|
77
76
|
* @param value The value to be set
|
|
78
77
|
*/
|
|
79
78
|
private _changeValueFallback(value: Array<any> | null): Promise<void> {
|
|
80
|
-
return this.setProperty<Array<any
|
|
79
|
+
return this.setProperty<Array<any> | null>('value', value);
|
|
81
80
|
}
|
|
82
81
|
}
|
|
@@ -29,7 +29,6 @@ class OjDataGrid extends OjDataGridBase_1.OjDataGridBase {
|
|
|
29
29
|
let columnIndex = key.columnIndex;
|
|
30
30
|
let rowKey = key.rowKey;
|
|
31
31
|
let columnKey = key.columnKey;
|
|
32
|
-
let cellProperty = await this.getCell();
|
|
33
32
|
let cellMatch = null;
|
|
34
33
|
let cells = await this.findElements(selenium_webdriver_1.By.css('.oj-datagrid-cell'));
|
|
35
34
|
for (let i = 0; i < cells.length; i++) {
|
|
@@ -140,7 +139,6 @@ class OjDataGrid extends OjDataGridBase_1.OjDataGridBase {
|
|
|
140
139
|
let index = itemLocator.index;
|
|
141
140
|
let level = itemLocator.level != null ? itemLocator.level : 0;
|
|
142
141
|
let header = null;
|
|
143
|
-
let headerCell = null;
|
|
144
142
|
header = await this.getDriver().executeAsyncScript(`
|
|
145
143
|
var element = arguments[0];
|
|
146
144
|
var axis = arguments[1];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OjDataGrid.js","sourceRoot":"","sources":["../../../elements/oj-data-grid/OjDataGrid.ts"],"names":[],"mappings":";;;AAAA,2DAAoD;AACpD,qDAAkD;AAClD,8BAA8C;AAE9C;;;;GAIG;AACH,MAAa,UAAW,SAAQ,+BAAc;IAC5C,qBAAqB;IAErB;;;;;;;;;;OAUG;IACH,KAAK,CAAC,eAAe,
|
|
1
|
+
{"version":3,"file":"OjDataGrid.js","sourceRoot":"","sources":["../../../elements/oj-data-grid/OjDataGrid.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,14 +21,13 @@ export class OjDataGrid extends OjDataGridBase {
|
|
|
21
21
|
* If cell renderer/template/slot is not specified the promise will be rejected with an error message.
|
|
22
22
|
* @ojdeprecated {since:"10.0.0", description:"This api is deprecated. Please use findCell"}
|
|
23
23
|
*/
|
|
24
|
-
async getCellContents
|
|
24
|
+
async getCellContents(itemLocator: { key: cellSubId }): Promise<WebElement | null> {
|
|
25
25
|
let datagridCell = null;
|
|
26
26
|
let key = itemLocator.key;
|
|
27
27
|
let rowIndex = key.rowIndex;
|
|
28
28
|
let columnIndex = key.columnIndex;
|
|
29
29
|
let rowKey = key.rowKey;
|
|
30
30
|
let columnKey = key.columnKey;
|
|
31
|
-
let cellProperty = await this.getCell();
|
|
32
31
|
let cellMatch = null;
|
|
33
32
|
|
|
34
33
|
let cells = await this.findElements(By.css('.oj-datagrid-cell'));
|
|
@@ -62,7 +61,7 @@ export class OjDataGrid extends OjDataGridBase {
|
|
|
62
61
|
return datagridCell;
|
|
63
62
|
}
|
|
64
63
|
|
|
65
|
-
async findCell
|
|
64
|
+
async findCell(itemLocator: cellSubId): Promise<SlotProxy> {
|
|
66
65
|
let rowIndex = itemLocator.rowIndex;
|
|
67
66
|
let columnIndex = itemLocator.columnIndex;
|
|
68
67
|
let rowKey = itemLocator.rowKey;
|
|
@@ -168,14 +167,13 @@ export class OjDataGrid extends OjDataGridBase {
|
|
|
168
167
|
return null;
|
|
169
168
|
}
|
|
170
169
|
|
|
171
|
-
async findHeader
|
|
170
|
+
async findHeader(itemLocator: headerSubId): Promise<SlotProxy> {
|
|
172
171
|
await this.whenReady();
|
|
173
172
|
let axis = itemLocator.axis;
|
|
174
173
|
let key = itemLocator.key;
|
|
175
174
|
let index = itemLocator.index;
|
|
176
175
|
let level = itemLocator.level != null ? itemLocator.level : 0;
|
|
177
176
|
let header = null;
|
|
178
|
-
let headerCell = null;
|
|
179
177
|
header = await this.getDriver().executeAsyncScript<WebElement>(
|
|
180
178
|
`
|
|
181
179
|
var element = arguments[0];
|
|
@@ -266,7 +264,7 @@ export class OjDataGrid extends OjDataGridBase {
|
|
|
266
264
|
return null;
|
|
267
265
|
}
|
|
268
266
|
|
|
269
|
-
async findLabel
|
|
267
|
+
async findLabel(itemLocator: labelSubId): Promise<SlotProxy> {
|
|
270
268
|
await this.whenReady();
|
|
271
269
|
let axis = itemLocator.axis;
|
|
272
270
|
let level = itemLocator.level != null ? itemLocator.level : 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OjDialog.js","sourceRoot":"","sources":["../../../elements/oj-dialog/OjDialog.ts"],"names":[],"mappings":";;;AAAA,iDAA8C;
|
|
1
|
+
{"version":3,"file":"OjDialog.js","sourceRoot":"","sources":["../../../elements/oj-dialog/OjDialog.ts"],"names":[],"mappings":";;;AAAA,iDAA8C;AAE9C;;;;GAIG;AACH,MAAa,QAAS,SAAQ,2BAAY;IACxC;;OAEG;IACH,KAAK,CAAC,OAAO;QACX,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACvB,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAAC,sBAAsB,EAAE,IAAI,CAAC,CAAC;QACnE,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;IACpC,CAAC;CACF;AATD,4BASC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OjDrawerPopup.js","sourceRoot":"","sources":["../../../elements/oj-drawer-popup/OjDrawerPopup.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;
|
|
1
|
+
{"version":3,"file":"OjDrawerPopup.js","sourceRoot":"","sources":["../../../elements/oj-drawer-popup/OjDrawerPopup.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AAExD;;;;GAIG;AACH,MAAa,aAAc,SAAQ,qCAAiB;IAClD;;OAEG;IACH,KAAK,CAAC,OAAO;QACX,OAAO,IAAI,CAAC,WAAW,CAAU,QAAQ,EAAE,KAAK,CAAC,CAAC;IACpD,CAAC;CACF;AAPD,sCAOC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OjInputSearch.js","sourceRoot":"","sources":["../../../elements/oj-input-search/OjInputSearch.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"OjInputSearch.js","sourceRoot":"","sources":["../../../elements/oj-input-search/OjInputSearch.ts"],"names":[],"mappings":";;;AAAA,2DAAwD;AACxD,uDAAmD;AAEnD;;;;GAIG;AACH,MAAa,aAAc,SAAQ,qCAAiB;IAClD;;;;;OAKG;IACH,KAAK,CAAC,WAAW,CAAC,KAAa;QAC7B,mCAAmC;QACnC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAAC,sBAAsB,EAAE,IAAI,CAAC,CAAC;QACnE,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAClC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,kBAAkB,CACvC;;;;;;;;;;KAUD,EACC,IAAI,EACJ,KAAK,CACN,CAAC;IACJ,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,gBAAgB,CAAC,GAAQ;QAC7B,mCAAmC;QACnC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAAC,sBAAsB,EAAE,IAAI,CAAC,CAAC;QACnE,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAClC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,kBAAkB,CACvC;;;;;;;;;;KAUD,EACC,IAAI,EACJ,GAAG,CACJ,CAAC;IACJ,CAAC;CACF;AArDD,sCAqDC;AACD,IAAA,wBAAU,EAAC,aAAa,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OjInputText.js","sourceRoot":"","sources":["../../../elements/oj-input-text/OjInputText.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"OjInputText.js","sourceRoot":"","sources":["../../../elements/oj-input-text/OjInputText.ts"],"names":[],"mappings":";;;AAAA,uDAAoD;AACpD,uDAAqE;AAErE;;;;GAIG;AACH,MAAa,WAAY,SAAQ,iCAAe;CAAG;AAAnD,kCAAmD;AACnD,IAAA,8BAAgB,EAAC,WAAW,CAAC,CAAC;AAC9B,IAAA,wBAAU,EAAC,WAAW,CAAC,CAAC"}
|
|
@@ -52,15 +52,10 @@ class OjListView extends OjListViewBase_1.OjListViewBase {
|
|
|
52
52
|
await this.setProperty('scrollToKey', 'always');
|
|
53
53
|
// Call changeScrollPosition to scroll the row into view and ensure it's
|
|
54
54
|
// rendere in DOM
|
|
55
|
+
// TODO: Base class should mark position properties as optional
|
|
56
|
+
// @ts-ignore
|
|
55
57
|
await this.changeScrollPosition({
|
|
56
|
-
key: itemLocator.key
|
|
57
|
-
// TODO: These should be marked optional by the base class
|
|
58
|
-
index: undefined,
|
|
59
|
-
offsetX: undefined,
|
|
60
|
-
offsetY: undefined,
|
|
61
|
-
parent: undefined,
|
|
62
|
-
x: undefined,
|
|
63
|
-
y: undefined
|
|
58
|
+
key: itemLocator.key
|
|
64
59
|
});
|
|
65
60
|
await this.whenBusyContextReady();
|
|
66
61
|
const display = await this.getProperty('display');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OjListView.js","sourceRoot":"","sources":["../../../elements/oj-list-view/OjListView.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAClD,8BAA8C;AAC9C,2DAAoD;AAEpD;;;;GAIG;AACH,MAAa,UAAW,SAAQ,+BAAc;IAC5C;;;;;;OAMG;IACH,KAAK,CAAC,cAAc,CAAI,QAAkB;QACxC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACvB,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAClC;;;;;OAKC,EACD,IAAI,EACJ,QAAQ,CACT,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,WAAW;QACf,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACvB,MAAM,QAAQ,GAAa,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAC7D;;;;KAID,EACC,IAAI,CACL,CAAC;QACF,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,QAAQ,CAAI,WAAuB;QACvC,4EAA4E;QAC5E,gDAAgD;QAChD,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAChD,wEAAwE;QACxE,iBAAiB;QACjB,MAAM,IAAI,CAAC,oBAAoB,CAAC;YAC9B,GAAG,EAAE,WAAW,CAAC,GAAG;
|
|
1
|
+
{"version":3,"file":"OjListView.js","sourceRoot":"","sources":["../../../elements/oj-list-view/OjListView.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAClD,8BAA8C;AAC9C,2DAAoD;AAEpD;;;;GAIG;AACH,MAAa,UAAW,SAAQ,+BAAc;IAC5C;;;;;;OAMG;IACH,KAAK,CAAC,cAAc,CAAI,QAAkB;QACxC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACvB,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAClC;;;;;OAKC,EACD,IAAI,EACJ,QAAQ,CACT,CAAC;IACJ,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,WAAW;QACf,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACvB,MAAM,QAAQ,GAAa,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAC7D;;;;KAID,EACC,IAAI,CACL,CAAC;QACF,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,QAAQ,CAAI,WAAuB;QACvC,4EAA4E;QAC5E,gDAAgD;QAChD,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;QAChD,wEAAwE;QACxE,iBAAiB;QACjB,+DAA+D;QAC/D,aAAa;QACb,MAAM,IAAI,CAAC,oBAAoB,CAAC;YAC9B,GAAG,EAAE,WAAW,CAAC,GAAG;SACrB,CAAC,CAAC;QACH,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAClC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,CAAC;QAClD,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAC3C;;GAEH,EACG,IAAI,EACJ,WAAW,CAAC,GAAG,CAChB,CAAC;QACF,IAAI,OAAO,KAAK,MAAM,EAAE;YACtB,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,uBAAE,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,CAAC;SAClD;QACD,OAAO,IAAA,aAAS,EAAC,EAAE,EAAE,IAAI,CAAC,CAAC;IAC7B,CAAC;CACF;AAvED,gCAuEC"}
|
|
@@ -59,15 +59,10 @@ export class OjListView extends OjListViewBase {
|
|
|
59
59
|
await this.setProperty('scrollToKey', 'always');
|
|
60
60
|
// Call changeScrollPosition to scroll the row into view and ensure it's
|
|
61
61
|
// rendere in DOM
|
|
62
|
+
// TODO: Base class should mark position properties as optional
|
|
63
|
+
// @ts-ignore
|
|
62
64
|
await this.changeScrollPosition({
|
|
63
|
-
key: itemLocator.key
|
|
64
|
-
// TODO: These should be marked optional by the base class
|
|
65
|
-
index: undefined,
|
|
66
|
-
offsetX: undefined,
|
|
67
|
-
offsetY: undefined,
|
|
68
|
-
parent: undefined,
|
|
69
|
-
x: undefined,
|
|
70
|
-
y: undefined
|
|
65
|
+
key: itemLocator.key
|
|
71
66
|
});
|
|
72
67
|
await this.whenBusyContextReady();
|
|
73
68
|
const display = await this.getProperty('display');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OjMenu.js","sourceRoot":"","sources":["../../../elements/oj-menu/OjMenu.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"OjMenu.js","sourceRoot":"","sources":["../../../elements/oj-menu/OjMenu.ts"],"names":[],"mappings":";;;AAAA,2DAA6C;AAC7C,6CAA0C;AAE1C;;;;GAIG;AACH,MAAa,MAAO,SAAQ,uBAAU;IACpC;;;;OAIG;IACH,KAAK,CAAC,IAAI,CAAC,QAAgB;QACzB,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACvB,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,WAAW,CAAC,uBAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;QAC9D,MAAM,CAAC,CAAC,KAAK,EAAE,CAAC;QAChB,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;IACpC,CAAC;IACD;;;;;;OAMG;IACH,KAAK,CAAC,eAAe,CAAC,EAAU;QAC9B,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACvB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,uBAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QAC/C,MAAM,CAAC,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,uBAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,6CAA6C;QAChG,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACvC,IAAI,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,uBAAuB,CAAC,CAAC;QACjE,OAAO,SAAS,KAAK,GAAG,EAAE;YACxB,MAAM,IAAI,CAAC,QAAQ,CAAC,wBAAG,CAAC,IAAI,CAAC,CAAC;YAC9B,SAAS,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,uBAAuB,CAAC,CAAC;SAC9D;QACD,MAAM,IAAI,CAAC,KAAK,EAAE,CAAC;QACnB,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;IACpC,CAAC;IACD;;;;;;OAMG;IACH,KAAK,CAAC,YAAY,CAAC,aAAqB;QACtC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACvB,OAAO,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CACnC;;;0BAGoB,aAAa;;;;;KAKlC,EACC,IAAI,CACL,CAAC;IACJ,CAAC;CACF;AAtDD,wBAsDC"}
|
|
@@ -161,11 +161,11 @@ class OjNavigationList extends OjNavigationListBase_1.OjNavigationListBase {
|
|
|
161
161
|
}
|
|
162
162
|
for (let i = 0; i < indexArray.length; i++) {
|
|
163
163
|
parent = await this._getItemByIndex(indexArray[i], parent);
|
|
164
|
-
if (i < indexArray.length - 1) {
|
|
164
|
+
if (parent && i < indexArray.length - 1) {
|
|
165
165
|
await this._expandItem(parent);
|
|
166
166
|
}
|
|
167
167
|
else {
|
|
168
|
-
await parent
|
|
168
|
+
await parent?.click();
|
|
169
169
|
}
|
|
170
170
|
}
|
|
171
171
|
}
|
|
@@ -216,13 +216,10 @@ class OjNavigationList extends OjNavigationListBase_1.OjNavigationListBase {
|
|
|
216
216
|
}
|
|
217
217
|
}
|
|
218
218
|
catch (e) {
|
|
219
|
-
item =
|
|
219
|
+
item = undefined; //element not found
|
|
220
220
|
}
|
|
221
221
|
return item;
|
|
222
222
|
}
|
|
223
|
-
async _isCollapsed(item) {
|
|
224
|
-
return await this._hasClass(item, 'oj-collapsed');
|
|
225
|
-
}
|
|
226
223
|
async _isExpanded(item) {
|
|
227
224
|
return await this._hasClass(item, 'oj-expanded');
|
|
228
225
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OjNavigationList.js","sourceRoot":"","sources":["../../../elements/oj-navigation-list/OjNavigationList.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"OjNavigationList.js","sourceRoot":"","sources":["../../../elements/oj-navigation-list/OjNavigationList.ts"],"names":[],"mappings":"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"}
|
|
@@ -162,7 +162,7 @@ Use the ExpandAllKeySet class to expand all items.
|
|
|
162
162
|
*/
|
|
163
163
|
async changeSelectionByIndex(index: number | Array<number>) {
|
|
164
164
|
await this.whenReady();
|
|
165
|
-
let indexArray: Array<number>, parent: WebElement;
|
|
165
|
+
let indexArray: Array<number>, parent: WebElement | undefined;
|
|
166
166
|
if (!Array.isArray(index)) {
|
|
167
167
|
indexArray = [index];
|
|
168
168
|
} else {
|
|
@@ -171,10 +171,10 @@ Use the ExpandAllKeySet class to expand all items.
|
|
|
171
171
|
|
|
172
172
|
for (let i = 0; i < indexArray.length; i++) {
|
|
173
173
|
parent = await this._getItemByIndex(indexArray[i], parent);
|
|
174
|
-
if (i < indexArray.length - 1) {
|
|
174
|
+
if (parent && i < indexArray.length - 1) {
|
|
175
175
|
await this._expandItem(parent);
|
|
176
176
|
} else {
|
|
177
|
-
await parent
|
|
177
|
+
await parent?.click();
|
|
178
178
|
}
|
|
179
179
|
}
|
|
180
180
|
}
|
|
@@ -199,8 +199,8 @@ Use the ExpandAllKeySet class to expand all items.
|
|
|
199
199
|
* Returns item node specified by index path.
|
|
200
200
|
* @param index array of index path to the element to be returned
|
|
201
201
|
*/
|
|
202
|
-
async getItemByIndex(indexPath: Array<number>): Promise<WebElement> {
|
|
203
|
-
let item: WebElement;
|
|
202
|
+
async getItemByIndex(indexPath: Array<number>): Promise<WebElement | undefined> {
|
|
203
|
+
let item: WebElement | undefined;
|
|
204
204
|
for (let i = 0; i < indexPath.length; i++) {
|
|
205
205
|
item = item
|
|
206
206
|
? await this._getItemByIndex(indexPath[i], item)
|
|
@@ -220,7 +220,10 @@ Use the ExpandAllKeySet class to expand all items.
|
|
|
220
220
|
return hasClass;
|
|
221
221
|
}
|
|
222
222
|
|
|
223
|
-
private async _getItemByIndex(
|
|
223
|
+
private async _getItemByIndex(
|
|
224
|
+
index: number,
|
|
225
|
+
parent?: WebElement
|
|
226
|
+
): Promise<WebElement | undefined> {
|
|
224
227
|
let item;
|
|
225
228
|
try {
|
|
226
229
|
if (!parent)
|
|
@@ -237,15 +240,11 @@ Use the ExpandAllKeySet class to expand all items.
|
|
|
237
240
|
);
|
|
238
241
|
}
|
|
239
242
|
} catch (e) {
|
|
240
|
-
item =
|
|
243
|
+
item = undefined; //element not found
|
|
241
244
|
}
|
|
242
245
|
return item;
|
|
243
246
|
}
|
|
244
247
|
|
|
245
|
-
private async _isCollapsed(item: WebElement) {
|
|
246
|
-
return await this._hasClass(item, 'oj-collapsed');
|
|
247
|
-
}
|
|
248
|
-
|
|
249
248
|
private async _isExpanded(item: WebElement) {
|
|
250
249
|
return await this._hasClass(item, 'oj-expanded');
|
|
251
250
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OjRadioset.js","sourceRoot":"","sources":["../../../elements/oj-radioset/OjRadioset.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"OjRadioset.js","sourceRoot":"","sources":["../../../elements/oj-radioset/OjRadioset.ts"],"names":[],"mappings":";;;AAAA,qDAAkD;AAClD,2DAA4D;AAE5D;;;;GAIG;AACH,MAAa,UAAW,SAAQ,+BAAc;IAC5C;;;;;;OAMG;IACH,KAAK,CAAC,WAAW,CAAC,KAAU;QAC1B,uCAAuC;QACvC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC,EAAE;YAClC,2DAA2D;YAC3D,OAAO,OAAO,CAAC,MAAM,CACnB,IAAI,0BAAK,CAAC,2BAA2B,CACnC,8EAA8E,CAC/E,CACF,CAAC;SACH;QAED,iDAAiD;QACjD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QAEzC,IAAI,KAAK,IAAI,IAAI,EAAE;YACjB,2EAA2E;YAC3E,sBAAsB;YACtB,OAAO,OAAO,CAAC,MAAM,CACnB,IAAI,0BAAK,CAAC,oBAAoB,CAAC,eAAe,KAAK,wBAAwB,CAAC,CAC7E,CAAC;SACH;QAED,iEAAiE;QACjE,OAAO,KAAK,CAAC,QAAQ,CAAC,wBAAG,CAAC,KAAK,CAAC,CAAC;IACnC,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,cAAc;QAC1B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC5C,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAE5C,OAAO,CAAC,CAAC,UAAU,IAAI,UAAU,CAAC,CAAC;IACrC,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,QAAQ,CAAC,KAAU;QAC/B,MAAM,KAAK,GAAG,EAAE,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;QAC3D,OAAO,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CACzC;;;;KAID,EACC,IAAI,EACJ,KAAK,CACN,CAAC;IACJ,CAAC;CACF;AA9DD,gCA8DC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OjSelectMany.js","sourceRoot":"","sources":["../../../elements/oj-select-many/OjSelectMany.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"OjSelectMany.js","sourceRoot":"","sources":["../../../elements/oj-select-many/OjSelectMany.ts"],"names":[],"mappings":";;;AAAA,yDAAsD;AAEtD;;;;GAIG;AACH,MAAa,YAAa,SAAQ,mCAAgB;IAChD;;;;;OAKG;IACH,KAAK,CAAC,WAAW,CAAC,KAAwB;QACxC,mCAAmC;QACnC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAAC,sBAAsB,EAAE,IAAI,CAAC,CAAC;QACnE,uCAAuC;QACvC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC1C,IAAI,CAAC,CAAC,QAAQ,IAAI,QAAQ,CAAC,EAAE;YAC3B,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAElC,IAAI,KAAK,IAAI,IAAI,EAAE;gBACjB,uEAAuE;gBACvE,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC;gBACtC,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAClC,OAAO;aACR;YAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,kBAAkB,CAC1D;;;;;;;;;;;;;;;;;;;SAmBC,EACD,IAAI,EACJ,KAAK,CACN,CAAC;YAEF,kDAAkD;YAClD,IAAI,UAAU,KAAK,KAAK,EAAE;gBACxB,OAAO,CAAC,IAAI,CAAC,qEAAqE,CAAC,CAAC;gBACpF,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;aACxC;SACF;IACH,CAAC;IAED;;;OAGG;IACH,KAAK;QACH,OAAO,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IAC9B,CAAC;IAED;;;;;OAKG;IACK,oBAAoB,CAAC,KAAwB;QACnD,OAAO,IAAI,CAAC,WAAW,CAAoB,OAAO,EAAE,KAAK,CAAC,CAAC;IAC7D,CAAC;CACF;AAzED,oCAyEC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { By, WebElement } from 'selenium-webdriver';
|
|
2
1
|
import { OjSelectManyBase } from './OjSelectManyBase';
|
|
3
2
|
|
|
4
3
|
/**
|
|
@@ -77,6 +76,6 @@ export class OjSelectMany extends OjSelectManyBase {
|
|
|
77
76
|
* @param value The value to be set
|
|
78
77
|
*/
|
|
79
78
|
private _changeValueFallback(value: Array<any> | null): Promise<void> {
|
|
80
|
-
return this.setProperty<Array<any
|
|
79
|
+
return this.setProperty<Array<any> | null>('value', value);
|
|
81
80
|
}
|
|
82
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OjStreamList.js","sourceRoot":"","sources":["../../../elements/oj-stream-list/OjStreamList.ts"],"names":[],"mappings":";;;AAAA,yDAAsD;
|
|
1
|
+
{"version":3,"file":"OjStreamList.js","sourceRoot":"","sources":["../../../elements/oj-stream-list/OjStreamList.ts"],"names":[],"mappings":";;;AAAA,yDAAsD;AACtD,2DAAoD;AAEpD;;;;GAIG;AACH,MAAa,YAAa,SAAQ,mCAAgB;IAChD,qBAAqB;IACrB,KAAK,CAAC,QAAQ,CAAI,WAAuC;QACvD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,uBAAE,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC,CAAC;QAC7F,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAClC,IAAI,IAAI,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,kBAAkB,CAClD;;;;;;;;;;;;;;;;;;;;;;;;;;;QA2BE,EACF,IAAI,EACJ,WAAW,EACX,KAAK,CACN,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,SAAS,CAAI,WAAwB;QACzC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,uBAAE,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,CAAC;QACvE,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAElC,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,kBAAkB,CACnD;;;;;;;;;;;;;;;;;QAiBE,EACF,IAAI,EACJ,WAAW,EACX,KAAK,CACN,CAAC;QAEF,OAAO,KAAK,CAAC;IACf,CAAC;CACF;AAxED,oCAwEC"}
|
|
@@ -12,7 +12,7 @@ export class OjSwitch extends OjSwitchBase {
|
|
|
12
12
|
* The boolean state of the switch component.
|
|
13
13
|
* @param value The value to set for "value"
|
|
14
14
|
*/
|
|
15
|
-
async changeValue(value: boolean) {
|
|
15
|
+
async changeValue(value: boolean): Promise<void> {
|
|
16
16
|
// Check if the control is interactable
|
|
17
17
|
if (!(await this.isInteractable())) {
|
|
18
18
|
// Cannot interact when the control is disabled or readonly
|