From 8d28920c9e9ab788dcee8453b664693ac7c50613 Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 10 Feb 2025 18:36:42 -0500 Subject: [PATCH] Bump deps --- .../BaseFeatureDetail/BaseAttributes.tsx | 20 +++++++++++ .../BaseFeatureDetail/BaseCoreDetails.tsx | 14 ++++++++ .../BaseFeatureDetail/index.tsx | 33 ++----------------- .../BaseFeatureDetail/types.ts | 8 +++++ packages/core/ReExports/modules.tsx | 17 +++++++--- 5 files changed, 58 insertions(+), 34 deletions(-) create mode 100644 packages/core/BaseFeatureWidget/BaseFeatureDetail/BaseAttributes.tsx create mode 100644 packages/core/BaseFeatureWidget/BaseFeatureDetail/BaseCoreDetails.tsx create mode 100644 packages/core/BaseFeatureWidget/BaseFeatureDetail/types.ts diff --git a/packages/core/BaseFeatureWidget/BaseFeatureDetail/BaseAttributes.tsx b/packages/core/BaseFeatureWidget/BaseFeatureDetail/BaseAttributes.tsx new file mode 100644 index 0000000000..0c92547123 --- /dev/null +++ b/packages/core/BaseFeatureWidget/BaseFeatureDetail/BaseAttributes.tsx @@ -0,0 +1,20 @@ +import Attributes from './Attributes' +import BaseCard from './BaseCard' + +import type { BaseCardProps, BaseProps } from '../types' + +export interface BaseInputProps extends BaseCardProps { + omit?: string[] + model: any + descriptions?: Record + formatter?: (val: unknown, key: string) => React.ReactNode +} + +export default function BaseAttributes(props: BaseProps) { + const { title = 'Attributes', feature } = props + return ( + + + + ) +} diff --git a/packages/core/BaseFeatureWidget/BaseFeatureDetail/BaseCoreDetails.tsx b/packages/core/BaseFeatureWidget/BaseFeatureDetail/BaseCoreDetails.tsx new file mode 100644 index 0000000000..e0be998580 --- /dev/null +++ b/packages/core/BaseFeatureWidget/BaseFeatureDetail/BaseCoreDetails.tsx @@ -0,0 +1,14 @@ +import BaseCard from './BaseCard' + +import CoreDetails from './CoreDetails' + +import type { BaseProps } from '../types' + +export default function BaseCoreDetails(props: BaseProps) { + const { title = 'Primary data' } = props + return ( + + + + ) +} diff --git a/packages/core/BaseFeatureWidget/BaseFeatureDetail/index.tsx b/packages/core/BaseFeatureWidget/BaseFeatureDetail/index.tsx index 5b0a2b6a52..8a411e77ec 100644 --- a/packages/core/BaseFeatureWidget/BaseFeatureDetail/index.tsx +++ b/packages/core/BaseFeatureWidget/BaseFeatureDetail/index.tsx @@ -1,40 +1,11 @@ import { observer } from 'mobx-react' -// utils import { isEmpty } from './util' import { replaceUndefinedWithNull } from '../util' -import Attributes from './Attributes' -import BaseCard from './BaseCard' -import CoreDetails from './CoreDetails' import FeatureDetails from './FeatureDetails' import { ErrorMessage } from '../../ui' -import type { BaseCardProps, BaseProps } from '../types' - -export const BaseCoreDetails = (props: BaseProps) => { - const { title = 'Primary data' } = props - return ( - - - - ) -} - -export const BaseAttributes = (props: BaseProps) => { - const { feature } = props - return ( - - - - ) -} - -export interface BaseInputProps extends BaseCardProps { - omit?: string[] - model: any - descriptions?: Record - formatter?: (val: unknown, key: string) => React.ReactNode -} +import type { BaseInputProps } from './types' const BaseFeatureDetail = observer(function ({ model }: BaseInputProps) { const { error, featureData } = model @@ -58,4 +29,6 @@ const BaseFeatureDetail = observer(function ({ model }: BaseInputProps) { export default BaseFeatureDetail export { default as BaseCard } from './BaseCard' +export { default as BaseAttributes } from './BaseAttributes' +export { default as BaseCoreDetails } from './BaseCoreDetails' export { default as FeatureDetails } from './FeatureDetails' diff --git a/packages/core/BaseFeatureWidget/BaseFeatureDetail/types.ts b/packages/core/BaseFeatureWidget/BaseFeatureDetail/types.ts new file mode 100644 index 0000000000..7bb6933e73 --- /dev/null +++ b/packages/core/BaseFeatureWidget/BaseFeatureDetail/types.ts @@ -0,0 +1,8 @@ +import { BaseCardProps } from '../types' + +export interface BaseInputProps extends BaseCardProps { + omit?: string[] + model: any + descriptions?: Record + formatter?: (val: unknown, key: string) => React.ReactNode +} diff --git a/packages/core/ReExports/modules.tsx b/packages/core/ReExports/modules.tsx index cc1aa46e5f..c707a117b8 100644 --- a/packages/core/ReExports/modules.tsx +++ b/packages/core/ReExports/modules.tsx @@ -4,7 +4,7 @@ import type { LazyExoticComponent } from 'react' import * as React from 'react' import { Suspense, forwardRef, lazy } from 'react' -import { useTheme } from '@mui/material' +import { alpha, createTheme, useTheme } from '@mui/material' import * as MUIStyles from '@mui/material/styles' import * as MUIUtils from '@mui/material/utils' import { @@ -199,6 +199,12 @@ const FeatureDetails = lazy( const BaseCard = lazy( () => import('../BaseFeatureWidget/BaseFeatureDetail/BaseCard'), ) +const BaseAttributes = lazy( + () => import('../BaseFeatureWidget/BaseFeatureDetail/BaseAttributes'), +) +const BaseCoreDetails = lazy( + () => import('../BaseFeatureWidget/BaseFeatureDetail/BaseCoreDetails'), +) const DataGridEntries: Record> = { DataGrid: lazy(() => @@ -514,7 +520,7 @@ const libs = { '@material-ui/core': { ...LazyMUICore, useTheme, - alpha: MUIStyles.alpha, + alpha, makeStyles: (args: any) => { const useStyles = makeStyles()(args) @@ -523,8 +529,9 @@ const libs = { }, '@mui/material': { ...LazyMUICore, - alpha: MUIStyles.alpha, - useTheme: MUIStyles.useTheme, + alpha, + useTheme, + createTheme, }, // end special case @@ -593,6 +600,8 @@ const libs = { Attributes: LazyAttributes, FeatureDetails: LazyFeatureDetails, BaseCard: LazyBaseCard, + BaseCoreDetails, + BaseAttributes, }, '@jbrowse/core/data_adapters/BaseAdapter': BaseAdapterExports, }