@oracle/oraclejet-core-pack 16.1.3 → 17.0.0

package/oj-c/select-single/useSelectSinglePreact.js

@@ -1,10 +1,13 @@
-define(["require", "exports", "@oracle/oraclejet-preact/hooks/UNSAFE_useTranslationBundle", "oj-c/editable-value/UNSAFE_useEditableValue/useEditableValue", "oj-c/editable-value/UNSAFE_useValidators/useValidators", "oj-c/editable-value/utils/utils", "oj-c/hooks/UNSAFE_useListData/useListData", "oj-c/select-common/UNSAFE_useDataProviderListeners/useDataProviderListeners", "oj-c/select-common/UNSAFE_useWrapDataProvider/useWrapDataProvider", "oj-c/select-common/UNSAFE_useWrapValueState/useWrapValueState", "oj-c/select-common/utils/utils", "ojs/ojdataprovider", "preact/hooks", "./useSyncValueAndValueItem", "./useValueItem"], function (require, exports, UNSAFE_useTranslationBundle_1, useEditableValue_1, useValidators_1, utils_1, useListData_1, useDataProviderListeners_1, useWrapDataProvider_1, useWrapValueState_1, utils_2, ojdataprovider_1, hooks_1, useSyncValueAndValueItem_1, useValueItem_1) {
+define(["require", "exports", "@oracle/oraclejet-preact/hooks/UNSAFE_useTranslationBundle", "oj-c/editable-value/UNSAFE_useEditableValue/useEditableValue", "oj-c/editable-value/UNSAFE_useValidators/useValidators", "oj-c/editable-value/utils/utils", "oj-c/hooks/UNSAFE_useListData/useListData", "oj-c/select-common/UNSAFE_useDataProviderListeners/useDataProviderListeners", "oj-c/select-common/UNSAFE_useWrapDataProvider/useWrapDataProvider", "oj-c/select-common/UNSAFE_useWrapValueState/useWrapValueState", "oj-c/select-common/utils/utils", "preact/hooks", "./useSyncValueAndValueItem", "./useValueItem"], function (require, exports, UNSAFE_useTranslationBundle_1, useEditableValue_1, useValidators_1, utils_1, useListData_1, useDataProviderListeners_1, useWrapDataProvider_1, useWrapValueState_1, utils_2, hooks_1, useSyncValueAndValueItem_1, useValueItem_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.useSelectSinglePreact = void 0;
-    function useSelectSinglePreact({ advancedSearch, data: propData, disabled, displayOptions, itemTemplate, itemText, labelEdge, labelHint, labelStartWidth, messagesCustom, placeholder, readonly, requiredMessageDetail: propRequiredMessageDetail, required, textAlign, userAssistanceDensity, value: propValue, valueItem: propValueItem, virtualKeyboard, onMessagesCustomChanged, onOjAdvancedSearchAction, onOjValueAction, onValidChanged, onValueChanged, onValueItemChanged, ...otherProps }, addBusyState) {
+    function useSelectSinglePreact({ advancedSearch, data: propData, disabled, displayOptions, itemTemplate, itemText, labelEdge, labelHint, labelStartWidth, matchBy: propMatchBy, messagesCustom, placeholder, readonly, requiredMessageDetail: propRequiredMessageDetail, required, textAlign, userAssistanceDensity, value: propValue, valueItem: propValueItem, virtualKeyboard, onMessagesCustomChanged, onOjAdvancedSearchAction, onOjValueAction, onValidChanged, onValueChanged, onValueItemChanged, ...otherProps }, addBusyState) {
         const [filterCriterion, setFilterCriterion] = (0, hooks_1.useState)(undefined);
         const [isLoading, setIsLoading] = (0, hooks_1.useState)(propData != null && propValue != null && propValueItem == null);
+        const matchBy = (0, hooks_1.useMemo)(() => {
+            return propMatchBy && propMatchBy.length > 0 ? [...propMatchBy] : undefined;
+        }, [propMatchBy]);
         const { valueItem, setValueItem } = (0, useValueItem_1.useValueItem)(propValueItem, onValueItemChanged);
         const [preactValueItem, setPreactValueItem] = (0, hooks_1.useState)(valueItem);
         (0, hooks_1.useEffect)(() => {
@@ -18,7 +21,7 @@ define(["require", "exports", "@oracle/oraclejet-preact/hooks/UNSAFE_useTranslat
         });
         const translations = (0, UNSAFE_useTranslationBundle_1.useTranslationBundle)('@oracle/oraclejet-preact');
         const requiredMessageDetail = propRequiredMessageDetail || translations.select_requiredMessageDetail();
-        const { methods, onCommitValue, setValue, textFieldProps, value } = (0, useEditableValue_1.useEditableValue)({
+        const { methods, onCommitValue, setDisplayValue, setValue, textFieldProps, value, validateValueOnExternalChange } = (0, useEditableValue_1.useEditableValue)({
             ariaDescribedBy: otherProps['aria-describedby'],
             disabled,
             displayOptions,
@@ -55,18 +58,22 @@ define(["require", "exports", "@oracle/oraclejet-preact/hooks/UNSAFE_useTranslat
         (0, useSyncValueAndValueItem_1.useSyncValueAndValueItem)({
             addBusyState,
             dataProvider: dataProvider,
+            setDisplayValue,
             setIsLoading,
             setValue,
             setValueItem,
             value: valueToSync,
-            valueItem: valueItemToSync
+            valueItem: valueItemToSync,
+            validateValueOnExternalChange
         });
         const [listDataState, onLoadRange] = (0, useListData_1.useListData)(dataProvider, {
             filterCriterion,
             initialRowsFetched: 0
         });
         const onCommit = (0, hooks_1.useCallback)(async ({ previousValue, value }) => {
-            const validationResult = await onCommitValue(value != null ? value : utils_2.DEFAULT_VALUE);
+            const valueToCommit = value != null ? value : utils_2.DEFAULT_VALUE;
+            setDisplayValue(valueToCommit);
+            const validationResult = await onCommitValue(valueToCommit);
             if (validationResult === useValidators_1.ValidationResult.INVALID) {
                 setPreactValueItem(undefined);
             }
@@ -107,19 +114,25 @@ define(["require", "exports", "@oracle/oraclejet-preact/hooks/UNSAFE_useTranslat
                     });
                 }
             }
-        }, [dataProvider, listDataState, preactValueItem, valueItem, onCommitValue, onOjValueAction]);
+        }, [
+            dataProvider,
+            listDataState,
+            preactValueItem,
+            valueItem,
+            onCommitValue,
+            onOjValueAction,
+            setDisplayValue
+        ]);
         const onFilter = (0, hooks_1.useCallback)(({ searchText }) => {
-            const fc = searchText && searchText.length > 0
-                ? ojdataprovider_1.FilterFactory.getFilter({ filterDef: { text: searchText } })
-                : undefined;
+            const fc = (0, utils_2.getFilterCriterion)(dataProvider, searchText, matchBy);
             setFilterCriterion(fc);
-        }, []);
+        }, [dataProvider, matchBy]);
         const itemRenderer = (0, hooks_1.useCallback)(({ data, metadata, searchText }) => {
             return itemTemplate
                 ? itemTemplate({
                     item: {
-                        data,
-                        metadata
+                        data: data,
+                        metadata: metadata
                     },
                     searchText
                 })

package/oj-c/select-single/useSyncValueAndValueItem.js

@@ -1,8 +1,8 @@
-define(["require", "exports", "@oracle/oraclejet-preact/utils/UNSAFE_logger", "oj-c/editable-value/UNSAFE_useStaleIdentity/useStaleIdentity", "oj-c/select-common/utils/utils", "preact/hooks"], function (require, exports, UNSAFE_logger_1, useStaleIdentity_1, utils_1, hooks_1) {
+define(["require", "exports", "@oracle/oraclejet-preact/utils/UNSAFE_logger", "oj-c/editable-value/UNSAFE_useStaleIdentity/useStaleIdentity", "oj-c/editable-value/UNSAFE_useValidators/useValidators", "oj-c/select-common/utils/utils", "preact/hooks"], function (require, exports, UNSAFE_logger_1, useStaleIdentity_1, useValidators_1, utils_1, hooks_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.useSyncValueAndValueItem = void 0;
-    function useSyncValueAndValueItem({ addBusyState, dataProvider, setIsLoading, setValue, setValueItem, value, valueItem }) {
+    function useSyncValueAndValueItem({ addBusyState, dataProvider, setDisplayValue, setIsLoading, setValue, setValueItem, value, valueItem, validateValueOnExternalChange }) {
         const prevValueRef = (0, hooks_1.useRef)(value);
         const prevValueItemsRef = (0, hooks_1.useRef)(valueItem);
         const { setStaleIdentity } = (0, useStaleIdentity_1.useStaleIdentity)();
@@ -41,19 +41,44 @@ define(["require", "exports", "@oracle/oraclejet-preact/utils/UNSAFE_logger", "o
                 setIsLoading(false);
             }
             resolveBusyState();
-        }, [dataProvider, hasValue, hasValueItem, value, valueItem]);
+        }, [
+            addBusyState,
+            dataProvider,
+            hasValue,
+            hasValueItem,
+            setIsLoading,
+            setStaleIdentity,
+            setValueItem,
+            value,
+            valueItem
+        ]);
         const syncValueToValueItem = (0, hooks_1.useCallback)(() => {
+            const updateValue = (nextValue) => {
+                const validationResult = validateValueOnExternalChange(nextValue);
+                if (validationResult === useValidators_1.ValidationResult.VALID) {
+                    setValue(nextValue);
+                    setDisplayValue(nextValue);
+                }
+            };
             if (!hasValueItem) {
                 if (hasValue) {
-                    setValue(utils_1.DEFAULT_VALUE);
+                    updateValue(utils_1.DEFAULT_VALUE);
                 }
                 return;
             }
             if (valueItem.key !== value) {
-                setValue(valueItem.key);
+                updateValue(valueItem.key);
                 return;
             }
-        }, [hasValue, hasValueItem, value, valueItem]);
+        }, [
+            hasValue,
+            hasValueItem,
+            setDisplayValue,
+            setValue,
+            validateValueOnExternalChange,
+            value,
+            valueItem
+        ]);
         (0, hooks_1.useEffect)(() => {
             if (hasValue) {
                 syncValueItemToValue();
@@ -81,7 +106,7 @@ define(["require", "exports", "@oracle/oraclejet-preact/utils/UNSAFE_logger", "o
                 prevValueItemsRef.current = valueItem;
                 syncValueToValueItem();
             }
-        }, [value, valueItem]);
+        }, [syncValueItemToValue, syncValueToValueItem, value, valueItem]);
     }
     exports.useSyncValueAndValueItem = useSyncValueAndValueItem;
     function handleFetchByKeysResults(value, valueItem, fetchByKeysResults) {

package/oj-c/select-single.js

@@ -1,4 +1,4 @@
-define(["require", "exports", "./select-single/select-single"], function (require, exports, select_single_1) {
+define(["require", "exports", "oj-c/select-single/select-single"], function (require, exports, select_single_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.SelectSingle = void 0;

package/oj-c/selection-card/component.json

@@ -1,7 +1,7 @@
 {
   "name": "selection-card",
-  "version": "16.1.3",
-  "jetVersion": "^16.1.3",
+  "version": "17.0.0",
+  "jetVersion": "^17.0.0",
   "pack": "oj-c",
   "type": "composite",
   "dependencyScope": "runtime",
@@ -11,6 +11,12 @@
   ],
   "description": "A Selection Card is a container that can be set as selected with a collection",
   "displayName": "Selection Card",
+  "status": [
+    {
+      "type": "candidate",
+      "since": "17.0.0"
+    }
+  ],
   "extension": {
     "catalog": {
       "category": "Collections"
@@ -25,6 +31,9 @@
       "module": "oj-c/selection-card",
       "defaultColumns": "1",
       "minColumns": "1"
+    },
+    "webelement": {
+      "docUrl": "https://www.oracle.com/webfolder/technetwork/jet-1700/cpwdtsdoc/classes/SelectionCardWebElement.html"
     }
   },
   "since": "16.0.0",

package/oj-c/selection-card.js

@@ -1,4 +1,4 @@
-define(["require", "exports", "./selection-card/selection-card"], function (require, exports, selection_card_1) {
+define(["require", "exports", "oj-c/selection-card/selection-card"], function (require, exports, selection_card_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.SelectionCard = void 0;

package/oj-c/selector/component.json

@@ -1,7 +1,7 @@
 {
   "name": "selector",
-  "version": "16.1.3",
-  "jetVersion": "^16.1.3",
+  "version": "17.0.0",
+  "jetVersion": "^17.0.0",
   "pack": "oj-c",
   "type": "composite",
   "dependencyScope": "runtime",
@@ -17,6 +17,9 @@
     },
     "vbdt": {
       "module": "oj-c/selector"
+    },
+    "webelement": {
+      "docUrl": "https://www.oracle.com/webfolder/technetwork/jet-1700/cpwdtsdoc/classes/SelectorWebElement.html"
     }
   },
   "help": "oj-c.Selector.html",

package/oj-c/selector-all/component.json

@@ -1,7 +1,7 @@
 {
   "name": "selector-all",
-  "version": "16.1.3",
-  "jetVersion": "^16.1.3",
+  "version": "17.0.0",
+  "jetVersion": "^17.0.0",
   "pack": "oj-c",
   "type": "composite",
   "dependencyScope": "runtime",
@@ -17,6 +17,9 @@
     },
     "vbdt": {
       "module": "oj-c/selectorAll"
+    },
+    "webelement": {
+      "docUrl": "https://www.oracle.com/webfolder/technetwork/jet-1700/cpwdtsdoc/classes/SelectorAllWebElement.html"
     }
   },
   "help": "oj-c.SelectorAll.html",

package/oj-c/selector-all/selector-all.js

@@ -6,7 +6,7 @@ define(["require", "exports", "preact/jsx-runtime", '@oracle/oraclejet-preact/tr
         const keys = selectedKeys.keys;
         const selected = (keys.all
             ? keys.deletedKeys.size > 0
-                ? 'partial-all'
+                ? 'partial'
                 : 'all'
             : keys.keys.size > 0
                 ? 'partial'

package/oj-c/selector-all.js

@@ -1,4 +1,4 @@
-define(["require", "exports", "./selector-all/selector-all"], function (require, exports, selector_all_1) {
+define(["require", "exports", "oj-c/selector-all/selector-all"], function (require, exports, selector_all_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.SelectorAll = void 0;

package/oj-c/selector.js

@@ -1,4 +1,4 @@
-define(["require", "exports", "./selector/selector"], function (require, exports, selector_1) {
+define(["require", "exports", "oj-c/selector/selector"], function (require, exports, selector_1) {
     "use strict";
     Object.defineProperty(exports, "__esModule", { value: true });
     exports.Selector = void 0;

package/oj-c/split-menu-button/__webdriver__/SplitMenuButtonWebElement.d.ts

@@ -27,6 +27,7 @@ export declare class SplitMenuButtonWebElement extends SplitMenuButtonWebElement
      * delay - delays the milliseconds
      * await delay(2000);
      */
+    private delay;
     /**
      * In order to do nested selections, we need an isolated menu clicker
      */

package/oj-c/split-menu-button/__webdriver__/SplitMenuButtonWebElement.js

@@ -9,7 +9,16 @@ var selenium_webdriver_1 = require("selenium-webdriver");
  * [findSplitMenuButton](../functions/findSplitMenuButton.html).
  */
 class SplitMenuButtonWebElement extends SplitMenuButtonWebElementBase_1.SplitMenuButtonWebElementBase {
-    // Put overrides here
+    constructor() {
+        // Put overrides here
+        super(...arguments);
+        /**
+         * delay - delays the milliseconds
+         * await delay(2000);
+         */
+        // private delay = (ms: number) => new Promise((fn) => setTimeout(fn, ms));
+        this.delay = (ms) => new Promise((fn) => setTimeout(fn, ms));
+    }
     /**
      * Perform a click on the button action
      */
@@ -50,20 +59,16 @@ class SplitMenuButtonWebElement extends SplitMenuButtonWebElementBase_1.SplitMen
      * openMenu - opens the menu
      */
     async openMenu() {
-        const button = await this.findElements(selenium_webdriver_1.By.css('[role=button] span'));
+        const button = await this.findElements(selenium_webdriver_1.By.css('span[role=none]'));
         await button[1].click();
     }
-    /**
-     * delay - delays the milliseconds
-     * await delay(2000);
-     */
-    // private delay = (ms: number) => new Promise(fn => setTimeout(fn, ms));
     /**
      * In order to do nested selections, we need an isolated menu clicker
      */
     async doMenuClick(selectedValue) {
         // Find the <menu-item> element to click
-        const menuItems = await this.getDriver().findElements(selenium_webdriver_1.By.css('#__root_layer_host [role=menuitem]'));
+        await this.delay(350);
+        const menuItems = await this.getDriver().findElements(selenium_webdriver_1.By.css('#__root_layer_host [role^=menuitem], #__oj_zorder_container [role^=menuitem]'));
         const match = await this.findAsyncSequential(menuItems, async (item) => {
             const text = await item.getText();
             return text === selectedValue;

package/oj-c/split-menu-button/__webdriver__/SplitMenuButtonWebElement.js.map

@@ -1 +1 @@
-{"version":3,"file":"SplitMenuButtonWebElement.js","sourceRoot":"","sources":["SplitMenuButtonWebElement.ts"],"names":[],"mappings":";;;AAAA,iFAAgF;AAChF,yDAAwC;AAExC;;;;GAIG;AACH,MAAa,yBAA0B,SAAQ,6DAA6B;IAC1E,qBAAqB;IAErB;;OAEG;IACH,KAAK,CAAC,KAAK;QACT,uDAAuD;QACvD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,uBAAE,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC;QACpE,OAAO,MAAM,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;IAED;;SAEK;IAEL,KAAK,CAAC,mBAAmB,CACvB,KAAU,EACV,SAAqC;QAErC,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;YACtB,IAAI,MAAM,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;gBACvB,OAAO,CAAC,CAAC;YACX,CAAC;QACH,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,YAAY,CAAC,aAAgC;QACxD,gBAAgB;QAChB,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACtB,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;YACjC,KAAK,MAAM,KAAK,IAAI,aAAa,EAAE,CAAC;gBAClC,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAChC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,QAAQ;QACpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,uBAAE,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC;QACrE,MAAM,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC;IAED;;;OAGG;IACH,yEAAyE;IAEzE;;OAEG;IACK,KAAK,CAAC,WAAW,CAAC,aAAqB;QAC7C,wCAAwC;QACxC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,YAAY,CACnD,uBAAE,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAC7C,CAAC;QAEF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACrE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YAClC,OAAO,IAAI,KAAK,aAAa,CAAC;QAChC,CAAC,CAAC,CAAC;QAEH,MAAM,KAAK,EAAE,KAAK,EAAE,CAAC;IACvB,CAAC;CACF;AA3ED,8DA2EC","sourcesContent":["import { SplitMenuButtonWebElementBase } from './SplitMenuButtonWebElementBase';\nimport { By } from 'selenium-webdriver';\n\n/**\n * The component WebElement for [oj-c-split-menu-button](../../../oj-c/docs/oj.SplitMenuButton.html).\n * Do not instantiate this class directly, instead, use\n * [findSplitMenuButton](../functions/findSplitMenuButton.html).\n */\nexport class SplitMenuButtonWebElement extends SplitMenuButtonWebElementBase {\n  // Put overrides here\n\n  /**\n   * Perform a click on the button action\n   */\n  async click() {\n    // Find the action part of <button> element top element\n    const button = await this.findElement(By.css('[role=button] span'));\n    return button.click();\n  }\n\n  /**\n   * Helper util\n   * */\n\n  async findAsyncSequential<T>(\n    array: T[],\n    predicate: (t: T) => Promise<boolean>\n  ): Promise<T | undefined> {\n    for (const t of array) {\n      if (await predicate(t)) {\n        return t;\n      }\n    }\n    return undefined;\n  }\n\n  /**\n   * Fire the ojMenuAction event on the oj-c-split-menu-button, and\n   * invoke the Action handler of the selected value.\n   *\n   */\n  public async doMenuAction(selectedValue: string | string[]): Promise<void> {\n    // open the menu\n    await this.openMenu();\n    if (Array.isArray(selectedValue)) {\n      for (const value of selectedValue) {\n        await this.doMenuClick(value);\n      }\n    } else {\n      await this.doMenuClick(selectedValue);\n    }\n  }\n\n  /**\n   * openMenu - opens the menu\n   */\n  private async openMenu() {\n    const button = await this.findElements(By.css('[role=button] span'));\n    await button[1].click();\n  }\n\n  /**\n   * delay - delays the milliseconds\n   * await delay(2000);\n   */\n  // private delay = (ms: number) => new Promise(fn => setTimeout(fn, ms));\n\n  /**\n   * In order to do nested selections, we need an isolated menu clicker\n   */\n  private async doMenuClick(selectedValue: string): Promise<void> {\n    // Find the <menu-item> element to click\n    const menuItems = await this.getDriver().findElements(\n      By.css('#__root_layer_host [role=menuitem]')\n    );\n\n    const match = await this.findAsyncSequential(menuItems, async (item) => {\n      const text = await item.getText();\n      return text === selectedValue;\n    });\n\n    await match?.click();\n  }\n}\n"]}
+{"version":3,"file":"SplitMenuButtonWebElement.js","sourceRoot":"","sources":["SplitMenuButtonWebElement.ts"],"names":[],"mappings":";;;AAAA,iFAAgF;AAChF,yDAAwC;AAExC;;;;GAIG;AACH,MAAa,yBAA0B,SAAQ,6DAA6B;IAA5E;QACE,qBAAqB;;QAoDrB;;;WAGG;QACH,2EAA2E;QACnE,UAAK,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IAmB1E,CAAC;IA1EC;;OAEG;IACH,KAAK,CAAC,KAAK;QACT,uDAAuD;QACvD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,uBAAE,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC,CAAC;QACpE,OAAO,MAAM,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;IAED;;SAEK;IAEL,KAAK,CAAC,mBAAmB,CACvB,KAAU,EACV,SAAqC;QAErC,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;YACtB,IAAI,MAAM,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;gBACvB,OAAO,CAAC,CAAC;YACX,CAAC;QACH,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,YAAY,CAAC,aAAgC;QACxD,gBAAgB;QAChB,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACtB,IAAI,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC;YACjC,KAAK,MAAM,KAAK,IAAI,aAAa,EAAE,CAAC;gBAClC,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAChC,CAAC;QACH,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;QACxC,CAAC;IACH,CAAC;IAED;;OAEG;IACK,KAAK,CAAC,QAAQ;QACpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,uBAAE,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAClE,MAAM,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC;IAC1B,CAAC;IASD;;OAEG;IACK,KAAK,CAAC,WAAW,CAAC,aAAqB;QAC7C,wCAAwC;QACxC,MAAM,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACtB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,YAAY,CACnD,uBAAE,CAAC,GAAG,CAAC,8EAA8E,CAAC,CACvF,CAAC;QAEF,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YACrE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YAClC,OAAO,IAAI,KAAK,aAAa,CAAC;QAChC,CAAC,CAAC,CAAC;QAEH,MAAM,KAAK,EAAE,KAAK,EAAE,CAAC;IACvB,CAAC;CACF;AA7ED,8DA6EC","sourcesContent":["import { SplitMenuButtonWebElementBase } from './SplitMenuButtonWebElementBase';\nimport { By } from 'selenium-webdriver';\n\n/**\n * The component WebElement for [oj-c-split-menu-button](../../../oj-c/docs/oj.SplitMenuButton.html).\n * Do not instantiate this class directly, instead, use\n * [findSplitMenuButton](../functions/findSplitMenuButton.html).\n */\nexport class SplitMenuButtonWebElement extends SplitMenuButtonWebElementBase {\n  // Put overrides here\n\n  /**\n   * Perform a click on the button action\n   */\n  async click() {\n    // Find the action part of <button> element top element\n    const button = await this.findElement(By.css('[role=button] span'));\n    return button.click();\n  }\n\n  /**\n   * Helper util\n   * */\n\n  async findAsyncSequential<T>(\n    array: T[],\n    predicate: (t: T) => Promise<boolean>\n  ): Promise<T | undefined> {\n    for (const t of array) {\n      if (await predicate(t)) {\n        return t;\n      }\n    }\n    return undefined;\n  }\n\n  /**\n   * Fire the ojMenuAction event on the oj-c-split-menu-button, and\n   * invoke the Action handler of the selected value.\n   *\n   */\n  public async doMenuAction(selectedValue: string | string[]): Promise<void> {\n    // open the menu\n    await this.openMenu();\n    if (Array.isArray(selectedValue)) {\n      for (const value of selectedValue) {\n        await this.doMenuClick(value);\n      }\n    } else {\n      await this.doMenuClick(selectedValue);\n    }\n  }\n\n  /**\n   * openMenu - opens the menu\n   */\n  private async openMenu() {\n    const button = await this.findElements(By.css('span[role=none]'));\n    await button[1].click();\n  }\n\n  /**\n   * delay - delays the milliseconds\n   * await delay(2000);\n   */\n  // private delay = (ms: number) => new Promise((fn) => setTimeout(fn, ms));\n  private delay = (ms: number) => new Promise((fn) => setTimeout(fn, ms));\n\n  /**\n   * In order to do nested selections, we need an isolated menu clicker\n   */\n  private async doMenuClick(selectedValue: string): Promise<void> {\n    // Find the <menu-item> element to click\n    await this.delay(350);\n    const menuItems = await this.getDriver().findElements(\n      By.css('#__root_layer_host [role^=menuitem], #__oj_zorder_container [role^=menuitem]')\n    );\n\n    const match = await this.findAsyncSequential(menuItems, async (item) => {\n      const text = await item.getText();\n      return text === selectedValue;\n    });\n\n    await match?.click();\n  }\n}\n"]}

package/oj-c/split-menu-button/__webdriver__/SplitMenuButtonWebElementBase.d.ts

@@ -19,7 +19,7 @@ export declare class SplitMenuButtonWebElementBase extends OjWebElement {
      * @return The value of <code>items</code> property.
      *
      */
-    getItems(): Promise<Array<object>>;
+    getItems(): Promise<Array<Items>>;
     /**
      * Gets the value of <code>tooltip</code> property.
      * Text to show in the tooltip.
@@ -56,3 +56,61 @@ export declare class SplitMenuButtonWebElementBase extends OjWebElement {
      */
     getChroming(): Promise<string>;
 }
+export interface Items {
+    /**
+     * Specifies the type of the menu item.
+     */
+    type: string;
+    /**
+     * Specifies the text to show for the menu item.
+     */
+    label: string;
+    /**
+     * Specifes a key value associated with the menu item.
+     */
+    key: string;
+    /**
+     * Specifies whether the menu item should be disabled.
+     */
+    disabled: boolean;
+    /**
+     * Specifies an icon to show at the start position of the menu item.
+     */
+    startIcon: ItemsStartIcon;
+    /**
+     * Specifies an icon to show at the end position of the menu item.
+     */
+    endIcon: ItemsEndIcon;
+    /**
+     * Specifies styling for the menu item based upon its associated action.
+     */
+    variant: string;
+}
+export interface ItemsStartIcon {
+    /**
+     *
+     */
+    type: string;
+    /**
+     *
+     */
+    class: string;
+    /**
+     *
+     */
+    src: string;
+}
+export interface ItemsEndIcon {
+    /**
+     *
+     */
+    type: string;
+    /**
+     *
+     */
+    class: string;
+    /**
+     *
+     */
+    src: string;
+}

package/oj-c/split-menu-button/__webdriver__/SplitMenuButtonWebElementBase.js.map

@@ -1 +1 @@
-{"version":3,"file":"SplitMenuButtonWebElementBase.js","sourceRoot":"","sources":["SplitMenuButtonWebElementBase.ts"],"names":[],"mappings":";;;AAAA,iEAAoE;AAEpE;;;;;GAKG;AACH,MAAa,6BAA8B,SAAQ,uBAAY;IAC7D;;;;;OAKG;IACI,QAAQ;QACb,OAAO,IAAI,CAAC,WAAW,CAAS,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED;;;;;OAKG;IACI,QAAQ;QACb,OAAO,IAAI,CAAC,WAAW,CAAgB,OAAO,CAAC,CAAC;IAClD,CAAC;IAED;;;;;OAKG;IACI,UAAU;QACf,OAAO,IAAI,CAAC,WAAW,CAAS,SAAS,CAAC,CAAC;IAC7C,CAAC;IAED;;;;;OAKG;IACI,WAAW;QAChB,OAAO,IAAI,CAAC,WAAW,CAAU,UAAU,CAAC,CAAC;IAC/C,CAAC;IAED;;;;;OAKG;IACI,eAAe;QACpB,OAAO,IAAI,CAAC,WAAW,CAAS,MAAM,CAAC,CAAC;IAC1C,CAAC;IAED;;;;;OAKG;IACI,QAAQ;QACb,OAAO,IAAI,CAAC,WAAW,CAAkB,OAAO,CAAC,CAAC;IACpD,CAAC;IAED;;;;;OAKG;IACI,WAAW;QAChB,OAAO,IAAI,CAAC,WAAW,CAAS,UAAU,CAAC,CAAC;IAC9C,CAAC;CACF;AAtED,sEAsEC","sourcesContent":["import { OjWebElement } from '@oracle/oraclejet-webdriver/elements';\n\n/**\n * This is the base class for oj-c-split-menu-button WebElement, and is generated from the\n * component's metadata. Do not modify these contents since they'll be replaced\n * during the next generation.\n * Put overrides into the WebElements's subclass, SplitMenuButtonWebElement.ts.\n */\nexport class SplitMenuButtonWebElementBase extends OjWebElement {\n  /**\n   * Gets the value of <code>label</code> property.\n   * Text to show in the button.\n   * @return The value of <code>label</code> property.\n   *\n   */\n  public getLabel(): Promise<string> {\n    return this.getProperty<string>('label');\n  }\n\n  /**\n   * Gets the value of <code>items</code> property.\n   * Items describe the menu items rendered by the menu button.\n   * @return The value of <code>items</code> property.\n   *\n   */\n  public getItems(): Promise<Array<object>> {\n    return this.getProperty<Array<object>>('items');\n  }\n\n  /**\n   * Gets the value of <code>tooltip</code> property.\n   * Text to show in the tooltip.\n   * @return The value of <code>tooltip</code> property.\n   *\n   */\n  public getTooltip(): Promise<string> {\n    return this.getProperty<string>('tooltip');\n  }\n\n  /**\n   * Gets the value of <code>disabled</code> property.\n   * Specifies that the button element should be disabled.\n   * @return The value of <code>disabled</code> property.\n   *\n   */\n  public getDisabled(): Promise<boolean> {\n    return this.getProperty<boolean>('disabled');\n  }\n\n  /**\n   * Gets the value of <code>size</code> property.\n   * Size of button\n   * @return The value of <code>size</code> property.\n   *\n   */\n  public getSizeProperty(): Promise<string> {\n    return this.getProperty<string>('size');\n  }\n\n  /**\n   * Gets the value of <code>width</code> property.\n   * Specifies that the button style width\n   * @return The value of <code>width</code> property.\n   *\n   */\n  public getWidth(): Promise<number | string> {\n    return this.getProperty<number | string>('width');\n  }\n\n  /**\n   * Gets the value of <code>chroming</code> property.\n   * Indicates in what states the button has chromings in background and border.\n   * @return The value of <code>chroming</code> property.\n   *\n   */\n  public getChroming(): Promise<string> {\n    return this.getProperty<string>('chroming');\n  }\n}\n"]}
+{"version":3,"file":"SplitMenuButtonWebElementBase.js","sourceRoot":"","sources":["SplitMenuButtonWebElementBase.ts"],"names":[],"mappings":";;;AAAA,iEAAoE;AAEpE;;;;;GAKG;AACH,MAAa,6BAA8B,SAAQ,uBAAY;IAC7D;;;;;OAKG;IACI,QAAQ;QACb,OAAO,IAAI,CAAC,WAAW,CAAS,OAAO,CAAC,CAAC;IAC3C,CAAC;IAED;;;;;OAKG;IACI,QAAQ;QACb,OAAO,IAAI,CAAC,WAAW,CAAe,OAAO,CAAC,CAAC;IACjD,CAAC;IAED;;;;;OAKG;IACI,UAAU;QACf,OAAO,IAAI,CAAC,WAAW,CAAS,SAAS,CAAC,CAAC;IAC7C,CAAC;IAED;;;;;OAKG;IACI,WAAW;QAChB,OAAO,IAAI,CAAC,WAAW,CAAU,UAAU,CAAC,CAAC;IAC/C,CAAC;IAED;;;;;OAKG;IACI,eAAe;QACpB,OAAO,IAAI,CAAC,WAAW,CAAS,MAAM,CAAC,CAAC;IAC1C,CAAC;IAED;;;;;OAKG;IACI,QAAQ;QACb,OAAO,IAAI,CAAC,WAAW,CAAkB,OAAO,CAAC,CAAC;IACpD,CAAC;IAED;;;;;OAKG;IACI,WAAW;QAChB,OAAO,IAAI,CAAC,WAAW,CAAS,UAAU,CAAC,CAAC;IAC9C,CAAC;CACF;AAtED,sEAsEC","sourcesContent":["import { OjWebElement } from '@oracle/oraclejet-webdriver/elements';\n\n/**\n * This is the base class for oj-c-split-menu-button WebElement, and is generated from the\n * component's metadata. Do not modify these contents since they'll be replaced\n * during the next generation.\n * Put overrides into the WebElements's subclass, SplitMenuButtonWebElement.ts.\n */\nexport class SplitMenuButtonWebElementBase extends OjWebElement {\n  /**\n   * Gets the value of <code>label</code> property.\n   * Text to show in the button.\n   * @return The value of <code>label</code> property.\n   *\n   */\n  public getLabel(): Promise<string> {\n    return this.getProperty<string>('label');\n  }\n\n  /**\n   * Gets the value of <code>items</code> property.\n   * Items describe the menu items rendered by the menu button.\n   * @return The value of <code>items</code> property.\n   *\n   */\n  public getItems(): Promise<Array<Items>> {\n    return this.getProperty<Array<Items>>('items');\n  }\n\n  /**\n   * Gets the value of <code>tooltip</code> property.\n   * Text to show in the tooltip.\n   * @return The value of <code>tooltip</code> property.\n   *\n   */\n  public getTooltip(): Promise<string> {\n    return this.getProperty<string>('tooltip');\n  }\n\n  /**\n   * Gets the value of <code>disabled</code> property.\n   * Specifies that the button element should be disabled.\n   * @return The value of <code>disabled</code> property.\n   *\n   */\n  public getDisabled(): Promise<boolean> {\n    return this.getProperty<boolean>('disabled');\n  }\n\n  /**\n   * Gets the value of <code>size</code> property.\n   * Size of button\n   * @return The value of <code>size</code> property.\n   *\n   */\n  public getSizeProperty(): Promise<string> {\n    return this.getProperty<string>('size');\n  }\n\n  /**\n   * Gets the value of <code>width</code> property.\n   * Specifies that the button style width\n   * @return The value of <code>width</code> property.\n   *\n   */\n  public getWidth(): Promise<number | string> {\n    return this.getProperty<number | string>('width');\n  }\n\n  /**\n   * Gets the value of <code>chroming</code> property.\n   * Indicates in what states the button has chromings in background and border.\n   * @return The value of <code>chroming</code> property.\n   *\n   */\n  public getChroming(): Promise<string> {\n    return this.getProperty<string>('chroming');\n  }\n}\nexport interface Items {\n  /**\n   * Specifies the type of the menu item.\n   */\n  type: string;\n  /**\n   * Specifies the text to show for the menu item.\n   */\n  label: string;\n  /**\n   * Specifes a key value associated with the menu item.\n   */\n  key: string;\n  /**\n   * Specifies whether the menu item should be disabled.\n   */\n  disabled: boolean;\n  /**\n   * Specifies an icon to show at the start position of the menu item.\n   */\n  startIcon: ItemsStartIcon;\n  /**\n   * Specifies an icon to show at the end position of the menu item.\n   */\n  endIcon: ItemsEndIcon;\n  /**\n   * Specifies styling for the menu item based upon its associated action.\n   */\n  variant: string;\n}\nexport interface ItemsStartIcon {\n  /**\n   *\n   */\n  type: string;\n  /**\n   *\n   */\n  class: string;\n  /**\n   *\n   */\n  src: string;\n}\nexport interface ItemsEndIcon {\n  /**\n   *\n   */\n  type: string;\n  /**\n   *\n   */\n  class: string;\n  /**\n   *\n   */\n  src: string;\n}\n"]}