@oracle/oraclejet 20.0.0 → 20.0.2

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

@@ -342,7 +342,7 @@
 }
 
 .oj-theme-json {
-  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v20.0.0"}' !important;
+  font-family: '{"name":"stable","targetPlatform":"all","behavior":"redwood","jetReleaseVersion":"v20.0.2"}' !important;
 }
 
 .oj-helper-hidden-accessible {
@@ -16093,8 +16093,12 @@ html[dir=rtl] .oj-datagrid-bottom-corner {
 .oj-datagrid-row-drop-target-line {
   border-bottom: 2px solid var(--oj-core-drag-drop-line-color);
   position: absolute;
+  pointer-events: none;
 }
 
+.oj-datagrid-col-drop-target-line {
+  pointer-events: none;
+}
 html:not([dir=rtl]) .oj-datagrid-col-drop-target-line {
   border-right: 2px solid var(--oj-core-drag-drop-line-color);
   position: absolute;

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

@@ -37,12 +37,12 @@ define(['ojs/ojlogger', 'ojs/ojwebdrivertest-proxy'], function (Logger, ojwebdri
      * @global
      * @member {string} version JET version numberr
      */
-    version: '20.0.0',
+    version: '20.0.2',
     /**
      * @global
      * @member {string} revision JET source code revision number
      */
-    revision: '2026-02-13_03-22-54',
+    revision: '2026-04-03_09-42-02',
 
     // 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

@@ -1496,6 +1496,7 @@ var __oj_data_grid_metadata =
     this.attributes.dropIndex = 'data-oj-dropIndex';
     this.attributes.dropLevel = 'data-oj-dropLevel';
     this.attributes.dropAxis = 'data-oj-dropAxis';
+    this.attributes.dropPos = 'data-oj-dropPos';
   };
 
   oj._registerLegacyNamespaceProp('DataGridResources', DataGridResources);
@@ -7046,6 +7047,7 @@ var __oj_data_grid_metadata =
     section.addEventListener('dragstart', this.handleCornerDragStart.bind(this), false);
     section.addEventListener('dragend', this.handleCornerDragEnd.bind(this), false);
     section.addEventListener('dragover', this.handleCornerDragOver.bind(this), false);
+    section.addEventListener('dragleave', this.handleCornerDragLeave.bind(this), false);
     section.addEventListener('drop', this.handleCornerDrop.bind(this), false);
     section.addEventListener('dragenter', this.handleCornerDragEnter.bind(this), false);
   };
@@ -49213,6 +49215,9 @@ var __oj_data_grid_metadata =
   DvtDataGrid.prototype.handleColumnDragLeave = function (event) {
     let dropContext = this._getDropContext(event, this.m_dropColumnIndex, 'column');
     var returnValue = this._invokeDndCallback('drop', 'columns', 'dragLeave', event, dropContext);
+    if (this.m_pivotInProgress) {
+      this._removePivotDropTargetLine();
+    }
 
     this.m_dropColumnIndex = null;
     return returnValue;
@@ -54988,7 +54993,8 @@ var __oj_data_grid_metadata =
         this.m_pivotDropTarget == null ||
         !(
           this._getAttribute(this.m_pivotDropTarget, 'dropLevel', true) === dragOverLevel &&
-          this._getAttribute(this.m_pivotDropTarget, 'dropAxis') === dragOverAxis
+          this._getAttribute(this.m_pivotDropTarget, 'dropAxis') === dragOverAxis &&
+          this._getAttribute(this.m_pivotDropTarget, 'dropPos') === position
         )
       ) {
         this._addPivotDropTargetLine(
@@ -55006,6 +55012,14 @@ var __oj_data_grid_metadata =
         position: position
       };
       this._invokeDropCallback(`${dragOverAxis}Labels`, 'dragOver', event, dropContext);
+    } else {
+      this._removePivotDropTargetLine();
+    }
+  };
+
+  DvtDataGrid.prototype.handleCornerDragLeave = function () {
+    if (this.m_pivotInProgress) {
+      this._removePivotDropTargetLine();
     }
   };
 
@@ -55028,6 +55042,7 @@ var __oj_data_grid_metadata =
     this.m_pivotDropHeaderTarget = document.createElement('div');
     this._setAttribute(this.m_pivotDropTarget, 'dropLevel', level);
     this._setAttribute(this.m_pivotDropTarget, 'dropAxis', axis);
+    this._setAttribute(this.m_pivotDropTarget, 'dropPos', position);
 
     let headerElem = label;
     let databodyElem = this.m_colHeader;
@@ -55218,10 +55233,9 @@ var __oj_data_grid_metadata =
     ];
   };
 
