@atlaskit/editor-plugin-text-formatting 2.2.4 → 2.2.6

package/dist/esm/ui/Toolbar/hooks/formatting-icons.js

@@ -168,7 +168,7 @@ var buildMenuIconState = function buildMenuIconState(iconMark) {
   return function (_ref2) {
     var schema = _ref2.schema,
       textFormattingState = _ref2.textFormattingState;
-    var hasPluginState = Boolean(Object.keys(textFormattingState || {}).length);
+    var hasPluginState = Boolean(textFormattingState === null || textFormattingState === void 0 ? void 0 : textFormattingState.isInitialised);
     var markSchema = IconsMarkSchema[iconMark];
     var hasSchemaMark = Boolean(schema.marks[markSchema]);
     if (!hasPluginState) {
@@ -258,7 +258,7 @@ export var useHasFormattingActived = function useHasFormattingActived(_ref5) {
   var iconTypeList = _ref5.iconTypeList,
     textFormattingState = _ref5.textFormattingState;
   var hasActiveFormatting = useMemo(function () {
-    if (!textFormattingState) {
+    if (!(textFormattingState !== null && textFormattingState !== void 0 && textFormattingState.isInitialised)) {
       return false;
     }
     return iconTypeList.some(function (iconType) {

package/dist/esm/ui/Toolbar/index.js

@@ -1,5 +1,7 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
+var _excluded = ["formattingIsPresent"];
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -41,16 +43,19 @@ var ToolbarFormatting = function ToolbarFormatting(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     message = _useState2[0],
     setMessage = _useState2[1];
+  var formattingIsPresent = textFormattingState.formattingIsPresent,
+    formattingIconState = _objectWithoutProperties(textFormattingState, _excluded);
   var defaultIcons = useFormattingIcons({
     schema: editorView.state.schema,
     intl: intl,
     isToolbarDisabled: isToolbarDisabled,
     editorAnalyticsAPI: editorAnalyticsAPI,
-    textFormattingState: textFormattingState,
+    textFormattingState: formattingIconState,
     toolbarType: toolbarType
   });
   var clearIcon = useClearIcon({
-    textFormattingState: textFormattingState,
+    formattingPluginInitialised: textFormattingState.isInitialised,
+    formattingIsPresent: formattingIsPresent,
     intl: intl,
     editorAnalyticsAPI: editorAnalyticsAPI,
     toolbarType: toolbarType

package/dist/types/ui/Toolbar/hooks/clear-formatting-icon.d.ts

@@ -1,10 +1,10 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import type { TextFormattingState } from '@atlaskit/editor-common/types';
 import type { IconHookProps, MenuIconItem, ToolbarType } from '../types';
 interface ClearIconHookProps extends IconHookProps {
     editorAnalyticsAPI: EditorAnalyticsAPI | undefined;
-    textFormattingState: TextFormattingState | undefined;
+    formattingPluginInitialised: boolean | undefined;
+    formattingIsPresent: boolean | undefined;
     toolbarType: ToolbarType;
 }
-export declare const useClearIcon: ({ intl, textFormattingState, editorAnalyticsAPI, toolbarType, }: ClearIconHookProps) => MenuIconItem | null;
+export declare const useClearIcon: ({ intl, formattingPluginInitialised, formattingIsPresent: formattingPresent, editorAnalyticsAPI, toolbarType, }: ClearIconHookProps) => MenuIconItem | null;
 export {};

package/dist/types/ui/Toolbar/index.d.ts

@@ -15,7 +15,7 @@ export type ToolbarFormattingProps = {
     popupsBoundariesElement?: HTMLElement;
     popupsScrollableElement?: HTMLElement;
     editorAnalyticsAPI?: EditorAnalyticsAPI;
-    textFormattingState: TextFormattingState | undefined;
+    textFormattingState: TextFormattingState;
     api: ExtractInjectionAPI<TextFormattingPlugin> | undefined;
     toolbarType: ToolbarType;
 };

package/dist/types-ts4.5/ui/Toolbar/hooks/clear-formatting-icon.d.ts

@@ -1,10 +1,10 @@
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import type { TextFormattingState } from '@atlaskit/editor-common/types';
 import type { IconHookProps, MenuIconItem, ToolbarType } from '../types';
 interface ClearIconHookProps extends IconHookProps {
     editorAnalyticsAPI: EditorAnalyticsAPI | undefined;
-    textFormattingState: TextFormattingState | undefined;
+    formattingPluginInitialised: boolean | undefined;
+    formattingIsPresent: boolean | undefined;
     toolbarType: ToolbarType;
 }
-export declare const useClearIcon: ({ intl, textFormattingState, editorAnalyticsAPI, toolbarType, }: ClearIconHookProps) => MenuIconItem | null;
+export declare const useClearIcon: ({ intl, formattingPluginInitialised, formattingIsPresent: formattingPresent, editorAnalyticsAPI, toolbarType, }: ClearIconHookProps) => MenuIconItem | null;
 export {};

package/dist/types-ts4.5/ui/Toolbar/index.d.ts

@@ -15,7 +15,7 @@ export type ToolbarFormattingProps = {
     popupsBoundariesElement?: HTMLElement;
     popupsScrollableElement?: HTMLElement;
     editorAnalyticsAPI?: EditorAnalyticsAPI;
-    textFormattingState: TextFormattingState | undefined;
+    textFormattingState: TextFormattingState;
     api: ExtractInjectionAPI<TextFormattingPlugin> | undefined;
     toolbarType: ToolbarType;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-text-formatting",
-	"version": "2.2.4",
+	"version": "2.2.6",
 	"description": "Text-formatting plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -34,9 +34,9 @@
 	},
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
-		"@atlaskit/editor-common": "^104.1.0",
-		"@atlaskit/editor-plugin-analytics": "^2.2.0",
-		"@atlaskit/editor-plugin-base": "^2.3.0",
+		"@atlaskit/editor-common": "^105.2.0",
+		"@atlaskit/editor-plugin-analytics": "^2.3.0",
+		"@atlaskit/editor-plugin-base": "^3.0.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^3.2.0",
 		"@atlaskit/editor-plugin-selection-toolbar": "^3.6.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
@@ -45,7 +45,7 @@
 		"@atlaskit/icon": "^26.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-input-rules": "^3.3.0",
-		"@atlaskit/tmp-editor-statsig": "^4.19.0",
+		"@atlaskit/tmp-editor-statsig": "^4.21.0",
 		"@atlaskit/tokens": "^4.8.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",