Fixes Error Cannot read property 'id' of undefined when dragging view to Panel with no pinned views (microsoft#99582)

jeanp413 · sbatten · web-flow · commit a855a5183b4f · 2020-06-08T12:50:21.000-07:00
* Fixes microsoft#99581 * use visible composite ids Co-authored-by: SteVen Batten <stbatt@microsoft.com>
diff --git a/src/vs/workbench/browser/parts/compositeBar.ts b/src/vs/workbench/browser/parts/compositeBar.ts
@@ -234,13 +234,13 @@ export class CompositeBar extends Widget implements ICompositeBar {
 		this._register(CompositeDragAndDropObserver.INSTANCE.registerTarget(parent, {
 			onDragOver: (e: IDraggedCompositeData) => {
 				// don't add feedback if this is over the composite bar actions or there are no actions
-				if (!(this.compositeSwitcherBar?.length()) || (e.eventData.target && isAncestor(e.eventData.target as HTMLElement, actionBarDiv))) {
+				const visibleItems = this.getVisibleComposites();
+				if (!visibleItems.length || (e.eventData.target && isAncestor(e.eventData.target as HTMLElement, actionBarDiv))) {
 					toggleClass(parent, 'dragged-over', false);
 					return;
 				}
 
-				const pinnedItems = this.getPinnedComposites();
-				const validDropTarget = this.options.dndHandler.onDragOver(e.dragAndDropData, pinnedItems[pinnedItems.length - 1].id, e.eventData);
+				const validDropTarget = this.options.dndHandler.onDragOver(e.dragAndDropData, visibleItems[visibleItems.length - 1].id, e.eventData);
 				toggleClass(parent, 'dragged-over', validDropTarget);
 			},
 
@@ -251,9 +251,9 @@ export class CompositeBar extends Widget implements ICompositeBar {
 				toggleClass(parent, 'dragged-over', false);
 			},
 			onDrop: (e: IDraggedCompositeData) => {
-				const pinnedItems = this.getPinnedComposites();
-				if (pinnedItems.length) {
-					this.options.dndHandler.drop(e.dragAndDropData, pinnedItems[pinnedItems.length - 1].id, e.eventData, { horizontallyBefore: false, verticallyBefore: false });
+				const visibleItems = this.getVisibleComposites();
+				if (visibleItems.length) {
+					this.options.dndHandler.drop(e.dragAndDropData, visibleItems[visibleItems.length - 1].id, e.eventData, { horizontallyBefore: false, verticallyBefore: false });
 				}
 				toggleClass(parent, 'dragged-over', false);
 			}
