factor type definitions

Author: severo

src/components/viewers/ContentHeader.tsx

@@ -1,8 +1,16 @@
 import React, { ReactNode } from 'react'
 import { getFileSize } from '../../files.js'
 
+export interface ContentSize {
+  fileSize?: number
+}
+
+export interface TextContent extends ContentSize {
+  text: string
+}
+
 interface ContentHeaderProps {
-  content?: { fileSize?: number }
+  content?: ContentSize
   headers?: ReactNode
   children?: ReactNode
 }

src/components/viewers/ImageView.tsx

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import ContentHeader, { parseFileSize } from './ContentHeader.js'
+import ContentHeader, { ContentSize, parseFileSize } from './ContentHeader.js'
 
 enum LoadingState {
   NotLoaded,
@@ -12,9 +12,8 @@ interface ViewerProps {
   setError: (error: Error) => void
 }
 
-interface Content {
+interface Content extends ContentSize {
   dataUri: string
-  fileSize?: number
 }
 
 /**

src/components/viewers/MarkdownView.tsx

@@ -1,7 +1,7 @@
 import React from 'react'
 import { useEffect, useState } from 'react'
 import Markdown from '../Markdown.js'
-import ContentHeader, { parseFileSize } from './ContentHeader.js'
+import ContentHeader, { parseFileSize, TextContent } from './ContentHeader.js'
 
 enum LoadingState {
   NotLoaded,
@@ -14,17 +14,12 @@ interface ViewerProps {
   setError: (error: Error) => void
 }
 
-interface Content {
-  text: string
-  fileSize?: number
-}
-
 /**
  * Markdown viewer component.
  */
 export default function MarkdownView({ file, setError }: ViewerProps) {
   const [loading, setLoading] = useState(LoadingState.NotLoaded)
-  const [content, setContent] = useState<Content>()
+  const [content, setContent] = useState<TextContent>()
 
   const isUrl = file.startsWith('http://') || file.startsWith('https://')
   const url = isUrl ? file : '/api/store/get?key=' + file

src/components/viewers/ParquetView.tsx

@@ -2,7 +2,7 @@ import HighTable, { DataFrame, rowCache } from 'hightable'
 import React, { useCallback, useEffect, useState } from 'react'
 import { parquetDataFrame } from '../../tableProvider.js'
 import { Spinner } from '../Layout.js'
-import ContentHeader from './ContentHeader.js'
+import ContentHeader, {ContentSize} from './ContentHeader.js'
 import { asyncBufferFromUrl, parquetMetadataAsync } from 'hyparquet'
 
 enum LoadingState {
@@ -17,9 +17,8 @@ interface ViewerProps {
   setError: (error: Error) => void
 }
 
-interface Content {
+interface Content extends ContentSize {
   dataframe: DataFrame
-  fileSize?: number
 }
 
 /**

src/components/viewers/TextView.tsx

@@ -1,7 +1,7 @@
 import { useEffect, useRef, useState } from 'react'
 import React from 'react'
 import { Spinner } from '../Layout.js'
-import ContentHeader, { parseFileSize } from './ContentHeader.js'
+import ContentHeader, { parseFileSize, TextContent } from './ContentHeader.js'
 
 enum LoadingState {
   NotLoaded,
@@ -15,17 +15,12 @@ interface ViewerProps {
   setProgress: (progress: number) => void
 }
 
-interface Content {
-  text: string
-  fileSize?: number
-}
-
 /**
  * Text viewer component.
  */
 export default function TextView({ file, setError }: ViewerProps) {
   const [loading, setLoading] = useState(LoadingState.NotLoaded)
-  const [content, setContent] = useState<Content>()
+  const [content, setContent] = useState<TextContent>()
   const textRef = useRef<HTMLPreElement>(null)
 
   const isUrl = file.startsWith('http://') || file.startsWith('https://')