May 25, 2018 · Apr 23, 2018 · Apr 24, 2018 · Apr 25, 2018 · Apr 26, 2018 · Apr 27, 2018
diff --git a/packages/apputils/src/mainareawidget.ts b/packages/apputils/src/mainareawidget.ts
    this.addClass('jp-MainAreaWidget');
    this.id = uuid();

    const content = this.content = options.content;
    const toolbar = this.toolbar = options.toolbar || new Toolbar();
    const content = this._content = options.content;
    const toolbar = this._toolbar = options.toolbar || new Toolbar();
    const spinner = this._spinner;

    const layout = this.layout = new BoxLayout({spacing: 0});
    BoxLayout.setStretch(content, 1);
    BoxLayout.setStretch(spinner, 1);

    layout.addWidget(toolbar);

    if (!content.id) {
      content.id = uuid();
    }
    content.title.changed.connect(this._updateTitle, this);
    this.title.closable = true;
    this.title.changed.connect(this._updateContentTitle, this);
    content.disposed.connect(() => this.dispose());

    if (options.reveal) {
      layout.addWidget(spinner);
      // Make sure the revealed promise is a Promise<void> to avoid leaking any
      // results.
      this._revealed = options.reveal.then(() => {
        if (content.isDisposed) {
          this.dispose();
          return;
        }
        content.disposed.connect(() => this.dispose());
        const active = document.activeElement === spinner.node;
        spinner.dispose();
        layout.addWidget(toolbar);
        layout.addWidget(content);
        this._isRevealed = true;
        if (active) {
        BoxLayout.setStretch(error, 1);
        spinner.dispose();
        content.dispose();
        this._content = null;
        toolbar.dispose();
        this._toolbar = null;
        layout.addWidget(error);
        this._isRevealed = true;
        throw(error);
      });
    // Handle no reveal promise.
    } else {
      // Handle no reveal promise.
      spinner.dispose();
      layout.addWidget(toolbar);
      layout.addWidget(content);
      content.disposed.connect(() => this.dispose());
      this._isRevealed = true;
      this._revealed = Promise.resolve(undefined);
    }
  /**
   * The content hosted by the widget.
   */
  readonly content: T;
  get content(): T {
    return this._content;
  }

  /**
   * The toolbar hosted by the widget.
   */
  readonly toolbar: Toolbar;
  get toolbar(): Toolbar {
    return this._toolbar;
  }

  /**
   * Whether the content widget or an error is revealed.
    case 'mouseup':
    case 'mouseout':
      let target = event.target as HTMLElement;
      if (this._isRevealed &&
      if (this._isRevealed && this._content &&
          this.toolbar.node.contains(document.activeElement) &&
          target.tagName !== 'SELECT') {
        this._focusContent();
   */
  protected onActivateRequest(msg: Message): void {
    if (this._isRevealed) {
      this._focusContent();
      if (this._content) {
        this._focusContent();
      }
    } else {
      this._spinner.node.focus();
    }
    this.content.activate();
  }

  private _content: T;
  private _toolbar: Toolbar;
  private _changeGuard = false;
  private _spinner = new Spinner();
Original file line number	Diff line number	Diff line change
Expand Up		@@ -43,8 +43,8 @@ class MainAreaWidget<T extends Widget = Widget> extends Widget {
		this.addClass('jp-MainAreaWidget');
		this.id = uuid();

		const content = this.content = options.content;
		const toolbar = this.toolbar = options.toolbar \|\| new Toolbar();
		const content = this._content = options.content;
		const toolbar = this._toolbar = options.toolbar \|\| new Toolbar();
		const spinner = this._spinner;

		const layout = this.layout = new BoxLayout({spacing: 0});
Expand All		@@ -54,8 +54,6 @@ class MainAreaWidget<T extends Widget = Widget> extends Widget {
		BoxLayout.setStretch(content, 1);
		BoxLayout.setStretch(spinner, 1);

		layout.addWidget(toolbar);

		if (!content.id) {
		content.id = uuid();
		}
Expand All		@@ -65,15 +63,18 @@ class MainAreaWidget<T extends Widget = Widget> extends Widget {
		content.title.changed.connect(this._updateTitle, this);
		this.title.closable = true;
		this.title.changed.connect(this._updateContentTitle, this);
		content.disposed.connect(() => this.dispose());

		if (options.reveal) {
		layout.addWidget(spinner);
		// Make sure the revealed promise is a Promise<void> to avoid leaking any
		// results.
		this._revealed = options.reveal.then(() => {
		if (content.isDisposed) {
		this.dispose();
		return;
		}
		content.disposed.connect(() => this.dispose());
		const active = document.activeElement === spinner.node;
		spinner.dispose();
		layout.addWidget(toolbar);
		layout.addWidget(content);
		this._isRevealed = true;
		if (active) {
Expand All		@@ -89,14 +90,19 @@ class MainAreaWidget<T extends Widget = Widget> extends Widget {
		BoxLayout.setStretch(error, 1);
		spinner.dispose();
		content.dispose();
		this._content = null;
		toolbar.dispose();
		this._toolbar = null;
		layout.addWidget(error);
		this._isRevealed = true;
		throw(error);
		});
		// Handle no reveal promise.
		} else {
		// Handle no reveal promise.
		spinner.dispose();
		layout.addWidget(toolbar);
		layout.addWidget(content);
		content.disposed.connect(() => this.dispose());
		this._isRevealed = true;
		this._revealed = Promise.resolve(undefined);
		}
Expand All		@@ -105,12 +111,16 @@ class MainAreaWidget<T extends Widget = Widget> extends Widget {
		/**
		* The content hosted by the widget.
		*/
		readonly content: T;
		get content(): T {
		return this._content;
		}

		/**
		* The toolbar hosted by the widget.
		*/
		readonly toolbar: Toolbar;
		get toolbar(): Toolbar {
		return this._toolbar;
		}

		/**
		* Whether the content widget or an error is revealed.
Expand DownExpand Up		@@ -141,7 +151,7 @@ class MainAreaWidget<T extends Widget = Widget> extends Widget {
		case 'mouseup':
		case 'mouseout':
		let target = event.target as HTMLElement;
		if (this._isRevealed &&
		if (this._isRevealed && this._content &&
		this.toolbar.node.contains(document.activeElement) &&
		target.tagName !== 'SELECT') {
		this._focusContent();
Expand DownExpand Up		@@ -173,7 +183,9 @@ class MainAreaWidget<T extends Widget = Widget> extends Widget {
		*/
		protected onActivateRequest(msg: Message): void {
		if (this._isRevealed) {
		this._focusContent();
		if (this._content) {
		this._focusContent();
		}
		} else {
		this._spinner.node.focus();
		}
Expand DownExpand Up		@@ -238,6 +250,8 @@ class MainAreaWidget<T extends Widget = Widget> extends Widget {
		this.content.activate();
		}

		private _content: T;
		private _toolbar: Toolbar;
		private _changeGuard = false;
		private _spinner = new Spinner();

Expand Down