@oracle/oraclejet-webdriver 16.1.6 → 17.0.1

package/elements/oj-table/OjTable.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OjTable = void 0;
 const OjTableBase_1 = require("./OjTableBase");
 const __1 = require("../../");
+const oj_module_proxy_1 = require("../../lib/oj-module-proxy");
 /**
  * The component WebElement for [oj-table](../../jsdocs/oj.ojTable.html).
  * Do not instantiate this class directly, instead, use
@@ -15,18 +16,18 @@ class OjTable extends OjTableBase_1.OjTableBase {
      * @param selected The value to set for "selected"
      * @override
      * @typeparam K Type of keys
+     * @deprecated Since 17.0.0 use changeSelectedKeys as the replacement.
      */
     async changeSelected(selected) {
         await this.whenReady();
-        await this.getDriver().executeScript(`
-        const ele = arguments[0];
-        const selected = arguments[1];
-        const keySet = require('ojs/ojkeyset');
+        return (0, oj_module_proxy_1.executeWithModules)(this.getDriver(), ['KeySet'], [this, selected], `
+      (({ KeySetImpl }, ele, selected) => {
         ele.selected = {
-          row: new keySet.KeySetImpl(selected.row),
-          column: new keySet.KeySetImpl(selected.column)
+          row: new KeySetImpl(selected.row),
+          column: new KeySetImpl(selected.column)
         };
-      `, this, selected);
+      })
+      `);
     }
     _changeScrollPosition(scrollPosition) {
         // OjTableBase.ScrollPosition marks all properties required, although they're not
@@ -39,6 +40,7 @@ class OjTable extends OjTableBase_1.OjTableBase {
      * @override
      * @typeparam K Type of keys
      * @return The value of "selected" property.
+     * @deprecated Since 17.0.0 use getSelectedKeys as the replacement.
      */
     async getSelected() {
         await this.whenReady();
@@ -70,13 +72,8 @@ class OjTable extends OjTableBase_1.OjTableBase {
                 rowKey: itemLocator.rowKey
             });
         }
-        const el = await this.getDriver().executeAsyncScript(`
-      const element = arguments[0];
-      const rowIndex = arguments[1];
-      let columnIndex = arguments[2];
-      const rowKey = arguments[3];
-      const columnKey = arguments[4];
-      const done = arguments[5];
+        const el = await (0, oj_module_proxy_1.executeWithModules)(this.getDriver(), ['KeyUtils'], [this, itemLocator], `
+      (({ equals }, element, { rowIndex, columnIndex, rowKey, columnKey }) => {
       const columns = element.columns;
       if (columnIndex == null) {
         for (let i = 0; i < columns.length; i++) {
@@ -87,45 +84,44 @@ class OjTable extends OjTableBase_1.OjTableBase {
         }
       }
       if (columnIndex == null || columnIndex >= columns.length) {
-        done(null);
+        return null;
       }
       const defaultCellTemplate = element.querySelectorAll('[slot="cellTemplate"]')[0];
       if (columns[columnIndex].template == null && columns[columnIndex].renderer == null &&
           defaultCellTemplate == null) {
-            done(null);
+            return null;
       } else {
         if (rowIndex != null) {
-          done(element.getNodeBySubId({ subId: 'oj-table-cell', rowIndex: rowIndex, columnIndex: columnIndex }));
+          return element.getNodeBySubId({ subId: 'oj-table-cell', rowIndex: rowIndex, columnIndex: columnIndex });
         } else {
-          require(['ojs/ojcore'], function(oj) {
-            const rows = element.querySelectorAll('.oj-table-body-row');
-            let row;
-            for (let i = 0; i < rows.length; i++) {
-              if (oj.KeyUtils.equals(rows[i]['oj-table-oj-row-item'].key, rowKey)) {
-                row = rows[i];
-                break;
-              }
-            }
-            if (row == null) {
-              done(null);
+          const rows = element.querySelectorAll('.oj-table-body-row');
+          let row;
+          for (let i = 0; i < rows.length; i++) {
+            if (equals(rows[i]['oj-table-oj-row-item'].key, rowKey)) {
+              row = rows[i];
+              break;
             }
-            const cells = row.querySelectorAll('.oj-table-data-cell');
-            if (cells.length === columns.length) {
-              done(cells[columnIndex]);
-            } else {
-              let index = 0;
-              for (let i = 0; i < cells.length; i++) {
-                let colSpan = cells[i].colSpan
-                if (columnIndex >= index && columnIndex < index + colSpan) {
-                  done(cells[i]);
-                }
-                index += colSpan;
+          }
+          if (row == null) {
+            return null;
+          }
+          const cells = row.querySelectorAll('.oj-table-data-cell');
+          if (cells.length === columns.length) {
+            return cells[columnIndex];
+          } else {
+            let index = 0;
+            for (let i = 0; i < cells.length; i++) {
+              let colSpan = cells[i].colSpan
+              if (columnIndex >= index && columnIndex < index + colSpan) {
+                return cells[i];
               }
+              index += colSpan;
             }
-          });
+          }
         }
       }
-    `, this, itemLocator.rowIndex, itemLocator.columnIndex, itemLocator.rowKey, itemLocator.columnKey);
+      })
+    `);
         if (el) {
             return (0, __1.slotProxy)(el, this);
         }
@@ -151,33 +147,29 @@ class OjTable extends OjTableBase_1.OjTableBase {
                 rowKey: itemLocator.rowKey
             });
         }
-        const el = await this.getDriver().executeAsyncScript(`
-      const element = arguments[0];
-      const rowIndex = arguments[1];
-      const rowKey = arguments[2];
-      const done = arguments[3];
+        const el = await (0, oj_module_proxy_1.executeWithModules)(this.getDriver(), ['KeyUtils'], [this, itemLocator], `
+      (({ equals }, element, { rowIndex, rowKey }) => {
       const rowTemplate = element.querySelectorAll('[slot="rowTemplate"]')[0];
       const rowRenderer = element.rowRenderer;
       if (rowTemplate == null && rowRenderer == null) {
-        done(null);
+        return null;
       }
-      require(['ojs/ojcore'], function(oj) {
         const rows = element.querySelectorAll('.oj-table-body-row');
         if (rowKey != null) {
           for (let i = 0; i < rows.length; i++) {
-            if (oj.KeyUtils.equals(rows[i]['oj-table-oj-row-item'].key, rowKey)) {
-              done(rows[i]);
+            if (equals(rows[i]['oj-table-oj-row-item'].key, rowKey)) {
+              return rows[i];
             }
           }
-          done(null);
+          return null;
         } else {
           if (rowIndex == null || rowIndex >= rows.length){
-            done(null);
+            return null;
           }
-          done(rows[rowIndex]);
+          return rows[rowIndex];
         }
-      });
-    `, this, itemLocator.rowIndex, itemLocator.rowKey);
+      })
+    `);
         if (el) {
             return (0, __1.slotProxy)(el, this);
         }
@@ -266,19 +258,14 @@ class OjTable extends OjTableBase_1.OjTableBase {
      */
     async doSort(header, direction) {
         await this.whenReady();
-        const msg = await this.getDriver().executeAsyncScript(`
-      const element = arguments[0];
-      const done = arguments[3];
-      const headerId = arguments[1];
-      const sortDirection = arguments[2];
-      require(['ojs/ojcustomelement-utils'], function (utils) {
+        const msg = await (0, oj_module_proxy_1.executeWithModules)(this.getDriver(), ['CustomElementUtils'], [this, header, direction], `
+      (({ getElementBridge }, element, headerId, sortDirection) => {
         // Retrieve the widget instance from the element
-        const bridge = utils.CustomElementUtils.getElementBridge(element);
+        const bridge = getElementBridge(element);
         const widget = bridge._WIDGET_INSTANCE;
-        const err = widget._doSortHelper(headerId, sortDirection);
-        done(err);
-      });
-    `, this, header, direction);
+        return widget._doSortHelper(headerId, sortDirection);
+      })
+    `);
         if (msg) {
             throw Error(msg);
         }
@@ -301,37 +288,69 @@ class OjTable extends OjTableBase_1.OjTableBase {
                 rowKey: itemLocator.rowKey
             });
         }
-        const el = await this.getDriver().executeAsyncScript(`
-      const element = arguments[0];
-      const rowIndex = arguments[1];
-      const rowKey = arguments[2];
-      const done = arguments[3];
-      require(['ojs/ojcore'], function(oj) {
+        const el = await (0, oj_module_proxy_1.executeWithModules)(this.getDriver(), ['KeyUtils'], [this, itemLocator], `
+      (({ equals }, element, { rowIndex, rowKey }) => {
         const rows = element.querySelectorAll('.oj-table-body-row');
         if (rowKey != null) {
           for (let i = 0; i < rows.length; i++) {
-            if (oj.KeyUtils.equals(rows[i]['oj-table-oj-row-item'].key, rowKey)) {
-              done(rows[i]);
+            if (equals(rows[i]['oj-table-oj-row-item'].key, rowKey)) {
+              return rows[i];
             }
           }
-          done(null);
+          return null;
         } else {
           if (rowIndex == null || rowIndex >= rows.length){
-            done(null);
+            return null;
           }
-          done(rows[rowIndex]);
+          return rows[rowIndex];
         }
-      });
-    `, this, itemLocator.rowIndex, itemLocator.rowKey);
+      })
+    `);
         if (el) {
             const actions = this.getDriver().actions({ bridge: true });
-            await actions.click(el).perform();
-            await this.whenBusyContextReady();
+            return actions.click(el).perform();
         }
         else {
             throw Error(`No corresponding row template or renderer found for the itemLocator`);
         }
     }
+    /**
+     * Sets the value of "selected" property.
+     * If row/column are both unspecified selected for both will be empty.
+     * If no object is set on row/column, selected for that axis will be empty.
+     * If 'all' is unset for row/column object only 'keys' will be considered, if no 'keys' are specified selected for that axis will be empty.
+     * See the Help documentation for more information.
+     * @param selected The value to set for "selected"
+     * @typeparam K Type of keys
+     */
+    async changeSelectedKeys(selected) {
+        await this.whenReady();
+        return (0, oj_module_proxy_1.executeWithModules)(this.getDriver(), ['KeySet'], [this, selected], `
+      (({ KeySetImpl, AllKeySetImpl }, ele, selected, all) => {
+        ele.selected = {
+          row: selected.row?.all ? new AllKeySetImpl().delete(selected.row.deletedKeys) : new KeySetImpl(selected.row?.keys),
+          column: selected.column?.all ? new AllKeySetImpl().delete(selected.column.deletedKeys) : new KeySetImpl(selected.column?.keys)
+        };
+      })
+      `);
+    }
+    /**
+     * Gets the value of "selected" property.
+     * @typeparam K Type of keys
+     * @return The value of "selected" property.
+     */
+    async getSelectedKeys() {
+        await this.whenReady();
+        const selected = await this.getDriver().executeScript(`
+      const ele = arguments[0];
+      let row = ele.selected.row.keys.all ? { all: true, deletedKeys: Array.from(ele.selected.row.keys.deletedKeys) } : 
+        { all: false, keys: Array.from(ele.selected.row.keys.keys) };
+      let column = ele.selected.column.keys.all ? { all: true, deletedKeys: Array.from(ele.selected.column.keys.deletedKeys) } : 
+        { all: false, keys: Array.from(ele.selected.column.keys.keys) };
+      return { row, column };
+      `, this);
+        return selected;
+    }
 }
 exports.OjTable = OjTable;
 //# sourceMappingURL=OjTable.js.map

package/elements/oj-table/OjTable.js.map

@@ -1 +1 @@
-{"version":3,"file":"OjTable.js","sourceRoot":"","sources":["../../../elements/oj-table/OjTable.ts"],"names":[],"mappings":";;;AACA,+CAA4C;AAC5C,8BAA8C;AAE9C;;;;GAIG;AACH,MAAa,OAAQ,SAAQ,yBAAW;IACtC;;;;;;OAMG;IACH,KAAK,CAAC,cAAc,CAAI,QAA6C;QACnE,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACvB,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAClC;;;;;;;;OAQC,EACD,IAAI,EACJ,QAAQ,CACT,CAAC;IACJ,CAAC;IAEO,qBAAqB,CAAC,cAAsD;QAClF,iFAAiF;QACjF,aAAa;QACb,OAAO,KAAK,CAAC,oBAAoB,CAAC,cAAc,CAAC,CAAC;IACpD,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,WAAW;QACf,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACvB,MAAM,QAAQ,GAAwC,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CACxF;;;;;;;KAOD,EACC,IAAI,CACL,CAAC;QACF,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,QAAQ,CACZ,WAI0E;QAE1E,wEAAwE;QACxE,kBAAkB;QAClB,IAAI,OAAO,WAAW,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;YAChD,MAAM,IAAI,CAAC,qBAAqB,CAAC;gBAC/B,QAAQ,EAAE,WAAW,CAAC,QAAQ;aAC/B,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,qBAAqB,CAAC;gBAC/B,MAAM,EAAE,WAAW,CAAC,MAAM;aAC3B,CAAC,CAAC;QACL,CAAC;QACD,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,kBAAkB,CAClD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAuDD,EACC,IAAI,EACJ,WAAW,CAAC,QAAQ,EACpB,WAAW,CAAC,WAAW,EACvB,WAAW,CAAC,MAAM,EAClB,WAAW,CAAC,SAAS,CACtB,CAAC;QACF,IAAI,EAAE,EAAE,CAAC;YACP,OAAO,IAAA,aAAS,EAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC7B,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,CAAC,sEAAsE,CAAC,CAAC;QACtF,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,OAAO,CACX,WAAmF;QAEnF,wEAAwE;QACxE,kBAAkB;QAClB,IAAI,OAAO,WAAW,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;YAChD,MAAM,IAAI,CAAC,qBAAqB,CAAC;gBAC/B,QAAQ,EAAE,WAAW,CAAC,QAAQ;aAC/B,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,qBAAqB,CAAC;gBAC/B,MAAM,EAAE,WAAW,CAAC,MAAM;aAC3B,CAAC,CAAC;QACL,CAAC;QACD,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,kBAAkB,CAClD;;;;;;;;;;;;;;;;;;;;;;;;;;KA0BD,EACC,IAAI,EACJ,WAAW,CAAC,QAAQ,EACpB,WAAW,CAAC,MAAM,CACnB,CAAC;QACF,IAAI,EAAE,EAAE,CAAC;YACP,OAAO,IAAA,aAAS,EAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC7B,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,CAAC,qEAAqE,CAAC,CAAC;QACrF,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,UAAU,CACd,WAE8C;QAE9C,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACvB,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAC7C;;;;;;;;;;;;;;;;;;;;;;KAsBD,EACC,IAAI,EACJ,WAAW,CAAC,WAAW,EACvB,WAAW,CAAC,SAAS,CACtB,CAAC;QACF,IAAI,EAAE,EAAE,CAAC;YACP,OAAO,IAAA,aAAS,EAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC7B,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,CAAC,wEAAwE,CAAC,CAAC;QACxF,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,UAAU,CACd,WAE8C;QAE9C,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACvB,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,aAAa,CAC7C;;;;;;;;;;;;;;;;;;;;;;KAsBD,EACC,IAAI,EACJ,WAAW,CAAC,WAAW,EACvB,WAAW,CAAC,SAAS,CACtB,CAAC;QACF,IAAI,EAAE,EAAE,CAAC;YACP,OAAO,IAAA,aAAS,EAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QAC7B,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,CAAC,wEAAwE,CAAC,CAAC;QACxF,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,MAAM,CAAC,MAAc,EAAE,SAAqC;QAChE,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QACvB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,kBAAkB,CACnD;;;;;;;;;;;;KAYD,EACC,IAAI,EACJ,MAAM,EACN,SAAS,CACV,CAAC;QACF,IAAI,GAAG,EAAE,CAAC;YACR,MAAM,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,WAAW,CACf,WAAmF;QAEnF,wEAAwE;QACxE,kBAAkB;QAClB,IAAI,OAAO,WAAW,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;YAChD,MAAM,IAAI,CAAC,qBAAqB,CAAC;gBAC/B,QAAQ,EAAE,WAAW,CAAC,QAAQ;aAC/B,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,qBAAqB,CAAC;gBAC/B,MAAM,EAAE,WAAW,CAAC,MAAM;aAC3B,CAAC,CAAC;QACL,CAAC;QACD,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,kBAAkB,CAClD;;;;;;;;;;;;;;;;;;;;;KAqBD,EACC,IAAI,EACJ,WAAW,CAAC,QAAQ,EACpB,WAAW,CAAC,MAAM,CACnB,CAAC;QACF,IAAI,EAAE,EAAE,CAAC;YACP,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3D,MAAM,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;YAClC,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAC;QACpC,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,CAAC,qEAAqE,CAAC,CAAC;QACrF,CAAC;IACH,CAAC;CACF;AA7XD,0BA6XC"}
+{"version":3,"file":"OjTable.js","sourceRoot":"","sources":["../../../elements/oj-table/OjTable.ts"],"names":[],"mappings":"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"}

package/elements/oj-table/OjTable.ts

@@ -1,6 +1,7 @@
 import { WebElement } from 'selenium-webdriver';
 import { OjTableBase } from './OjTableBase';
 import { slotProxy, SlotProxy } from '../../';
+import { executeWithModules } from '../../lib/oj-module-proxy';
 
 /**
  * The component WebElement for [oj-table](../../jsdocs/oj.ojTable.html).
@@ -14,21 +15,22 @@ export class OjTable extends OjTableBase {
    * @param selected The value to set for "selected"
    * @override
    * @typeparam K Type of keys
+   * @deprecated Since 17.0.0 use changeSelectedKeys as the replacement.
    */
   async changeSelected<K>(selected: { row: Array<K>; column: Array<K> }) {
     await this.whenReady();
-    await this.getDriver().executeScript(
+    return executeWithModules<void>(
+      this.getDriver(),
+      ['KeySet'],
+      [this, selected],
       `
-        const ele = arguments[0];
-        const selected = arguments[1];
-        const keySet = require('ojs/ojkeyset');
+      (({ KeySetImpl }, ele, selected) => {
         ele.selected = {
-          row: new keySet.KeySetImpl(selected.row),
-          column: new keySet.KeySetImpl(selected.column)
+          row: new KeySetImpl(selected.row),
+          column: new KeySetImpl(selected.column)
         };
-      `,
-      this,
-      selected
+      })
+      `
     );
   }
 
@@ -44,6 +46,7 @@ export class OjTable extends OjTableBase {
    * @override
    * @typeparam K Type of keys
    * @return The value of "selected" property.
+   * @deprecated Since 17.0.0 use getSelectedKeys as the replacement.
    */
   async getSelected<K>(): Promise<{ row: Array<K>; column: Array<K> }> {
     await this.whenReady();
@@ -84,14 +87,12 @@ export class OjTable extends OjTableBase {
         rowKey: itemLocator.rowKey
       });
     }
-    const el = await this.getDriver().executeAsyncScript<WebElement>(
+    const el = await executeWithModules<WebElement>(
+      this.getDriver(),
+      ['KeyUtils'],
+      [this, itemLocator],
       `
-      const element = arguments[0];
-      const rowIndex = arguments[1];
-      let columnIndex = arguments[2];
-      const rowKey = arguments[3];
-      const columnKey = arguments[4];
-      const done = arguments[5];
+      (({ equals }, element, { rowIndex, columnIndex, rowKey, columnKey }) => {
       const columns = element.columns;
       if (columnIndex == null) {
         for (let i = 0; i < columns.length; i++) {
@@ -102,50 +103,44 @@ export class OjTable extends OjTableBase {
         }
       }
       if (columnIndex == null || columnIndex >= columns.length) {
-        done(null);
+        return null;
       }
       const defaultCellTemplate = element.querySelectorAll('[slot="cellTemplate"]')[0];
       if (columns[columnIndex].template == null && columns[columnIndex].renderer == null &&
           defaultCellTemplate == null) {
-            done(null);
+            return null;
       } else {
         if (rowIndex != null) {
-          done(element.getNodeBySubId({ subId: 'oj-table-cell', rowIndex: rowIndex, columnIndex: columnIndex }));
+          return element.getNodeBySubId({ subId: 'oj-table-cell', rowIndex: rowIndex, columnIndex: columnIndex });
         } else {
-          require(['ojs/ojcore'], function(oj) {
-            const rows = element.querySelectorAll('.oj-table-body-row');
-            let row;
-            for (let i = 0; i < rows.length; i++) {
-              if (oj.KeyUtils.equals(rows[i]['oj-table-oj-row-item'].key, rowKey)) {
-                row = rows[i];
-                break;
-              }
-            }
-            if (row == null) {
-              done(null);
+          const rows = element.querySelectorAll('.oj-table-body-row');
+          let row;
+          for (let i = 0; i < rows.length; i++) {
+            if (equals(rows[i]['oj-table-oj-row-item'].key, rowKey)) {
+              row = rows[i];
+              break;
             }
-            const cells = row.querySelectorAll('.oj-table-data-cell');
-            if (cells.length === columns.length) {
-              done(cells[columnIndex]);
-            } else {
-              let index = 0;
-              for (let i = 0; i < cells.length; i++) {
-                let colSpan = cells[i].colSpan
-                if (columnIndex >= index && columnIndex < index + colSpan) {
-                  done(cells[i]);
-                }
-                index += colSpan;
+          }
+          if (row == null) {
+            return null;
+          }
+          const cells = row.querySelectorAll('.oj-table-data-cell');
+          if (cells.length === columns.length) {
+            return cells[columnIndex];
+          } else {
+            let index = 0;
+            for (let i = 0; i < cells.length; i++) {
+              let colSpan = cells[i].colSpan
+              if (columnIndex >= index && columnIndex < index + colSpan) {
+                return cells[i];
               }
+              index += colSpan;
             }
-          });
+          }
         }
       }
-    `,
-      this,
-      itemLocator.rowIndex,
-      itemLocator.columnIndex,
-      itemLocator.rowKey,
-      itemLocator.columnKey
+      })
+    `
     );
     if (el) {
       return slotProxy(el, this);
@@ -173,37 +168,33 @@ export class OjTable extends OjTableBase {
         rowKey: itemLocator.rowKey
       });
     }
-    const el = await this.getDriver().executeAsyncScript<WebElement>(
+    const el = await executeWithModules<WebElement>(
+      this.getDriver(),
+      ['KeyUtils'],
+      [this, itemLocator],
       `
-      const element = arguments[0];
-      const rowIndex = arguments[1];
-      const rowKey = arguments[2];
-      const done = arguments[3];
+      (({ equals }, element, { rowIndex, rowKey }) => {
       const rowTemplate = element.querySelectorAll('[slot="rowTemplate"]')[0];
       const rowRenderer = element.rowRenderer;
       if (rowTemplate == null && rowRenderer == null) {
-        done(null);
+        return null;
       }
-      require(['ojs/ojcore'], function(oj) {
         const rows = element.querySelectorAll('.oj-table-body-row');
         if (rowKey != null) {
           for (let i = 0; i < rows.length; i++) {
-            if (oj.KeyUtils.equals(rows[i]['oj-table-oj-row-item'].key, rowKey)) {
-              done(rows[i]);
+            if (equals(rows[i]['oj-table-oj-row-item'].key, rowKey)) {
+              return rows[i];
             }
           }
-          done(null);
+          return null;
         } else {
           if (rowIndex == null || rowIndex >= rows.length){
-            done(null);
+            return null;
           }
-          done(rows[rowIndex]);
+          return rows[rowIndex];
         }
-      });
-    `,
-      this,
-      itemLocator.rowIndex,
-      itemLocator.rowKey
+      })
+    `
     );
     if (el) {
       return slotProxy(el, this);
@@ -311,23 +302,18 @@ export class OjTable extends OjTableBase {
    */
   async doSort(header: string, direction: 'ascending' | 'descending') {
     await this.whenReady();
-    const msg = await this.getDriver().executeAsyncScript<string>(
+    const msg = await executeWithModules<string>(
+      this.getDriver(),
+      ['CustomElementUtils'],
+      [this, header, direction],
       `
-      const element = arguments[0];
-      const done = arguments[3];
-      const headerId = arguments[1];
-      const sortDirection = arguments[2];
-      require(['ojs/ojcustomelement-utils'], function (utils) {
+      (({ getElementBridge }, element, headerId, sortDirection) => {
         // Retrieve the widget instance from the element
-        const bridge = utils.CustomElementUtils.getElementBridge(element);
+        const bridge = getElementBridge(element);
         const widget = bridge._WIDGET_INSTANCE;
-        const err = widget._doSortHelper(headerId, sortDirection);
-        done(err);
-      });
-    `,
-      this,
-      header,
-      direction
+        return widget._doSortHelper(headerId, sortDirection);
+      })
+    `
     );
     if (msg) {
       throw Error(msg);
@@ -353,39 +339,102 @@ export class OjTable extends OjTableBase {
         rowKey: itemLocator.rowKey
       });
     }
-    const el = await this.getDriver().executeAsyncScript<WebElement>(
+    const el = await executeWithModules<WebElement>(
+      this.getDriver(),
+      ['KeyUtils'],
+      [this, itemLocator],
       `
-      const element = arguments[0];
-      const rowIndex = arguments[1];
-      const rowKey = arguments[2];
-      const done = arguments[3];
-      require(['ojs/ojcore'], function(oj) {
+      (({ equals }, element, { rowIndex, rowKey }) => {
         const rows = element.querySelectorAll('.oj-table-body-row');
         if (rowKey != null) {
           for (let i = 0; i < rows.length; i++) {
-            if (oj.KeyUtils.equals(rows[i]['oj-table-oj-row-item'].key, rowKey)) {
-              done(rows[i]);
+            if (equals(rows[i]['oj-table-oj-row-item'].key, rowKey)) {
+              return rows[i];
             }
           }
-          done(null);
+          return null;
         } else {
           if (rowIndex == null || rowIndex >= rows.length){
-            done(null);
+            return null;
           }
-          done(rows[rowIndex]);
+          return rows[rowIndex];
         }
-      });
-    `,
-      this,
-      itemLocator.rowIndex,
-      itemLocator.rowKey
+      })
+    `
     );
     if (el) {
       const actions = this.getDriver().actions({ bridge: true });
-      await actions.click(el).perform();
-      await this.whenBusyContextReady();
+      return actions.click(el).perform();
     } else {
       throw Error(`No corresponding row template or renderer found for the itemLocator`);
     }
   }
+
+  /**
+   * Sets the value of "selected" property.
+   * If row/column are both unspecified selected for both will be empty.
+   * If no object is set on row/column, selected for that axis will be empty.
+   * If 'all' is unset for row/column object only 'keys' will be considered, if no 'keys' are specified selected for that axis will be empty.
+   * See the Help documentation for more information.
+   * @param selected The value to set for "selected"
+   * @typeparam K Type of keys
+   */
+  async changeSelectedKeys<K>(selected: {
+    row?:
+      | { all: true; keys?: never; deletedKeys: Array<K> }
+      | { all: false; keys: Array<K>; deletedKeys?: never };
+    column?:
+      | { all: true; keys?: never; deletedKeys: Array<K> }
+      | { all: false; keys: Array<K>; deletedKeys?: never };
+  }) {
+    await this.whenReady();
+    return executeWithModules<void>(
+      this.getDriver(),
+      ['KeySet'],
+      [this, selected],
+      `
+      (({ KeySetImpl, AllKeySetImpl }, ele, selected, all) => {
+        ele.selected = {
+          row: selected.row?.all ? new AllKeySetImpl().delete(selected.row.deletedKeys) : new KeySetImpl(selected.row?.keys),
+          column: selected.column?.all ? new AllKeySetImpl().delete(selected.column.deletedKeys) : new KeySetImpl(selected.column?.keys)
+        };
+      })
+      `
+    );
+  }
+
+  /**
+   * Gets the value of "selected" property.
+   * @typeparam K Type of keys
+   * @return The value of "selected" property.
+   */
+  async getSelectedKeys<K>(): Promise<{
+    row:
+      | { all: true; keys?: never; deletedKeys: Array<K> }
+      | { all: false; keys: Array<K>; deletedKeys?: never };
+    column:
+      | { all: true; keys?: never; deletedKeys: Array<K> }
+      | { all: false; keys: Array<K>; deletedKeys?: never };
+  }> {
+    await this.whenReady();
+    const selected: {
+      row:
+        | { all: true; keys?: never; deletedKeys: Array<K> }
+        | { all: false; keys: Array<K>; deletedKeys?: never };
+      column:
+        | { all: true; keys?: never; deletedKeys: Array<K> }
+        | { all: false; keys: Array<K>; deletedKeys?: never };
+    } = await this.getDriver().executeScript(
+      `
+      const ele = arguments[0];
+      let row = ele.selected.row.keys.all ? { all: true, deletedKeys: Array.from(ele.selected.row.keys.deletedKeys) } : 
+        { all: false, keys: Array.from(ele.selected.row.keys.keys) };
+      let column = ele.selected.column.keys.all ? { all: true, deletedKeys: Array.from(ele.selected.column.keys.deletedKeys) } : 
+        { all: false, keys: Array.from(ele.selected.column.keys.keys) };
+      return { row, column };
+      `,
+      this
+    );
+    return selected;
+  }
 }

package/elements/oj-table/OjTableBase.js

@@ -36,6 +36,15 @@ class OjTableBase extends __1.OjWebElement {
     getAs() {
         return this.getProperty('as');
     }
+    /**
+     * Gets the value of <code>columnResizeBehavior</code> property.
+     * Specifies the column resize behavior for this Table. See the Help documentation for more information.
+     * @return The value of <code>columnResizeBehavior</code> property.
+     *
+     */
+    getColumnResizeBehavior() {
+        return this.getProperty('columnResizeBehavior');
+    }
     /**
      * Sets the value of <code>columns</code> property.
      * An array of column definitions. See the Help documentation for more information.