@oracle/oraclejet 14.1.6 → 14.1.7

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

@@ -333,7 +333,7 @@
   visibility: hidden; }
 
 .oj-theme-json {
-  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v14.1.6"}' !important; }
+  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v14.1.7"}' !important; }
 
 .oj-helper-hidden-accessible {
   border: 0;

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

@@ -194,33 +194,7 @@ define(['exports', 'ojs/ojcore-base', 'ojs/ojhtmlutils', 'ojs/ojlogger', 'ojs/oj
           vmContext
         ]) || Promise.resolve(true);
 
-      var bridge = this;
-      return activatedPromise.then(function () {
-        var params = {
-          props: bridge._PROPS,
-          slotMap: slotMap,
-          slotNodeCounts: slotNodeCounts,
-          unique: bridge._VM_CONTEXT.unique,
-          uniqueId: bridge._VM_CONTEXT.uniqueId,
-          viewModel: bridge._VIEW_MODEL,
-          viewModelContext: bridge._VM_CONTEXT
-        };
-
-        // Store the name of the binding provider on the element when we are about
-        // to insert the view. This will allow custom elements within the view to look
-        // up the binding provider used by the composite (currently only KO).
-        // eslint-disable-next-line no-param-reassign
-        element[ojcustomelementUtils.CHILD_BINDING_PROVIDER] = 'knockout';
-        // For upstream or indirect dependency we will still rely components being registered on the oj namespace.
-        if (oj.Components) {
-          oj.Components.unmarkPendingSubtreeHidden(element);
-        }
-
-        var cache = ojcustomelementRegistry.getElementRegistration(element.tagName).cache;
-        // Need to clone nodes first
-        var view = CompositeElementBridge._getDomNodes(cache.view, element);
-        oj.CompositeTemplateRenderer.renderTemplate(params, element, view);
-      });
+      return activatedPromise.then(() => this._processCompositeTemplate(element));
     },
 
     DefineMethodCallback: function (proto, method, methodMeta) {
@@ -350,9 +324,16 @@ define(['exports', 'ojs/ojcore-base', 'ojs/ojhtmlutils', 'ojs/ojlogger', 'ojs/oj
       // Invoke callback on the superclass
       oj.BaseCustomElementBridge.proto.HandleReattached.call(this, element);
 
-      oj.CompositeTemplateRenderer.invokeViewModelMethod(element, this._VIEW_MODEL, 'connected', [
-        this._VM_CONTEXT
-      ]);
+      // Check if the template was not rendered and render it if it is the case.
+      // The connected callback will be called by CompositeTemplateRenderer.renderTemplate().
+      if (this._delayedTemplateRender) {
+        this._delayedTemplateRender = false;
+        this._processCompositeTemplate(element);
+      } else {
+        oj.CompositeTemplateRenderer.invokeViewModelMethod(element, this._VIEW_MODEL, 'connected', [
+          this._VM_CONTEXT
+        ]);
+      }
     },
 
     InitializeElement: function (element) {
@@ -559,6 +540,43 @@ define(['exports', 'ojs/ojcore-base', 'ojs/ojhtmlutils', 'ojs/ojlogger', 'ojs/oj
         throw new ojcustomelementUtils.JetElementError(this._ELEMENT, 'Cannot access methods before element is upgraded.');
       }
       return this._VIEW_MODEL;
+    },
+
+    _processCompositeTemplate: function (element) {
+      // Skip rendering the composite template since the it is not attached to the DOM.
+      // The template will be rendered if and when the component will be reattached.
+      // See HandleReattached().
+      if (!element.isConnected) {
+        this._delayedTemplateRender = true;
+        return;
+      }
+
+      const state = ojcustomelementUtils.CustomElementUtils.getElementState(element);
+      const slotMap = state.getSlotMap();
+      const params = {
+        props: this._PROPS,
+        slotMap: slotMap,
+        slotNodeCounts: this._VM_CONTEXT.slotCounts,
+        unique: this._VM_CONTEXT.unique,
+        uniqueId: this._VM_CONTEXT.uniqueId,
+        viewModel: this._VIEW_MODEL,
+        viewModelContext: this._VM_CONTEXT
+      };
+
+      // Store the name of the binding provider on the element when we are about
+      // to insert the view. This will allow custom elements within the view to look
+      // up the binding provider used by the composite (currently only KO).
+      // eslint-disable-next-line no-param-reassign
+      element[ojcustomelementUtils.CHILD_BINDING_PROVIDER] = 'knockout';
+      // For upstream or indirect dependency we will still rely components being registered on the oj namespace.
+      if (oj.Components) {
+        oj.Components.unmarkPendingSubtreeHidden(element);
+      }
+
+      const cache = ojcustomelementRegistry.getElementRegistration(element.tagName).cache;
+      // Need to clone nodes first
+      const view = CompositeElementBridge._getDomNodes(cache.view, element);
+      oj.CompositeTemplateRenderer.renderTemplate(params, element, view);
     }
   });
 

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: '14.1.6',
+    version: '14.1.7',
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2023-08-03_12-24-25',
+    revision: '2023-08-22_08-44-22',
 
     // 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

@@ -30950,7 +30950,10 @@ var __oj_data_grid_metadata =
    * @private
    */
   DvtDataGrid.prototype._isDisclosureIcon = function (target) {
-    return this.m_utils.containsCSSClassName(target, this.getMappedStyle('icon'));
+    return (
+      this.m_utils.containsCSSClassName(target, this.getMappedStyle('icon')) &&
+      this.m_utils.containsCSSClassName(target.parentElement, this.getMappedStyle('disclosureIcon'))
+    );
   };
 
   /**
@@ -30959,7 +30962,7 @@ var __oj_data_grid_metadata =
    * @private
    */
   DvtDataGrid.prototype._getDisclosureIcon = function (target) {
-    const isDisclosureIcon = this.m_utils.containsCSSClassName(target, this.getMappedStyle('icon'));
+    const isDisclosureIcon = this._isDisclosureIcon(target);
     if (isDisclosureIcon) {
       return target;
     }
@@ -35793,17 +35796,17 @@ var __oj_data_grid_metadata =
     _SetupResources: function () {
       // adds context menu gesture support
       this._super();
-      this.setupResources();
+      this.setupResources(!this._isCreate);
     },
 
     /**
      * @memberof oj.ojDataGrid
      * @private
      */
-    setupResources: function () {
+    setupResources: function (requiresRefresh) {
       if (this.datasource != null) {
         // sets the data source event listeners
-        if (!this._isCreate) {
+        if (!requiresRefresh) {
           this.grid._addDataSourceEventListeners();
         }
 
@@ -35813,7 +35816,9 @@ var __oj_data_grid_metadata =
         // register a resize listener
         this._registerResizeListener(this.root);
       }
-
+      if (requiresRefresh) {
+        this.refresh();
+      }
       this._isCreate = false;
     },
 
@@ -35845,6 +35850,8 @@ var __oj_data_grid_metadata =
       this._unregisterResizeListener(this.root);
 
       this.contextMenuEvent = null;
+
+      this._removeAllChildren();
     },
 
     _registerEventListeners: function () {
@@ -35938,10 +35945,9 @@ var __oj_data_grid_metadata =
 
       // unregister existing listeners
       if (shouldResetContextMenuListeners) {
-        this._ReleaseResources();
-      } else {
-        this.releaseResources();
+        this._ReleaseContextMenu();
       }
+      this.releaseResources();
 
       this._removeAllChildren();
 
@@ -35974,10 +35980,9 @@ var __oj_data_grid_metadata =
       // addListeners back in before rendering, including context menu
       // unregister existing listeners
       if (shouldResetContextMenuListeners) {
-        this._SetupResources();
-      } else {
-        this.setupResources();
+        this._SetupContextMenu();
       }
+      this.setupResources(false);
 
       // so long as the visibility property is not 'render', overwrite it with
       // a refresh and try to refresh the grid
@@ -36147,6 +36152,16 @@ var __oj_data_grid_metadata =
       }
     },
 
+    /**
+     * Override to do the delay connect/disconnect
+     * @memberof oj.ojDataGrid
+     * @override
+     * @protected
+     */
+    _VerifyConnectedForSetup: function () {
+      return true;
+    },
+
     /**
      * Determine if the entire datagrid should refresh based on which options are updated.
      * @param {Object} options the options object

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

@@ -6271,8 +6271,12 @@ var __oj_input_date_time_metadata =
       }
     },
 
+    // If the inputConverter is not one with isoStrFormat offset, then create a new converter
+    // based on the options of the inputConverter but with isoStrFormat: 'offset'.
     _createOffsetConverter: function (inputConverter) {
       var resolvedOptions = inputConverter.resolvedOptions();
+      const isoStrFormat = resolvedOptions.isoStrFormat;
+      if (isoStrFormat === 'offset') return inputConverter;
       var options = {};
       $.extend(options, resolvedOptions, { isoStrFormat: 'offset' });
       return new ojconverterDatetime.IntlDateTimeConverter(options);
@@ -11304,17 +11308,6 @@ var __oj_input_date_time_metadata =
    * var node = myInputTime.getNodeBySubId( {'subId': 'oj-timepicker-now'} );
    */
 
-  /**
-   *
-   * @private
-   */
-  var dateSwitcherConverter;
-
-  /**
-   * @private
-   */
-  var timeSwitcherConverter;
-
   var _defaultOptions$2 = ThemeUtils.parseJSONFromFontFamily('oj-inputdatetime-option-defaults') || {};
   var _yearFormat$1 = _defaultOptions$2.converterYear || 'numeric';
   var _sDefaultDateTimeConverter;
@@ -12378,9 +12371,14 @@ var __oj_input_date_time_metadata =
                 newVal = self._switcherDateValue;
               } else {
                 // dateIso could be this._switcherDateValue, this.options.value, or this._getDefaultIsoDate();
+                // if local, don't change it
                 const dateIso = self._getDateIso();
-                const converter = self._GetConverter();
-                newVal = self._parseValueToSubstituteDateOrTimePiece(converter, dateIso);
+                if (dateIso && ojconverterutilsI18n.IntlConverterUtils._getISOStrFormatType(dateIso) === 'local') {
+                  newVal = dateIso;
+                } else {
+                  const converter = self._GetConverter();
+                  newVal = self._parseValueToSubstituteDateOrTimePiece(converter, dateIso);
+                }
               }
 
               // If the user changed the time in the datetime picker, we will
@@ -12796,40 +12794,44 @@ var __oj_input_date_time_metadata =
     },
 
     /**
+     * In the UI, the switcher text shows the date when the timepicker is up and it shows the time when the
+     * datepicker is up.
      * @ignore
      */
     _updateSwitcherText: function () {
       if (!this._switcherDiv) {
         return;
       }
-      // create a converter to format the picker text
-      if (!dateSwitcherConverter) {
-        dateSwitcherConverter = new ojconverterDatetime.IntlDateTimeConverter({
+      var switcherText = '';
+      if (this._isShowingDatePickerSwitcher()) {
+        // create the date switcher converter we use to format the switcher text
+        // copy timezone and isoStrFormat from the component's converter.
+        const componentConverter = this._GetConverter();
+        const timeZone = _getConverterTimezone(componentConverter);
+        const isoStrFormat = componentConverter.resolvedOptions().isoStrFormat;
+        const dateSwitcherConverter = new ojconverterDatetime.IntlDateTimeConverter({
           day: '2-digit',
           month: '2-digit',
-          year: _yearFormat$1
+          year: _yearFormat$1,
+          timeZone,
+          isoStrFormat
         });
-      }
-      var switcherText = '';
-      if (this._isShowingDatePickerSwitcher()) {
         try {
           switcherText = dateSwitcherConverter.format(this._switcherDateValue || this._getDateIso());
         } catch (e) {
           switcherText = dateSwitcherConverter.format(this._getDefaultIsoDate());
         }
       } else {
-        // create a converter to format the picker text
-        if (!timeSwitcherConverter) {
-          timeSwitcherConverter = new ojconverterDatetime.IntlDateTimeConverter({
-            hour: '2-digit',
-            minute: '2-digit'
-          });
-        }
         try {
           switcherText = this._getTimePickerConverter().format(
             this._switcherTimeValue || this._getDateIso()
           );
         } catch (e) {
+          // create a converter to format the picker text
+          const timeSwitcherConverter = new ojconverterDatetime.IntlDateTimeConverter({
+            hour: '2-digit',
+            minute: '2-digit'
+          });
           switcherText = timeSwitcherConverter.format(this._getDefaultIsoDate());
         }
       }

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

@@ -883,6 +883,9 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget'], function
                         const mappedFilterCriterion = this._getMappedFilterCriterion(params[ListDataProviderView._FILTERCRITERION]);
                         this._filterResult(mappedFilterCriterion, items);
                     }
+                    if (nextResult.done && items.length > 0) {
+                        cachedData[ListDataProviderView._LASTDONEHASDATA] = true;
+                    }
                     const mappedResult = this._getMappedItems(items);
                     this._cacheResult(cachedData, mappedResult);
                     cachedData[ListDataProviderView._DONE] = nextResult[ListDataProviderView._DONE];
@@ -905,9 +908,6 @@ define(['ojs/ojcore-base', 'ojs/ojdataprovider', 'ojs/ojeventtarget'], function
                 if (data.length === 0) {
                     isDone = true;
                 }
-                else {
-                    cachedData[ListDataProviderView._LASTDONEHASDATA] = true;
-                }
             }
             if (isDone) {
                 return Promise.resolve(new this.AsyncIteratorReturnResult(this, new this.FetchListResult(this, params, data, metadata, totalFilteredRowCount)));

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

@@ -1260,6 +1260,7 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
         this._super();
         this._initRender();
         this._render();
+        this._isInitFetch = true;
       },
       // @inheritdoc
       _CompareOptionValues: function (option, value1, value2) {
@@ -4205,6 +4206,10 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
         this._super();
         this._refreshId += 1;
 
+        if (this._getItemTemplate() != null) {
+          this._cleanTemplateNodes(this._getRoot());
+        }
+
         delete this.m_template;
         delete this.m_engine;
         delete this.m_dataSource;
@@ -4397,16 +4402,42 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
       _SetupResources: function () {
         this._super();
         this._addDataProviderEventListeners();
+        if (this._isInitFetch) {
+          this._isInitFetch = false;
+        } else {
+          this.refresh();
+        }
       },
       _ReleaseResources: function () {
         this._super();
+        if (this._getItemTemplate() != null) {
+          this._cleanTemplateNodes(this._getRoot());
+        }
         this._removeDataProviderEventListeners();
       },
+      /**
+       * Override to do the delay connect/disconnect
+       * @memberof oj.ojTreeView
+       * @override
+       * @protected
+       */
+      _VerifyConnectedForSetup: function () {
+        return true;
+      },
       // @inheritdoc
       _destroy: function () {
+        if (this._getItemTemplate() != null) {
+          this._cleanTemplateNodes(this._getRoot());
+        }
         this._removeDataProviderEventListeners();
         this._super();
       },
+      _cleanTemplateNodes: function (node) {
+        const templateEngine = this._getTemplateEngine();
+        if (node != null && templateEngine != null) {
+          templateEngine.clean(node);
+        }
+      },
       _addDataProviderEventListeners: function () {
         var dataProvider = this.options.data;
         if (dataProvider && oj.DataProviderFeatureChecker.isTreeDataProvider(dataProvider)) {
@@ -4659,6 +4690,7 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
           var subtree = elem.parentNode;
           if (!oj.KeyUtils.equals(key, savedParentKey)) {
             subtree.removeChild(elem);
+            this._cleanTemplateNodes(elem);
             this._keyList.delete(key);
             if (!reorder) {
               removedKeys.push(key);

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

@@ -11,7 +11,7 @@ import { info, warn } from 'ojs/ojlogger';
 import { getDefaultValue } from 'ojs/ojmetadatautils';
 import 'ojs/ojcomposite-knockout';
 import 'ojs/ojcustomelement';
-import { ElementState, CustomElementUtils, ElementUtils, CHILD_BINDING_PROVIDER, transformPreactValue, JetElementError } from 'ojs/ojcustomelement-utils';
+import { ElementState, CustomElementUtils, ElementUtils, transformPreactValue, JetElementError, CHILD_BINDING_PROVIDER } from 'ojs/ojcustomelement-utils';
 import { getElementDescriptor, getElementRegistration, registerElement, isElementRegistered, isComposite } from 'ojs/ojcustomelement-registry';
 
 const CompositeInternal = {};
@@ -199,33 +199,7 @@ oj.CollectionUtils.copyInto(CompositeElementBridge.proto, {
         vmContext
       ]) || Promise.resolve(true);
 
-    var bridge = this;
-    return activatedPromise.then(function () {
-      var params = {
-        props: bridge._PROPS,
-        slotMap: slotMap,
-        slotNodeCounts: slotNodeCounts,
-        unique: bridge._VM_CONTEXT.unique,
-        uniqueId: bridge._VM_CONTEXT.uniqueId,
-        viewModel: bridge._VIEW_MODEL,
-        viewModelContext: bridge._VM_CONTEXT
-      };
-
-      // Store the name of the binding provider on the element when we are about
-      // to insert the view. This will allow custom elements within the view to look
-      // up the binding provider used by the composite (currently only KO).
-      // eslint-disable-next-line no-param-reassign
-      element[CHILD_BINDING_PROVIDER] = 'knockout';
-      // For upstream or indirect dependency we will still rely components being registered on the oj namespace.
-      if (oj.Components) {
-        oj.Components.unmarkPendingSubtreeHidden(element);
-      }
-
-      var cache = getElementRegistration(element.tagName).cache;
-      // Need to clone nodes first
-      var view = CompositeElementBridge._getDomNodes(cache.view, element);
-      oj.CompositeTemplateRenderer.renderTemplate(params, element, view);
-    });
+    return activatedPromise.then(() => this._processCompositeTemplate(element));
   },
 
   DefineMethodCallback: function (proto, method, methodMeta) {
@@ -355,9 +329,16 @@ oj.CollectionUtils.copyInto(CompositeElementBridge.proto, {
     // Invoke callback on the superclass
     oj.BaseCustomElementBridge.proto.HandleReattached.call(this, element);
 
-    oj.CompositeTemplateRenderer.invokeViewModelMethod(element, this._VIEW_MODEL, 'connected', [
-      this._VM_CONTEXT
-    ]);
+    // Check if the template was not rendered and render it if it is the case.
+    // The connected callback will be called by CompositeTemplateRenderer.renderTemplate().
+    if (this._delayedTemplateRender) {
+      this._delayedTemplateRender = false;
+      this._processCompositeTemplate(element);
+    } else {
+      oj.CompositeTemplateRenderer.invokeViewModelMethod(element, this._VIEW_MODEL, 'connected', [
+        this._VM_CONTEXT
+      ]);
+    }
   },
 
   InitializeElement: function (element) {
@@ -564,6 +545,43 @@ oj.CollectionUtils.copyInto(CompositeElementBridge.proto, {
       throw new JetElementError(this._ELEMENT, 'Cannot access methods before element is upgraded.');
     }
     return this._VIEW_MODEL;
+  },
+
+  _processCompositeTemplate: function (element) {
+    // Skip rendering the composite template since the it is not attached to the DOM.
+    // The template will be rendered if and when the component will be reattached.
+    // See HandleReattached().
+    if (!element.isConnected) {
+      this._delayedTemplateRender = true;
+      return;
+    }
+
+    const state = CustomElementUtils.getElementState(element);
+    const slotMap = state.getSlotMap();
+    const params = {
+      props: this._PROPS,
+      slotMap: slotMap,
+      slotNodeCounts: this._VM_CONTEXT.slotCounts,
+      unique: this._VM_CONTEXT.unique,
+      uniqueId: this._VM_CONTEXT.uniqueId,
+      viewModel: this._VIEW_MODEL,
+      viewModelContext: this._VM_CONTEXT
+    };
+
+    // Store the name of the binding provider on the element when we are about
+    // to insert the view. This will allow custom elements within the view to look
+    // up the binding provider used by the composite (currently only KO).
+    // eslint-disable-next-line no-param-reassign
+    element[CHILD_BINDING_PROVIDER] = 'knockout';
+    // For upstream or indirect dependency we will still rely components being registered on the oj namespace.
+    if (oj.Components) {
+      oj.Components.unmarkPendingSubtreeHidden(element);
+    }
+
+    const cache = getElementRegistration(element.tagName).cache;
+    // Need to clone nodes first
+    const view = CompositeElementBridge._getDomNodes(cache.view, element);
+    oj.CompositeTemplateRenderer.renderTemplate(params, element, view);
   }
 });
 

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

@@ -37,12 +37,12 @@ const oj = {
    * @global
    * @member {string} version JET version numberr
    */
-  version: '14.1.6',
+  version: '14.1.7',
   /**
    * @global
    * @member {string} revision JET source code revision number
    */
-  revision: '2023-08-03_12-24-25',
+  revision: '2023-08-22_08-44-22',
 
   // 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

@@ -30966,7 +30966,10 @@ DvtDataGrid.prototype._handleDisclosureMouseOut = function (event) {
  * @private
  */
 DvtDataGrid.prototype._isDisclosureIcon = function (target) {
-  return this.m_utils.containsCSSClassName(target, this.getMappedStyle('icon'));
+  return (
+    this.m_utils.containsCSSClassName(target, this.getMappedStyle('icon')) &&
+    this.m_utils.containsCSSClassName(target.parentElement, this.getMappedStyle('disclosureIcon'))
+  );
 };
 
 /**
@@ -30975,7 +30978,7 @@ DvtDataGrid.prototype._isDisclosureIcon = function (target) {
  * @private
  */
 DvtDataGrid.prototype._getDisclosureIcon = function (target) {
-  const isDisclosureIcon = this.m_utils.containsCSSClassName(target, this.getMappedStyle('icon'));
+  const isDisclosureIcon = this._isDisclosureIcon(target);
   if (isDisclosureIcon) {
     return target;
   }
@@ -35809,17 +35812,17 @@ oj.__registerWidget('oj.ojDataGrid', $.oj.baseComponent, {
   _SetupResources: function () {
     // adds context menu gesture support
     this._super();
-    this.setupResources();
+    this.setupResources(!this._isCreate);
   },
 
   /**
    * @memberof oj.ojDataGrid
    * @private
    */
-  setupResources: function () {
+  setupResources: function (requiresRefresh) {
     if (this.datasource != null) {
       // sets the data source event listeners
-      if (!this._isCreate) {
+      if (!requiresRefresh) {
         this.grid._addDataSourceEventListeners();
       }
 
@@ -35829,7 +35832,9 @@ oj.__registerWidget('oj.ojDataGrid', $.oj.baseComponent, {
       // register a resize listener
       this._registerResizeListener(this.root);
     }
-
+    if (requiresRefresh) {
+      this.refresh();
+    }
     this._isCreate = false;
   },
 
@@ -35861,6 +35866,8 @@ oj.__registerWidget('oj.ojDataGrid', $.oj.baseComponent, {
     this._unregisterResizeListener(this.root);
 
     this.contextMenuEvent = null;
+
+    this._removeAllChildren();
   },
 
   _registerEventListeners: function () {
@@ -35954,10 +35961,9 @@ oj.__registerWidget('oj.ojDataGrid', $.oj.baseComponent, {
 
     // unregister existing listeners
     if (shouldResetContextMenuListeners) {
-      this._ReleaseResources();
-    } else {
-      this.releaseResources();
+      this._ReleaseContextMenu();
     }
+    this.releaseResources();
 
     this._removeAllChildren();
 
@@ -35990,10 +35996,9 @@ oj.__registerWidget('oj.ojDataGrid', $.oj.baseComponent, {
     // addListeners back in before rendering, including context menu
     // unregister existing listeners
     if (shouldResetContextMenuListeners) {
-      this._SetupResources();
-    } else {
-      this.setupResources();
+      this._SetupContextMenu();
     }
+    this.setupResources(false);
 
     // so long as the visibility property is not 'render', overwrite it with
     // a refresh and try to refresh the grid
@@ -36163,6 +36168,16 @@ oj.__registerWidget('oj.ojDataGrid', $.oj.baseComponent, {
     }
   },
 
+  /**
+   * Override to do the delay connect/disconnect
+   * @memberof oj.ojDataGrid
+   * @override
+   * @protected
+   */
+  _VerifyConnectedForSetup: function () {
+    return true;
+  },
+
   /**
    * Determine if the entire datagrid should refresh based on which options are updated.
    * @param {Object} options the options object