Snapshot-friendly (#162)

Author: DickSmith

drop-down.android.ts

@@ -57,28 +57,31 @@ export class DropDown extends DropDownBase {
     private _androidViewId: number;
 
     public createNativeView() {
+        initializeTNSSpinner();
         const spinner = new TNSSpinner(new WeakRef(this));
 
         if (!this._androidViewId) {
             this._androidViewId = android.view.View.generateViewId();
         }
         spinner.setId(this._androidViewId);
 
+        initializeDropDownAdapter();
         const adapter = new DropDownAdapter(new WeakRef(this));
         spinner.setAdapter(adapter);
-        (spinner as any).adapter = adapter;
+        spinner.adapter = adapter;
 
+        initializeDropDownItemSelectedListener();
         const itemSelectedListener = new DropDownItemSelectedListener(new WeakRef(this));
         spinner.setOnItemSelectedListener(itemSelectedListener);
-        (spinner as any).itemSelectedListener = itemSelectedListener;
+        spinner.itemSelectedListener = itemSelectedListener;
 
         return spinner;
     }
 
     public initNativeView() {
         super.initNativeView();
 
-        const nativeView = this.nativeView as any;
+        const nativeView = this.nativeView;
         nativeView.adapter.owner = new WeakRef(this);
         nativeView.itemSelectedListener.owner = new WeakRef(this);
 
@@ -90,7 +93,7 @@ export class DropDown extends DropDownBase {
     }
 
     public disposeNativeView() {
-        const nativeView = this.nativeView as any;
+        const nativeView = this.nativeView;
         nativeView.adapter.owner = null;
         nativeView.itemSelectedListener.owner = null;
 
@@ -107,11 +110,11 @@ export class DropDown extends DropDownBase {
     public open() {
         if (this.isEnabled) {
             this.nativeView.performClick();
-        }    
+        }
     }
 
     public close() {
-        this.nativeView.onDetachedFromWindow();
+        this.nativeView.onDetachedFromWindowX();
     }
 
     public [selectedIndexProperty.getDefault](): number {
@@ -233,7 +236,26 @@ export class DropDown extends DropDownBase {
     }
 }
 
-class TNSSpinner extends android.widget.Spinner {
+/* A snapshot-friendly, lazy-loaded class for TNSSpinner BEGIN */
+interface TNSSpinner extends android.widget.Spinner {
+    adapter;
+    itemSelectedListener;
+
+    /*tslint:disable-next-line no-misused-new*/
+    new(owner: WeakRef<DropDown>): TNSSpinner;
+
+    /** onDetachedFromWindow is protected so public version renamed */
+    onDetachedFromWindowX();
+}
+
+let TNSSpinner: TNSSpinner;
+
+function initializeTNSSpinner() {
+if (TNSSpinner) {
+    return;
+}
+
+class TNSSpinnerImpl extends android.widget.Spinner {
     private _isOpenedIn = false;
 
     constructor(private owner: WeakRef<DropDown>) {
@@ -266,12 +288,29 @@ class TNSSpinner extends android.widget.Spinner {
         }
     }
 
-    public onDetachedFromWindow() {
+    public onDetachedFromWindowX(): void {
         super.onDetachedFromWindow();
     }
 }
 
-class DropDownAdapter extends android.widget.BaseAdapter implements android.widget.ISpinnerAdapter {
+TNSSpinner = TNSSpinnerImpl as any;
+}
+/* TNSSpinner END */
+
+/* A snapshot-friendly, lazy-loaded class for DropDownAdpater BEGIN */
+interface DropDownAdapter extends android.widget.BaseAdapter, android.widget.ISpinnerAdapter {
+    /*tslint:disable-next-line no-misused-new*/
+    new(owner: WeakRef<DropDown>): DropDownAdapter;
+}
+
+let DropDownAdapter: DropDownAdapter;
+
+function initializeDropDownAdapter() {
+if (DropDownAdapter) {
+    return;
+}
+
+class DropDownAdapterImpl extends android.widget.BaseAdapter implements android.widget.ISpinnerAdapter {
     constructor(private owner: WeakRef<DropDown>) {
         super();
 
@@ -372,8 +411,25 @@ class DropDownAdapter extends android.widget.BaseAdapter implements android.widg
     }
 }
 
+DropDownAdapter = DropDownAdapterImpl as any;
+}
+/* DropDownAdpater END */
+
+/* A snapshot-friendly, lazy-loaded class for DropDownItemSelectedListener BEGIN */
+interface DropDownItemSelectedListener extends java.lang.Object, android.widget.AdapterView.OnItemSelectedListener {
+    /*tslint:disable-next-line no-misused-new*/
+    new(owner: WeakRef<DropDown>): DropDownItemSelectedListener;
+}
+
+let DropDownItemSelectedListener: DropDownItemSelectedListener;
+
+function initializeDropDownItemSelectedListener() {
+if (DropDownItemSelectedListener) {
+    return;
+}
+
 @Interfaces([android.widget.AdapterView.OnItemSelectedListener])
-class DropDownItemSelectedListener extends java.lang.Object implements android.widget.AdapterView.OnItemSelectedListener {
+class DropDownItemSelectedListenerImpl extends java.lang.Object implements android.widget.AdapterView.OnItemSelectedListener {
     constructor(private owner: WeakRef<DropDown>) {
         super();
 
@@ -400,4 +456,8 @@ class DropDownItemSelectedListener extends java.lang.Object implements android.w
     public onNothingSelected() {
         /* Currently Not Needed */
     }
-}
+}
+
+DropDownItemSelectedListener = DropDownItemSelectedListenerImpl as any;
+}
+/* DropDownItemSelectedListener END */

drop-down.d.ts

@@ -18,20 +18,20 @@ import { CoercibleProperty, Property, View } from "ui/core/view";
 import { EventData } from "data/observable";
 import { ItemsSource } from "ui/list-picker";
 
-export interface SelectedIndexChangedEventData extends EventData {
+export declare interface SelectedIndexChangedEventData extends EventData {
     oldIndex: number;
     newIndex: number;
 }
 
-export interface ValueItem<T> {
+export declare interface ValueItem<T> {
     value: T;
     display: string;
 }
 
-export class DropDown extends View {
-    public static openedEvent: string;
-    public static closedEvent: string;
-    public static selectedIndexChangedEvent: string;
+export declare class DropDown extends View {
+    public static openedEvent: "opened";
+    public static closedEvent: "closed";
+    public static selectedIndexChangedEvent: "selectedIndexChanged";
 
     public items: any[] | ItemsSource;
     public selectedIndex: number;
@@ -41,21 +41,21 @@ export class DropDown extends View {
     public ios: any; /* UILabel */
     public android: any; /*android.widget.Spinner */
 
-    public on(eventNames: string, callback: (data: EventData) => void, thisArg?: any);       
-    public on(event: "opened", callback: (args: EventData) => void, thisArg?: any); 
-    public on(event: "closed", callback: (args: EventData) => void, thisArg?: any); 
+    public on(eventNames: string, callback: (data: EventData) => void, thisArg?: any);
+    public on(event: "opened", callback: (args: EventData) => void, thisArg?: any);
+    public on(event: "closed", callback: (args: EventData) => void, thisArg?: any);
     public on(event: "selectedIndexChanged", callback: (args: SelectedIndexChangedEventData) => void, thisArg?: any);
 
     public open();
     public close();
 }
 
-export class ValueList<T> extends ObservableArray<ValueItem<T>> implements ItemsSource {
+export declare class ValueList<T> extends ObservableArray<ValueItem<T>> implements ItemsSource {
     public getDisplay(index: number): string;
     public getValue(index: number): T;
-    public getIndex(value: T): number;   
+    public getIndex(value: T): number;
 }
 
-export const selectedIndexProperty: CoercibleProperty<DropDown, number>;
-export const itemsProperty: Property<DropDown, any[] | ItemsSource>;
-export const hintProperty: Property<DropDown, string>;
+export declare const selectedIndexProperty: CoercibleProperty<DropDown, number>;
+export declare const itemsProperty: Property<DropDown, any[] | ItemsSource>;
+export declare const hintProperty: Property<DropDown, string>;