-  DvtDataGrid.prototype._getLabelRelativePosition = function (event, axis) {
-    let target = event.target;
+  DvtDataGrid.prototype._getLabelRelativePosition = function (event, axis, dragOverLabel) {
     let dir = this.getResources().isRTLMode() ? 'right' : 'left';
-    let elementBoundingRect = target.getBoundingClientRect();
+    let elementBoundingRect = dragOverLabel.getBoundingClientRect();
     let position = 'before';
 
     let relativePos;
@@ -55295,6 +55309,7 @@ var __oj_data_grid_metadata =
     if (this.m_pivotDropTarget) {
       this.m_pivotDropTarget.removeAttribute(this.getResources().getMappedAttribute('dropLevel'));
       this.m_pivotDropTarget.removeAttribute(this.getResources().getMappedAttribute('dropAxis'));
+      this.m_pivotDropTarget.removeAttribute(this.getResources().getMappedAttribute('dropPos'));
     }
     this._remove(this.m_pivotDropHeaderTarget);
     this.m_pivotDropTarget = null;
@@ -55444,7 +55459,8 @@ var __oj_data_grid_metadata =
           this.m_pivotDropTarget == null ||
           !(
             this._getAttribute(this.m_pivotDropTarget, 'dropLevel', true) === dragOverLevel &&
-            this._getAttribute(this.m_pivotDropTarget, 'dropAxis') === dragOverAxis
+            this._getAttribute(this.m_pivotDropTarget, 'dropAxis') === dragOverAxis &&
+            this._getAttribute(this.m_pivotDropTarget, 'dropPos') === position
           )
         ) {
           dropLineTop =
@@ -55478,6 +55494,8 @@ var __oj_data_grid_metadata =
           position: position
         };
         this._invokeDropCallback(`${dragOverAxis}Labels`, 'dragOver', event, dropContext);
+      } else {
+        this._removePivotDropTargetLine();
       }
     }
   };

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

