@oracle/oraclejet 10.1.1 → 10.1.6

package/dist/js/libs/oj/debug_es5/ojselectcombobox.js

@@ -3180,7 +3180,11 @@ define(['ojs/ojeditablevalue', 'ojs/ojoptgroup', 'ojs/ojoption', 'ojs/ojhighligh
       this.parseData = opts.parseData;
       this.sanitizeData = opts.sanitizeData;
       this.headerInitialized = false;
-      this.isOjOption = this.ojContext._IsCustomElement() && !opts.options && opts.element.find('oj-option').length > 0; // 'opts.element' is initialized in _setup() method in component files
+      this.isOjOption = this.ojContext._IsCustomElement() && !opts.options && opts.element.find('oj-option').length > 0; // JET-39086 - raw-value is not getting updated until space in android devices
+      // In android device we need to update rawValue even for composition events
+      // Get and store agent info
+
+      this._isAndroidDevice = oj$1.AgentUtils.getAgentInfo().os === oj$1.AgentUtils.OS.ANDROID; // 'opts.element' is initialized in _setup() method in component files
       // ojcombobox.js, ojselect.js and ojInputSearch.js.
       // destroy if called on an existing component
 
@@ -5926,6 +5930,7 @@ define(['ojs/ojeditablevalue', 'ojs/ojoptgroup', 'ojs/ojoption', 'ojs/ojhighligh
      */
     _selectItemFromArray: function _selectItemFromArray(values, options) {
       var optionsArray = this.ojContext.options.options;
+      var optionsKeys = this.ojContext.options.optionsKeys || {};
       var foundItems = new Map();
       var items = [];
 
@@ -5934,10 +5939,12 @@ define(['ojs/ojeditablevalue', 'ojs/ojoptgroup', 'ojs/ojoption', 'ojs/ojhighligh
       }
 
       for (var i = 0; i < optionsArray.length; i++) {
-        var _item = optionsArray[i];
+        var item = optionsArray[i];
+
+        var value = _ComboUtils.lookupOptionKeys(item, optionsKeys, 'value');
 
-        if (values.includes(this.id(_item))) {
-          foundItems.set(this.id(_item), _item); // prematurely break the loop if all values are found
+        if (values.includes(value)) {
+          foundItems.set(value, item); // prematurely break the loop if all values are found
 
           if (values.length === foundItems.size) {
             break;
@@ -5958,7 +5965,18 @@ define(['ojs/ojeditablevalue', 'ojs/ojoptgroup', 'ojs/ojoption', 'ojs/ojhighligh
         } // Push the created item in the array if it is not null
 
 
-        if (_item != null) items.push(_item);
+        if (_item != null) {
+          // Map using optionsKeys if specified
+          if (optionsKeys.value != null) {
+            _item.value = _item[optionsKeys.value];
+          }
+
+          if (optionsKeys.label != null) {
+            _item.label = _item[optionsKeys.label];
+          }
+
+          items.push(_item);
+        }
       }));
       return this._InvokeSelection(items, options);
     },
@@ -6514,7 +6532,20 @@ define(['ojs/ojeditablevalue', 'ojs/ojoptgroup', 'ojs/ojoption', 'ojs/ojhighligh
         this._onSearchInputHandler(e);
       }));
       this.search.on('input', this._bind(function (e) {
-        if (!this.ojContext._isComposing) {
+        // JET-39086 - raw-value is not getting updated until space in android devices
+        // In android devices, typing in an English word will behave similar to what one
+        // would see when they compose a CJK character in desktop devices. So, we need to
+        // update the raw-value for all the input events in Android devices without considering
+        // composition events so that the property gets updated for each english character and not
+        // only for delimiters. In GBoard all the CJK keyboard layouts directly allow users
+        // to input a CJK character, so we do not need to rely on composition events for that.
+        // In Japanese keyboard, one of the three available layouts uses english chars
+        // to compose a Japanese character in which case circumventing the logic would end up
+        // updating the property with garbage values. But, it is highly unlikely for one to
+        // use this layout as the other two layouts would allow users to directly type in Japanese
+        // characters. So, for now we will not have to worry about composition events in
+        // Android devices.
+        if (!this.ojContext._isComposing || this._isAndroidDevice) {
           this._onSearchInputHandler(e);
         }
       }));
@@ -7528,16 +7559,23 @@ define(['ojs/ojeditablevalue', 'ojs/ojoptgroup', 'ojs/ojoption', 'ojs/ojhighligh
       var opts = _ComboUtils.getOpts(this.ojContext);
 
       var isDataProvider = opts ? _ComboUtils.isDataProvider(opts.options) : false;
+      var values = [];
+      var valueOptions = [];
       var valueOptionsData = [];
-      var valueOptionsMetadata = [];
+      var valueOptionsMetadata = []; // Iterate through the items and generate value and valueOptions
 
-      if (isDataProvider) {
-        items.forEach(function (item) {
+      items.forEach(function (item) {
+        values.push(this.id(item));
+        valueOptions.push({
+          label: item.label,
+          value: this.id(item)
+        }); // populate data and metadata only when using a data provider
+
+        if (isDataProvider) {
           valueOptionsData.push(item.data);
           valueOptionsMetadata.push(item.metadata);
-        });
-      }
-
+        }
+      }.bind(this));
       var context = {
         optionMetadata: {
           trigger: options.trigger
@@ -7545,9 +7583,8 @@ define(['ojs/ojeditablevalue', 'ojs/ojoptgroup', 'ojs/ojoption', 'ojs/ojhighligh
       };
       context = _ComboUtils.getContextWithExtraData(context, opts, valueOptionsData, valueOptionsMetadata); // set valueOptions
 
-      this.setValOpts(items);
+      this.setValOpts(valueOptions);
       this._skipSetValueOptions = true;
-      var values = items.map(this.id);
       var setValueReturn = this.setVal(values, null, context);
 
       if (setValueReturn instanceof Promise) {
@@ -7624,7 +7661,7 @@ define(['ojs/ojeditablevalue', 'ojs/ojoptgroup', 'ojs/ojoption', 'ojs/ojhighligh
       // combobox many in most of situations (since we do not call this method unless
       // we know for a fact that the value is not present), when having label-edge=inside,
       // this method will be called unconditionally on focus events. Since the placeholder
-      // is being updated programatically for label animations.
+      // is being updated programmatically for label animations.
       // This results in the placeholder being set even when there is a value which
       // is causing issues.
       // In oj-combobox-one, this is not a problem as the placeholder is set on the input
@@ -7632,10 +7669,24 @@ define(['ojs/ojeditablevalue', 'ojs/ojoptgroup', 'ojs/ojoption', 'ojs/ojhighligh
       // will not be shown when there is a value selected.
       // To fix this in oj-combobox-many, we will be setting the placeholder only when there is
       // no value.
-      if (_ComboUtils.isValueForPlaceholder(true, this.getVal()) && _ComboUtils.isValueOptionsForPlaceholder(true, this.getValOpts())) {
-        // Now that we know, there is no value selected, call the superclass' method to
+      // JET-45520 - [jet10] oj-combobox-many: placeholder text is missing is if "required" turned on
+      // A regression from the fix for JET-39650. When the component is in invalid state, the
+      // this.getVal() might not reflect the actual displayValue. So, in those cases we need to
+      // use this.currentValue instead.
+      var isValid = this.ojContext.isValid();
+
+      var isValidValueForPlaceholder = _ComboUtils.isValueForPlaceholder(true, this.getVal()) && _ComboUtils.isValueOptionsForPlaceholder(true, this.getValOpts());
+
+      var isCurrentValueForPlaceholder = _ComboUtils.isValueForPlaceholder(true, this.currentValue) && _ComboUtils.isValueOptionsForPlaceholder(true, this.currentItem);
+
+      if (isValid && isValidValueForPlaceholder || !isValid && isCurrentValueForPlaceholder) {
+        // Now that we know, there are no selected pills, call the superclass' method to
         // apply the placeholder.
-        _OjMultiCombobox.superclass._setPlaceholder.apply(this, arguments);
+        _OjMultiCombobox.superclass._setPlaceholder.apply(this, arguments); // After setting the placeholder, resize the input field to make sure it has proper
+        // width
+
+
+        this._resizeSearch();
       }
     },
     _clearSearch: function _clearSearch() {
@@ -8028,7 +8079,20 @@ define(['ojs/ojeditablevalue', 'ojs/ojoptgroup', 'ojs/ojoption', 'ojs/ojhighligh
         this._onSearchInputHandler(e);
       }));
       this.search.on('input', this._bind(function (e) {
-        if (!this.ojContext._isComposing) {
+        // JET-39086 - raw-value is not getting updated until space in android devices
+        // In android devices, typing in an English word will behave similar to what one
+        // would see when they compose a CJK character in desktop devices. So, we need to
+        // update the raw-value for all the input events in Android devices without considering
+        // composition events so that the property gets updated for each english character and not
+        // only for delimiters. In GBoard all the CJK keyboard layouts directly allow users
+        // to input a CJK character, so we do not need to rely on composition events for that.
+        // In Japanese keyboard, one of the three available layouts uses english chars
+        // to compose a Japanese character in which case circumventing the logic would end up
+        // updating the property with garbage values. But, it is highly unlikely for one to
+        // use this layout as the other two layouts would allow users to directly type in Japanese
+        // characters. So, for now we will not have to worry about composition events in
+        // Android devices.
+        if (!this.ojContext._isComposing || this._isAndroidDevice) {
           this._onSearchInputHandler(e);
         }
       }));

package/dist/js/libs/oj/debug_es5/ojselector.js

@@ -9,7 +9,7 @@ function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || func
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 

package/dist/js/libs/oj/debug_es5/ojset.js

@@ -17,7 +17,7 @@ define(['ojs/ojkeysetimpl'], function (KeySetImpl) {
 
   KeySetImpl = KeySetImpl && Object.prototype.hasOwnProperty.call(KeySetImpl, 'default') ? KeySetImpl['default'] : KeySetImpl;
 
-  var ojSet = /*#__PURE__*/function () {
+  var ojSet = /*#__PURE__*/function (_Symbol$toStringTag) {
     function ojSet(initialKeys) {
       _classCallCheck(this, ojSet);
 
@@ -102,14 +102,14 @@ define(['ojs/ojkeysetimpl'], function (KeySetImpl) {
         return this;
       }
     }, {
-      key: Symbol.toStringTag,
+      key: _Symbol$toStringTag,
       get: function get() {
         return Set[Symbol.toStringTag]();
       }
     }]);
 
     return ojSet;
-  }();
+  }(Symbol.toStringTag);
 
   return ojSet;
 });

package/dist/js/libs/oj/debug_es5/ojstreamlist.js

@@ -7,7 +7,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
 
-function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); }
+function _get() { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(arguments.length < 3 ? target : receiver); } return desc.value; }; } return _get.apply(this, arguments); }
 
 function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
 
@@ -17,7 +17,7 @@ function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || func
 
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
 
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }