diff --git a/packages/types/src/editor.ts b/packages/types/src/editor.ts index 97328fdd5..ded6c790c 100644 --- a/packages/types/src/editor.ts +++ b/packages/types/src/editor.ts @@ -1,10 +1,10 @@ import { EventEmitter } from 'events'; -import { ReactNode, ReactElement, RefObject, ComponentType } from 'react'; +import { ReactNode, ComponentType } from 'react'; import { NpmInfo } from './npm'; import { RegisterOptions } from 'power-di'; -export type KeyType = Function | symbol | string; -export type ClassType = Function | (new (...args: any[]) => any); +export type KeyType = new (...args: any[]) => any | symbol | string; +export type ClassType = new (...args: any[]) => any; export interface GetOptions { forceNew?: boolean; sourceCls?: ClassType; @@ -48,7 +48,7 @@ export interface EditorConfig { export interface SkeletonConfig { config: NpmInfo; - props?: object; + props?: Record; handler?: (config: EditorConfig) => EditorConfig; } @@ -78,13 +78,13 @@ export interface PluginConfig { marked?: boolean; align?: 'left' | 'right' | 'top' | 'bottom'; onClick?: () => void; - dialogProps?: object; - balloonProps?: object; - panelProps?: object; - linkProps?: object; + dialogProps?: Record; + balloonProps?: Record; + panelProps?: Record; + linkProps?: Record; }; config?: NpmInfo; - pluginProps?: object; + pluginProps?: Record; } export type HooksConfig = HookConfig[]; @@ -110,7 +110,7 @@ export interface UtilConfig { content: NpmInfo | ((...args: []) => any); } -export type ConstantsConfig = object; +export type ConstantsConfig = Record; export interface LifeCyclesConfig { init?: (editor: IEditor) => any; diff --git a/packages/types/src/schema.ts b/packages/types/src/schema.ts index b645c3e7d..9002d6594 100644 --- a/packages/types/src/schema.ts +++ b/packages/types/src/schema.ts @@ -40,7 +40,7 @@ export type DOMText = string; export interface ContainerSchema extends NodeSchema { componentName: string; // 'Block' | 'Page' | 'Component'; fileName: string; - meta?: object; + meta?: Record; state?: { [key: string]: CompositeValue; }; diff --git a/packages/types/src/setter-config.ts b/packages/types/src/setter-config.ts index 479efd78a..aa8695e5b 100644 --- a/packages/types/src/setter-config.ts +++ b/packages/types/src/setter-config.ts @@ -12,7 +12,7 @@ function isReactComponent(obj: any): obj is ComponentType { export type CustomView = ReactElement | ComponentType; -export type DynamicProps = (target: SettingTarget) => object; +export type DynamicProps = (target: SettingTarget) => Record; export type DynamicSetter = (target: SettingTarget) => string | SetterConfig | CustomView; export interface SetterConfig { @@ -23,7 +23,7 @@ export interface SetterConfig { /** * the props pass to Setter Component */ - props?: object | DynamicProps; + props?: Record | DynamicProps; children?: any; isRequired?: boolean; initialValue?: any | ((target: SettingTarget) => any); diff --git a/packages/types/src/title.ts b/packages/types/src/title.ts index 7a260ebeb..bdb641503 100644 --- a/packages/types/src/title.ts +++ b/packages/types/src/title.ts @@ -13,7 +13,7 @@ export interface TitleConfig { export type TitleContent = string | I18nData | ReactElement | TitleConfig; -function isPlainObject(value: any): value is object { +function isPlainObject(value: any): value is Record { if (typeof value !== 'object') { return false; }