Merge remote-tracking branch 'origin/latest' into latest

Author: Robert Clarke

packages/ag-grid-angular-cli-example

@@ -2,7 +2,7 @@ import { IEventEmitter } from "../interfaces/iEventEmitter";
 import { EventService } from "../eventService";
 import { GridOptionsWrapper } from "../gridOptionsWrapper";
 import { AgEvent } from "../events";
-import { PreDestroy } from "./context";
+import {Autowired, Context, PreDestroy} from "./context";
 import { _ } from "../utils";
 
 export class BeanStub implements IEventEmitter {
@@ -15,6 +15,8 @@ export class BeanStub implements IEventEmitter {
 
     private destroyed = false;
 
+    @Autowired('context') private context: Context;
+
     // this was a test constructor niall built, when active, it prints after 5 seconds all beans/components that are
     // not destroyed. to use, create a new grid, then api.destroy() before 5 seconds. then anything that gets printed
     // points to a bean or component that was not properly disposed of.
@@ -30,6 +32,10 @@ export class BeanStub implements IEventEmitter {
     //     }, 5000);
     // }
 
+    public getContext(): Context {
+        return this.context;
+    }
+
     @PreDestroy
     public destroy(): void {
 

packages/ag-grid-community/src/ts/context/beanStub.ts

@@ -1,6 +1,7 @@
 import { ILogger } from "../iLogger";
 import { Component } from "../widgets/component";
 import { _ } from "../utils";
+import {BeanStub} from "./beanStub";
 
 // steps in booting up:
 // 1. create all beans
@@ -95,11 +96,10 @@ export class Context {
         }
     }
 
-    // public createComponent(ComponentClass: new () => Component): Component {
-    //     const compInstance = new ComponentClass();
-    //     this.wireBean(compInstance);
-    //     compInstance.instantiate(this);
-    //     return compInstance;
+    // public createBean(BeanClass: new () => any): Component {
+    //     const beanInstance = new BeanClass();
+    //     this.wireBean(beanInstance);
+    //     return beanInstance;
     // }
 
     public wireBean(bean: any, afterPreCreateCallback?: (comp: Component) => void): void {

packages/ag-grid-community/src/ts/context/context.ts

@@ -88,9 +88,6 @@ export abstract class  BaseFilter<T, P extends IFilterParams, M> extends Compone
     @QuerySelector('#clearButton')
     private eClearButton: HTMLElement;
 
-    @Autowired('context')
-    public context: Context;
-
     private eConditionWrapper: HTMLElement;
     conditionValue: string;
 

packages/ag-grid-community/src/ts/filter/baseFilter.ts

@@ -40,11 +40,10 @@ export class FloatingFilterWrapper extends Component {
         `<div class="ag-header-cell" aria-hidden="true">
             <div ref="eFloatingFilterBody" aria-hidden="true"></div>
             <div class="ag-floating-filter-button" ref="eButtonWrapper" aria-hidden="true">
-                    <button type="button" (click)="showParentFilter" ref="eButtonShowMainFilter"></button>
+                    <button type="button" ref="eButtonShowMainFilter"></button>
             </div>
         </div>`;
 
-    @Autowired('context') private context: Context;
     @Autowired('columnHoverService') private columnHoverService: ColumnHoverService;
     @Autowired('eventService') private eventService: EventService;
     @Autowired('beans') private beans: Beans;
@@ -72,26 +71,31 @@ export class FloatingFilterWrapper extends Component {
 
     @PostConstruct
     private postConstruct(): void {
-        this.instantiate(this.context);
 
         this.setupFloatingFilter();
         this.setupWidth();
         this.setupLeftPositioning();
         this.setupColumnHover();
-        this.addFeature(this.context, new HoverFeature([this.column], this.getGui()));
+        this.addFeature(this.getContext(), new HoverFeature([this.column], this.getGui()));
+
+        this.addDestroyableEventListener(this.eButtonShowMainFilter, 'click', this.showParentFilter.bind(this));
     }
 
     private setupFloatingFilter(): void {
         const colDef = this.column.getColDef();
         if (colDef.filter) {
             this.floatingFilterCompPromise = this.getFloatingFilterInstance();
-            this.floatingFilterCompPromise.then(compInstance => {
-                if (compInstance) {
-                    this.setupWithFloatingFilter(compInstance);
-                } else {
-                    this.setupEmpty();
-                }
-            });
+            if (this.floatingFilterCompPromise) {
+                this.floatingFilterCompPromise.then(compInstance => {
+                    if (compInstance) {
+                        this.setupWithFloatingFilter(compInstance);
+                    } else {
+                        this.setupEmpty();
+                    }
+                });
+            } else {
+                this.setupEmpty();
+            }
             this.setupSyncWithFilter();
         } else {
             this.setupEmpty();

packages/ag-grid-community/src/ts/filter/floatingFilterWrapper.ts

@@ -61,7 +61,6 @@ export class GridCore extends Component {
     @Autowired('quickFilterOnScope') private quickFilterOnScope: string;
     @Autowired('popupService') private popupService: PopupService;
     @Autowired('focusedCellController') private focusedCellController: FocusedCellController;
-    @Autowired('context') private context: Context;
     @Autowired('loggerFactory') loggerFactory: LoggerFactory;
 
     @Autowired('columnApi') private columnApi: ColumnApi;
@@ -84,7 +83,6 @@ export class GridCore extends Component {
 
         const template = this.enterprise ? GridCore.TEMPLATE_ENTERPRISE : GridCore.TEMPLATE_NORMAL;
         this.setTemplate(template);
-        this.instantiate(this.context);
 
         // register with services that need grid core
         [

packages/ag-grid-community/src/ts/gridCore.ts

@@ -108,7 +108,6 @@ export class GridPanel extends Component {
     @Autowired('rowRenderer') private rowRenderer: RowRenderer;
     @Autowired('pinnedRowModel') private pinnedRowModel: PinnedRowModel;
     @Autowired('eventService') private eventService: EventService;
-    @Autowired('context') private context: Context;
     @Autowired('animationFrameService') private animationFrameService: AnimationFrameService;
     @Autowired('navigationService') private navigationService: NavigationService;
     @Autowired('autoHeightCalculator') private autoHeightCalculator: AutoHeightCalculator;
@@ -235,7 +234,6 @@ export class GridPanel extends Component {
 
     @PostConstruct
     private init() {
-        this.instantiate(this.context);
 
         this.scrollWidth = this.gridOptionsWrapper.getScrollbarWidth();
         this.enableRtl = this.gridOptionsWrapper.isEnableRtl();
@@ -326,7 +324,7 @@ export class GridPanel extends Component {
     private addRowDragListener(): void {
         const rowDragFeature = new RowDragFeature(this.eBodyViewport, this);
 
-        this.context.wireBean(rowDragFeature);
+        this.getContext().wireBean(rowDragFeature);
         this.dragAndDropService.addDropTarget(rowDragFeature);
     }
 
@@ -1091,7 +1089,7 @@ export class GridPanel extends Component {
 
         _.iterateObject(this.rowContainerComponents, (key: string, container: RowContainerComponent) => {
             if (container) {
-                this.context.wireBean(container);
+                this.getContext().wireBean(container);
             }
         });
     }

packages/ag-grid-community/src/ts/gridPanel/gridPanel.ts

@@ -41,7 +41,6 @@ export class HeaderWrapperComp extends Component {
     @Autowired('dragAndDropService') private dragAndDropService: DragAndDropService;
     @Autowired('columnController') private columnController: ColumnController;
     @Autowired('horizontalResizeService') private horizontalResizeService: HorizontalResizeService;
-    @Autowired('context') private context: Context;
     @Autowired('menuFactory') private menuFactory: IMenuFactory;
     @Autowired('gridApi') private gridApi: GridApi;
     @Autowired('columnApi') private columnApi: ColumnApi;
@@ -78,7 +77,6 @@ export class HeaderWrapperComp extends Component {
 
     @PostConstruct
     public init(): void {
-        this.instantiate(this.context);
 
         const colDef = this.getComponentHolder();
         const displayName = this.columnController.getDisplayNameForColumn(this.column, 'header', true);
@@ -95,12 +93,12 @@ export class HeaderWrapperComp extends Component {
         this.setupSortableClass(enableSorting);
         this.addColumnHoverListener();
 
-        this.addFeature(this.context, new HoverFeature([this.column], this.getGui()));
+        this.addFeature(this.getContext(), new HoverFeature([this.column], this.getGui()));
 
         this.addDestroyableEventListener(this.column, Column.EVENT_FILTER_ACTIVE_CHANGED, this.onFilterChanged.bind(this));
         this.onFilterChanged();
 
-        this.addFeature(this.context, new SelectAllFeature(this.cbSelectAll, this.column));
+        this.addFeature(this.getContext(), new SelectAllFeature(this.cbSelectAll, this.column));
 
         const setLeftFeature = new SetLeftFeature(this.column, this.getGui(), this.beans);
         setLeftFeature.init();

packages/ag-grid-community/src/ts/headerRendering/header/headerWrapperComp.ts

@@ -34,7 +34,6 @@ export class HeaderGroupWrapperComp extends Component {
     @Autowired('columnController') private columnController: ColumnController;
     @Autowired('horizontalResizeService') private horizontalResizeService: HorizontalResizeService;
     @Autowired('dragAndDropService') private dragAndDropService: DragAndDropService;
-    @Autowired('context') private context: Context;
     @Autowired('componentRecipes') private componentRecipes: ComponentRecipes;
     @Autowired('gridApi') private gridApi: GridApi;
     @Autowired('columnApi') private columnApi: ColumnApi;
@@ -80,7 +79,7 @@ export class HeaderGroupWrapperComp extends Component {
         this.setupMovingCss();
         this.setupTooltip();
 
-        this.addFeature(this.context, new HoverFeature(this.columnGroup.getOriginalColumnGroup().getLeafColumns(), this.getGui()));
+        this.addFeature(this.getContext(), new HoverFeature(this.columnGroup.getOriginalColumnGroup().getLeafColumns(), this.getGui()));
 
         const setLeftFeature = new SetLeftFeature(this.columnGroup, this.getGui(), this.beans);
         setLeftFeature.init();

packages/ag-grid-community/src/ts/headerRendering/headerGroup/headerGroupWrapperComp.ts

@@ -31,7 +31,6 @@ export class HeaderRootComp extends Component {
 
     @Autowired('gridOptionsWrapper') private gridOptionsWrapper: GridOptionsWrapper;
     @Autowired('columnController') private columnController: ColumnController;
-    @Autowired('context') private context: Context;
     @Autowired('eventService') private eventService: EventService;
     @Autowired('gridApi') private gridApi: GridApi;
     @Autowired('autoWidthCalculator') private autoWidthCalculator: AutoWidthCalculator;
@@ -69,7 +68,7 @@ export class HeaderRootComp extends Component {
 
         this.childContainers = [centerContainer, pinnedLeftContainer, pinnedRightContainer];
 
-        this.childContainers.forEach(container => this.context.wireBean(container));
+        this.childContainers.forEach(container => this.getContext().wireBean(container));
 
         // shotgun way to get labels to change, eg from sum(amount) to avg(amount)
         this.addDestroyableEventListener(this.eventService, Events.EVENT_COLUMN_VALUE_CHANGED, this.refreshHeader.bind(this));

packages/ag-grid-community/src/ts/headerRendering/headerRootComp.ts

@@ -27,7 +27,6 @@ export class HeaderRowComp extends Component {
     @Autowired('gridOptionsWrapper') private gridOptionsWrapper: GridOptionsWrapper;
     @Autowired('gridApi') private gridApi: GridApi;
     @Autowired('columnController') private columnController: ColumnController;
-    @Autowired('context') private context: Context;
     @Autowired('eventService') private eventService: EventService;
     @Autowired('filterManager') private filterManager: FilterManager;
     @Autowired('componentRecipes') private componentRecipes: ComponentRecipes;
@@ -261,7 +260,7 @@ export class HeaderRowComp extends Component {
                 break;
         }
 
-        this.context.wireBean(result);
+        this.getContext().wireBean(result);
 
         return result;
     }

packages/ag-grid-community/src/ts/headerRendering/headerRowComp.ts

@@ -44,7 +44,6 @@ export class GroupCellRenderer extends Component implements ICellRenderer {
     @Autowired('eventService') private eventService: EventService;
     @Autowired('cellRendererService') private cellRendererService: CellRendererService;
     @Autowired('valueFormatterService') private valueFormatterService: ValueFormatterService;
-    @Autowired('context') private context: Context;
     @Autowired('columnController') private columnController: ColumnController;
     @Autowired('mouseEventService') private mouseEventService: MouseEventService;
 
@@ -296,7 +295,7 @@ export class GroupCellRenderer extends Component implements ICellRenderer {
                 && !rowNode.detail;
         if (checkboxNeeded) {
             const cbSelectionComponent = new CheckboxSelectionComponent();
-            this.context.wireBean(cbSelectionComponent);
+            this.getContext().wireBean(cbSelectionComponent);
             cbSelectionComponent.init({rowNode: rowNode, column: this.params.column});
             this.eCheckbox.appendChild(cbSelectionComponent.getGui());
             this.addDestroyFunc(() => cbSelectionComponent.destroy());

packages/ag-grid-community/src/ts/rendering/cellRenderers/groupCellRenderer.ts

@@ -44,7 +44,6 @@ export class RowRenderer extends BeanStub {
     @Autowired("valueService") private valueService: ValueService;
     @Autowired("eventService") private eventService: EventService;
     @Autowired("pinnedRowModel") private pinnedRowModel: PinnedRowModel;
-    @Autowired("context") private context: Context;
     @Autowired("loggerFactory") private loggerFactory: LoggerFactory;
     @Autowired("focusedCellController") private focusedCellController: FocusedCellController;
     @Autowired("cellNavigationService") private cellNavigationService: CellNavigationService;

packages/ag-grid-community/src/ts/rendering/rowRenderer.ts

@@ -11,7 +11,6 @@ import { _ } from "../../utils";
 export class InfiniteBlock extends RowNodeBlock implements IEventEmitter {
 
     @Autowired('gridOptionsWrapper') private gridOptionsWrapper: GridOptionsWrapper;
-    @Autowired('context') private context: Context;
     @Autowired('rowRenderer') private rowRenderer: RowRenderer;
 
     private cacheParams: InfiniteCacheParams;
@@ -51,7 +50,7 @@ export class InfiniteBlock extends RowNodeBlock implements IEventEmitter {
     @PostConstruct
     protected init(): void {
         super.init({
-            context: this.context,
+            context: this.getContext(),
             rowRenderer: this.rowRenderer
         });
     }

packages/ag-grid-community/src/ts/rowModels/infinite/infiniteBlock.ts

@@ -16,7 +16,6 @@ export interface InfiniteCacheParams extends RowNodeCacheParams {
 export class InfiniteCache extends RowNodeCache<InfiniteBlock, InfiniteCacheParams> {
 
     @Autowired('eventService') private eventService: EventService;
-    @Autowired('context') private context: Context;
     @Autowired('columnApi') private columnApi: ColumnApi;
     @Autowired('gridApi') private gridApi: GridApi;
 
@@ -133,10 +132,8 @@ export class InfiniteCache extends RowNodeCache<InfiniteBlock, InfiniteCachePara
 
     private createBlock(blockNumber: number): InfiniteBlock {
         const newBlock = new InfiniteBlock(blockNumber, this.cacheParams);
-        this.context.wireBean(newBlock);
-
+        this.getContext().wireBean(newBlock);
         this.postCreateBlock(newBlock);
-
         return newBlock;
     }
 

packages/ag-grid-community/src/ts/rowModels/infinite/infiniteCache.ts

@@ -27,7 +27,6 @@ export class InfiniteRowModel extends BeanStub implements IRowModel {
     @Autowired('sortController') private sortController: SortController;
     @Autowired('selectionController') private selectionController: SelectionController;
     @Autowired('eventService') private eventService: EventService;
-    @Autowired('context') private context: Context;
     @Autowired('gridApi') private gridApi: GridApi;
     @Autowired('columnApi') private columnApi: ColumnApi;
     @Autowired('rowRenderer') private rowRenderer: RowRenderer;
@@ -206,7 +205,7 @@ export class InfiniteRowModel extends BeanStub implements IRowModel {
         // there is a bi-directional dependency between the loader and the cache,
         // so we create loader here, and then pass dependencies in setDependencies() method later
         this.rowNodeBlockLoader = new RowNodeBlockLoader(maxConcurrentRequests, blockLoadDebounceMillis);
-        this.context.wireBean(this.rowNodeBlockLoader);
+        this.getContext().wireBean(this.rowNodeBlockLoader);
 
         this.cacheParams = {
             // the user provided datasource
@@ -253,7 +252,7 @@ export class InfiniteRowModel extends BeanStub implements IRowModel {
         }
 
         this.infiniteCache = new InfiniteCache(this.cacheParams);
-        this.context.wireBean(this.infiniteCache);
+        this.getContext().wireBean(this.infiniteCache);
 
         this.infiniteCache.addEventListener(RowNodeCache.EVENT_CACHE_UPDATED, this.onCacheUpdated.bind(this));
     }

packages/ag-grid-community/src/ts/rowModels/infinite/infiniteRowModel.ts

@@ -1,4 +1,4 @@
-import { Context } from "../context/context";
+import {Autowired, Context, PreConstruct} from "../context/context";
 import { BeanStub } from "../context/beanStub";
 import { IComponent } from "../interfaces/iComponent";
 import { AgEvent } from "../events";
@@ -38,18 +38,15 @@ export class Component extends BeanStub implements IComponent<any> {
         return this.compId;
     }
 
-    public instantiate(context: Context): void {
-        this.instantiateRecurse(this.getGui(), context);
-    }
-
-    private instantiateRecurse(parentNode: Element, context: Context): void {
+    // for registered components only, eg creates AgCheckbox instance from ag-checkbox HTML tag
+    private createChildComponentsFromTags(parentNode: Element): void {
 
         // we MUST take a copy of the list first, as the 'swapComponentForNode' adds comments into the DOM
         // which messes up the traversal order of the children.
         const childNodeList: Node[] = _.copyNodeList(parentNode.childNodes);
 
         childNodeList.forEach(childNode => {
-            const childComp = context.createComponentFromElement(childNode as Element, (childComp) => {
+            const childComp = this.getContext().createComponentFromElement(childNode as Element, (childComp) => {
                 // copy over all attributes, including css classes, so any attributes user put on the tag
                 // wll be carried across
                 this.copyAttributesFromNode(childNode as Element, childComp.getGui());
@@ -58,7 +55,7 @@ export class Component extends BeanStub implements IComponent<any> {
                 // replace the tag (eg ag-checkbox) with the proper HTMLElement (eg 'div') in the dom
                 this.swapComponentForNode(childComp, parentNode, childNode);
             } else if (childNode.childNodes) {
-                this.instantiateRecurse(childNode as Element, context);
+                this.createChildComponentsFromTags(childNode as Element);
             }
         });
     }
@@ -110,6 +107,22 @@ export class Component extends BeanStub implements IComponent<any> {
         (this.eGui as any).__agComponent = this;
         this.addAnnotatedEventListeners();
         this.wireQuerySelectors();
+
+        // context will not be available when user sets template in constructor
+        const contextIsAvailable = !!this.getContext();
+        if (contextIsAvailable) {
+            this.createChildComponentsFromTags(this.getGui());
+        }
+    }
+
+    @PreConstruct
+    private createChildComponentsPreConstruct(): void {
+        // ui exists if user sets template in constructor. when this happens, we have to wait for the context
+        // to be autoWired first before we can create child components.
+        const uiExists = !!this.getGui();
+        if (uiExists) {
+            this.createChildComponentsFromTags(this.getGui());
+        }
     }
 
     protected wireQuerySelectors(): void {