diff --git a/packages/react/src/NodeViewContent.tsx b/packages/react/src/NodeViewContent.tsx
index 62d9cb28..fbc64d8a 100644
--- a/packages/react/src/NodeViewContent.tsx
+++ b/packages/react/src/NodeViewContent.tsx
@@ -6,19 +6,14 @@ export interface NodeViewContentProps {
 }
 
 export const NodeViewContent: React.FC<NodeViewContentProps> = props => {
-  // TODO
-  // @ts-ignore
   const { isEditable } = useReactNodeView()
-
   const Tag = props.as || 'div'
 
   return (
     <Tag
       data-node-view-content=""
       contentEditable={isEditable}
-      style={{
-        whiteSpace: 'pre-wrap'
-      }}
+      style={{ whiteSpace: 'pre-wrap' }}
     />
   )
 }
diff --git a/packages/react/src/NodeViewWrapper.tsx b/packages/react/src/NodeViewWrapper.tsx
index 3941106e..6e159123 100644
--- a/packages/react/src/NodeViewWrapper.tsx
+++ b/packages/react/src/NodeViewWrapper.tsx
@@ -6,19 +6,14 @@ export interface NodeViewWrapperProps {
 }
 
 export const NodeViewWrapper: React.FC<NodeViewWrapperProps> = props => {
-  // TODO
-  // @ts-ignore
   const { onDragStart } = useReactNodeView()
-
   const Tag = props.as || 'div'
 
   return (
     <Tag
       data-node-view-wrapper=""
-      style={{
-        whiteSpace: 'normal'
-      }}
       onDragStart={onDragStart}
+      style={{ whiteSpace: 'normal' }}
     >
      {props.children}
     </Tag>
diff --git a/packages/react/src/useReactNodeView.ts b/packages/react/src/useReactNodeView.ts
index 0225a201..094a388e 100644
--- a/packages/react/src/useReactNodeView.ts
+++ b/packages/react/src/useReactNodeView.ts
@@ -1,6 +1,11 @@
 import React, { useContext } from 'react'
 
-export const ReactNodeViewContext = React.createContext<any>({
+export interface ReactNodeViewContextProps {
+  isEditable: boolean,
+  onDragStart: (event: DragEvent) => void,
+}
+
+export const ReactNodeViewContext = React.createContext<Partial<ReactNodeViewContextProps>>({
   isEditable: undefined,
   onDragStart: undefined,
 })