@oracle/oraclejet 12.0.1 → 12.0.2

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

@@ -5301,6 +5301,11 @@ var __oj_list_view_metadata =
           y: event.originalEvent.changedTouches[0].pageY
         };
       }
+
+      // mouse down on input element inside item should trigger actionable mode
+      if (this._isInputElement(target.get(0))) {
+        this._enterActionableMode(item);
+      }
     },
 
     /**
@@ -5359,19 +5364,21 @@ var __oj_list_view_metadata =
      * Enters actionable mode
      * @private
      */
-    _enterActionableMode: function () {
-      var current = this.m_active.elem;
+    _enterActionableMode: function (item) {
+      var current = (item === undefined) ? this.m_active.elem : item;
 
-      // in case content has been updated under the cover
-      this.disableAllTabbableElements(current);
+      if (current) {
+        // in case content has been updated under the cover
+        this.disableAllTabbableElements(current);
 
-      // re-enable all tabbable elements
-      this._enableAllTabbableElements(current);
+        // re-enable all tabbable elements
+        this._enableAllTabbableElements(current);
 
-      // only go into actionable mode if there is something to focus
-      var first = current.find('[data-first]');
-      if (first.length > 0) {
-        this._setActionableMode(true);
+        // only go into actionable mode if there is something to focus
+        var first = current.find('[data-first]');
+        if (first.length > 0) {
+          this._setActionableMode(true);
+        }
       }
     },
 
@@ -5383,7 +5390,9 @@ var __oj_list_view_metadata =
       this._setActionableMode(false);
 
       // disable all tabbable elements in the item again
-      this.disableAllTabbableElements(this.m_active.elem);
+      if (this.m_active) {
+        this.disableAllTabbableElements(this.m_active.elem);
+      }
     },
 
     /**
@@ -5424,7 +5433,7 @@ var __oj_list_view_metadata =
           }
 
           if (this._isActionableMode() && this.m_active != null &&
-            this.m_active.elem.get(0) !== item.get(0)) {
+            this.m_active.elem.get(0) !== item.get(0) && !this._isInputElement(target.get(0))) {
             // click on item other than current focus item should exit actionable mode
             this._exitActionableMode();
           }
@@ -5474,12 +5483,6 @@ var __oj_list_view_metadata =
             this._fireActionEvent(item.get(0), event);
           }
 
-          // click on input element inside item should trigger actionable mode
-          if (this._isInputElement(target.get(0))) {
-            this._enterActionableMode();
-            return;
-          }
-
           // clicking on header will expand/collapse item
           this._handleHeaderClick(event, target, item);
         }
@@ -7240,7 +7243,8 @@ var __oj_list_view_metadata =
           }
           current.removeClass('oj-focus-highlight');
         }
-      } else if ((key === ' ' || key === 'Spacebar' || key === this.SPACE_KEY) && this._isSelectionEnabled()) {
+      } else if ((key === ' ' || key === 'Spacebar' || key === this.SPACE_KEY) &&
+        this._isSelectionEnabled() && !this._isInputElement(event.target)) {
         ctrlKey = this._ctrlEquivalent(event);
         shiftKey = event.shiftKey;
         if (shiftKey && !ctrlKey && this.m_selectionFrontier != null &&

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

@@ -1150,12 +1150,7 @@ var __oj_radioset_metadata =
           }
 
           // if readonly, set tabindex and aria-readonly on the wrapper
-          if (this.options.readOnly) {
-            let domElem = this.element[0];
-            let wrapperDom = domElem.querySelector('.oj-radioset-wrapper');
-            wrapperDom.setAttribute('tabindex', this._externalTabIndex);
-            wrapperDom.setAttribute('aria-readonly', 'true');
-          }
+          this._updateReadonlyState();
           this._on(this._events);
           this._setup();
         },
@@ -1854,6 +1849,45 @@ var __oj_radioset_metadata =
 
           this.$radios._ojRadioCheckbox('refreshDisabled');
         },
+
+        /**
+         * Updates the component's state based on whether or not it is in the readonly
+         * state.
+         * @private
+         * @memberof! oj.ojRadioset
+         */
+        _updateReadonlyState: function () {
+          const wrapperDom = this.element[0].querySelector('.oj-radioset-wrapper');
+          if (this.options.readOnly) {
+            wrapperDom.setAttribute('tabindex', this._externalTabIndex);
+            wrapperDom.setAttribute('aria-readonly', 'true');
+            this.element.addClass('oj-read-only');
+
+            // JET-49107 - reassess accessibility implementation of 'readonly' radioset
+            // In readonly mode, we will not have any radio input in the visible DOM. Thus,
+            // in this state it will just be showing generic text based on the value selected.
+            // So, we need to clean up the role along with the aria-labelledby attributes we added
+            // for that role to make things accessible.
+            this.element.removeAttr('role').removeAttr('aria-labelledby');
+            return;
+          }
+
+          // remove tabindex and role
+          wrapperDom.removeAttribute('tabindex');
+          wrapperDom.removeAttribute('aria-readonly');
+          this.element.removeClass('oj-read-only');
+
+          // JET-49107 - reassess accessibility implementation of 'readonly' radioset
+          // add back the role and aria attributes removed before
+          this.element.attr('role', 'radiogroup');
+          this._labelledByUpdatedForSet(
+            this.widget()[0].id,
+            null,
+            this.options.labelledBy,
+            this.widget()
+          );
+        },
+
         /**
          * Note that _setOption does not get called during create in the super class.
          * It only gets called when the component has already been created.
@@ -1870,18 +1904,8 @@ var __oj_radioset_metadata =
               this._propagateDisabled(value);
               break;
             case 'readOnly':
-              var wrapperDom = this.element[0].querySelector('.oj-radioset-wrapper');
               var val = this.options.value;
-              if (value) {
-                wrapperDom.setAttribute('tabindex', this._externalTabIndex);
-                wrapperDom.setAttribute('aria-readonly', 'true');
-                this.element.addClass('oj-read-only');
-              } else {
-                // remove tabindex and role
-                wrapperDom.removeAttribute('tabindex');
-                wrapperDom.removeAttribute('aria-readonly');
-                this.element.removeClass('oj-read-only');
-              }
+              this._updateReadonlyState();
               this._ResetComponentState();
               // when toggle readonly to false, we need to check the initial set values.
               if (val != null) {

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

@@ -2723,11 +2723,12 @@ var __oj_row_expander_metadata =
        * @private
        * @memberof oj.ojRowExpander
        */
-      _releaseResources: function () {
+       _releaseResources: function () {
         this.component.element[0].removeEventListener('keydown', this.handleKeyDownCallback, true);
-        this.toucharea.removeEventListener('touchend', this._touchEndListener);
-        this.toucharea.removeEventListener('click', this._clickListener);
-        this.element[0].removeEventListener('keypress', this._keyPressListener);
+        this.toucharea.removeEventListener('touchend', this.handleTouchEndCallback);
+        this.toucharea.removeEventListener('click', this.handleClickCallback);
+        this.element[0].removeEventListener('keypress', this.handleKeyPressCallback);
+
 
         if (this.component._IsCustomElement()) {
           $(this.component.element).off('ojBeforeCurrentCell', this.handleActiveKeyChangeCallback);
@@ -2767,7 +2768,7 @@ var __oj_row_expander_metadata =
       * @memberof oj.ojRowExpander
       * @private
       */
-      _setupResources: function () {
+       _setupResources: function () {
         if (!this._subscribed && this._isDataProvider()) {
           this._subscribeToDataProvider();
           this._subscribed = true;
@@ -2776,9 +2777,14 @@ var __oj_row_expander_metadata =
         this.handleKeyDownCallback = this._handleKeyDownEvent.bind(this);
         this.component.element[0].addEventListener('keydown', this.handleKeyDownCallback, true);
         if (this.iconState === 'expanded' || this.iconState === 'collapsed') {
-          this.toucharea.addEventListener('touchend', this._touchEndListener.bind(this));
-          this.toucharea.addEventListener('click', this._clickListener.bind(this));
-          this.element[0].addEventListener('keypress', this._keyPressListener.bind(this));
+          this.handleTouchEndCallback = this._touchEndListener.bind(this);
+          this.toucharea.addEventListener('touchend', this.handleTouchEndCallback);
+
+          this.handleClickCallback = this._clickListener.bind(this);
+          this.toucharea.addEventListener('click', this.handleClickCallback);
+
+          this.handleKeyPressCallback = this._keyPressListener.bind(this);
+          this.element[0].addEventListener('keypress', this.handleKeyPressCallback);
 
           // listens for expand and collapse event from flattened datasource
           // this could be due to user clicks, keyboard shortcuts or programmatically

package/dist/js/libs/oj/debug/ojvalidator-datetimerange.js

@@ -186,9 +186,6 @@ define(['ojs/ojcore', 'ojs/ojtranslation', 'ojs/ojvalidator', 'ojs/ojvalidation-
     }
 
     var processValidation = function (converter) {
-      // verify value, min, and max are of the same type and not mixed with date/time and time only.
-      // throws an error if they are not
-      converterUtils._verifyValueMinMax(value, min, max);
       if (min) {
         min = converterUtils._minMaxIsoString(min, value);
         minStr = converter ? converter.format(min) : min;

package/dist/js/libs/oj/debug_esm/ojcheckboxset.js

@@ -1177,11 +1177,7 @@ var __oj_checkboxset_metadata =
         }
 
         // if readonly, set tabindex on the wrapper
-        if (this.options.readOnly) {
-          let domElem = this.element[0];
-          let wrapperDom = domElem.querySelector('.oj-checkboxset-wrapper');
-          wrapperDom.setAttribute('tabindex', this._externalTabIndex);
-        }
+        this._updateReadonlyState();
         this._on(this._events);
         this._setup();
       },
@@ -2062,6 +2058,43 @@ var __oj_checkboxset_metadata =
 
         this.$checkboxes._ojRadioCheckbox('refreshDisabled'); // re-render disabled
       },
+
+      /**
+       * Updates the component's state based on whether or not it is in the readonly
+       * state.
+       * @private
+       * @memberof! oj.ojCheckboxSet
+       */
+       _updateReadonlyState: function () {
+        const wrapperDom = this.element[0].querySelector('.oj-checkboxset-wrapper');
+        if (this.options.readOnly) {
+          wrapperDom.setAttribute('tabindex', this._externalTabIndex);
+          this.element.addClass('oj-read-only');
+
+          // JET-49297 - reassess accessibility implementation of 'readonly' checkboxset
+          // In readonly mode, we will not have any checkbox input in the visible DOM. Thus,
+          // in this state it will just be showing generic text based on the value selected.
+          // So, we need to clean up the role along with the aria-labelledby attributes we added
+          // for that role to make things accessible.
+          this.element.removeAttr('role').removeAttr('aria-labelledby');
+          return;
+        }
+
+        // remove tabindex and role
+        wrapperDom.removeAttribute('tabindex');
+        this.element.removeClass('oj-read-only');
+
+        // JET-49297 - reassess accessibility implementation of 'readonly' checkboxset
+        // add back the role and aria attributes removed before
+        this.element.attr('role', 'group');
+        this._labelledByUpdatedForSet(
+          this.widget()[0].id,
+          null,
+          this.options.labelledBy,
+          this.widget()
+        );
+      },
+
   /**
    * @override
    * @private
@@ -2077,17 +2110,8 @@ var __oj_checkboxset_metadata =
             break;
           case 'readOnly':
             this.options.readOnly = !!value;
-            var wrapperDom = this.element[0].querySelector('.oj-checkboxset-wrapper');
             var val = this.options.value;
-            if (this.options.readOnly) {
-              wrapperDom.setAttribute('tabindex', this._externalTabIndex);
-              this.element.addClass('oj-read-only');
-            } else {
-              // remove tabindex and role
-              wrapperDom.removeAttribute('tabindex');
-              // remove oj-read-only class
-              this.element.removeClass('oj-read-only');
-            }
+            this._updateReadonlyState();
             this._ResetComponentState();
             // when toggle readonly to false, we need to check the initial set values.
             if (val != null) {

package/dist/js/libs/oj/debug_esm/ojconverter-nativedatetime.js

@@ -578,10 +578,10 @@ NativeDateTimeConstants._dateTimeFormats = {
         short: { year: 'y', month_s: 'M', month_m: 'MMM', day: 'd' }
     },
     timeStyle: {
-        full: { hour: 'h', minute: 'm', second: 's', timeZoneName: 'zzzz' },
-        long: { hour: 'h', minute: 'm', second: 's', timeZoneName: 'z' },
-        medium: { hour: 'h', minute: 'm', second: 's' },
-        short: { hour: 'h', minute: 'm' }
+        full: { hour: 'h', minute: 'mm', second: 'ss', timeZoneName: 'zzzz' },
+        long: { hour: 'h', minute: 'mm', second: 'ss', timeZoneName: 'z' },
+        medium: { hour: 'h', minute: 'mm', second: 'ss' },
+        short: { hour: 'h', minute: 'mm' }
     }
 };
 NativeDateTimeConstants._ALPHA_REGEXP = /([a-zA-Z]+)/;

package/dist/js/libs/oj/debug_esm/ojconverterutils-i18n.js

@@ -10,7 +10,6 @@ import { getTranslatedString } from 'ojs/ojtranslation';
 import $ from 'jquery';
 import ConverterUtils from 'ojs/ojconverterutils';
 import { ConverterError } from 'ojs/ojvalidation-error';
-import { warn } from 'ojs/ojlogger';
 
 /*
  DESCRIPTION
@@ -1213,44 +1212,10 @@ IntlConverterUtils._getISOStrFormatType = function (isoStr) {
   return OraI18nUtils.getISOStrFormatType(isoStr);
 };
 
-/**
- * Will issue a warning if the ISO string value has a time portion specified.  For input date, we only
- * want the date portion of the ISO string specified.  We pass in a logger function so that this function
- * can be tested by providing an alternate function.  See pattern library for useControlledVariantWarning
- * @param {string} name The name is used for logging purposes only
- * @param {string} value The iSO string value to be tested
- * @param {function} logger The method used to log the warning
- * @memberof oj.IntlConverterUtils
- * @method _warnIfISOFormatHasTime
- * @private
- */
-IntlConverterUtils._warnIfISOFormatHasTime = function (name, value, logger = warn) {
-  if (value && value.indexOf('T') !== -1) {
-    logger(`${name} iso string value should not include a time value for oj-input-date component.`);
-  }
-};
 
 /**
- * This method will verify that the value, min, and max iso strings
- * contain no time component, and issue warnings if they do, and then
- * call _verifyValueMinMax to verify the time portion if the iso string.
- * @param {string} value iso string value for the component value
- * @param {string} min iso string value for the min property
- * @param {string} max iso string value for the max property
- */
-IntlConverterUtils._verifyValueMinMaxNoTime = function (value, min, max) {
-  // call _warnIfISOFormatHasTime for each parameter
-  Object.entries({ value, min, max }).forEach(
-    ([k, v]) => IntlConverterUtils._warnIfISOFormatHasTime(k, v));
-
-  IntlConverterUtils._verifyValueMinMax(value, min, max);
-};
-
-/**
- * Checks that min and max are parseable isoStrings, and that they
- * are the same type as each other and as the value option.
- * Logs a warning if value, min, max are not all iso strings, or are not of the same type.
- * In a future release this will throw an error.
+ * Checks that min and max and value are parseable isoStrings,
+ * Logs a warning if value, min, max are not all iso strings.
  *
  * @throws {Error} if value, min, max are not all iso strings, or are not of the same type.
  * @param {string} value
@@ -1264,10 +1229,6 @@ IntlConverterUtils._verifyValueMinMaxNoTime = function (value, min, max) {
  * @private
  */
  IntlConverterUtils._verifyValueMinMax = function (value, min, max) {
-  let valueIsoFormat;
-  let minIsoFormat;
-  let maxIsoFormat;
-
   // If value or min or max is not an iso string (say 'abc' or '2021/03/03'),
   // the datepicker renders, but you see an inline converter error meant only for an application
   // developer under the field, 'Please provide valid ISO 8601 string'.
@@ -1275,54 +1236,18 @@ IntlConverterUtils._verifyValueMinMaxNoTime = function (value, min, max) {
   // ** e.g., set oj-input-number value='abc' and an error is thrown in the console.
   // In v11 we logged the warning and monitored FA tests for this warning. After six months or so
   // we saw no warnings and so now in v12 we will throw an error.
-  if (value) {
-    try {
-      valueIsoFormat = IntlConverterUtils._getISOStrFormatType(value);
-    } catch (e) {
-      // We weren't checking this in pre-v11.
-      throw new Error('value must be an iso string: ' + e);
-    }
-  }
 
-  if (min) {
-    try {
-      minIsoFormat = IntlConverterUtils._getISOStrFormatType(min);
-    } catch (e) {
-      throw new Error('min must be an iso string: ' + e);
-    }
-  }
-
-  if (max) {
-    try {
-      maxIsoFormat = IntlConverterUtils._getISOStrFormatType(max);
-    } catch (e) {
-      throw new Error('max must be an iso string: ' + e);
-    }
-  }
-
-  // Issue two is.
-  // If value and min and max are not of the same iso string type: zulu, offset, or local,
-  // we coerced to the same type so that we could easily compare them,
-  // like min <= value <= max. In v11, we warned. In v12 we throw an error
-  // if they are not of the same type,
-
-  if (value && min && max &&
-    !(valueIsoFormat === minIsoFormat && valueIsoFormat === maxIsoFormat)) {
-    throw new Error(`min and max must be in the same iso string format as value.
-    value is in ${valueIsoFormat} format.`);
-  }
-  if (value && min && !(valueIsoFormat === minIsoFormat)) {
-    throw new Error(`min must be in the same iso string format as value.
-    value is in ${valueIsoFormat} format.`);
-  }
-  if (value && max && !(valueIsoFormat === maxIsoFormat)) {
-    throw new Error(`max must be in the same iso string format as value.
-      value is in ${valueIsoFormat} format.`);
-  }
-  if (min && max && !(minIsoFormat === maxIsoFormat)) {
-    throw new Error(`min and max must be in the same iso string format.
-      min is in ${minIsoFormat} format and max is in ${maxIsoFormat} format.`);
-  }
+  Object.entries({ value, min, max }).forEach(
+    ([k, v]) => {
+      if (v) {
+        try {
+          IntlConverterUtils._getISOStrFormatType(v);
+        } catch (e) {
+          // We weren't checking this in pre-v11.
+          throw new Error(`${k} must be an iso string: ${e}`);
+        }
+      }
+    });
 };
 
 /**

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

@@ -37,12 +37,12 @@ const oj = {
    * @global
    * @member {string} version JET version numberr
    */
-  version: '12.0.1',
+  version: '12.0.2',
   /**
    * @global
    * @member {string} revision JET source code revision number
    */
-  revision: '2022-02-16_11-15-51',
+  revision: '2022-03-10_18-27-13',
 
   // 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_esm/ojdatagrid.js

@@ -20617,7 +20617,8 @@ DvtDataGrid.prototype._resizeSelectedHeaders = function (event, oldWidth, oldHei
     allowResizeWithinSelection = true;
   }
   let selectedHeaders;
-  if (this.m_selection && this.m_selection.length && allowResizeWithinSelection) {
+  if (this.m_selection && this.m_selection.length && allowResizeWithinSelection &&
+      !this.m_discontiguousSelection) {
     selectedHeaders = this._getHeadersWithinSelection(this.m_selection[0],
                                   resizingElementIndex, resizingElementAxis);
   }
@@ -20630,10 +20631,9 @@ DvtDataGrid.prototype._resizeSelectedHeaders = function (event, oldWidth, oldHei
         } else {
           this.resizeRowHeight(this.getElementDir(selectedHeaders[i], 'height'), newHeight);
         }
-        // set the information we want to callback with in the resize event and callback
-
-        this._fireResizeEvent(event, oldWidth, oldHeight, newWidth, newHeight, size);
       }
+      // set the information we want to callback with in the resize event and callback
+      this._fireResizeEvent(event, oldWidth, oldHeight, newWidth, newHeight, size);
     }
   } else {
     if (resizeHeaderMode === 'column') {
@@ -20682,10 +20682,7 @@ DvtDataGrid.prototype.handleResizeMouseUp = function (event) {
     if (newWidth !== this.m_orginalResizeDimensions.width ||
         newHeight !== this.m_orginalResizeDimensions.height) {
       if (this.m_cursor === 'col-resize' || this.m_cursor === 'row-resize') {
-        if (this._isSelectionEnabled() && this.isMultipleSelection() &&
-          this.m_selection.length && !this.m_discontiguousSelection) {
-          this._resizeSelectedHeaders(event, oldWidth, oldHeight, newWidth, newHeight, size);
-        }
+        this._resizeSelectedHeaders(event, oldWidth, oldHeight, newWidth, newHeight, size);
       }
     }