tinymce-rails 6.1.2 → 6.2.0

data/vendor/assets/javascripts/tinymce/tinymce.d.ts

@@ -93,10 +93,10 @@ declare class EventDispatcher<T> {
     private readonly scope;
     private readonly toggleEvent;
     private bindings;
-    constructor(settings?: Record<string, any>);
+    constructor(settings?: EventDispatcherSettings);
     fire<K extends string, U extends MappedEvent<T, K>>(name: K, args?: U): EditorEvent<U>;
     dispatch<K extends string, U extends MappedEvent<T, K>>(name: K, args?: U): EditorEvent<U>;
-    on<K extends string>(name: K, callback: false | ((event: EditorEvent<MappedEvent<T, K>>) => void), prepend?: boolean, extra?: {}): this;
+    on<K extends string>(name: K, callback: false | ((event: EditorEvent<MappedEvent<T, K>>) => void | boolean), prepend?: boolean, extra?: {}): this;
     off<K extends string>(name?: K, callback?: (event: EditorEvent<MappedEvent<T, K>>) => void): this;
     once<K extends string>(name: K, callback: (event: EditorEvent<MappedEvent<T, K>>) => void, prepend?: boolean): this;
     has(name: string): boolean;
@@ -105,31 +105,54 @@ declare const enum UndoLevelType {
     Fragmented = "fragmented",
     Complete = "complete"
 }
-interface UndoLevel {
+interface BaseUndoLevel {
     type: UndoLevelType;
+    bookmark: Bookmark | null;
+    beforeBookmark: Bookmark | null;
+}
+interface FragmentedUndoLevel extends BaseUndoLevel {
+    type: UndoLevelType.Fragmented;
     fragments: string[];
+    content: '';
+}
+interface CompleteUndoLevel extends BaseUndoLevel {
+    type: UndoLevelType.Complete;
+    fragments: null;
     content: string;
-    bookmark: Bookmark;
-    beforeBookmark: Bookmark;
 }
+declare type NewUndoLevel = CompleteUndoLevel | FragmentedUndoLevel;
+declare type UndoLevel = NewUndoLevel & {
+    bookmark: Bookmark;
+};
 interface UndoManager {
     data: UndoLevel[];
     typing: boolean;
-    add: (level?: UndoLevel, event?: EditorEvent<any>) => UndoLevel;
+    add: (level?: Partial<UndoLevel>, event?: EditorEvent<any>) => UndoLevel | null;
     dispatchChange: () => void;
     beforeChange: () => void;
-    undo: () => UndoLevel;
-    redo: () => UndoLevel;
+    undo: () => UndoLevel | undefined;
+    redo: () => UndoLevel | undefined;
     clear: () => void;
     reset: () => void;
     hasUndo: () => boolean;
     hasRedo: () => boolean;
-    transact: (callback: () => void) => UndoLevel;
+    transact: (callback: () => void) => UndoLevel | null;
     ignore: (callback: () => void) => void;
     extra: (callback1: () => void, callback2: () => void) => void;
 }
 declare type SchemaType = 'html4' | 'html5' | 'html5-strict';
-interface SchemaSettings {
+interface ElementSettings {
+    block_elements?: string;
+    boolean_attributes?: string;
+    move_caret_before_on_enter_elements?: string;
+    non_empty_elements?: string;
+    self_closing_elements?: string;
+    text_block_elements?: string;
+    text_inline_elements?: string;
+    void_elements?: string;
+    whitespace_elements?: string;
+}
+interface SchemaSettings extends ElementSettings {
     custom_elements?: string;
     extended_valid_elements?: string;
     invalid_elements?: string;
@@ -152,12 +175,8 @@ interface DefaultAttribute {
     name: string;
     value: string;
 }
-interface AttributePattern {
-    defaultValue?: string;
-    forcedValue?: string;
+interface AttributePattern extends Attribute {
     pattern: RegExp;
-    required?: boolean;
-    validValues?: Record<string, {}>;
 }
 interface ElementRule {
     attributes: Record<string, Attribute>;
@@ -225,16 +244,16 @@ declare class AstNode {
     type: number;
     attributes?: Attributes$1;
     value?: string;
-    parent?: AstNode;
-    firstChild?: AstNode;
-    lastChild?: AstNode;
-    next?: AstNode;
-    prev?: AstNode;
+    parent?: AstNode | null;
+    firstChild?: AstNode | null;
+    lastChild?: AstNode | null;
+    next?: AstNode | null;
+    prev?: AstNode | null;
     raw?: boolean;
     constructor(name: string, type: number);
     replace(node: AstNode): AstNode;
-    attr(name: string, value: string | null): AstNode | undefined;
-    attr(name: Record<string, string | null>): AstNode | undefined;
+    attr(name: string, value: string | null | undefined): AstNode | undefined;
+    attr(name: Record<string, string | null | undefined> | undefined): AstNode | undefined;
     attr(name: string): string | undefined;
     clone(): AstNode;
     wrap(wrapper: AstNode): AstNode;
@@ -246,7 +265,7 @@ declare class AstNode {
     children(): AstNode[];
     empty(): AstNode;
     isEmpty(elements: SchemaMap, whitespace?: SchemaMap, predicate?: (node: AstNode) => boolean): boolean;
-    walk(prev?: boolean): AstNode;
+    walk(prev?: boolean): AstNode | null | undefined;
 }
 declare type Content = string | AstNode;
 declare type ContentFormat = 'raw' | 'text' | 'html' | 'tree';
@@ -266,6 +285,8 @@ interface SetContentArgs {
     no_events?: boolean;
     no_selection?: boolean;
     paste?: boolean;
+    load?: boolean;
+    initial?: boolean;
 }
 interface GetSelectionContentArgs extends GetContentArgs {
     selection?: boolean;
@@ -314,12 +335,12 @@ declare class NodeChange {
     private readonly editor;
     private lastPath;
     constructor(editor: Editor);
-    nodeChanged(args?: any): void;
+    nodeChanged(args?: Record<string, any>): void;
     private isSameElementPath;
 }
 interface SelectionOverrides {
-    showCaret: (direction: number, node: Element, before: boolean, scrollIntoView?: boolean) => Range | null;
-    showBlockCaretContainer: (blockCaretContainer: Element) => void;
+    showCaret: (direction: number, node: HTMLElement, before: boolean, scrollIntoView?: boolean) => Range | null;
+    showBlockCaretContainer: (blockCaretContainer: HTMLElement) => void;
     hideFakeCaret: () => void;
     destroy: () => void;
 }
@@ -365,7 +386,7 @@ interface Rect {
     fromClientRect: (clientRect: DOMRect) => GeomRect;
 }
 interface NotificationManagerImpl {
-    open: (spec: NotificationSpec, closeCallback?: () => void) => NotificationApi;
+    open: (spec: NotificationSpec, closeCallback: () => void) => NotificationApi;
     close: <T extends NotificationApi>(notification: T) => void;
     getArgs: <T extends NotificationApi>(notification: T) => NotificationSpec;
 }
@@ -440,6 +461,12 @@ interface BlockCmdPattern extends BlockBasePattern {
 }
 declare type BlockPattern = BlockFormatPattern | BlockCmdPattern;
 declare type Pattern = InlinePattern | BlockPattern;
+interface DynamicPatternContext {
+    readonly text: string;
+    readonly block: Element;
+}
+declare type DynamicPatternsLookup = (ctx: DynamicPatternContext) => Pattern[];
+declare type RawDynamicPatternsLookup = (ctx: DynamicPatternContext) => RawPattern[];
 interface AlertBannerSpec {
     type: 'alertbanner';
     level: 'info' | 'warn' | 'error' | 'success';
@@ -772,7 +799,8 @@ interface AutocompleterItemSpec {
 declare type AutocompleterContents = SeparatorItemSpec | AutocompleterItemSpec | CardMenuItemSpec;
 interface AutocompleterSpec {
     type?: 'autocompleter';
-    ch: string;
+    ch?: string;
+    trigger?: string;
     minChars?: number;
     columns?: ColumnTypes$1;
     matches?: (rng: Range, text: string, pattern: string) => boolean;
@@ -904,7 +932,7 @@ interface ColorSwatchMenuItemSpec extends BaseFancyMenuItemSpec<'colorswatch'> {
     fancytype: 'colorswatch';
     initData?: {
         allowCustomColors?: boolean;
-        colors: ChoiceMenuItemSpec[];
+        colors?: ChoiceMenuItemSpec[];
     };
 }
 declare type FancyMenuItemSpec = InsertTableMenuItemSpec | ColorSwatchMenuItemSpec;
@@ -1057,11 +1085,17 @@ interface GroupToolbarButtonSpec extends BaseToolbarButtonSpec<GroupToolbarButto
 }
 declare type MenuButtonItemTypes = NestedMenuItemContents;
 declare type SuccessCallback$1 = (menu: string | MenuButtonItemTypes[]) => void;
+interface MenuButtonFetchContext {
+    pattern: string;
+}
 interface BaseMenuButtonSpec {
     text?: string;
     tooltip?: string;
     icon?: string;
-    fetch: (success: SuccessCallback$1) => void;
+    search?: boolean | {
+        placeholder?: string;
+    };
+    fetch: (success: SuccessCallback$1, fetchContext: MenuButtonFetchContext) => void;
     onSetup?: (api: BaseMenuButtonInstanceApi) => (api: BaseMenuButtonInstanceApi) => void;
 }
 interface BaseMenuButtonInstanceApi {
@@ -1159,7 +1193,7 @@ declare type ApplyFormat = BlockFormat | InlineFormat | SelectorFormat;
 declare type RemoveFormat = RemoveBlockFormat | RemoveInlineFormat | RemoveSelectorFormat;
 declare type Format = ApplyFormat | RemoveFormat;
 declare type Formats = Record<string, Format | Format[]>;
-declare type FormatAttrOrStyleValue = string | ((vars?: FormatVars) => string);
+declare type FormatAttrOrStyleValue = string | ((vars?: FormatVars) => string | null);
 declare type FormatVars = Record<string, string | null>;
 interface BaseFormat<T> {
     ceFalseOverride?: boolean;
@@ -1170,7 +1204,7 @@ interface BaseFormat<T> {
     links?: boolean;
     mixed?: boolean;
     block_expand?: boolean;
-    onmatch?: (node: Node, fmt: T, itemName: string) => boolean;
+    onmatch?: (node: Element, fmt: T, itemName: string) => boolean;
     remove?: 'none' | 'empty' | 'all';
     remove_similar?: boolean;
     split?: boolean;
@@ -1194,7 +1228,7 @@ interface CommonFormat<T> extends BaseFormat<T> {
     styles?: Record<string, FormatAttrOrStyleValue>;
     toggle?: boolean;
     preview?: string | false;
-    onformat?: (elm: Node, fmt: T, vars?: FormatVars, node?: Node | RangeLikeObject) => void;
+    onformat?: (elm: Element, fmt: T, vars?: FormatVars, node?: Node | RangeLikeObject | null) => void;
     clear_child_styles?: boolean;
     merge_siblings?: boolean;
     merge_with_parents?: boolean;
@@ -1297,7 +1331,7 @@ interface WindowParams {
 }
 declare type InstanceApi<T> = UrlDialogInstanceApi | DialogInstanceApi<T>;
 interface WindowManagerImpl {
-    open: <T>(config: DialogSpec<T>, params: WindowParams, closeWindow: (dialog: DialogInstanceApi<T>) => void) => DialogInstanceApi<T>;
+    open: <T>(config: DialogSpec<T>, params: WindowParams | undefined, closeWindow: (dialog: DialogInstanceApi<T>) => void) => DialogInstanceApi<T>;
     openUrl: (config: UrlDialogSpec, closeWindow: (dialog: UrlDialogInstanceApi) => void) => UrlDialogInstanceApi;
     alert: (message: string, callback: () => void) => void;
     confirm: (message: string, callback: (state: boolean) => void) => void;
@@ -1312,7 +1346,7 @@ interface WindowManager {
 }
 interface ExecCommandEvent {
     command: string;
-    ui?: boolean;
+    ui: boolean;
     value?: any;
 }
 interface BeforeGetContentEvent extends GetContentArgs {
@@ -1328,6 +1362,9 @@ interface BeforeSetContentEvent extends SetContentArgs {
 interface SetContentEvent extends BeforeSetContentEvent {
     content: string;
 }
+interface SaveContentEvent extends GetContentEvent {
+    save: boolean;
+}
 interface NewBlockEvent {
     newBlock: Element;
 }
@@ -1340,7 +1377,7 @@ interface NodeChangeEvent {
 interface FormatEvent {
     format: string;
     vars?: FormatVars;
-    node?: Node | RangeLikeObject;
+    node?: Node | RangeLikeObject | null;
 }
 interface ObjectResizeEvent {
     target: HTMLElement;
@@ -1354,11 +1391,11 @@ interface ObjectSelectedEvent {
 }
 interface ScrollIntoViewEvent {
     elm: HTMLElement;
-    alignToTop: boolean;
+    alignToTop: boolean | undefined;
 }
 interface SetSelectionRangeEvent {
     range: Range;
-    forward: boolean;
+    forward: boolean | undefined;
 }
 interface ShowCaretEvent {
     target: Node;
@@ -1368,10 +1405,12 @@ interface ShowCaretEvent {
 interface SwitchModeEvent {
     mode: string;
 }
-interface AddUndoEvent {
+interface ChangeEvent {
     level: UndoLevel;
-    lastLevel: UndoLevel;
-    originalEvent: Event;
+    lastLevel: UndoLevel | undefined;
+}
+interface AddUndoEvent extends ChangeEvent {
+    originalEvent: Event | undefined;
 }
 interface UndoRedoEvent {
     level: UndoLevel;
@@ -1422,18 +1461,24 @@ interface TableEventData {
 interface TableModifiedEvent extends TableEventData {
     readonly table: HTMLTableElement;
 }
+interface BeforeOpenNotificationEvent {
+    notification: NotificationSpec;
+}
+interface OpenNotificationEvent {
+    notification: NotificationApi;
+}
 interface EditorEventMap extends Omit<NativeEventMap, 'blur' | 'focus'> {
     'activate': {
-        relatedTarget: Editor;
+        relatedTarget: Editor | null;
     };
     'deactivate': {
         relatedTarget: Editor;
     };
     'focus': {
-        blurredEditor: Editor;
+        blurredEditor: Editor | null;
     };
     'blur': {
-        focusedEditor: Editor;
+        focusedEditor: Editor | null;
     };
     'resize': UIEvent;
     'scroll': UIEvent;
@@ -1445,7 +1490,7 @@ interface EditorEventMap extends Omit<NativeEventMap, 'blur' | 'focus'> {
     'ObjectResized': ObjectResizeEvent;
     'ObjectResizeStart': ObjectResizeEvent;
     'SwitchMode': SwitchModeEvent;
-    'ScrollWindow': UIEvent;
+    'ScrollWindow': Event;
     'ResizeWindow': UIEvent;
     'SkinLoaded': {};
     'SkinLoadError': LoadErrorEvent;
@@ -1472,7 +1517,12 @@ interface EditorEventMap extends Omit<NativeEventMap, 'blur' | 'focus'> {
     'GetContent': GetContentEvent;
     'BeforeSetContent': BeforeSetContentEvent;
     'SetContent': SetContentEvent;
-    'LoadContent': {};
+    'SaveContent': SaveContentEvent;
+    'RawSaveContent': SaveContentEvent;
+    'LoadContent': {
+        load: boolean;
+        element: HTMLElement;
+    };
     'PreviewFormats': {};
     'AfterPreviewFormats': {};
     'ScriptsLoaded': {};
@@ -1485,6 +1535,7 @@ interface EditorEventMap extends Omit<NativeEventMap, 'blur' | 'focus'> {
     'Undo': UndoRedoEvent;
     'BeforeAddUndo': AddUndoEvent;
     'AddUndo': AddUndoEvent;
+    'change': ChangeEvent;
     'CloseWindow': WindowEvent<any>;
     'OpenWindow': WindowEvent<any>;
     'ProgressState': ProgressStateEvent;
@@ -1504,6 +1555,12 @@ interface EditorEventMap extends Omit<NativeEventMap, 'blur' | 'focus'> {
     'TableModified': TableModifiedEvent;
     'NewRow': NewTableRowEvent;
     'NewCell': NewTableCellEvent;
+    'SetAttrib': SetAttribEvent;
+    'hide': {};
+    'show': {};
+    'dirty': {};
+    'BeforeOpenNotification': BeforeOpenNotificationEvent;
+    'OpenNotification': OpenNotificationEvent;
 }
 interface EditorManagerEventMap {
     'AddEditor': {
@@ -1521,6 +1578,7 @@ type EventTypes_d_BeforeGetContentEvent = BeforeGetContentEvent;
 type EventTypes_d_GetContentEvent = GetContentEvent;
 type EventTypes_d_BeforeSetContentEvent = BeforeSetContentEvent;
 type EventTypes_d_SetContentEvent = SetContentEvent;
+type EventTypes_d_SaveContentEvent = SaveContentEvent;
 type EventTypes_d_NewBlockEvent = NewBlockEvent;
 type EventTypes_d_NodeChangeEvent = NodeChangeEvent;
 type EventTypes_d_FormatEvent = FormatEvent;
@@ -1530,6 +1588,7 @@ type EventTypes_d_ScrollIntoViewEvent = ScrollIntoViewEvent;
 type EventTypes_d_SetSelectionRangeEvent = SetSelectionRangeEvent;
 type EventTypes_d_ShowCaretEvent = ShowCaretEvent;
 type EventTypes_d_SwitchModeEvent = SwitchModeEvent;
+type EventTypes_d_ChangeEvent = ChangeEvent;
 type EventTypes_d_AddUndoEvent = AddUndoEvent;
 type EventTypes_d_UndoRedoEvent = UndoRedoEvent;
 type EventTypes_d_WindowEvent<_0> = WindowEvent<_0>;
@@ -1546,10 +1605,12 @@ type EventTypes_d_NewTableRowEvent = NewTableRowEvent;
 type EventTypes_d_NewTableCellEvent = NewTableCellEvent;
 type EventTypes_d_TableEventData = TableEventData;
 type EventTypes_d_TableModifiedEvent = TableModifiedEvent;
+type EventTypes_d_BeforeOpenNotificationEvent = BeforeOpenNotificationEvent;
+type EventTypes_d_OpenNotificationEvent = OpenNotificationEvent;
 type EventTypes_d_EditorEventMap = EditorEventMap;
 type EventTypes_d_EditorManagerEventMap = EditorManagerEventMap;
 declare namespace EventTypes_d {
-    export { EventTypes_d_ExecCommandEvent as ExecCommandEvent, EventTypes_d_BeforeGetContentEvent as BeforeGetContentEvent, EventTypes_d_GetContentEvent as GetContentEvent, EventTypes_d_BeforeSetContentEvent as BeforeSetContentEvent, EventTypes_d_SetContentEvent as SetContentEvent, EventTypes_d_NewBlockEvent as NewBlockEvent, EventTypes_d_NodeChangeEvent as NodeChangeEvent, EventTypes_d_FormatEvent as FormatEvent, EventTypes_d_ObjectResizeEvent as ObjectResizeEvent, EventTypes_d_ObjectSelectedEvent as ObjectSelectedEvent, EventTypes_d_ScrollIntoViewEvent as ScrollIntoViewEvent, EventTypes_d_SetSelectionRangeEvent as SetSelectionRangeEvent, EventTypes_d_ShowCaretEvent as ShowCaretEvent, EventTypes_d_SwitchModeEvent as SwitchModeEvent, EventTypes_d_AddUndoEvent as AddUndoEvent, EventTypes_d_UndoRedoEvent as UndoRedoEvent, EventTypes_d_WindowEvent as WindowEvent, EventTypes_d_ProgressStateEvent as ProgressStateEvent, EventTypes_d_AfterProgressStateEvent as AfterProgressStateEvent, EventTypes_d_PlaceholderToggleEvent as PlaceholderToggleEvent, EventTypes_d_LoadErrorEvent as LoadErrorEvent, EventTypes_d_PreProcessEvent as PreProcessEvent, EventTypes_d_PostProcessEvent as PostProcessEvent, EventTypes_d_PastePlainTextToggleEvent as PastePlainTextToggleEvent, EventTypes_d_PastePreProcessEvent as PastePreProcessEvent, EventTypes_d_PastePostProcessEvent as PastePostProcessEvent, EventTypes_d_NewTableRowEvent as NewTableRowEvent, EventTypes_d_NewTableCellEvent as NewTableCellEvent, EventTypes_d_TableEventData as TableEventData, EventTypes_d_TableModifiedEvent as TableModifiedEvent, EventTypes_d_EditorEventMap as EditorEventMap, EventTypes_d_EditorManagerEventMap as EditorManagerEventMap, };
+    export { EventTypes_d_ExecCommandEvent as ExecCommandEvent, EventTypes_d_BeforeGetContentEvent as BeforeGetContentEvent, EventTypes_d_GetContentEvent as GetContentEvent, EventTypes_d_BeforeSetContentEvent as BeforeSetContentEvent, EventTypes_d_SetContentEvent as SetContentEvent, EventTypes_d_SaveContentEvent as SaveContentEvent, EventTypes_d_NewBlockEvent as NewBlockEvent, EventTypes_d_NodeChangeEvent as NodeChangeEvent, EventTypes_d_FormatEvent as FormatEvent, EventTypes_d_ObjectResizeEvent as ObjectResizeEvent, EventTypes_d_ObjectSelectedEvent as ObjectSelectedEvent, EventTypes_d_ScrollIntoViewEvent as ScrollIntoViewEvent, EventTypes_d_SetSelectionRangeEvent as SetSelectionRangeEvent, EventTypes_d_ShowCaretEvent as ShowCaretEvent, EventTypes_d_SwitchModeEvent as SwitchModeEvent, EventTypes_d_ChangeEvent as ChangeEvent, EventTypes_d_AddUndoEvent as AddUndoEvent, EventTypes_d_UndoRedoEvent as UndoRedoEvent, EventTypes_d_WindowEvent as WindowEvent, EventTypes_d_ProgressStateEvent as ProgressStateEvent, EventTypes_d_AfterProgressStateEvent as AfterProgressStateEvent, EventTypes_d_PlaceholderToggleEvent as PlaceholderToggleEvent, EventTypes_d_LoadErrorEvent as LoadErrorEvent, EventTypes_d_PreProcessEvent as PreProcessEvent, EventTypes_d_PostProcessEvent as PostProcessEvent, EventTypes_d_PastePlainTextToggleEvent as PastePlainTextToggleEvent, EventTypes_d_PastePreProcessEvent as PastePreProcessEvent, EventTypes_d_PastePostProcessEvent as PastePostProcessEvent, EventTypes_d_NewTableRowEvent as NewTableRowEvent, EventTypes_d_NewTableCellEvent as NewTableCellEvent, EventTypes_d_TableEventData as TableEventData, EventTypes_d_TableModifiedEvent as TableModifiedEvent, EventTypes_d_BeforeOpenNotificationEvent as BeforeOpenNotificationEvent, EventTypes_d_OpenNotificationEvent as OpenNotificationEvent, EventTypes_d_EditorEventMap as EditorEventMap, EventTypes_d_EditorManagerEventMap as EditorManagerEventMap, };
 }
 type Format_d_Formats = Formats;
 type Format_d_Format = Format;
@@ -1603,7 +1664,7 @@ declare type ThemeInitFunc = (editor: Editor, elm: HTMLElement) => {
     api?: EditorUiApi;
 };
 declare type SetupCallback = (editor: Editor) => void;
-declare type FilePickerCallback = (callback: Function, value: any, meta: Record<string, any>) => void;
+declare type FilePickerCallback = (callback: (value: string, meta?: Record<string, any>) => void, value: string, meta: Record<string, any>) => void;
 declare type FilePickerValidationStatus = 'valid' | 'unknown' | 'invalid' | 'none';
 declare type FilePickerValidationCallback = (info: {
     type: string;
@@ -1614,13 +1675,14 @@ declare type FilePickerValidationCallback = (info: {
 }) => void) => void;
 declare type PastePreProcessFn = (editor: Editor, args: PastePreProcessEvent) => void;
 declare type PastePostProcessFn = (editor: Editor, args: PastePostProcessEvent) => void;
-declare type URLConverter = (url: string, name: string, elm?: HTMLElement) => string;
-declare type URLConverterCallback = (url: string, node: Node, on_save: boolean, name: string) => string;
+declare type URLConverter = (url: string, name: string, elm?: string | Element) => string;
+declare type URLConverterCallback = (url: string, node: Node | string | undefined, on_save: boolean, name: string) => string;
 interface ToolbarGroup {
     name?: string;
     items: string[];
 }
 declare type ToolbarMode = 'floating' | 'sliding' | 'scrolling' | 'wrap';
+declare type ToolbarLocation = 'top' | 'bottom' | 'auto';
 interface BaseEditorOptions {
     a11y_advanced_options?: boolean;
     add_form_submit_trigger?: boolean;
@@ -1664,6 +1726,7 @@ interface BaseEditorOptions {
     directionality?: 'ltr' | 'rtl';
     doctype?: string;
     document_base_url?: string;
+    draggable_modal?: boolean;
     editable_class?: string;
     element_format?: 'xhtml' | 'html';
     elementpath?: boolean;
@@ -1688,6 +1751,7 @@ interface BaseEditorOptions {
     forced_root_block?: string;
     forced_root_block_attrs?: Record<string, string>;
     formats?: Formats;
+    format_noneditable_selector?: string;
     height?: number | string;
     hidden_input?: boolean;
     icons?: string;
@@ -1748,6 +1812,7 @@ interface BaseEditorOptions {
     placeholder?: string;
     preserve_cdata?: boolean;
     preview_styles?: false | string;
+    promotion?: boolean;
     protect?: RegExp[];
     readonly?: boolean;
     referrer_policy?: ReferrerPolicy;
@@ -1774,6 +1839,7 @@ interface BaseEditorOptions {
     table_tab_navigation?: boolean;
     target?: HTMLElement;
     text_patterns?: RawPattern[] | false;
+    text_patterns_lookup?: RawDynamicPatternsLookup;
     theme?: string | ThemeInitFunc | false;
     theme_url?: string;
     toolbar?: boolean | string | string[] | Array<ToolbarGroup>;
@@ -1786,6 +1852,8 @@ interface BaseEditorOptions {
     toolbar7?: string;
     toolbar8?: string;
     toolbar9?: string;
+    toolbar_groups?: Record<string, GroupToolbarButtonSpec>;
+    toolbar_location?: ToolbarLocation;
     toolbar_mode?: ToolbarMode;
     toolbar_sticky?: boolean;
     toolbar_sticky_offset?: number;
@@ -1819,15 +1887,73 @@ interface NormalizedEditorOptions extends BaseEditorOptions {
     plugins: string[];
 }
 interface EditorOptions extends NormalizedEditorOptions {
+    a11y_advanced_options: boolean;
+    allow_unsafe_link_target: boolean;
+    anchor_bottom: string;
+    anchor_top: string;
+    automatic_uploads: boolean;
+    block_formats: string;
+    body_class: string;
+    body_id: string;
+    br_newline_selector: string;
+    color_cols: number;
     content_css: string[];
     contextmenu: string[];
+    custom_colors: boolean;
+    document_base_url: string;
+    draggable_modal: boolean;
+    editable_class: string;
     font_css: string[];
+    font_family_formats: string;
+    font_size_classes: string;
+    font_size_formats: string;
+    font_size_legacy_values: string;
+    font_size_style_values: string;
     forced_root_block: string;
     forced_root_block_attrs: Record<string, string>;
+    format_noneditable_selector: string;
+    height: number | string;
+    iframe_attrs: Record<string, string>;
+    images_file_types: string;
+    images_upload_base_path: string;
+    images_upload_credentials: boolean;
+    images_upload_url: string;
+    indent_use_margin: boolean;
+    indentation: string;
+    inline: boolean;
+    inline_boundaries_selector: string;
+    language: string;
+    language_load: boolean;
+    language_url: string;
+    line_height_formats: string;
+    menu: Record<string, {
+        title: string;
+        items: string;
+    }>;
+    menubar: boolean | string;
+    model: string;
+    no_newline_selector: string;
+    noneditable_class: string;
     noneditable_regexp: RegExp[];
-    object_resizing?: string;
-    preview_styles?: string;
-    text_patterns?: Pattern[];
+    object_resizing: string;
+    paste_as_text: boolean;
+    preview_styles: string;
+    promotion: boolean;
+    readonly: boolean;
+    removed_menuitems: string;
+    toolbar: boolean | string | string[] | Array<ToolbarGroup>;
+    toolbar_groups: Record<string, GroupToolbarButtonSpec>;
+    toolbar_location: ToolbarLocation;
+    toolbar_mode: ToolbarMode;
+    toolbar_persist: boolean;
+    toolbar_sticky: boolean;
+    toolbar_sticky_offset: number;
+    text_patterns: Pattern[];
+    text_patterns_lookup: DynamicPatternsLookup;
+    visual: boolean;
+    visual_anchor_class: string;
+    visual_table_class: string;
+    width: number | string;
 }
 declare type StyleMap = Record<string, string | number>;
 interface StylesSettings {
@@ -1837,13 +1963,22 @@ interface StylesSettings {
     url_converter_scope?: any;
 }
 interface Styles {
-    parse: (css: string) => Record<string, string>;
+    parse: (css: string | undefined) => Record<string, string>;
     serialize: (styles: StyleMap, elementName?: string) => string;
 }
-declare type EventUtilsCallback<T> = (event: EventUtilsEvent<T>) => void;
+declare type EventUtilsCallback<T> = (event: EventUtilsEvent<T>) => void | boolean;
 declare type EventUtilsEvent<T> = NormalizedEvent<T> & {
     metaKey: boolean;
 };
+interface Callback$1<T> {
+    func: EventUtilsCallback<T>;
+    scope: any;
+}
+interface CallbackList<T> extends Array<Callback$1<T>> {
+    fakeName: string | false;
+    capture: boolean;
+    nativeHandler: EventListener;
+}
 interface EventUtilsConstructor {
     readonly prototype: EventUtils;
     new (): EventUtils;
@@ -1852,11 +1987,9 @@ interface EventUtilsConstructor {
 declare class EventUtils {
     static Event: EventUtils;
     domLoaded: boolean;
-    events: Record<string, any>;
+    events: Record<number, Record<string, CallbackList<any>>>;
     private readonly expando;
     private hasFocusIn;
-    private hasMouseEnterLeave;
-    private mouseEnterLeave;
     private count;
     constructor();
     bind<K extends keyof HTMLElementEventMap>(target: any, name: K, callback: EventUtilsCallback<HTMLElementEventMap[K]>, scope?: any): EventUtilsCallback<HTMLElementEventMap[K]>;
@@ -1868,9 +2001,14 @@ declare class EventUtils {
     dispatch(target: any, name: string, args?: {}): this;
     clean(target: any): this;
     destroy(): void;
-    cancel<T = any>(e: EventUtilsEvent<T>): boolean;
+    cancel<T>(e: EventUtilsEvent<T>): boolean;
     private executeHandlers;
 }
+interface SetAttribEvent {
+    attrElm: HTMLElement;
+    attrName: string;
+    attrValue: string | boolean | number | null;
+}
 interface DOMUtilsSettings {
     schema: Schema;
     url_converter: URLConverter;
@@ -1878,14 +2016,14 @@ interface DOMUtilsSettings {
     ownEvents: boolean;
     keep_values: boolean;
     update_styles: boolean;
-    root_element: HTMLElement;
-    collect: Function;
-    onSetAttrib: Function;
+    root_element: HTMLElement | null;
+    collect: boolean;
+    onSetAttrib: (event: SetAttribEvent) => void;
     contentCssCors: boolean;
     referrerPolicy: ReferrerPolicy;
 }
 declare type Target = Node | Window;
-declare type RunArguments<T extends Node = Node> = string | T | Array<string | T>;
+declare type RunArguments<T extends Node = Node> = string | T | Array<string | T> | null;
 declare type BoundEvent = [
     Target,
     string,
@@ -1893,7 +2031,7 @@ declare type BoundEvent = [
     any
 ];
 declare type Callback<K extends string> = EventUtilsCallback<MappedEvent<HTMLElementEventMap, K>>;
-declare type RunResult<T, R> = T extends Array<any> ? false | R[] : false | R;
+declare type RunResult<T, R> = T extends Array<any> ? R[] : false | R;
 interface DOMUtils {
     doc: Document;
     settings: Partial<DOMUtilsSettings>;
@@ -1906,8 +2044,11 @@ interface DOMUtils {
     styles: Styles;
     schema: Schema;
     events: EventUtils;
-    root: Node;
-    isBlock: (node: string | Node) => boolean;
+    root: Node | null;
+    isBlock: {
+        (node: Node | null): node is HTMLElement;
+        (node: string): boolean;
+    };
     clone: (node: Node, deep: boolean) => Node;
     getRoot: () => HTMLElement;
     getViewPort: (argWin?: Window) => GeomRect;
@@ -1917,39 +2058,52 @@ interface DOMUtils {
         h: number;
     };
     getParent: {
-        <K extends keyof HTMLElementTagNameMap>(node: string | Node, selector: K, root?: Node): HTMLElementTagNameMap[K] | null;
-        <T extends HTMLElement>(node: string | Node, selector: (node: HTMLElement) => node is T, root?: Node): T | null;
-        <T extends Element = Element>(node: string | Node, selector?: string | ((node: HTMLElement) => boolean | void), root?: Node): T | null;
+        <K extends keyof HTMLElementTagNameMap>(node: string | Node | null, selector: K, root?: Node): HTMLElementTagNameMap[K] | null;
+        <T extends Element>(node: string | Node | null, selector: string | ((node: Node) => node is T), root?: Node): T | null;
+        (node: string | Node | null, selector?: string | ((node: Node) => boolean | void), root?: Node): Node | null;
     };
     getParents: {
-        <K extends keyof HTMLElementTagNameMap>(elm: string | Node, selector: K, root?: Node, collect?: boolean): Array<HTMLElementTagNameMap[K]>;
-        <T extends HTMLElement>(node: string | Node, selector: (node: HTMLElement) => node is T, root?: Node): T[];
-        <T extends Element = Element>(elm: string | Node, selector?: string | ((node: HTMLElement) => boolean | void), root?: Node, collect?: boolean): T[];
+        <K extends keyof HTMLElementTagNameMap>(elm: string | HTMLElementTagNameMap[K] | null, selector: K, root?: Node, collect?: boolean): Array<HTMLElementTagNameMap[K]>;
+        <T extends Element>(node: string | Node | null, selector: string | ((node: Node) => node is T), root?: Node, collect?: boolean): T[];
+        (elm: string | Node | null, selector?: string | ((node: Node) => boolean | void), root?: Node, collect?: boolean): Node[];
+    };
+    get: {
+        <T extends Node>(elm: T): T;
+        (elm: string): HTMLElement | null;
     };
-    get: (elm: string | Node) => HTMLElement | null;
-    getNext: (node: Node, selector: string | ((node: Node) => boolean)) => Node | null;
-    getPrev: (node: Node, selector: string | ((node: Node) => boolean)) => Node | null;
+    getNext: (node: Node | null, selector: string | ((node: Node) => boolean)) => Node | null;
+    getPrev: (node: Node | null, selector: string | ((node: Node) => boolean)) => Node | null;
     select: {
         <K extends keyof HTMLElementTagNameMap>(selector: K, scope?: string | Node): Array<HTMLElementTagNameMap[K]>;
         <T extends HTMLElement = HTMLElement>(selector: string, scope?: string | Node): T[];
     };
-    is: (elm: Node | Node[], selector: string) => boolean;
-    add: (parentElm: RunArguments, name: string | Node, attrs?: Record<string, string | boolean | number>, html?: string | Node, create?: boolean) => HTMLElement;
+    is: {
+        <T extends Element>(elm: Node | Node[] | null, selector: string): elm is T;
+        (elm: Node | Node[] | null, selector: string): boolean;
+    };
+    add: (parentElm: RunArguments, name: string | Element, attrs?: Record<string, string | boolean | number | null>, html?: string | Node | null, create?: boolean) => HTMLElement;
     create: {
-        <K extends keyof HTMLElementTagNameMap>(name: K, attrs?: Record<string, string | boolean | number>, html?: string | Node): HTMLElementTagNameMap[K];
-        (name: string, attrs?: Record<string, string | boolean | number>, html?: string | Node): HTMLElement;
+        <K extends keyof HTMLElementTagNameMap>(name: K, attrs?: Record<string, string | boolean | number | null>, html?: string | Node | null): HTMLElementTagNameMap[K];
+        (name: string, attrs?: Record<string, string | boolean | number | null>, html?: string | Node | null): HTMLElement;
     };
-    createHTML: (name: string, attrs?: Record<string, string>, html?: string) => string;
+    createHTML: (name: string, attrs?: Record<string, string | null>, html?: string) => string;
     createFragment: (html?: string) => DocumentFragment;
-    remove: <T extends Node>(node: string | T | T[], keepChildren?: boolean) => RunResult<typeof node, T>;
-    setStyle: (elm: string | Node | Node[], name: string, value: string | number | null) => void;
-    getStyle: (elm: string | Node, name: string, computed?: boolean) => string | undefined;
-    setStyles: (elm: string | Node | Node[], stylesArg: StyleMap) => void;
+    remove: {
+        <T extends Node>(node: T | T[], keepChildren?: boolean): typeof node extends Array<any> ? T[] : T;
+        <T extends Node>(node: string, keepChildren?: boolean): T | false;
+    };
+    getStyle: {
+        (elm: Element, name: string, computed: true): string;
+        (elm: string | Element | null, name: string, computed?: boolean): string | undefined;
+    };
+    setStyle: (elm: string | Element | Element[], name: string, value: string | number | null) => void;
+    setStyles: (elm: string | Element | Element[], stylesArg: StyleMap) => void;
     removeAllAttribs: (e: RunArguments<Element>) => void;
-    setAttrib: (elm: string | Node | Node[], name: string, value: string | boolean | number | null) => void;
-    setAttribs: (elm: string | Node | Node[], attrs: Record<string, string | boolean | number | null>) => void;
-    getAttrib: (elm: string | Node, name: string, defaultVal?: string) => string;
-    getPos: (elm: string | Node, rootElm?: Node) => {
+    setAttrib: (elm: RunArguments<Element>, name: string, value: string | boolean | number | null) => void;
+    setAttribs: (elm: RunArguments<Element>, attrs: Record<string, string | boolean | number | null>) => void;
+    getAttrib: (elm: string | Element | null, name: string, defaultVal?: string) => string;
+    getAttribs: (elm: string | Element) => NamedNodeMap | Attr[];
+    getPos: (elm: string | Element, rootElm?: Node) => {
         x: number;
         y: number;
     };
@@ -1957,15 +2111,15 @@ interface DOMUtils {
     serializeStyle: (stylesArg: StyleMap, name?: string) => string;
     addStyle: (cssText: string) => void;
     loadCSS: (url: string) => void;
-    addClass: (elm: string | Node | Node[], cls: string) => void;
-    removeClass: (elm: string | Node | Node[], cls: string) => void;
-    hasClass: (elm: string | Node, cls: string) => boolean;
-    toggleClass: (elm: string | Node | Node[], cls: string, state?: boolean) => void;
+    hasClass: (elm: string | Element, cls: string) => boolean;
+    addClass: (elm: RunArguments<Element>, cls: string) => void;
+    removeClass: (elm: RunArguments<Element>, cls: string) => void;
+    toggleClass: (elm: RunArguments<Element>, cls: string, state?: boolean) => void;
     show: (elm: string | Node | Node[]) => void;
     hide: (elm: string | Node | Node[]) => void;
     isHidden: (elm: string | Node) => boolean;
     uniqueId: (prefix?: string) => string;
-    setHTML: (elm: string | Node | Node[], html: string) => void;
+    setHTML: (elm: RunArguments<Element>, html: string) => void;
     getOuterHTML: (elm: string | Node) => string;
     setOuterHTML: (elm: string | Node | Node[], html: string) => void;
     decode: (text: string) => string;
@@ -1982,16 +2136,15 @@ interface DOMUtils {
         <K extends keyof HTMLElementTagNameMap>(elm: Element, name: K): HTMLElementTagNameMap[K];
         (elm: Element, name: string): Element;
     };
-    findCommonAncestor: (a: Node, b: Node) => Node;
+    findCommonAncestor: (a: Node, b: Node) => Node | null;
     run<R, T extends Node>(this: DOMUtils, elm: T | T[], func: (node: T) => R, scope?: any): typeof elm extends Array<any> ? R[] : R;
     run<R, T extends Node>(this: DOMUtils, elm: RunArguments<T>, func: (node: T) => R, scope?: any): RunResult<typeof elm, R>;
-    getAttribs: (elm: string | Node) => NamedNodeMap | Attr[];
     isEmpty: (node: Node, elements?: Record<string, any>) => boolean;
     createRng: () => Range;
     nodeIndex: (node: Node, normalized?: boolean) => number;
     split: {
-        <T extends Node>(parentElm: Node, splitElm: Node, replacementElm: T): T;
-        <T extends Node>(parentElm: Node, splitElm: T): T;
+        <T extends Node>(parentElm: Node, splitElm: Node, replacementElm: T): T | undefined;
+        <T extends Node>(parentElm: Node, splitElm: T): T | undefined;
     };
     bind: {
         <K extends string>(target: Target, name: K, func: Callback<K>, scope?: any): Callback<K>;
@@ -2018,12 +2171,12 @@ interface ClientRect {
     height: number;
 }
 interface BookmarkManager {
-    getBookmark: (type: number, normalized?: boolean) => Bookmark;
+    getBookmark: (type?: number, normalized?: boolean) => Bookmark;
     moveToBookmark: (bookmark: Bookmark) => void;
 }
 interface ControlSelection {
     isResizable: (elm: Element) => boolean;
-    showResizeRect: (elm: Element) => void;
+    showResizeRect: (elm: HTMLElement) => void;
     hideResizeRect: () => void;
     updateResizeRect: (evt: EditorEvent<any>) => void;
     destroy: () => void;
@@ -2048,7 +2201,7 @@ interface Writer {
     getContent: () => string;
     pi: (name: string, text?: string) => void;
     reset: () => void;
-    start: (name: string, attrs?: Attributes, empty?: boolean) => void;
+    start: (name: string, attrs?: Attributes | null, empty?: boolean) => void;
     text: (text: string, raw?: boolean) => void;
 }
 interface HtmlSerializerSettings extends WriterSettings {
@@ -2108,7 +2261,7 @@ interface EditorSelection {
     isCollapsed: () => boolean;
     isForward: () => boolean;
     setNode: (elm: Element) => Element;
-    getNode: () => Element;
+    getNode: () => HTMLElement;
     getSel: () => Selection | null;
     setRng: (rng: Range, forward?: boolean) => void;
     getRng: () => Range;
@@ -2119,23 +2272,23 @@ interface EditorSelection {
     selectorChanged: (selector: string, callback: (active: boolean, args: {
         node: Node;
         selector: String;
-        parents: Element[];
+        parents: Node[];
     }) => void) => EditorSelection;
     selectorChangedWithUnbind: (selector: string, callback: (active: boolean, args: {
         node: Node;
         selector: String;
-        parents: Element[];
+        parents: Node[];
     }) => void) => {
         unbind: () => void;
     };
-    getScrollContainer: () => HTMLElement;
+    getScrollContainer: () => HTMLElement | undefined;
     scrollIntoView: (elm?: HTMLElement, alignToTop?: boolean) => void;
     placeCaretAt: (clientX: number, clientY: number) => void;
     getBoundingClientRect: () => ClientRect | DOMRect;
     destroy: () => void;
 }
-declare type EditorCommandCallback = (ui: boolean, value: any) => void;
-declare type EditorCommandsCallback = (command: string, ui: boolean, value: any) => void;
+declare type EditorCommandCallback<S> = (this: S, ui: boolean, value: any) => void;
+declare type EditorCommandsCallback = (command: string, ui: boolean, value?: any) => void;
 interface Commands {
     state: Record<string, (command: string) => boolean>;
     exec: Record<string, EditorCommandsCallback>;
@@ -2157,10 +2310,13 @@ declare class EditorCommands {
     queryCommandValue(command: string): string;
     addCommands<K extends keyof Commands>(commandList: Commands[K], type: K): void;
     addCommands(commandList: Record<string, EditorCommandsCallback>): void;
-    addCommand(command: string, callback: EditorCommandCallback, scope?: any): void;
+    addCommand<S>(command: string, callback: EditorCommandCallback<S>, scope: S): void;
+    addCommand(command: string, callback: EditorCommandCallback<Editor>): void;
     queryCommandSupported(command: string): boolean;
-    addQueryStateHandler(command: string, callback: () => boolean, scope?: any): void;
-    addQueryValueHandler(command: string, callback: () => string, scope?: any): void;
+    addQueryStateHandler<S>(command: string, callback: (this: S) => boolean, scope: S): void;
+    addQueryStateHandler(command: string, callback: (this: Editor) => boolean): void;
+    addQueryValueHandler<S>(command: string, callback: (this: S) => string, scope: S): void;
+    addQueryValueHandler(command: string, callback: (this: Editor) => string): void;
 }
 interface RawString {
     raw: string;
@@ -2170,7 +2326,7 @@ declare type TokenisedString = [
     string,
     ...Primitive[]
 ];
-declare type Untranslated = Primitive | TokenisedString | RawString;
+declare type Untranslated = Primitive | TokenisedString | RawString | null | undefined;
 declare type TranslatedString = string;
 interface I18n {
     getData: () => Record<string, Record<string, string>>;
@@ -2213,7 +2369,7 @@ interface SafeUriOptions {
 }
 declare class URI {
     static parseDataUri(uri: string): {
-        type: string;
+        type: string | undefined;
         data: string;
     };
     static isDomSafe(uri: string, context?: string, options?: SafeUriOptions): boolean;
@@ -2224,19 +2380,19 @@ declare class URI {
         pathname?: string;
     }): string;
     source: string;
-    protocol: string;
-    authority: string;
-    userInfo: string;
-    user: string;
-    password: string;
-    host: string;
-    port: string;
-    relative: string;
+    protocol: string | undefined;
+    authority: string | undefined;
+    userInfo: string | undefined;
+    user: string | undefined;
+    password: string | undefined;
+    host: string | undefined;
+    port: string | undefined;
+    relative: string | undefined;
     path: string;
     directory: string;
-    file: string;
-    query: string;
-    anchor: string;
+    file: string | undefined;
+    query: string | undefined;
+    anchor: string | undefined;
     settings: URISettings;
     constructor(url: string, settings?: URISettings);
     setPath(path: string): void;
@@ -2252,8 +2408,8 @@ interface EditorManager extends Observable<EditorManagerEventMap> {
     majorVersion: string;
     minorVersion: string;
     releaseDate: string;
-    activeEditor: Editor;
-    focusedEditor: Editor;
+    activeEditor: Editor | null;
+    focusedEditor: Editor | null;
     baseURI: URI;
     baseURL: string;
     documentBaseURL: string;
@@ -2264,11 +2420,12 @@ interface EditorManager extends Observable<EditorManagerEventMap> {
     createEditor(this: EditorManager, id: string, options: RawEditorOptions): Editor;
     execCommand(this: EditorManager, cmd: string, ui: boolean, value: any): boolean;
     get(this: EditorManager): Editor[];
-    get(this: EditorManager, id: number | string): Editor;
+    get(this: EditorManager, id: number | string): Editor | null;
     init(this: EditorManager, options: RawEditorOptions): Promise<Editor[]>;
     overrideDefaults(this: EditorManager, defaultOptions: Partial<RawEditorOptions>): void;
     remove(this: EditorManager): void;
-    remove(this: EditorManager, selector: string | Editor): Editor | void;
+    remove(this: EditorManager, selector: string): void;
+    remove(this: EditorManager, editor: Editor): Editor | null;
     setActive(this: EditorManager, editor: Editor): void;
     setup(this: EditorManager): void;
     translate: (text: Untranslated) => TranslatedString;
@@ -2277,7 +2434,7 @@ interface EditorManager extends Observable<EditorManagerEventMap> {
 }
 interface EditorObservable extends Observable<EditorEventMap> {
     bindPendingEventDelegates(this: Editor): void;
-    toggleNativeEvent(this: Editor, name: string, state: boolean): any;
+    toggleNativeEvent(this: Editor, name: string, state: boolean): void;
     unbindAllNativeEvents(this: Editor): void;
 }
 interface ProcessorSuccess<T> {
@@ -2328,7 +2485,7 @@ interface Options {
     };
     isRegistered: (name: string) => boolean;
     get: {
-        <K extends keyof EditorOptions>(name: K): EditorOptions[K] | undefined;
+        <K extends keyof EditorOptions>(name: K): EditorOptions[K];
         <T>(name: string): T | undefined;
     };
     set: <K extends string, T>(name: K, value: K extends keyof NormalizedEditorOptions ? NormalizedEditorOptions[K] : T) => boolean;
@@ -2353,7 +2510,7 @@ interface EditorUpload {
 declare type FormatChangeCallback = (state: boolean, data: {
     node: Node;
     format: string;
-    parents: any;
+    parents: Element[];
 }) => void;
 interface FormatRegistry {
     get: {
@@ -2365,18 +2522,18 @@ interface FormatRegistry {
     unregister: (name: string) => Formats;
 }
 interface Formatter extends FormatRegistry {
-    apply: (name: string, vars?: FormatVars, node?: Node | RangeLikeObject) => void;
+    apply: (name: string, vars?: FormatVars, node?: Node | RangeLikeObject | null) => void;
     remove: (name: string, vars?: FormatVars, node?: Node | Range, similar?: boolean) => void;
     toggle: (name: string, vars?: FormatVars, node?: Node) => void;
     match: (name: string, vars?: FormatVars, node?: Node, similar?: boolean) => boolean;
     closest: (names: string[]) => string | null;
     matchAll: (names: string[], vars?: FormatVars) => string[];
-    matchNode: (node: Node, name: string, vars?: FormatVars, similar?: boolean) => Format | undefined;
+    matchNode: (node: Node | null, name: string, vars?: FormatVars, similar?: boolean) => Format | undefined;
     canApply: (name: string) => boolean;
     formatChanged: (names: string, callback: FormatChangeCallback, similar?: boolean, vars?: FormatVars) => {
         unbind: () => void;
     };
-    getCssText: (format: string | Format) => string;
+    getCssText: (format: string | ApplyFormat) => string;
 }
 interface EditorMode {
     isReadOnly: () => boolean;
@@ -2419,7 +2576,7 @@ declare class Shortcuts {
     private readonly shortcuts;
     private pendingPatterns;
     constructor(editor: Editor);
-    add(pattern: string, desc: string, cmdFunc: CommandFunc, scope?: any): boolean;
+    add(pattern: string, desc: string | null, cmdFunc: CommandFunc, scope?: any): boolean;
     remove(pattern: string): boolean;
     private normalizeCommandFunc;
     private createShortcut;
@@ -2428,17 +2585,18 @@ declare class Shortcuts {
     private matchShortcut;
     private executeShortcutAction;
 }
+interface RenderResult {
+    iframeContainer?: HTMLElement;
+    editorContainer: HTMLElement;
+    api?: Partial<EditorUiApi>;
+}
 interface Theme {
     ui?: any;
     inline?: any;
     execCommand?: (command: string, ui?: boolean, value?: any) => boolean;
     destroy?: () => void;
     init?: (editor: Editor, url: string) => void;
-    renderUI?: () => {
-        iframeContainer?: HTMLIFrameElement;
-        editorContainer: HTMLElement;
-        api?: Partial<EditorUiApi>;
-    };
+    renderUI?: () => RenderResult;
     getNotificationManagerImpl?: () => NotificationManagerImpl;
     getWindowManagerImpl?: () => WindowManagerImpl;
 }
@@ -2464,34 +2622,34 @@ declare class Editor implements EditorObservable {
     editorCommands: EditorCommands;
     suffix: string;
     editorManager: EditorManager;
+    hidden: boolean;
     inline: boolean;
+    hasVisual: boolean;
     isNotDirty: boolean;
     annotator: Annotator;
-    bodyElement: HTMLElement;
+    bodyElement: HTMLElement | undefined;
     bookmark: any;
     composing: boolean;
     container: HTMLElement;
     contentAreaContainer: HTMLElement;
     contentDocument: Document;
     contentWindow: Window;
-    delegates: Record<string, (event: any) => void>;
+    delegates: Record<string, EventUtilsCallback<any>> | undefined;
     destroyed: boolean;
     dom: DOMUtils;
     editorContainer: HTMLElement;
     editorUpload: EditorUpload;
-    eventRoot?: Element;
+    eventRoot: Element | undefined;
     formatter: Formatter;
-    formElement: HTMLElement;
-    formEventDelegate: (e: Event) => void;
+    formElement: HTMLElement | undefined;
+    formEventDelegate: ((e: Event) => void) | undefined;
     hasHiddenInput: boolean;
-    hasVisual: boolean;
-    hidden: boolean;
     iframeElement: HTMLIFrameElement | null;
-    iframeHTML: string;
+    iframeHTML: string | undefined;
     initialized: boolean;
     notificationManager: NotificationManager;
     orgDisplay: string;
-    orgVisibility: string;
+    orgVisibility: string | undefined;
     parser: DomParser;
     quirks: Quirks;
     readonly: boolean;
@@ -2505,8 +2663,8 @@ declare class Editor implements EditorObservable {
     model: Model;
     undoManager: UndoManager;
     windowManager: WindowManager;
-    _beforeUnload: () => void;
-    _eventDispatcher: EventDispatcher<NativeEventMap>;
+    _beforeUnload: (() => void) | undefined;
+    _eventDispatcher: EventDispatcher<NativeEventMap> | undefined;
     _nodeChangeDispatcher: NodeChange;
     _pendingNativeEvents: string[];
     _selectionOverrides: SelectionOverrides;
@@ -2530,9 +2688,12 @@ declare class Editor implements EditorObservable {
     getParam<T>(name: string, defaultVal: T, type?: BuiltInOptionType): T;
     hasPlugin(name: string, loaded?: boolean): boolean;
     nodeChanged(args?: any): void;
-    addCommand(name: string, callback: EditorCommandCallback, scope?: object): void;
-    addQueryStateHandler(name: string, callback: () => boolean, scope?: any): void;
-    addQueryValueHandler(name: string, callback: () => string, scope?: any): void;
+    addCommand<S>(name: string, callback: EditorCommandCallback<S>, scope: S): void;
+    addCommand(name: string, callback: EditorCommandCallback<Editor>): void;
+    addQueryStateHandler<S>(name: string, callback: (this: S) => boolean, scope?: S): void;
+    addQueryStateHandler(name: string, callback: (this: Editor) => boolean): void;
+    addQueryValueHandler<S>(name: string, callback: (this: S) => string, scope: S): void;
+    addQueryValueHandler(name: string, callback: (this: Editor) => string): void;
     addShortcut(pattern: string, desc: string, cmdFunc: string | [
         string,
         boolean,
@@ -2546,8 +2707,8 @@ declare class Editor implements EditorObservable {
     hide(): void;
     isHidden(): boolean;
     setProgressState(state: boolean, time?: number): void;
-    load(args?: any): string;
-    save(args?: any): string;
+    load(args?: Partial<SetContentArgs>): string;
+    save(args?: Partial<GetContentArgs>): string;
     setContent(content: string, args?: Partial<SetContentArgs>): string;
     setContent(content: AstNode, args?: Partial<SetContentArgs>): AstNode;
     setContent(content: Content, args?: Partial<SetContentArgs>): Content;
@@ -2565,7 +2726,7 @@ declare class Editor implements EditorObservable {
     getWin(): Window;
     getDoc(): Document;
     getBody(): HTMLElement;
-    convertURL(url: string, name: string, elm?: any): string;
+    convertURL(url: string, name: string, elm?: string | Element): string;
     addVisual(elm?: HTMLElement): void;
     remove(): void;
     destroy(automatic?: boolean): void;
@@ -2585,8 +2746,8 @@ interface AddOnManager<T> {
     lookup: Record<string, {
         instance: AddOnConstructor<T>;
     }>;
-    get: (name: string) => AddOnConstructor<T>;
-    requireLangPack: (name: string, languages: string) => void;
+    get: (name: string) => AddOnConstructor<T> | undefined;
+    requireLangPack: (name: string, languages?: string) => void;
     add: (id: string, addOn: AddOnConstructor<T>) => AddOnConstructor<T>;
     remove: (name: string) => void;
     createUrl: (baseUrl: UrlObject, dep: string | UrlObject) => UrlObject;
@@ -2642,10 +2803,10 @@ declare class DomTreeWalker {
     private readonly rootNode;
     private node;
     constructor(startNode: Node, rootNode: Node);
-    current(): Node | undefined;
-    next(shallow?: boolean): Node | undefined;
-    prev(shallow?: boolean): Node | undefined;
-    prev2(shallow?: boolean): Node | undefined;
+    current(): Node | null | undefined;
+    next(shallow?: boolean): Node | null | undefined;
+    prev(shallow?: boolean): Node | null | undefined;
+    prev2(shallow?: boolean): Node | null | undefined;
     private findSibling;
     private findPreviousNode;
 }
@@ -2714,7 +2875,7 @@ interface Entities {
     encodeAllRaw: (text: string) => string;
     encodeNumeric: (text: string, attr?: boolean) => string;
     encodeNamed: (text: string, attr?: boolean, entities?: EntitiesMap) => string;
-    getEncodeFunc: (name: string, entities?: EntitiesMap | string) => (text: string, attr?: boolean) => string;
+    getEncodeFunc: (name: string, entities?: string) => (text: string, attr?: boolean) => string;
     decode: (text: string) => string;
 }
 interface IconPack {
@@ -2730,6 +2891,20 @@ interface Resource {
     add: (id: string, data: any) => void;
     unload: (id: string) => void;
 }
+type TextPatterns_d_Pattern = Pattern;
+type TextPatterns_d_RawPattern = RawPattern;
+type TextPatterns_d_DynamicPatternsLookup = DynamicPatternsLookup;
+type TextPatterns_d_RawDynamicPatternsLookup = RawDynamicPatternsLookup;
+type TextPatterns_d_DynamicPatternContext = DynamicPatternContext;
+type TextPatterns_d_BlockCmdPattern = BlockCmdPattern;
+type TextPatterns_d_BlockPattern = BlockPattern;
+type TextPatterns_d_BlockFormatPattern = BlockFormatPattern;
+type TextPatterns_d_InlineCmdPattern = InlineCmdPattern;
+type TextPatterns_d_InlinePattern = InlinePattern;
+type TextPatterns_d_InlineFormatPattern = InlineFormatPattern;
+declare namespace TextPatterns_d {
+    export { TextPatterns_d_Pattern as Pattern, TextPatterns_d_RawPattern as RawPattern, TextPatterns_d_DynamicPatternsLookup as DynamicPatternsLookup, TextPatterns_d_RawDynamicPatternsLookup as RawDynamicPatternsLookup, TextPatterns_d_DynamicPatternContext as DynamicPatternContext, TextPatterns_d_BlockCmdPattern as BlockCmdPattern, TextPatterns_d_BlockPattern as BlockPattern, TextPatterns_d_BlockFormatPattern as BlockFormatPattern, TextPatterns_d_InlineCmdPattern as InlineCmdPattern, TextPatterns_d_InlinePattern as InlinePattern, TextPatterns_d_InlineFormatPattern as InlineFormatPattern, };
+}
 interface Delay {
     setEditorInterval: (editor: Editor, callback: () => void, time?: number) => number;
     setEditorTimeout: (editor: Editor, callback: () => void, time?: number) => number;
@@ -2738,12 +2913,13 @@ declare type UploadResult = UploadResult$2;
 interface ImageUploader {
     upload: (blobInfos: BlobInfo[], showNotification?: boolean) => Promise<UploadResult[]>;
 }
-declare type ArrayCallback$1<T, R> = (x: T, i: number, xs: ReadonlyArray<T>) => R;
-declare type ObjCallback$1<T, R> = (value: T, key: string, obj: Record<string, T>) => R;
+declare type ArrayCallback$1<T, R> = (this: any, x: T, i: number, xs: ArrayLike<T>) => R;
+declare type ObjCallback$1<T, R> = (this: any, value: T, key: string, obj: Record<string, T>) => R;
 declare type ArrayCallback<T, R> = ArrayCallback$1<T, R>;
 declare type ObjCallback<T, R> = ObjCallback$1<T, R>;
+declare type WalkCallback<T> = (this: any, o: T, i: string, n: keyof T | undefined) => boolean | void;
 interface Tools {
-    is: (obj: any, type: string) => boolean;
+    is: (obj: any, type?: string) => boolean;
     isArray: <T>(arr: any) => arr is Array<T>;
     inArray: <T>(arr: ArrayLike<T>, value: T) => number;
     grep: {
@@ -2753,7 +2929,7 @@ interface Tools {
     trim: (str: string | null | undefined) => string;
     toArray: <T>(obj: ArrayLike<T>) => T[];
     hasOwn: (obj: any, name: string) => boolean;
-    makeMap: <T>(items: ArrayLike<T> | string, delim?: string | RegExp, map?: Record<string, T | string>) => Record<string, T | string>;
+    makeMap: (items: ArrayLike<string> | string | undefined, delim?: string | RegExp, map?: Record<string, {}>) => Record<string, {}>;
     each: {
         <T>(arr: ArrayLike<T> | null | undefined, cb: ArrayCallback<T, void | boolean>, scope?: any): boolean;
         <T>(obj: Record<string, T> | null | undefined, cb: ObjCallback<T, void | boolean>, scope?: any): boolean;
@@ -2763,9 +2939,9 @@ interface Tools {
         <T, R>(obj: Record<string, T> | null | undefined, cb: ObjCallback<T, R>): R[];
     };
     extend: (obj: Object, ext: Object, ...objs: Object[]) => any;
-    walk: <T = any>(obj: T, f: Function, n?: keyof T, scope?: any) => void;
+    walk: <T extends Record<string, any>>(obj: T, f: WalkCallback<T>, n?: keyof T, scope?: any) => void;
     resolve: (path: string, o?: Object) => any;
-    explode: (s: string, d?: string | RegExp) => string[];
+    explode: (s: string | string[], d?: string | RegExp) => string[];
     _addCacheSuffix: (url: string) => string;
 }
 interface KeyboardLikeEvent {
@@ -2892,4 +3068,4 @@ interface TinyMCE extends EditorManager {
     _addCacheSuffix: Tools['_addCacheSuffix'];
 }
 declare const tinymce: TinyMCE;
-export { AddOnManager, Annotator, AstNode, Bookmark, BookmarkManager, ControlSelection, DOMUtils, Delay, DomParser, DomParserSettings, DomSerializer, DomSerializerSettings, DomTreeWalker, Editor, EditorCommands, EditorEvent, EditorManager, EditorModeApi, EditorObservable, EditorOptions, EditorSelection, Entities, Env, EventDispatcher, EventUtils, EventTypes_d as Events, FakeClipboard, FocusManager, Format_d as Formats, Formatter, GeomRect, HtmlSerializer, HtmlSerializerSettings, I18n, IconManager, Model, ModelManager, NotificationApi, NotificationManager, NotificationSpec, Observable, Plugin, PluginManager, RangeUtils, RawEditorOptions, Rect, Resource, Schema, SchemaSettings, ScriptLoader, Shortcuts, StyleSheetLoader, Styles, TextSeeker, Theme, ThemeManager, TinyMCE, Tools, URI, Ui_d as Ui, UndoManager, VK, WindowManager, Writer, WriterSettings, tinymce as default };
+export { AddOnManager, Annotator, AstNode, Bookmark, BookmarkManager, ControlSelection, DOMUtils, Delay, DomParser, DomParserSettings, DomSerializer, DomSerializerSettings, DomTreeWalker, Editor, EditorCommands, EditorEvent, EditorManager, EditorModeApi, EditorObservable, EditorOptions, EditorSelection, Entities, Env, EventDispatcher, EventUtils, EventTypes_d as Events, FakeClipboard, FocusManager, Format_d as Formats, Formatter, GeomRect, HtmlSerializer, HtmlSerializerSettings, I18n, IconManager, Model, ModelManager, NotificationApi, NotificationManager, NotificationSpec, Observable, Plugin, PluginManager, RangeUtils, RawEditorOptions, Rect, Resource, Schema, SchemaSettings, ScriptLoader, Shortcuts, StyleSheetLoader, Styles, TextPatterns_d as TextPatterns, TextSeeker, Theme, ThemeManager, TinyMCE, Tools, URI, Ui_d as Ui, UndoManager, VK, WindowManager, Writer, WriterSettings, tinymce as default };