@oracle/oraclejet 16.0.1 → 16.0.2

package/dist/css/stable/oj-stable.css

@@ -335,7 +335,7 @@
   visibility: hidden; }
 
 .oj-theme-json {
-  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v16.0.1"}' !important; }
+  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v16.0.2"}' !important; }
 
 .oj-helper-hidden-accessible {
   border: 0;
@@ -16402,11 +16402,11 @@ oj-message-banner:not(.oj-complete) {
 .oj-messagebanner-item {
   background-color: var(--oj-private-message-banner-background-color);
   border-bottom-width: 1px;
-  border-bottom-style: 'solid';
+  border-bottom-style: solid;
   border-bottom-color: var(--oj-core-divider-color); }
 
 .oj-messagebanner-item:focus-visible {
-  outline-style: 'dotted';
+  outline-style: dotted;
   outline-width: 1px;
   outline-color: var(--oj-core-focus-border-color);
   outline-offset: 1px; }
@@ -16416,10 +16416,10 @@ oj-message-banner:not(.oj-complete) {
   border-radius: var(--oj-core-border-radius-lg); }
 
 .oj-messagebanner-content {
-  align-items: 'center';
-  box-sizing: 'border-box';
-  display: 'flex';
-  flex-wrap: 'wrap';
+  align-items: center;
+  box-sizing: border-box;
+  display: flex;
+  flex-wrap: wrap;
   padding-top: var(--oj-core-spacing-4x);
   padding-bottom: var(--oj-core-spacing-4x);
   padding-inline-start: var(--oj-core-gutter-start, var(--oj-core-spacing-4x));
@@ -16432,20 +16432,20 @@ oj-message-banner:not(.oj-complete) {
   color: var(--oj-private-message-banner-start-icon-color);
   font-size: var(--oj-private-message-banner-start-icon-size);
   height: var(--oj-private-message-banner-summary-line-height);
-  align-self: 'flex-start';
-  display: 'flex';
+  align-self: flex-start;
+  display: flex;
   margin-inline-end: var(--oj-core-spacing-2x); }
 
 .oj-messagebanner-start-icon {
   height: calc(var(--oj-private-message-banner-summary-text-size) * var(--oj-private-message-banner-summary-line-height));
-  display: 'flex';
-  align-items: 'center'; }
+  display: flex;
+  align-items: center; }
 
 .oj-messagebanner-header {
-  box-sizing: 'border-box';
-  display: 'flex';
-  flex-wrap: 'wrap';
-  flex-direction: 'row';
+  box-sizing: border-box;
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: row;
   line-height: var(--oj-private-message-banner-summary-line-height); }
 
 @media screen and (max-width: 599.9px) {
@@ -16454,7 +16454,7 @@ oj-message-banner:not(.oj-complete) {
 
 .oj-messagebanner-summary {
   flex: 1;
-  overflow-wrap: 'anywhere';
+  overflow-wrap: anywhere;
   font-size: var(--oj-private-message-banner-summary-text-size);
   font-weight: var(--oj-private-message-banner-summary-text-weight);
   color: var(--oj-private-message-banner-summary-text-color); }
@@ -16465,13 +16465,13 @@ oj-message-banner:not(.oj-complete) {
   color: var(--oj-core-text-color-secondary); }
 
 .oj-messagebanner-detail {
-  overflow-wrap: 'anywhere';
+  overflow-wrap: anywhere;
   font-size: var(--oj-typography-body-sm-font-size);
   color: var(--oj-core-text-color-primary); }
 
 .oj-messagebanner-close-button {
-  align-self: 'flex-start';
-  display: 'flex';
+  align-self: flex-start;
+  display: flex;
   margin-inline-start: var(--oj-core-spacing-1x);
   margin-inline-end: calc(-1 * var(--oj-core-spacing-2x));
   margin-top: calc(-1 * var(--oj-core-spacing-2x));

package/dist/js/libs/oj/debug/ojbufferingdataprovider.js

@@ -707,8 +707,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
                     this._baseIterator = _baseIterator;
                     this._params = _params;
                     this.firstBaseKey = null;
-                    this.mergedAddKeySet = new Set();
-                    this.unFetchedAddItemSet = new Set();
+                    this.mergedAddKeySet = new MutableKeySet();
                     this.mergedItemArray = [];
                     this.nextOffset = 0;
                     if (this._params == null) {
@@ -765,16 +764,11 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
                             }
                             const newDataArray = [];
                             const newMetaArray = [];
-                            this.unFetchedAddItemSet.forEach((item) => {
-                                newDataArray.push(item.data);
-                                newMetaArray.push(item.metadata);
-                            });
-                            this.unFetchedAddItemSet.clear();
                             let idx;
                             for (idx = this.nextOffset; idx < this.mergedItemArray.length; idx++) {
-                                ++this.nextOffset;
                                 const item = this.mergedItemArray[idx];
                                 if (!this._parent._isItemRemoved(item.metadata.key)) {
+                                    this.nextOffset = idx + 1;
                                     newDataArray.push(item.data);
                                     newMetaArray.push(item.metadata);
                                     if (params.size && newDataArray.length === params.size) {
@@ -985,7 +979,7 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
                         else {
                             sortCriteria = params.sortCriteria;
                         }
-                        this._mergeEdits(baseItemArray, newItemArray, params.filterCriterion, sortCriteria, new Set(), baseResults.done);
+                        this._mergeEdits(baseItemArray, newItemArray, params.filterCriterion, sortCriteria, new MutableKeySet(), baseResults.done);
                         let actualReturnSize = newItemArray.length;
                         for (const newItem of newItemArray) {
                             if (this._isItemRemoved(newItem.metadata.key)) {
@@ -1148,9 +1142,13 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
                 }
                 else {
                     addBeforeKey = this.lastIterator.firstBaseKey;
+                    let shouldIncrementNextOffset = this.lastIterator.nextOffset !== 0;
                     if (this.editBuffer.isUpdateTransformed(item.metadata.key)) {
                         for (let i = 0; i < this.lastIterator.mergedItemArray.length; i++) {
-                            if (this.lastIterator.mergedItemArray[i].metadata.key === item.metadata.key) {
+                            if (oj.KeyUtils.equals(this.lastIterator.mergedItemArray[i].metadata.key, item.metadata.key)) {
+                                if (shouldIncrementNextOffset) {
+                                    shouldIncrementNextOffset = this.lastIterator.nextOffset <= i;
+                                }
                                 this.lastIterator.mergedItemArray.splice(i, 1);
                                 break;
                             }
@@ -1158,11 +1156,10 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
                     }
                     this.lastIterator.mergedItemArray.splice(0, 0, item);
                     this.lastIterator.mergedAddKeySet.add(item.metadata.key);
-                    if (addBeforeKey === null) {
-                        this.lastIterator.unFetchedAddItemSet.add(item);
-                    }
                     this.lastIterator.firstBaseKey = item.metadata.key;
-                    this.lastIterator.nextOffset++;
+                    if (shouldIncrementNextOffset) {
+                        this.lastIterator.nextOffset++;
+                    }
                 }
             }
             return addBeforeKey;
@@ -1217,14 +1214,13 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
                     if (fromBaseDP || mergedAddKeySet.has(key)) {
                         mergedItemArray.splice(keyIdx, 1);
                         mergedAddKeySet.delete(key);
-                        if (keyIdx < this.lastIterator.nextOffset) {
-                            --this.lastIterator.nextOffset;
-                        }
                     }
-                    else {
-                        if (keyIdx === this.lastIterator.nextOffset - 1) {
-                            --this.lastIterator.nextOffset;
+                    for (let i = this.lastIterator.nextOffset - 1; i >= 0; i--) {
+                        let itemKey = mergedItemArray[i]?.metadata.key;
+                        if (itemKey != null && !this._isItemRemoved(itemKey)) {
+                            break;
                         }
+                        this.lastIterator.nextOffset = i;
                     }
                     if (oj.KeyUtils.equals(this.lastIterator.firstBaseKey, key)) {
                         this.lastIterator.firstBaseKey = null;
@@ -1666,6 +1662,47 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget', 'ojs/ojmap
     BufferingDataProvider._REFRESH = 'refresh';
     BufferingDataProvider._MUTATE = 'mutate';
     BufferingDataProvider._ADDEVENTLISTENER = 'addEventListener';
+    class MutableKeySet {
+        constructor() {
+            this.set = new Set();
+        }
+        has(key) {
+            return _has(this.set, key);
+        }
+        add(key) {
+            if (!_has(this.set, key)) {
+                this.set.add(key);
+            }
+        }
+        delete(key) {
+            const ret = _find(this.set, key);
+            if (ret.value) {
+                this.set.delete(ret.key);
+            }
+        }
+    }
+    const _has = (keys, keyToFind) => {
+        return _find(keys, keyToFind).value;
+    };
+    const _find = (keys, keyToFind) => {
+        if (keys.size === 0) {
+            return { value: false };
+        }
+        if (typeof keyToFind === 'string' ||
+            typeof keyToFind === 'number' ||
+            typeof keyToFind === 'boolean') {
+            return { value: keys.has(keyToFind), key: keyToFind };
+        }
+        const iterator = keys[Symbol.iterator]();
+        let key = iterator.next();
+        while (!key.done) {
+            if (oj.KeyUtils.equals(key.value, keyToFind)) {
+                return { value: true, key: key.value };
+            }
+            key = iterator.next();
+        }
+        return { value: false };
+    };
     ojeventtarget.EventTargetMixin.applyMixin(BufferingDataProvider);
     oj._registerLegacyNamespaceProp('BufferingDataProvider', BufferingDataProvider);
 

package/dist/js/libs/oj/debug/ojcore-base.js

@@ -37,12 +37,12 @@ define(['ojs/ojlogger'], function (Logger) { 'use strict';
      * @global
      * @member {string} version JET version numberr
      */
-    version: '16.0.1',
+    version: '16.0.2',
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2024-03-20_19-05-18',
+    revision: '2024-04-10_09-01-56',
 
     // This function is only meant to be used outside the library, so quoting the name
     // to avoid renaming is appropriate

package/dist/js/libs/oj/debug/ojdatagrid.js

@@ -4518,10 +4518,9 @@ var __oj_data_grid_metadata =
       ' ' +
       resources.getMappedStyle('headercell');
     this.m_root.appendChild(div); // @HTMLUpdateOK
-    // Not using offsetWidth/Height due to
-    var rect = div.getBoundingClientRect();
-    this.m_defaultColumnWidth = Math.round(rect.width);
-    this.m_defaultRowHeight = Math.round(rect.height);
+    // can use offset due to fixes in chrome partial pixel rounding fixes
+    this.m_defaultColumnWidth = div.offsetWidth;
+    this.m_defaultRowHeight = div.offsetHeight;
 
     // minimize reflows
     this.getViewportWidth();

package/dist/js/libs/oj/debug/ojpopupcore.js

@@ -4410,13 +4410,9 @@ define(['exports', 'ojs/ojcore-base', 'jquery', 'ojs/ojcomponentcore', 'ojs/ojlo
       static findOpenVPopups() {
           const rootLayerHost = document.getElementById(NEW_DEFAULT_LAYER_ID);
           const topLayerHost = document.getElementById(NEW_DEFAULT_TOP_LAYER_ID);
-          const result = [];
-          if (rootLayerHost) {
-              result.concat([].slice.call(rootLayerHost.children));
-          }
-          if (topLayerHost) {
-              result.concat([].slice.call(topLayerHost.children));
-          }
+          const resRoot = rootLayerHost ? [].slice.call(rootLayerHost.children) : [];
+          const resTop = topLayerHost ? [].slice.call(topLayerHost.children) : [];
+          const result = resRoot.concat(resTop);
           return result;
       }
   }

package/dist/js/libs/oj/debug/ojselectbase.js

@@ -22,7 +22,7 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
     // idSuffix, lovMainField, filterInputText, lovDropdown, liveRegion, enabled, readOnly, value,
     // getTranslatedStringFunc, addBusyStateFunc, showMainFieldFunc, setFilterFieldTextFunc,
     // setUiLoadingStateFunc, isValueForPlaceholderFunc, isShowValueInFilterFieldFunc,
-    // getFilterInputElemFunc}
+    // getFilterInputElemFunc, matchBy}
     this._minLength = 0;
 
     this._className = options.className;
@@ -46,6 +46,7 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
     this._isValueForPlaceholderFunc = options.isValueForPlaceholderFunc;
     this._isShowValueInFilterFieldFunc = options.isShowValueInFilterFieldFunc;
     this._getFilterInputElemFunc = options.getFilterInputElemFunc;
+    this._matchBy = options.matchBy;
 
     this._lastDataProviderPromise = null;
 
@@ -63,6 +64,10 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
     this._value = value;
   };
 
+  AbstractLovBase.prototype.setMatchBy = function (matchBy) {
+    this._matchBy = matchBy;
+  };
+
   AbstractLovBase.prototype.getFetchType = function () {
     return this._fetchType;
   };
@@ -464,6 +469,7 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
 
     var filterCriteria = null;
     if (term) {
+      var matchBy;
       if (this._dataProvider) {
         var filterCapability = this._dataProvider.getCapability('filter');
         if (!filterCapability || !filterCapability.textFilter) {
@@ -471,12 +477,43 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
             'Select: DataProvider does not support text filter.  ' +
               'Filtering results in dropdown may not work correctly.'
           );
+        } else if (this._matchBy) {
+          // JET-60725 - Add option to specify the matchBy behavior of the text filter
+          // Find the first matchBy behavior in the array that the data provider supports.
+          matchBy = this._matchBy.reduce((result, curr) => {
+            // if we've already found a supported matchBy, use it
+            if (result) {
+              return result;
+            }
+            // if we've encountered 'unknown' in the array, return it because it's always supported
+            if (curr === 'unknown') {
+              return curr;
+            }
+            // if we haven't found a supported matchBy yet, see if the current one is supported and
+            // return it if so; if not log a warning
+            if (curr) {
+              if (
+                filterCapability.textFilterMatching &&
+                filterCapability.textFilterMatching.matchBy &&
+                filterCapability.textFilterMatching.matchBy.indexOf(curr) > -1
+              ) {
+                return curr;
+              }
+              Logger.warn(
+                `Select: DataProvider does not support text filter "${curr}" matching.  ` +
+                  'Filtering results in dropdown may not work as expected.'
+              );
+            }
+            // if we haven't found a supported matchBy yet, return undefined and go on
+            return undefined;
+          }, null);
         }
       }
 
       // create filter using FilterFactory so that default local filtering will happen if
       // underlying DP doesn't support its own filtering
-      filterCriteria = oj.FilterFactory.getFilter({ filterDef: { text: term } });
+      var filterDef = matchBy ? { text: term, matchBy } : { text: term };
+      filterCriteria = oj.FilterFactory.getFilter({ filterDef });
     }
 
     var retPromise = new Promise(
@@ -2532,7 +2569,7 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
    * @since 8.0.0
    * @abstract
    * @hideconstructor
-   * @ojtsimport {module: "ojdataprovider", type: "AMD", imported: ["DataProvider"]}
+   * @ojtsimport {module: "ojdataprovider", type: "AMD", imported: ["DataProvider", "TextFilter"]}
    * @ojtsimport {module: "ojcommontypes", type: "AMD", importName: ["ojcommontypes"]}
    * @ojsignature [{
    *                target: "Type",
@@ -2873,7 +2910,38 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
        * @memberof oj.ojSelectBase
        * @ojfragment selectCommonLabelledBy
        */
-      labelledBy: null
+      labelledBy: null,
+
+      /**
+       * The list of text filter matching behaviors to use when fetching data filtered by a user's
+       * typed search text, in order of descending priority with the preferred behavior first.
+       * If the preferred behavior is not supported by the DataProvider, then the component will
+       * check the next behavior, and so on, until it finds one that is supported.
+       * If none of the specified behaviors are supported or if this property is not specified,
+       * then the behavior will effectively be "unknown".
+       *
+       * @example <caption>Initialize the Select with the <code class="prettyprint">match-by</code> attribute specified:</caption>
+       * &lt;oj-select-single match-by="[[matchByValue]]">&lt;/oj-select-single>
+       *
+       * @example <caption>Get or set the <code class="prettyprint">matchBy</code> property after initialization:</caption>
+       * // getter
+       * var matchByValue = mySelect.matchBy;
+       *
+       * // setter
+       * mySelect.matchBy = ["phrase", "fuzzy", "contains", "startsWith", "unknown"];
+       *
+       * @name matchBy
+       * @ojshortdesc The ordered list of text filter matching behaviors to use when filtering data.
+       * @expose
+       * @access public
+       * @instance
+       * @memberof oj.ojSelectBase
+       * @type {Array.<string>|null}
+       * @ojsignature {target: "Type", value: "Array<TextFilter<D>['matchBy']>|null", jsdocOverride: true}
+       * @default null
+       * @since 16.0.2
+       */
+      matchBy: null
     },
 
     /**
@@ -3112,6 +3180,12 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
 
       var options = this.options;
 
+      // JET-60725 - Add option to specify the matchBy behavior of the text filter
+      // Make a copy of the array to use internally so that the application can't mutate it;
+      // they have to set a new array if they want to change it.
+      this._matchBy =
+        options.matchBy && options.matchBy.length > 0 ? [...options.matchBy] : undefined;
+
       this._wrapDataProviderIfNeeded(options.data);
       this._addDataProviderEventListeners();
 
@@ -3251,7 +3325,8 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
         setUiLoadingStateFunc: this._setUiLoadingState.bind(this),
         isValueForPlaceholderFunc: this._IsValueForPlaceholder.bind(this),
         isShowValueInFilterFieldFunc: this._IsShowValueInFilterField.bind(this),
-        getFilterInputElemFunc: this._getFilterInputElem.bind(this)
+        getFilterInputElemFunc: this._getFilterInputElem.bind(this),
+        matchBy: this._matchBy
       });
       this._abstractLovBase = abstractLovBase;
 
@@ -4279,6 +4354,16 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
       oj.Assert.failedInAbstractFunction();
     },
 
+    /**
+     * Called when the filter field is blurred.
+     * @memberof! oj.ojSelectBase
+     * @instance
+     * @protected
+     */
+    _HandleFilterFieldBlur: function () {
+      oj.Assert.failedInAbstractFunction();
+    },
+
     /**
      * @memberof! oj.ojSelectBase
      * @instance
@@ -4512,6 +4597,11 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
             var focusInFilterField =
               document.activeElement && DomUtils.isAncestor(filterInputText, document.activeElement);
             if (!focusInDropdown && !this._mousedownOnDropdown && !focusInFilterField) {
+              // JET-65757 - Empty value rejected when not confirmed by Enter/Tab
+              // clear the value after deleting all the filter text and clicking outside the
+              // component
+              this._HandleFilterFieldBlur();
+
               this._showMainField();
             }
           }
@@ -5037,7 +5127,15 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
         }
       }
 
-      this._super(key, value, flags);
+      // JET-64632 - DataProvider refresh event can wipe out currently selected value
+      // If we get a DP refresh event we may re-set the currently selected value so that we fetch
+      // new data for it, in which case we don't want to fire a change event, so don't call the
+      // superclass.
+      var bSkipSuperclassCall = key === 'value' && this.options.value === value;
+
+      if (!bSkipSuperclassCall) {
+        this._super(key, value, flags);
+      }
 
       // In vdom architecture, there are multiple issues with value and valueItem property that we need to
       // handle.
@@ -5222,6 +5320,14 @@ define(['exports', 'ojs/ojeditablevalue', 'ojs/ojpopupcore', 'ojs/ojinputtext',
         // JET-45922 - timing issue with select-single: lov drop-down doesn't have element
         // do a granular update if item-text changes instead of a general refresh
         this._UpdateItemText();
+      } else if (key === 'matchBy') {
+        // JET-60725 - Add option to specify the matchBy behavior of the text filter
+        // Make a copy of the array to use internally so that the application can't mutate it;
+        // they have to set a new array if they want to change it.
+        this._matchBy = value && value.length > 0 ? [...value] : undefined;
+        if (this._abstractLovBase) {
+          this._abstractLovBase.setMatchBy(this._matchBy);
+        }
       }
     },
 

package/dist/js/libs/oj/debug/ojselectsingle.js

@@ -90,6 +90,9 @@ var __oj_select_single_metadata =
     "labelledBy": {
       "type": "string"
     },
+    "matchBy": {
+      "type": "Array<string>"
+    },
     "messagesCustom": {
       "type": "Array<Object>",
       "writeback": true,
@@ -818,7 +821,11 @@ var __oj_select_single_metadata =
      * @override
      */
     _ReleaseSelectResources: function (shouldRetainMainFieldElem) {
+      this._bReleasingSelectResources = true;
+
       this._super(shouldRetainMainFieldElem);
+
+      this._bReleasingSelectResources = false;
     },
 
     /**
@@ -881,6 +888,34 @@ var __oj_select_single_metadata =
       this._handleSelection(this._GetDefaultValueItemForPlaceholder());
     },
 
+    /**
+     * Called when the filter field is blurred.
+     * @memberof! oj.ojSelectSingle
+     * @instance
+     * @protected
+     * @override
+     */
+    _HandleFilterFieldBlur: function () {
+      // JET-65757 - Empty value rejected when not confirmed by Enter/Tab
+      // clear the value after deleting all the filter text and clicking outside the
+      // component;
+      // check whether placeholder valueItem is already set so that we don't trigger
+      // validation unnecessarily
+      if (
+        !this._fullScreenPopup &&
+        !this._bReleasingSelectResources &&
+        this._IsFilterInputTextCleared()
+      ) {
+        if (
+          !this._IsValueForPlaceholder(this.options.value) ||
+          !this._IsValueItemForPlaceholder(this.options.valueItem)
+        ) {
+          // on desktop, if the user clears all the text and clicks out, clear the LOV value
+          this._handleSelection(this._defaultValueItemForPlaceholder, null, true);
+        }
+      }
+    },
+
     /**
      * @memberof! oj.ojSelectSingle
      * @instance
@@ -1560,6 +1595,7 @@ var __oj_select_single_metadata =
       }
 
       var newVal = this.options.value;
+      var origVal = this.options.value;
       if (event.type === 'mutate') {
         if (event.detail.remove != null) {
           var keys = event.detail.remove.keys;
@@ -1575,18 +1611,41 @@ var __oj_select_single_metadata =
         }
       }
 
-      // JET-42413: set flag while we're processing a value change so that if an app makes
-      // changes to the component from within the change listener, we can defer processing the
-      // new change until after we're done processing the current change
-      var resolveValueChangeFunc = this._StartMakingInternalValueChange();
+      var resolveBusyState = this._AddBusyState('ojSelectSingle processing DataProvider event');
+
+      // JET-64632 - DataProvider refresh event can wipe out currently selected value
+      // defer handling the event until the throttle promise (which is hooked into JET's Knockout
+      // throttling timeout) resolves so that we can correctly handle the case where we get both a
+      // new value set and a DP event
+      var throttlePromise = this._GetThrottlePromise();
+      throttlePromise.then(
+        function () {
+          // if the component was released before the promise resolved, simply resolve the busy
+          // state and return
+          if (this._bReleasedResources) {
+            resolveBusyState();
+            return;
+          }
 
-      // if the event wasn't dispatched internally, need to re-set the value now that the label may
-      // be available, or because a mutation event removed a selected value
-      this._setOption('value', newVal);
+          // if the event wasn't dispatched internally, and if the value has not been changed since
+          // the event was received, need to re-set the value now that the label may be available,
+          // or because a mutation event removed a selected value
+          if (origVal === this.options.value) {
+            // JET-42413: set flag while we're processing a value change so that if an app makes
+            // changes to the component from within the change listener, we can defer processing the
+            // new change until after we're done processing the current change
+            var resolveValueChangeFunc = this._StartMakingInternalValueChange();
 
-      resolveValueChangeFunc();
+            this._setOption('value', newVal);
+
+            resolveValueChangeFunc();
+          }
 
-      this._abstractLovBase.handleDataProviderEvent(event);
+          this._abstractLovBase.handleDataProviderEvent(event);
+
+          resolveBusyState();
+        }.bind(this)
+      );
     },
 
     /**