From 3b4d18b33925d38df71f46d4e817f1e7de38d7a3 Mon Sep 17 00:00:00 2001 From: Tanya Fomina Date: Mon, 8 Aug 2022 12:24:54 +0300 Subject: [PATCH] Fix text block tunes --- src/components/block/index.ts | 2 +- src/components/modules/toolbar/blockSettings.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/block/index.ts b/src/components/block/index.ts index 97b8362c..4bb8cacc 100644 --- a/src/components/block/index.ts +++ b/src/components/block/index.ts @@ -651,7 +651,7 @@ export default class Block extends EventsDispatcher { const tunesItems: PopoverItem[] = []; /** Tool's tunes: may be defined as return value of optional renderSettings method */ - const tunesDefinedInTool = typeof this.toolInstance.renderSettings === 'function' && this.toolInstance.renderSettings(); + const tunesDefinedInTool = typeof this.toolInstance.renderSettings === 'function' ? this.toolInstance.renderSettings() : []; /** Common tunes: combination of default tunes (move up, move down, delete) and third-party tunes connected via tunes api */ const commonTunes = [ diff --git a/src/components/modules/toolbar/blockSettings.ts b/src/components/modules/toolbar/blockSettings.ts index a7d36c65..6e277041 100644 --- a/src/components/modules/toolbar/blockSettings.ts +++ b/src/components/modules/toolbar/blockSettings.ts @@ -3,7 +3,7 @@ import $ from '../../dom'; import * as _ from '../../utils'; import SelectionUtils from '../../selection'; import Block from '../../block'; -import Popover, { PopoverEvent, PopoverItem } from '../../utils/popover'; +import Popover, { PopoverEvent } from '../../utils/popover'; import I18n from '../../i18n'; import { I18nInternalNS } from '../../i18n/namespace-internal';