@web-atoms/core 2.5.14 → 2.5.19

package/dist-esm/web/controls/AtomItemsControl.d.ts

@@ -3,7 +3,6 @@ import { IClassOf } from "../../core/types.js";
 import XNode from "../../core/XNode.js";
 import { AtomControl } from "./AtomControl.js";
 export declare class AtomItemsControl extends AtomControl {
-    /** Item Template for displaying individual items */
     static itemTemplate: (attributes: Partial<unknown>, ...nodes: XNode[]) => XNode;
     mAllowSelectFirst: boolean;
     allowMultipleSelection: boolean;

package/dist-esm/web/controls/AtomItemsControl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AtomItemsControl.d.ts","sourceRoot":"","sources":["../../../src/web/controls/AtomItemsControl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AtomItemsControl.d.ts","sourceRoot":"","sources":["../../../src/web/controls/AtomItemsControl.ts"],"names":[],"mappings":"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"}

package/dist-esm/web/controls/AtomItemsControl.js

@@ -1,33 +1,56 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AtomItemsControl = void 0;
-const tslib_1 = require("tslib");
-const AtomBinder_js_1 = require("../../core/AtomBinder.js");
-const AtomEnumerator_js_1 = tslib_1.__importDefault(require("../../core/AtomEnumerator.js"));
-require("../../core/AtomList");
-const XNode_js_1 = tslib_1.__importDefault(require("../../core/XNode.js"));
-const AtomUI_js_1 = require("../../web/core/AtomUI.js");
-const AtomControl_js_1 = require("./AtomControl.js");
-class AtomItemsControl extends AtomControl_js_1.AtomControl {
-    constructor() {
-        super(...arguments);
-        this.mValue = undefined;
-        // private mFilteredItems: any[] = [];
-        // private mSelectedItem: any = undefined;
-        this.mFilter = undefined;
-        this.mFirstChild = null;
-        this.mLastChild = null;
-        this.mScrollerSetup = false;
-        this.mScopes = null;
-        this.mItemsDisposable = null;
-        this.isUpdating = false;
-    }
+import { AtomBinder } from "../../core/AtomBinder.js";
+import AtomEnumerator from "../../core/AtomEnumerator.js";
+import "../../core/AtomList";
+import XNode from "../../core/XNode.js";
+import { AtomUI, ChildEnumerator } from "../../web/core/AtomUI.js";
+import { AtomControl } from "./AtomControl.js";
+export class AtomItemsControl extends AtomControl {
+    static itemTemplate = XNode.prepare("itemTemplate", true, true);
+    mAllowSelectFirst;
+    allowMultipleSelection;
+    valuePath;
+    labelPath;
+    itemTemplate;
+    version;
+    autoScrollToSelection;
+    sort;
+    valueSeparator;
+    uiVirtualize;
+    mValue = undefined;
+    mSelectedItems;
+    mSelectedItemsWatcher;
+    itemsInvalidated;
+    mFilter = undefined;
+    mSelectAll;
+    mItemsPresenter;
+    mFirstChild = null;
+    mLastChild = null;
+    mScrollerSetup = false;
+    mScopes = null;
+    mVirtualContainer;
+    mChildItemType;
+    scrollTimeout;
+    mTraining;
+    mAvgHeight;
+    mAvgWidth;
+    mAllRows;
+    mColumns;
+    mVisibleRows;
+    mVisibleHeight;
+    mReady;
+    mIsChanging;
+    mOnUIChanged;
+    lastScrollTop;
+    mPromises;
+    mItems;
+    mItemsDisposable = null;
+    isUpdating = false;
     get itemsPresenter() {
         return this.mItemsPresenter || (this.mItemsPresenter = this.element);
     }
     set itemsPresenter(v) {
         this.mItemsPresenter = v;
-        AtomBinder_js_1.AtomBinder.refreshValue(this, "itemsPresenter");
+        AtomBinder.refreshValue(this, "itemsPresenter");
     }
     get value() {
         if (this.allowMultipleSelection) {
@@ -64,8 +87,7 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
         }
         const sItems = this.selectedItems;
         if (v === undefined || v === null) {
-            // reset...
-            AtomBinder_js_1.AtomBinder.clear(sItems);
+            AtomBinder.clear(sItems);
             return;
         }
         if (this.allowMultipleSelection && this.valueSeparator) {
@@ -77,18 +99,15 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
         else {
             v = [v];
         }
-        // const items = AtomArray.intersect(dataItems, this._valuePath, v);
         sItems.length = 0;
         const vp = this.valuePath;
         for (const item of v) {
-            // tslint:disable-next-line:triple-equals
             const dataItem = dataItems.find((i) => i[vp] == v);
             if (dataItem) {
                 sItems.push(dataItem);
             }
         }
-        // this.updateSelectionBindings();
-        AtomBinder_js_1.AtomBinder.refreshItems(sItems);
+        AtomBinder.refreshItems(sItems);
     }
     get items() {
         return this.mItems;
@@ -99,14 +118,12 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
             this.mItemsDisposable = null;
         }
         this.mItems = v;
-        // this.mFilteredItems = null;
         if (v != null) {
-            this.mItemsDisposable = this.registerDisposable(AtomBinder_js_1.AtomBinder.add_CollectionChanged(v, (target, key, index, item) => {
+            this.mItemsDisposable = this.registerDisposable(AtomBinder.add_CollectionChanged(v, (target, key, index, item) => {
                 this.onCollectionChangedInternal(key, index, item);
             }));
-            // this.onCollectionChangedInternal("refresh", -1, null);
         }
-        AtomBinder_js_1.AtomBinder.refreshValue(this, "items");
+        AtomBinder.refreshValue(this, "items");
     }
     get selectedItem() {
         if (this.selectedItems.length > 0) {
@@ -122,7 +139,7 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
         else {
             this.mSelectedItems.length = 0;
         }
-        AtomBinder_js_1.AtomBinder.refreshItems(this.mSelectedItems);
+        AtomBinder.refreshItems(this.mSelectedItems);
     }
     get selectedItems() {
         return this.mSelectedItems || (this.selectedItems = []);
@@ -134,7 +151,7 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
         }
         this.mSelectedItems = v;
         if (v) {
-            this.mSelectedItemsWatcher = this.registerDisposable(AtomBinder_js_1.AtomBinder.add_CollectionChanged(v, (t, k, i, item) => {
+            this.mSelectedItemsWatcher = this.registerDisposable(AtomBinder.add_CollectionChanged(v, (t, k, i, item) => {
                 this.onSelectedItemsChanged(k, i, item);
             }));
         }
@@ -157,7 +174,6 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
         this.selectedItem = this.mItems[n];
     }
     hasProperty(name) {
-        // tslint:disable-next-line: max-line-length
         if (/^(items|itemsPresenter|value|valuePath|valueSeparator|label|labelPath|selectedItems|selectedItem|selectedIndex|uiVirtualize|viewModel|localViewModel|data)$/.test(name)) {
             return true;
         }
@@ -166,7 +182,6 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
     dispose(e) {
         this.items = null;
         this.selectedItems = null;
-        // this.mFilteredItems = null;
         super.dispose(e);
     }
     onPropertyChanged(name) {
@@ -181,11 +196,6 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
                 if (this.mItems) {
                     this.invalidateItems();
                 }
-                // this.runAfterInit(() => {
-                //     if (this.mItems) {
-                //         this.onCollectionChangedInternal("refresh", -1, null);
-                //     }
-                // });
                 break;
         }
     }
@@ -201,7 +211,7 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
             }
         }
         this.mSelectAll = true;
-        AtomBinder_js_1.AtomBinder.refreshItems(this.mSelectedItems);
+        AtomBinder.refreshItems(this.mSelectedItems);
     }
     resetVirtualContainer() {
         const ip = this.itemsPresenter;
@@ -230,7 +240,7 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
         const fc = this.mFirstChild;
         const lc = this.mLastChild;
         const vc = this.mVirtualContainer;
-        const vcHeight = AtomUI_js_1.AtomUI.innerHeight(vc);
+        const vcHeight = AtomUI.innerHeight(vc);
         const vcScrollHeight = vc.scrollHeight;
         if (isNaN(vcHeight) || vcHeight <= 0 || vcScrollHeight <= 0) {
             setTimeout(() => {
@@ -238,17 +248,16 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
             }, 1000);
             return;
         }
-        const vcWidth = AtomUI_js_1.AtomUI.innerWidth(vc);
+        const vcWidth = AtomUI.innerWidth(vc);
         let avgHeight = this.mAvgHeight;
         let avgWidth = this.mAvgWidth;
-        const itemsHeight = vc.scrollHeight - AtomUI_js_1.AtomUI.outerHeight(fc) - AtomUI_js_1.AtomUI.outerHeight(lc);
-        const itemsWidth = AtomUI_js_1.AtomUI.innerWidth(ip);
+        const itemsHeight = vc.scrollHeight - AtomUI.outerHeight(fc) - AtomUI.outerHeight(lc);
+        const itemsWidth = AtomUI.innerWidth(ip);
         const element = this.element;
         let ce;
-        let ae = new AtomEnumerator_js_1.default(items);
+        let ae = new AtomEnumerator(items);
         if (this.mTraining) {
             if (vcHeight >= itemsHeight) {
-                // lets add item...
                 ce = lc.previousElementSibling;
                 if (ce !== fc) {
                     const data = ce.atomControl.data;
@@ -266,15 +275,14 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
                 }
             }
             else {
-                // calculate avg height
                 let totalVisibleItems = 0;
                 ce = fc.nextElementSibling;
                 let allHeight = 0;
                 let allWidth = 0;
                 while (ce !== lc) {
                     totalVisibleItems++;
-                    allHeight += AtomUI_js_1.AtomUI.outerHeight(ce);
-                    allWidth += AtomUI_js_1.AtomUI.outerWidth(ce);
+                    allHeight += AtomUI.outerHeight(ce);
+                    allWidth += AtomUI.outerWidth(ce);
                     ce = ce.nextElementSibling;
                 }
                 avgHeight = allHeight / totalVisibleItems;
@@ -285,7 +293,6 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
                 const columns = Math.floor(vcWidth / avgWidth);
                 const allRows = Math.ceil(items.length / columns);
                 const visibleRows = Math.ceil(totalVisibleItems / columns);
-                // tslint:disable-next-line:no-console
                 console.log({
                     avgWidth,
                     avgHeight,
@@ -297,7 +304,6 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
                 this.mColumns = columns;
                 this.mVisibleRows = visibleRows;
                 this.mVisibleHeight = visibleRows * avgHeight;
-                // set height of last child... to increase padding
                 lc.style.height = ((allRows - visibleRows + 1) * avgHeight) + "px";
                 this.mTraining = false;
                 this.mReady = true;
@@ -308,18 +314,13 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
         const self = this;
         this.lastScrollTop = vc.scrollTop;
         if (this.mIsChanging) {
-            // setTimeout(function () {
-            //    self.onVirtualCollectionChanged();
-            // }, 100);
             return;
         }
         this.mIsChanging = true;
         const block = Math.floor(this.mVisibleHeight / avgHeight);
         const itemsInBlock = this.mVisibleRows * this.mColumns;
-        // lets simply recreate the view... if we are out of the scroll bounds...
         const index = Math.floor(vc.scrollTop / this.mVisibleHeight);
         const itemIndex = index * itemsInBlock;
-        // console.log("First block index is " + index + " item index is " + index * itemsInBlock);
         if (itemIndex >= items.length) {
             this.mIsChanging = false;
             return;
@@ -332,7 +333,6 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
         if (firstItem !== lastItem) {
             const firstVisibleIndex = items.indexOf(firstItem.atomControl.data);
             const lastVisibleIndex = items.indexOf(lastItem.atomControl.data);
-            // tslint:disable-next-line:no-console
             console.log({
                 firstVisibleIndex,
                 firstIndex,
@@ -340,7 +340,6 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
                 lastIndex
             });
             if (firstIndex >= firstVisibleIndex && lastIndex <= lastVisibleIndex) {
-                // tslint:disable-next-line:no-console
                 console.log("All items are visible...");
                 this.mIsChanging = false;
                 return;
@@ -356,7 +355,7 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
             remove.push(c);
         }
         this.app.dispatcher.pause();
-        ae = new AtomEnumerator_js_1.default(items);
+        ae = new AtomEnumerator(items);
         for (let i = 0; i < firstIndex; i++) {
             ae.next();
         }
@@ -382,14 +381,13 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
             last = index2;
         }
         const h = (this.mAllRows - block * 3) * avgHeight - index * this.mVisibleHeight;
-        // tslint:disable-next-line:no-console
         console.log("last child height = " + h);
         this.app.callLater(() => {
-            const oldHeight = AtomUI_js_1.AtomUI.outerHeight(fc);
+            const oldHeight = AtomUI.outerHeight(fc);
             const newHeight = index * this.mVisibleHeight;
             const diff = newHeight - oldHeight;
             const oldScrollTop = vc.scrollTop;
-            const a = new AtomEnumerator_js_1.default(add);
+            const a = new AtomEnumerator(add);
             while (a.next()) {
                 const ec = a.current;
                 ip.insertBefore(ec, ec.before.nextElementSibling);
@@ -402,22 +400,12 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
                 }
                 iterator.remove();
             }
-            // const a = new AtomEnumerator(remove);
-            // while (a.next()) {
-            //     const ec = a.current();
-            //     if (!ec.before) {
-            //         ec.atomControl.dispose();
-            //     }
-            //     ec.remove();
-            // }
-            // vc.scrollTop = oldScrollTop - diff;
             lc.style.height = h + "px";
-            // tslint:disable-next-line:no-console
             console.log(`Old: ${oldScrollTop} Diff: ${diff} Old Height: ${oldHeight} Height: ${newHeight}`);
             this.mIsChanging = false;
         });
         this.app.dispatcher.start();
-        AtomBinder_js_1.AtomBinder.refreshValue(this, "childAtomControls");
+        AtomBinder.refreshValue(this, "childAtomControls");
     }
     isSelected(item) {
         let selectedItem = null;
@@ -431,7 +419,7 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
     }
     bringIntoView(data) {
         this.app.callLater(() => {
-            for (let item of AtomUI_js_1.ChildEnumerator.enumerate(this.itemsPresenter || this.element)) {
+            for (let item of ChildEnumerator.enumerate(this.itemsPresenter || this.element)) {
                 const dataItem = item.atomControl ? item.atomControl.data : item;
                 if (dataItem === data) {
                     item.scrollIntoView();
@@ -441,10 +429,6 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
         });
     }
     bringSelectionIntoView() {
-        // do not scroll for first auto select
-        // if (this.mAllowSelectFirst && this.get_selectedIndex() === 0) {
-        //     return;
-        // }
         if (this.uiVirtualize) {
             const index = this.selectedIndex;
             if (!this.mReady) {
@@ -454,16 +438,14 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
                 return;
             }
             const avgHeight = this.mAvgHeight;
-            const vcHeight = AtomUI_js_1.AtomUI.innerHeight(this.mVirtualContainer);
+            const vcHeight = AtomUI.innerHeight(this.mVirtualContainer);
             const block = Math.ceil(vcHeight / avgHeight);
             const itemsInBlock = block * this.mColumns;
             const scrollTop = Math.floor(index / itemsInBlock);
-            AtomUI_js_1.AtomUI.scrollTop(this.mVirtualContainer, scrollTop * vcHeight);
+            AtomUI.scrollTop(this.mVirtualContainer, scrollTop * vcHeight);
             return;
         }
-        // const en = new ChildEnumerator(this.itemsPresenter || this.element);
-        for (let item of AtomUI_js_1.ChildEnumerator.enumerate(this.itemsPresenter || this.element)) {
-            // const item = en.current;
+        for (let item of ChildEnumerator.enumerate(this.itemsPresenter || this.element)) {
             const dataItem = item.atomControl ? item.atomControl.data : item;
             if (this.isSelected(dataItem)) {
                 setTimeout(() => {
@@ -478,27 +460,24 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
         if (this.mSelectedItems && this.mSelectedItems.length) {
             this.mValue = undefined;
         }
-        AtomBinder_js_1.AtomBinder.refreshValue(this, "value");
-        AtomBinder_js_1.AtomBinder.refreshValue(this, "selectedItem");
-        AtomBinder_js_1.AtomBinder.refreshValue(this, "selectedItems");
-        AtomBinder_js_1.AtomBinder.refreshValue(this, "selectedIndex");
+        AtomBinder.refreshValue(this, "value");
+        AtomBinder.refreshValue(this, "selectedItem");
+        AtomBinder.refreshValue(this, "selectedItems");
+        AtomBinder.refreshValue(this, "selectedIndex");
         if (!this.mSelectedItems.length) {
             if (this.mSelectAll === true) {
                 this.mSelectAll = false;
-                AtomBinder_js_1.AtomBinder.refreshValue(this, "selectAll");
+                AtomBinder.refreshValue(this, "selectAll");
             }
         }
     }
     onSelectedItemsChanged(type, index, item) {
         if (!this.mOnUIChanged) {
-            // this.updateChildSelections(type, index, item);
             if (this.autoScrollToSelection) {
                 this.bringSelectionIntoView();
             }
         }
         this.updateSelectionBindings();
-        // AtomControl.updateUI();
-        // this.invokePost();
     }
     hasItems() {
         return this.mItems !== undefined && this.mItems !== null;
@@ -518,13 +497,6 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
             this.itemsInvalidated = 0;
             this.onCollectionChangedInternal("refresh", -1, null);
         }, 5);
-        // this.registerDisposable({
-        //     dispose: () => {
-        //         if (this.itemsInvalidated) {
-        //             clearTimeout(this.itemsInvalidated);
-        //         }
-        //     }
-        // });
     }
     onCollectionChanged(key, index, item) {
         if (!this.mItems) {
@@ -541,12 +513,8 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
             this.resetVirtualContainer();
         }
         if (/remove/gi.test(key)) {
-            // tslint:disable-next-line:no-shadowed-variable
             const ip = this.itemsPresenter || this.element;
-            // const en = new ChildEnumerator(ip);
-            for (let ce of AtomUI_js_1.ChildEnumerator.enumerate(ip)) {
-                // const ce = en.current;
-                // tslint:disable-next-line:no-shadowed-variable
+            for (let ce of ChildEnumerator.enumerate(ip)) {
                 const c = ce;
                 if (c.atomControl && c.atomControl.data === item) {
                     c.atomControl.dispose();
@@ -554,23 +522,13 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
                     break;
                 }
             }
-            // AtomControl.updateUI();
             return;
         }
         if (this.uiVirtualize) {
             this.onVirtualCollectionChanged();
             return;
         }
-        // AtomUIComponent
         const parentScope = undefined;
-        // const parentScope = this.get_scope();
-        // const et = this.getTemplate("itemTemplate");
-        // if (et) {
-        //     et = AtomUI.getAtomType(et);
-        //     if (et) {
-        //         this._childItemType = et;
-        //     }
-        // }
         let items = this.mFilter ? this.mItems.filter(this.mFilter) : this.mItems;
         let s = this.sort;
         if (s) {
@@ -585,25 +543,6 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
             items = items.sort(s);
         }
         if (/add/gi.test(key)) {
-            // WebAtoms.dispatcher.pause();
-            // for (const aeItem of this.mItems) {
-            //     for (const ceItem of AtomUI.childEnumerator(this.itemsPresenter)) {
-            //         const d: any = ceItem;
-            //         if (aeItem.currentIndex() === index) {
-            //             const ctl: any = this.createChildElement(parentScope, this.itemsPresenter, item, aeItem, d);
-            //             this.applyItemStyle(ctl, item, aeItem.isFirst(), aeItem.isLast());
-            //             break;
-            //         }
-            //         if (aeItem.isLast()) {
-            // tslint:disable-next-line:max-line-length
-            //             const ctl: any = this.createChildElement(parentScope, this.itemsPresenter, item, aeItem, null);
-            //             this.applyItemStyle(ctl, item, aeItem.isFirst(), aeItem.isLast());
-            //             break;
-            //         }
-            //     }
-            // }
-            // WebAtoms.dispatcher.start();
-            // AtomControl.updateUI();
             const lastItem = items[index];
             let last = this.itemsPresenter.children.item(index);
             const df2 = document.createDocumentFragment();
@@ -617,48 +556,14 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
             return;
         }
         const element = this.itemsPresenter;
-        // const dataItems = this.get_dataItems();
-        // AtomControl.disposeChildren(element);
         this.disposeChildren(this.itemsPresenter);
-        // WebAtoms.dispatcher.pause();
-        // const items = this.get_dataItems(true);
         const added = [];
-        // this.getTemplate("itemTemplate");
-        // tslint:disable-next-line:no-console
-        // console.log("Started");
-        // const df = document.createDocumentFragment();
         const ip = this.itemsPresenter || this.element;
         for (const mItem of items) {
             const data = mItem;
-            // const elementChild = this.createChildElement(parentScope, element, data, mItem, null);
-            // added.push(elementChild);
-            // this.applyItemStyle(elementChild, data, mItem.isFirst(), mItem.isLast());
             const ac = this.createChild(null, data);
             ip.appendChild(ac.element);
         }
-        // (this.element as HTMLElement).appendChild(df);
-        // tslint:disable-next-line:no-console
-        // console.log("Ended");
-        // const self = this;
-        // WebAtoms.dispatcher.callLater(() => {
-        //     const dirty = [];
-        //     for (const elementItem of AtomUI.childEnumerator(element)) {
-        //         const ct = elementItem;
-        //         const func = added.filter((fx) => ct === fx);
-        //         if (func.pop() !== ct) {
-        //             dirty.push(ct);
-        //         }
-        //     }
-        //     for (const dirtyItem of dirty) {
-        //         const drt = dirtyItem;
-        //         if (drt.atomControl) {
-        //             drt.atomControl.dispose();
-        //         }
-        //         AtomUI.remove(item);
-        //     }
-        //     });
-        // WebAtoms.dispatcher.start();
-        // AtomBinder.refreshValue(this, "childAtomControls");
     }
     preCreate() {
         this.mAllowSelectFirst = false;
@@ -677,15 +582,13 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
         super.preCreate();
     }
     onCollectionChangedInternal(key, index, item) {
-        // Atom.refresh(this, "allValues");
-        // AtomBinder.refreshValue(this, "allValues");
         const value = this.value;
         try {
             this.isUpdating = true;
             this.onCollectionChanged(key, index, item);
             if (value) {
                 if (!(value || this.mAllowSelectFirst)) {
-                    AtomBinder_js_1.AtomBinder.clear(this.mSelectedItems);
+                    AtomBinder.clear(this.mSelectedItems);
                 }
             }
             if (value != null) {
@@ -703,7 +606,6 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
                 this.isUpdating = false;
             });
         }
-        // this.selectDefault();
     }
     set allowSelectFirst(b) {
         b = b ? b !== "false" : b;
@@ -714,8 +616,7 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
             return;
         }
         this.mFilter = f;
-        // this.mFilteredItems = null;
-        AtomBinder_js_1.AtomBinder.refreshValue(this, "filter");
+        AtomBinder.refreshValue(this, "filter");
     }
     onScroll() {
         if (this.scrollTimeout) {
@@ -731,16 +632,16 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
         this.mValue = undefined;
         if (this.allowMultipleSelection) {
             if (this.mSelectedItems.indexOf(data) !== -1) {
-                AtomBinder_js_1.AtomBinder.removeItem(this.mSelectedItems, data);
+                AtomBinder.removeItem(this.mSelectedItems, data);
             }
             else {
-                AtomBinder_js_1.AtomBinder.addItem(this.mSelectedItems, data);
+                AtomBinder.addItem(this.mSelectedItems, data);
             }
         }
         else {
             this.mSelectedItems.length = 1;
             this.mSelectedItems[0] = data;
-            AtomBinder_js_1.AtomBinder.refreshItems(this.mSelectedItems);
+            AtomBinder.refreshItems(this.mSelectedItems);
         }
         this.mOnUIChanged = false;
     }
@@ -765,7 +666,6 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
             this.onScroll();
         });
         ip.style.overflow = "hidden";
-        // this.validateScroller = null;
         const isTable = /tbody/i.test(ip.nodeName);
         let fc;
         let lc;
@@ -793,7 +693,6 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
         this.mLastChild = lc;
         ip.appendChild(fc);
         ip.appendChild(lc);
-        // let us train ourselves to find average height/width
         this.mTraining = true;
         this.mScrollerSetup = true;
     }
@@ -815,9 +714,7 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
         return ac;
     }
     disposeChildren(e) {
-        // const en = new ChildEnumerator(e);
-        for (let iterator of AtomUI_js_1.ChildEnumerator.enumerate(e)) {
-            // const iterator = en.current;
+        for (let iterator of ChildEnumerator.enumerate(e)) {
             const ac = iterator.atomControl;
             if (ac) {
                 ac.dispose();
@@ -826,10 +723,7 @@ class AtomItemsControl extends AtomControl_js_1.AtomControl {
         e.innerHTML = "";
     }
 }
-exports.AtomItemsControl = AtomItemsControl;
-/** Item Template for displaying individual items */
-AtomItemsControl.itemTemplate = XNode_js_1.default.prepare("itemTemplate", true, true);
-class AtomItemsControlItemTemplate extends AtomControl_js_1.AtomControl {
+class AtomItemsControlItemTemplate extends AtomControl {
     create() {
         this.runAfterInit(() => {
             const tp = this.element._templateParent;