diff --git a/.eslintignore b/.eslintignore index 2ecbfcdc0..532cc1b96 100644 --- a/.eslintignore +++ b/.eslintignore @@ -101,7 +101,6 @@ src/Explorer/Menus/CommandBar/CommandBarComponentButtonFactory.ts src/Explorer/Menus/ContextMenu.ts src/Explorer/MostRecentActivity/MostRecentActivity.ts src/Explorer/Notebook/FileSystemUtil.ts -src/Explorer/Notebook/NTeractUtil.ts src/Explorer/Notebook/NotebookClientV2.ts src/Explorer/Notebook/NotebookComponent/NotebookContentProvider.ts src/Explorer/Notebook/NotebookComponent/__mocks__/rx-jupyter.ts diff --git a/src/Explorer/Notebook/NTeractUtil.ts b/src/Explorer/Notebook/NTeractUtil.ts index b54afb530..2fdd9ae33 100644 --- a/src/Explorer/Notebook/NTeractUtil.ts +++ b/src/Explorer/Notebook/NTeractUtil.ts @@ -3,20 +3,18 @@ import { NotebookContentRecordProps, selectors } from "@nteract/core"; /** * A bunch of utilities to interact with nteract */ -export default class NTeractUtil { - public static getCurrentCellType(content: NotebookContentRecordProps): "markdown" | "code" | "raw" | undefined { - if (!content) { - return undefined; - } - - const cellFocusedId = selectors.notebook.cellFocused(content.model); - if (cellFocusedId) { - const cell = selectors.notebook.cellById(content.model, { id: cellFocusedId }); - if (cell) { - return cell.cell_type; - } - } - +export function getCurrentCellType(content: NotebookContentRecordProps): "markdown" | "code" | "raw" | undefined { + if (!content) { return undefined; } + + const cellFocusedId = selectors.notebook.cellFocused(content.model); + if (cellFocusedId) { + const cell = selectors.notebook.cellById(content.model, { id: cellFocusedId }); + if (cell) { + return cell.cell_type; + } + } + + return undefined; } diff --git a/src/Explorer/Notebook/NotebookComponent/NotebookComponentBootstrapper.tsx b/src/Explorer/Notebook/NotebookComponent/NotebookComponentBootstrapper.tsx index 2dc173fc6..3422f6456 100644 --- a/src/Explorer/Notebook/NotebookComponent/NotebookComponentBootstrapper.tsx +++ b/src/Explorer/Notebook/NotebookComponent/NotebookComponentBootstrapper.tsx @@ -29,7 +29,7 @@ import "@nteract/styles/global-variables.css"; import "react-table/react-table.css"; import * as CdbActions from "./actions"; -import NteractUtil from "../NTeractUtil"; +import * as NteractUtil from "../NTeractUtil"; export interface NotebookComponentBootstrapperOptions { notebookClient: NotebookClientV2; diff --git a/src/Explorer/Notebook/NotebookComponent/VirtualCommandBarComponent.tsx b/src/Explorer/Notebook/NotebookComponent/VirtualCommandBarComponent.tsx index b49669be5..9c2953cc7 100644 --- a/src/Explorer/Notebook/NotebookComponent/VirtualCommandBarComponent.tsx +++ b/src/Explorer/Notebook/NotebookComponent/VirtualCommandBarComponent.tsx @@ -1,7 +1,7 @@ import * as React from "react"; import { AppState, ContentRef, selectors } from "@nteract/core"; import { connect } from "react-redux"; -import NteractUtil from "../NTeractUtil"; +import * as NteractUtil from "../NTeractUtil"; interface VirtualCommandBarComponentProps { kernelSpecName: string;