diff --git a/packages/core/src/helpers/isActive.ts b/packages/core/src/helpers/isActive.ts index 3e6e40f7..65a9a809 100644 --- a/packages/core/src/helpers/isActive.ts +++ b/packages/core/src/helpers/isActive.ts @@ -2,8 +2,9 @@ import { EditorState } from 'prosemirror-state' import isNodeActive from './isNodeActive' import isMarkActive from './isMarkActive' import getSchemaTypeNameByName from './getSchemaTypeNameByName' +import { AnyObject } from '../types' -export default function isActive(state: EditorState, name: string | null, attributes: { [key: string ]: any } = {}): boolean { +export default function isActive(state: EditorState, name: string | null, attributes: AnyObject = {}): boolean { if (!name) { return isNodeActive(state, null, attributes) || isMarkActive(state, null, attributes) } diff --git a/packages/core/src/helpers/isMarkActive.ts b/packages/core/src/helpers/isMarkActive.ts index 7d0729f3..168ccbcd 100644 --- a/packages/core/src/helpers/isMarkActive.ts +++ b/packages/core/src/helpers/isMarkActive.ts @@ -2,6 +2,7 @@ import { EditorState } from 'prosemirror-state' import { Mark, MarkType } from 'prosemirror-model' import objectIncludes from '../utilities/objectIncludes' import getMarkType from './getMarkType' +import { AnyObject } from '../types' export type MarkRange = { mark: Mark, @@ -12,7 +13,7 @@ export type MarkRange = { export default function isMarkActive( state: EditorState, typeOrName: MarkType | string | null, - attributes = {}, + attributes: AnyObject = {}, ): boolean { const { from, to, empty } = state.selection const type = typeOrName diff --git a/packages/core/src/helpers/isNodeActive.ts b/packages/core/src/helpers/isNodeActive.ts index 772ad47e..fe78c93b 100644 --- a/packages/core/src/helpers/isNodeActive.ts +++ b/packages/core/src/helpers/isNodeActive.ts @@ -2,6 +2,7 @@ import { EditorState } from 'prosemirror-state' import { Node, NodeType } from 'prosemirror-model' import objectIncludes from '../utilities/objectIncludes' import getNodeType from './getNodeType' +import { AnyObject } from '../types' export type NodeRange = { node: Node, @@ -12,7 +13,7 @@ export type NodeRange = { export default function isNodeActive( state: EditorState, typeOrName: NodeType | string | null, - attributes = {}, + attributes: AnyObject = {}, ): boolean { const { from, to, empty } = state.selection const type = typeOrName diff --git a/packages/core/src/utilities/deleteProps.ts b/packages/core/src/utilities/deleteProps.ts index 9085dcf0..411d4283 100644 --- a/packages/core/src/utilities/deleteProps.ts +++ b/packages/core/src/utilities/deleteProps.ts @@ -1,16 +1,18 @@ +import { AnyObject } from '../types' + /** * Remove a property or an array of properties from an object * @param obj Object * @param key Key to remove */ -export default function deleteProps(obj: { [key: string ]: any }, propOrProps: string | string[]) { +export default function deleteProps(obj: AnyObject, propOrProps: string | string[]) { const props = typeof propOrProps === 'string' ? [propOrProps] : propOrProps return Object .keys(obj) - .reduce((newObj: { [key: string ]: any }, prop) => { + .reduce((newObj: AnyObject, prop) => { if (!props.includes(prop)) { newObj[prop] = obj[prop] } diff --git a/packages/core/src/utilities/objectIncludes.ts b/packages/core/src/utilities/objectIncludes.ts index 141bb3d1..09e89008 100644 --- a/packages/core/src/utilities/objectIncludes.ts +++ b/packages/core/src/utilities/objectIncludes.ts @@ -1,9 +1,11 @@ +import { AnyObject } from '../types' + /** * Check if object1 includes object2 * @param object1 Object * @param object2 Object */ -export default function objectIncludes(object1: { [key: string ]: any }, object2: { [key: string ]: any }): boolean { +export default function objectIncludes(object1: AnyObject, object2: AnyObject): boolean { const keys = Object.keys(object2) if (!keys.length) {