Merge pull request #105 from OneNoteDev/FixPublish

Support not passing oneNoteDataProvider and notebookListUpdater

Author: mttwc

package.json

@@ -1,6 +1,9 @@
 {
   "name": "onenotepicker",
-  "version": "2.3.0",
+  "version": "2.3.2",
+  "files": [
+    "dist/**/*"
+  ],
   "dependencies": {
     "bulma": "^0.4.2",
     "onenoteapi": "^2.0.1",

sampleApp/sample.tsx

@@ -42,19 +42,19 @@ oneNoteDataProvider.getNotebooks().then((notebooks) => {
 
 					console.log(breadcrumbs.map(x => x.name).join(' > '));
 
-					render(globalProps, globalProps.globals.notebookListUpdater.get());
+					render(globalProps, globalProps.globals.notebookListUpdater!.get());
 				},
 				onPageSelected: (page, breadcrumbs) => {
 					globalProps.globals.selectedId = page.id;
 
 					console.log(breadcrumbs.map(x => x.name).join(' > '));
 
-					render(globalProps, globalProps.globals.notebookListUpdater.get());
+					render(globalProps, globalProps.globals.notebookListUpdater!.get());
 				},
 				onAccessibleSelection: (selectedItemId: string) => {
 					globalProps.globals.ariaSelectedId = selectedItemId;
 
-					render(globalProps, globalProps.globals.notebookListUpdater.get());
+					render(globalProps, globalProps.globals.notebookListUpdater!.get());
 				}
 			},
 			selectedId: initialSelectedId

src/components/sharedNotebookRenderStrategy.tsx

@@ -115,36 +115,37 @@ export class SharedNotebookRenderStrategy implements ExpandableNodeRenderStrateg
 	}
 
 	private onExpand() {
-		if (this.isExpandable()) {
-			if (!this.notebook.apiProperties && !this.notebook.startedLoading) {
-				// This notebook was made known to us by GetRecentNotebooks, but we haven't
-				// fetched any metadata or children info
-				this.notebook.startedLoading = true;
-				const depth = this.globals.notebookExpandDepth || 5;
-				this.globals.oneNoteDataProvider.getSpNotebookProperties(this.notebook, depth, true).then((apiProperties) => {
-					if (!apiProperties) {
-						this.notebook.apiHttpErrorCode = 404;
-						return;
-					}
-
-					this.notebook.apiProperties = apiProperties;
-
-					if (this.globals.notebookListUpdater) {
-						this.globals.notebookListUpdater.updateNotebookList([this.notebook]);
-					}
-				}).catch((xhrs: XMLHttpRequest[]) => {
-					let max = 0;
-					for (let i = 0; i < xhrs.length; i++) {
-						max = Math.max(xhrs[i].status, max);
-					}
-					this.notebook.apiHttpErrorCode = max;
-				}).then(() => {
-					let { onSharedNotebookInfoReturned } = this.globals.callbacks;
-					if (!!onSharedNotebookInfoReturned) {
-						onSharedNotebookInfoReturned(this.notebook);
-					}
-				});
-			}
+		// Check if the picker is expandable
+		if ((this.globals.callbacks.onSectionSelected || !!this.globals.callbacks.onPageSelected) &&
+			!this.notebook.apiProperties && !this.notebook.startedLoading && this.globals.oneNoteDataProvider) {
+			// This notebook was made known to us by GetRecentNotebooks, but we haven't
+			// fetched any metadata or children info
+			this.notebook.startedLoading = true;
+			const depth = this.globals.notebookExpandDepth || 5;
+
+			this.globals.oneNoteDataProvider.getSpNotebookProperties(this.notebook, depth, true).then((apiProperties) => {
+				if (!apiProperties) {
+					this.notebook.apiHttpErrorCode = 404;
+					return;
+				}
+
+				this.notebook.apiProperties = apiProperties;
+
+				if (this.globals.notebookListUpdater) {
+					this.globals.notebookListUpdater.updateNotebookList([this.notebook]);
+				}
+			}).catch((xhrs: XMLHttpRequest[]) => {
+				let max = 0;
+				for (let i = 0; i < xhrs.length; i++) {
+					max = Math.max(xhrs[i].status, max);
+				}
+				this.notebook.apiHttpErrorCode = max;
+			}).then(() => {
+				let { onSharedNotebookInfoReturned } = this.globals.callbacks;
+				if (!!onSharedNotebookInfoReturned) {
+					onSharedNotebookInfoReturned(this.notebook);
+				}
+			});
 		}
 	}
 
@@ -153,8 +154,4 @@ export class SharedNotebookRenderStrategy implements ExpandableNodeRenderStrateg
 		let split = url.split('/');
 		return split.slice(3, -1).map(decodeURIComponent).join('/');
 	}
-
-	private isExpandable(): boolean {
-		return !!this.globals.callbacks.onSectionSelected || !!this.globals.callbacks.onPageSelected;
-	}
 }

src/props/globalProps.ts

@@ -16,8 +16,8 @@ export interface GlobalProps {
 export interface InnerGlobals {
 	focusOnMount: boolean;
 
-	oneNoteDataProvider: OneNoteDataProvider;
-	notebookListUpdater: NotebookListUpdater;
+	oneNoteDataProvider: OneNoteDataProvider | undefined;
+	notebookListUpdater: NotebookListUpdater | undefined;
 	callbacks: OneNotePickerCallbacks;
 
 	strings?: {};