@@ -3523,7 +3523,7 @@ define(['require', 'ojs/ojcore-base', 'jquery', 'ojs/ojcontext', 'ojs/ojthemeuti
         return function () {
           if (this.m_fetching.get(key) === 1) {
             this.m_fetching.delete(key);
-          } else {
+          } else if (this.m_fetching.has(key)) {
             this.m_fetching.set(key, this.m_fetching.get(key) - 1);
           }
           busyContextPromise();

package/dist/js/libs/oj/debug/ojvcomponent-template.js

@@ -307,11 +307,17 @@ define(['exports', 'ojs/ojlogger', 'ojs/ojhtmlutils', 'ojs/ojcustomelement-utils
             }
             const proxy = currentObj
                 ? createRecursiveProxy(currentObj, '', (identifier, value) => {
-                    const lastItem = this._expressionPaths[this._expressionPaths.length - 1];
-                    if (lastItem && identifier.startsWith(`${lastItem.identifier}.`)) {
-                        this._expressionPaths.pop();
+                    if (this._expressionPaths == null) {
+                        // bindingContext proxy should never be exposed when this._expressionPaths is undefined
+                        Logger.error('Unexpected bindingContext proxy detected - no expression paths available');
+                    }
+                    else {
+                        const lastItem = this._expressionPaths[this._expressionPaths.length - 1];
+                        if (lastItem && identifier.startsWith(`${lastItem.identifier}.`)) {
+                            this._expressionPaths.pop();
+                        }
+                        this._expressionPaths.push({ identifier, value });
                     }
-                    this._expressionPaths.push({ identifier, value });
                 })
                 : currentObj;
             return proxy;
@@ -1283,6 +1289,7 @@ define(['exports', 'ojs/ojlogger', 'ojs/ojhtmlutils', 'ojs/ojcustomelement-utils
                 type: ojexpparser.PROPERTY,
                 key: { type: ojexpparser.LITERAL, value: eventPropName },
                 value: this._createCallNodeWithContext((bindingContext) => {
+                    const unwrappedContext = _unwrapBindingContext(bindingContext, engineContext[TEMPLATE_ALIAS]);
                     return (event) => {
                         valuesArray.forEach((propItem, index) => {
                             let newValue = event.detail.value;
@@ -1296,7 +1303,7 @@ define(['exports', 'ojs/ojlogger', 'ojs/ojhtmlutils', 'ojs/ojcustomelement-utils
                                 propExprEvaluator = this._cspEvaluator.createEvaluator(propExpr).evaluate;
                                 propExprEvaluators.push(propExprEvaluator);
                             }
-                            const value = propExprEvaluator([bindingContext, bindingContext.$data]);
+                            const value = propExprEvaluator([unwrappedContext, unwrappedContext.$data]);
                             let writer;
                             if (engineContext[BINDING_PROVIDER] &&
                                 engineContext[BINDING_PROVIDER].__IsObservable(value)) {
@@ -1306,7 +1313,7 @@ define(['exports', 'ojs/ojlogger', 'ojs/ojhtmlutils', 'ojs/ojcustomelement-utils
                                 const writerExpr = this._getPropertyWriterExpression(propExpr);
                                 if (writerExpr !== null) {
                                     const writerEvaluator = this._cspEvaluator.createEvaluator(writerExpr).evaluate;
-                                    writer = this._getWriter(writerEvaluator([bindingContext.$data || {}, bindingContext]));
+                                    writer = this._getWriter(writerEvaluator([unwrappedContext.$data || {}, unwrappedContext]));
                                 }
                             }
                             ojmonitoring.performMonitoredWriteback(property, writer, event, newValue);
@@ -1317,10 +1324,10 @@ define(['exports', 'ojs/ojlogger', 'ojs/ojhtmlutils', 'ojs/ojcustomelement-utils
                                 this._cspEvaluator.createEvaluator(existingCallbackExpr).evaluate;
                         }
                         const existingCallback = callbackExprEvaluator
-                            ? callbackExprEvaluator([bindingContext, bindingContext.$data])
+                            ? callbackExprEvaluator([unwrappedContext, unwrappedContext.$data])
                             : null;
                         if (existingCallback) {
-                            existingCallback(event, _proxyUnwrap(bindingContext.$current) || bindingContext.$data, bindingContext);
+                            existingCallback(event, unwrappedContext.$current || unwrappedContext.$data, unwrappedContext);
                         }
                     };
                 })

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

@@ -889,6 +889,75 @@ define(['exports', 'preact/jsx-runtime', 'preact', 'ojs/ojvcomponent', 'ojs/ojco
             this._touchStartHandler = (event) => {
                 this._handleTouchOrClickEvent(event);
             };
+            /**
+             * The method that makes batch updates for container width and card width, otherwise updating card and container widths in different observers with debounced threshold results in a visible delay of updating columns
+             */
+            this.handlePendingResizes = () => {
+                const root = this.getRootElement();
+                if (this._pendingResizes && this.contentHandler && root) {
+                    let isCardWidthChanged = false;
+                    let isCardHeightChanged = false;
+                    if (this._pendingResizes.cards) {
+                        let width;
+                        for (const [key, value] of Object.entries(this._pendingResizes.cards)) {
+                            // assume all cards have same width, we can update the itemWidth only once if it's changed
+                            if (width == null) {
+                                width = value.width;
+                                const itemWidth = this.contentHandler.getLayout().getItemWidth();
+                                this.setState({ observedItemWidth: width });
+                                if (itemWidth !== undefined && itemWidth !== width) {
+                                    this.contentHandler.getLayout().setItemWidth(width);
+                                    isCardWidthChanged = true;
+                                }
+                            }
+                            // for each card, update the height in cache if it's changed
+                            const height = value.height;
+                            const cache = this.contentHandler.getLayout().getPosition(key);
+                            if (cache && cache.height !== height) {
+                                this.contentHandler.getLayout().setPosition(key, { ...cache, height });
+                                isCardHeightChanged = true;
+                            }
+                        }
+                    }
+                    if (this._pendingResizes.root) {
+                        const currWidth = this.state.width;
+                        const newWidth = this._pendingResizes.root.width;
+                        if (Math.abs(newWidth - currWidth) > WaterfallLayout_1.minResizeWidthThreshold) {
+                            // skeleton width might be zero because waterfall is hidden, and therefore needs to be re-calculated
+                            const skeleton = root.querySelector('.oj-waterfalllayout-skeleton');
+                            if (skeleton && this.skeletonWidth == 0) {
+                                this.skeletonWidth = skeleton.clientWidth;
+                            }
+                            this.setState({ width: newWidth });
+                            if (this.getSkeletonPositions() != null) {
+                                this._updatePositionsForSkeletons(newWidth);
+                            }
+                            else if (this.getPositions() != null) {
+                                this.contentHandler.getLayout().setWidth(newWidth);
+                                if (this.renderCompleted) {
+                                    this.contentHandler.handleResizeWidth(newWidth);
+                                }
+                            }
+                        }
+                        const currHeight = this.state.height;
+                        const newHeight = this._pendingResizes.root.height;
+                        if (Math.abs(newHeight - currHeight) > 1 && newHeight !== this.state.contentHeight) {
+                            this.setState({ height: newHeight });
+                        }
+                    }
+                    if (isCardWidthChanged) {
+                        // columns are recalculated when container width changes which occurs first, then card width changes are re-calculated however at this point columns are based on stale value of card widths
+                        // so recalculate columns whenever the card width changes so that incases where width increases from 0 to valid value columns are recalculated based on new non zero value.
+                        this.contentHandler.getLayout()._initializeColumnsInfo();
+                    }
+                    if (isCardHeightChanged) {
+                        // recalculate positions whenever the card size is changed
+                        this.contentHandler.getLayout().recalculatePositions(0);
+                        this.setState({ positions: this.contentHandler.getLayout().getPositions() });
+                    }
+                }
+                this._pendingResizes = null;
+            };
             this.setRootElement = (element) => {
                 this.root = element;
             };
@@ -911,7 +980,8 @@ define(['exports', 'preact/jsx-runtime', 'preact', 'ojs/ojvcomponent', 'ojs/ojco
                 skeletonPositions: null,
                 width: 0,
                 height: 0,
-                contentHeight: 0
+                contentHeight: 0,
+                observedItemWidth: 0
             };
         }
         render() {
@@ -961,14 +1031,6 @@ define(['exports', 'preact/jsx-runtime', 'preact', 'ojs/ojvcomponent', 'ojs/ojco
                 scroller: this._getScroller()
             };
         }
-        _debounce(callback, wait) {
-            let timeout = null;
-            return (...args) => {
-                const next = () => callback(...args);
-                clearTimeout(timeout);
-                timeout = setTimeout(next, wait);
-            };
-        }
         /**
          * An optional component lifecycle method called after the
          * virtual component has been initially rendered and inserted into the
@@ -999,36 +1061,20 @@ define(['exports', 'preact/jsx-runtime', 'preact', 'ojs/ojvcomponent', 'ojs/ojco
             }
             // register a ResizeObserver (note ResizeObserver is not in lib.dom.ts yet...)
             if (window['ResizeObserver']) {
-                const resizeObserver = new window['ResizeObserver'](this._debounce((entries) => {
+                const resizeObserver = new window['ResizeObserver']((entries) => {
+                    if (this._pendingResizes == null) {
+                        // We always initialize _pendingResizes object with cards to avoid extra null checks in batching logic and when we update cards in entries.
+                        this._pendingResizes = { cards: {} };
+                        setTimeout(this.handlePendingResizes, WaterfallLayout_1.batchUpdateThreshold); // @HTMLUpdateOK
+                    }
                     entries.forEach((entry) => {
-                        if (entry.target === root && entry.contentRect) {
-                            const currWidth = this.state.width;
-                            const newWidth = Math.round(entry.contentRect.width);
-                            if (Math.abs(newWidth - currWidth) > WaterfallLayout_1.minResizeWidthThreshold) {
-                                // skeleton width might be zero because waterfall is hidden, and therefore needs to be re-calculated
-                                const skeleton = root.querySelector('.oj-waterfalllayout-skeleton');
-                                if (skeleton && this.skeletonWidth == 0) {
-                                    this.skeletonWidth = skeleton.clientWidth;
-                                }
-                                this.setState({ width: newWidth });
-                                if (this.getSkeletonPositions() != null) {
-                                    this._updatePositionsForSkeletons(newWidth);
-                                }
-                                else if (this.getPositions() != null && this.contentHandler) {
-                                    this.contentHandler.getLayout().setWidth(newWidth);
-                                    if (this.renderCompleted) {
-                                        this.contentHandler.handleResizeWidth(newWidth);
-                                    }
-                                }
-                            }
-                            const currHeight = this.state.height;
-                            const newHeight = Math.round(entry.contentRect.height);
-                            if (Math.abs(newHeight - currHeight) > 1 && newHeight !== this.state.contentHeight) {
-                                this.setState({ height: newHeight });
-                            }
+                        if (entry.target === root) {
+                            const height = entry.contentBoxSize[0].blockSize;
+                            const width = entry.contentBoxSize[0].inlineSize;
+                            this._pendingResizes.root = { height, width };
                         }
                     });
-                }, WaterfallLayout_1.debounceThreshold));
+                });
                 resizeObserver.observe(root);
                 this.resizeObserver = resizeObserver;
             }
@@ -1155,33 +1201,19 @@ define(['exports', 'preact/jsx-runtime', 'preact', 'ojs/ojvcomponent', 'ojs/ojco
                 }
                 if (this.props.cardSizing === 'dynamic') {
                     if (!this.cardResizeObserver && window['ResizeObserver']) {
-                        this.cardResizeObserver = new window['ResizeObserver'](this._debounce((entries) => {
-                            let isCardSizeChanged = false;
-                            entries.forEach((entry, index) => {
-                                // assume all cards have same width, we can update the itemWidth only once if it's changed
-                                if (index === 0) {
-                                    const width = entry.borderBoxSize[0].inlineSize;
-                                    const itemWidth = this.contentHandler.getLayout().getItemWidth();
-                                    if (itemWidth !== undefined && itemWidth !== width) {
-                                        this.contentHandler.getLayout().setItemWidth(width);
-                                        isCardSizeChanged = true;
-                                    }
-                                }
-                                // for each card, update the height in cache if it's changed
+                        this.cardResizeObserver = new window['ResizeObserver']((entries) => {
+                            if (this._pendingResizes == null) {
+                                // We always initialize _pendingResizes object with cards to avoid extra null checks in batching logic and when we update cards in entries.
+                                this._pendingResizes = { cards: {} };
+                                setTimeout(this.handlePendingResizes, WaterfallLayout_1.batchUpdateThreshold); // @HTMLUpdateOK
+                            }
+                            entries.forEach((entry) => {
                                 const height = entry.borderBoxSize[0].blockSize;
+                                const width = entry.borderBoxSize[0].inlineSize;
                                 const key = this.contentHandler.getKey(entry.target);
-                                const cache = this.contentHandler.getLayout().getPosition(key);
-                                if (cache && cache.height !== height) {
-                                    this.contentHandler.getLayout().setPosition(key, { ...cache, height });
-                                    isCardSizeChanged = true;
-                                }
+                                this._pendingResizes.cards[key] = { height, width };
                             });
-                            if (isCardSizeChanged) {
-                                // recalcualte positions whenever the card size is changed
-                                this.contentHandler.getLayout().recalculatePositions(0);
-                                this.setState({ positions: this.contentHandler.getLayout().getPositions() });
-                            }
-                        }, WaterfallLayout_1.debounceThreshold));
+                        });
                     }
                     // observe every time to ensure all items are observed, just in case the items are not available at the beginning
                     if (this.cardResizeObserver) {
@@ -1334,6 +1366,10 @@ define(['exports', 'preact/jsx-runtime', 'preact', 'ojs/ojvcomponent', 'ojs/ojco
                 return updater(currentData);
             }.bind(this));
         }
+        isNotEmpty() {
+            const data = this.getData();
+            return data != null && data.value && data.value.data.length > 0;
+        }
         getSkeletonPositions() {
             return this.state.skeletonPositions;
         }
@@ -1544,7 +1580,14 @@ define(['exports', 'preact/jsx-runtime', 'preact', 'ojs/ojvcomponent', 'ojs/ojco
             return { height: this.state.contentHeight + 'px' };
         }
         _getRootElementStyle() {
-            return this.props.scrollPolicyOptions.scroller != null ? { overflow: 'hidden' } : null;
+            const rootScroll = this.props.scrollPolicyOptions.scroller != null ? { overflow: 'hidden' } : null;
+            // When the data is not empty, container or card width is 0 and it is dynamic resizing mode we want to make the component transparent so that the screen is blank until new size kicks
+            const rootOpacity = this.isNotEmpty() &&
+                (this.state.width === 0 ||
+                    (this.state.observedItemWidth === 0 && this.props.cardSizing === 'dynamic'))
+                ? { opacity: 0 }
+                : null;
+            return { ...rootScroll, ...rootOpacity };
         }
         /**
          * Renders the initial skeletons
@@ -1712,7 +1755,8 @@ define(['exports', 'preact/jsx-runtime', 'preact', 'ojs/ojvcomponent', 'ojs/ojco
         tabManagement: 'initial'
     };
     exports.WaterfallLayout.minResizeWidthThreshold = 10;
-    exports.WaterfallLayout.debounceThreshold = 100;
+    // We make use of throttle like approach to do batch updates of container and card dimensions
+    exports.WaterfallLayout.batchUpdateThreshold = 100;
     exports.WaterfallLayout._CSS_Vars = {
         showIndicatorDelay: '--oj-private-core-global-loading-indicator-delay-duration',
         cardAnimationDelay: '--oj-private-animation-global-card-entrance-delay-increment'

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

@@ -38,12 +38,12 @@ const oj = {
    * @global
    * @member {string} version JET version numberr
    */
-  version: '20.0.0',
+  version: '20.0.2',
   /**
    * @global
    * @member {string} revision JET source code revision number
    */
-  revision: '2026-02-13_03-22-54',
+  revision: '2026-04-03_09-42-02',
 
   // 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

@@ -1513,6 +1513,7 @@ const DataGridResources = function (
   this.attributes.dropIndex = 'data-oj-dropIndex';
   this.attributes.dropLevel = 'data-oj-dropLevel';
   this.attributes.dropAxis = 'data-oj-dropAxis';
+  this.attributes.dropPos = 'data-oj-dropPos';
 };
 
 oj._registerLegacyNamespaceProp('DataGridResources', DataGridResources);
@@ -7063,6 +7064,7 @@ DvtDataGrid.prototype._attachDndListenersOnLabelSection = function (section) {
   section.addEventListener('dragstart', this.handleCornerDragStart.bind(this), false);
   section.addEventListener('dragend', this.handleCornerDragEnd.bind(this), false);
   section.addEventListener('dragover', this.handleCornerDragOver.bind(this), false);
+  section.addEventListener('dragleave', this.handleCornerDragLeave.bind(this), false);
   section.addEventListener('drop', this.handleCornerDrop.bind(this), false);
   section.addEventListener('dragenter', this.handleCornerDragEnter.bind(this), false);
 };
@@ -49230,6 +49232,9 @@ DvtDataGrid.prototype.handleColumnDragEnter = function (event) {
 DvtDataGrid.prototype.handleColumnDragLeave = function (event) {
   let dropContext = this._getDropContext(event, this.m_dropColumnIndex, 'column');
   var returnValue = this._invokeDndCallback('drop', 'columns', 'dragLeave', event, dropContext);
+  if (this.m_pivotInProgress) {
+    this._removePivotDropTargetLine();
+  }
 
   this.m_dropColumnIndex = null;
   return returnValue;
@@ -55005,7 +55010,8 @@ DvtDataGrid.prototype.handleCornerDragOver = function (event) {
       this.m_pivotDropTarget == null ||
       !(
         this._getAttribute(this.m_pivotDropTarget, 'dropLevel', true) === dragOverLevel &&
-        this._getAttribute(this.m_pivotDropTarget, 'dropAxis') === dragOverAxis
+        this._getAttribute(this.m_pivotDropTarget, 'dropAxis') === dragOverAxis &&
+        this._getAttribute(this.m_pivotDropTarget, 'dropPos') === position
       )
     ) {
       this._addPivotDropTargetLine(
@@ -55023,6 +55029,14 @@ DvtDataGrid.prototype.handleCornerDragOver = function (event) {
       position: position
     };
     this._invokeDropCallback(`${dragOverAxis}Labels`, 'dragOver', event, dropContext);
+  } else {
+    this._removePivotDropTargetLine();
+  }
+};
+
+DvtDataGrid.prototype.handleCornerDragLeave = function () {
+  if (this.m_pivotInProgress) {
+    this._removePivotDropTargetLine();
   }
 };
 
@@ -55045,6 +55059,7 @@ DvtDataGrid.prototype._addPivotDropTargetLine = function (
   this.m_pivotDropHeaderTarget = document.createElement('div');
   this._setAttribute(this.m_pivotDropTarget, 'dropLevel', level);
   this._setAttribute(this.m_pivotDropTarget, 'dropAxis', axis);
+  this._setAttribute(this.m_pivotDropTarget, 'dropPos', position);
 
   let headerElem = label;
   let databodyElem = this.m_colHeader;
@@ -55235,10 +55250,9 @@ DvtDataGrid.prototype._calculatePivotVisualIndicatorPosition = function (
   ];
 };
 
-DvtDataGrid.prototype._getLabelRelativePosition = function (event, axis) {
-  let target = event.target;
+DvtDataGrid.prototype._getLabelRelativePosition = function (event, axis, dragOverLabel) {
   let dir = this.getResources().isRTLMode() ? 'right' : 'left';
-  let elementBoundingRect = target.getBoundingClientRect();
+  let elementBoundingRect = dragOverLabel.getBoundingClientRect();
   let position = 'before';
 
   let relativePos;
@@ -55312,6 +55326,7 @@ DvtDataGrid.prototype._removePivotDropTargetLine = function () {
   if (this.m_pivotDropTarget) {
     this.m_pivotDropTarget.removeAttribute(this.getResources().getMappedAttribute('dropLevel'));
     this.m_pivotDropTarget.removeAttribute(this.getResources().getMappedAttribute('dropAxis'));
+    this.m_pivotDropTarget.removeAttribute(this.getResources().getMappedAttribute('dropPos'));
   }
   this._remove(this.m_pivotDropHeaderTarget);
   this.m_pivotDropTarget = null;
@@ -55461,7 +55476,8 @@ DvtDataGrid.prototype._handlePivotDragOverOnHeader = function (event) {
         this.m_pivotDropTarget == null ||
         !(
           this._getAttribute(this.m_pivotDropTarget, 'dropLevel', true) === dragOverLevel &&
-          this._getAttribute(this.m_pivotDropTarget, 'dropAxis') === dragOverAxis
+          this._getAttribute(this.m_pivotDropTarget, 'dropAxis') === dragOverAxis &&
+          this._getAttribute(this.m_pivotDropTarget, 'dropPos') === position
         )
       ) {
         dropLineTop =
@@ -55495,6 +55511,8 @@ DvtDataGrid.prototype._handlePivotDragOverOnHeader = function (event) {
         position: position
       };
       this._invokeDropCallback(`${dragOverAxis}Labels`, 'dragOver', event, dropContext);
+    } else {
+      this._removePivotDropTargetLine();
     }
   }
 };

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

@@ -3514,7 +3514,7 @@ class TreeviewSelectionManager {
       return function () {
         if (this.m_fetching.get(key) === 1) {
           this.m_fetching.delete(key);
-        } else {
+        } else if (this.m_fetching.has(key)) {
           this.m_fetching.set(key, this.m_fetching.get(key) - 1);
         }
         busyContextPromise();

package/dist/js/libs/oj/debug_esm/ojvcomponent-template.js

@@ -5,7 +5,7 @@
  * as shown at https://oss.oracle.com/licenses/upl/
  * @ignore
  */
-import { info } from 'ojs/ojlogger';
+import { error, info } from 'ojs/ojlogger';
 import { getTemplateContent } from 'ojs/ojhtmlutils';
 import { CustomElementUtils, AttributeUtils, ElementUtils } from 'ojs/ojcustomelement-utils';
 import { getMetadata, getPropertiesForElementTag, isElementRegistered } from 'ojs/ojcustomelement-registry';
@@ -320,11 +320,17 @@ class VTemplateEngine {
         }
         const proxy = currentObj
             ? createRecursiveProxy(currentObj, '', (identifier, value) => {
-                const lastItem = this._expressionPaths[this._expressionPaths.length - 1];
-                if (lastItem && identifier.startsWith(`${lastItem.identifier}.`)) {
-                    this._expressionPaths.pop();
+                if (this._expressionPaths == null) {
+                    // bindingContext proxy should never be exposed when this._expressionPaths is undefined
+                    error('Unexpected bindingContext proxy detected - no expression paths available');
+                }
+                else {
+                    const lastItem = this._expressionPaths[this._expressionPaths.length - 1];
+                    if (lastItem && identifier.startsWith(`${lastItem.identifier}.`)) {
+                        this._expressionPaths.pop();
+                    }
+                    this._expressionPaths.push({ identifier, value });
                 }
-                this._expressionPaths.push({ identifier, value });
             })
             : currentObj;
         return proxy;
@@ -1296,6 +1302,7 @@ class VTemplateEngine {
             type: PROPERTY,
             key: { type: LITERAL, value: eventPropName },
             value: this._createCallNodeWithContext((bindingContext) => {
+                const unwrappedContext = _unwrapBindingContext(bindingContext, engineContext[TEMPLATE_ALIAS]);
                 return (event) => {
                     valuesArray.forEach((propItem, index) => {
                         let newValue = event.detail.value;
@@ -1309,7 +1316,7 @@ class VTemplateEngine {
                             propExprEvaluator = this._cspEvaluator.createEvaluator(propExpr).evaluate;
                             propExprEvaluators.push(propExprEvaluator);
                         }
-                        const value = propExprEvaluator([bindingContext, bindingContext.$data]);
+                        const value = propExprEvaluator([unwrappedContext, unwrappedContext.$data]);
                         let writer;
                         if (engineContext[BINDING_PROVIDER] &&
                             engineContext[BINDING_PROVIDER].__IsObservable(value)) {
@@ -1319,7 +1326,7 @@ class VTemplateEngine {
                             const writerExpr = this._getPropertyWriterExpression(propExpr);
                             if (writerExpr !== null) {
                                 const writerEvaluator = this._cspEvaluator.createEvaluator(writerExpr).evaluate;
-                                writer = this._getWriter(writerEvaluator([bindingContext.$data || {}, bindingContext]));
+                                writer = this._getWriter(writerEvaluator([unwrappedContext.$data || {}, unwrappedContext]));
                             }
                         }
                         performMonitoredWriteback(property, writer, event, newValue);
@@ -1330,10 +1337,10 @@ class VTemplateEngine {
                             this._cspEvaluator.createEvaluator(existingCallbackExpr).evaluate;
                     }
                     const existingCallback = callbackExprEvaluator
-                        ? callbackExprEvaluator([bindingContext, bindingContext.$data])
+                        ? callbackExprEvaluator([unwrappedContext, unwrappedContext.$data])
                         : null;
                     if (existingCallback) {
-                        existingCallback(event, _proxyUnwrap(bindingContext.$current) || bindingContext.$data, bindingContext);
+                        existingCallback(event, unwrappedContext.$current || unwrappedContext.$data, unwrappedContext);
                     }
                 };
             })