@atlaskit/editor-plugin-text-color 0.1.14 → 0.1.16

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # @atlaskit/editor-plugin-text-color
 
+## 0.1.16
+
+### Patch Changes
+
+- [#67557](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/67557) [`124d0c6d5286`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/124d0c6d5286) - Migrating block-type, text-color, and text-formatting to use useSharedPluginState rather than WithPluginState. Removing unused option on default preset. Adding formattingIsPresent prop to TextFormattingState.
+- Updated dependencies
+
+## 0.1.15
+
+### Patch Changes
+
+- [#65802](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/65802) [`438ead060875`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/438ead060875) - Ensure all editor plugins are marked as singletons
+
 ## 0.1.14
 
 ### Patch Changes

package/dist/cjs/plugin.js

@@ -13,10 +13,9 @@ Object.defineProperty(exports, "textColorPluginKey", {
 });
 var _react = _interopRequireDefault(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
-var _withPluginState = require("@atlaskit/editor-common/with-plugin-state");
 var _changeColor2 = require("./commands/change-color");
 var _main = require("./pm-plugins/main");
-var _ToolbarTextColor = _interopRequireDefault(require("./ui/ToolbarTextColor"));
+var _PrimaryToolbarComponent = require("./ui/PrimaryToolbarComponent");
 var pluginConfig = function pluginConfig(textColorConfig) {
   if (!textColorConfig || typeof textColorConfig === 'boolean') {
     return undefined;
@@ -63,24 +62,15 @@ var textColorPlugin = exports.textColorPlugin = function textColorPlugin(_ref) {
         isToolbarReducedSpacing = _ref3.isToolbarReducedSpacing,
         dispatchAnalyticsEvent = _ref3.dispatchAnalyticsEvent,
         disabled = _ref3.disabled;
-      return /*#__PURE__*/_react.default.createElement(_withPluginState.WithPluginState, {
-        plugins: {
-          textColor: _main.pluginKey
-        },
-        render: function render(_ref4) {
-          var textColor = _ref4.textColor;
-          return /*#__PURE__*/_react.default.createElement(_ToolbarTextColor.default, {
-            pluginState: textColor,
-            isReducedSpacing: isToolbarReducedSpacing,
-            editorView: editorView,
-            popupsMountPoint: popupsMountPoint,
-            popupsBoundariesElement: popupsBoundariesElement,
-            popupsScrollableElement: popupsScrollableElement,
-            dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-            disabled: disabled,
-            pluginInjectionApi: api
-          });
-        }
+      return /*#__PURE__*/_react.default.createElement(_PrimaryToolbarComponent.PrimaryToolbarComponent, {
+        isReducedSpacing: isToolbarReducedSpacing,
+        editorView: editorView,
+        popupsMountPoint: popupsMountPoint,
+        popupsBoundariesElement: popupsBoundariesElement,
+        popupsScrollableElement: popupsScrollableElement,
+        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+        disabled: disabled,
+        api: api
       });
     }
   };

package/dist/cjs/ui/PrimaryToolbarComponent.js

@@ -0,0 +1,33 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PrimaryToolbarComponent = PrimaryToolbarComponent;
+var _react = _interopRequireDefault(require("react"));
+var _hooks = require("@atlaskit/editor-common/hooks");
+var _ToolbarTextColor = _interopRequireDefault(require("./ToolbarTextColor"));
+function PrimaryToolbarComponent(_ref) {
+  var api = _ref.api,
+    isReducedSpacing = _ref.isReducedSpacing,
+    editorView = _ref.editorView,
+    popupsMountPoint = _ref.popupsMountPoint,
+    popupsScrollableElement = _ref.popupsScrollableElement,
+    popupsBoundariesElement = _ref.popupsBoundariesElement,
+    dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent,
+    disabled = _ref.disabled;
+  var _useSharedPluginState = (0, _hooks.useSharedPluginState)(api, ['textColor']),
+    textColorState = _useSharedPluginState.textColorState;
+  return /*#__PURE__*/_react.default.createElement(_ToolbarTextColor.default, {
+    pluginState: textColorState,
+    isReducedSpacing: isReducedSpacing,
+    editorView: editorView,
+    popupsMountPoint: popupsMountPoint,
+    popupsBoundariesElement: popupsBoundariesElement,
+    popupsScrollableElement: popupsScrollableElement,
+    dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+    disabled: disabled,
+    pluginInjectionApi: api
+  });
+}

package/dist/es2019/plugin.js

@@ -1,9 +1,8 @@
 import React from 'react';
 import { textColor } from '@atlaskit/adf-schema';
-import { WithPluginState } from '@atlaskit/editor-common/with-plugin-state';
 import { changeColor } from './commands/change-color';
 import { createPlugin, pluginKey as textColorPluginKey } from './pm-plugins/main';
-import ToolbarTextColor from './ui/ToolbarTextColor';
+import { PrimaryToolbarComponent } from './ui/PrimaryToolbarComponent';
 const pluginConfig = textColorConfig => {
   if (!textColorConfig || typeof textColorConfig === 'boolean') {
     return undefined;
@@ -51,23 +50,15 @@ export const textColorPlugin = ({
       dispatchAnalyticsEvent,
       disabled
     }) {
-      return /*#__PURE__*/React.createElement(WithPluginState, {
-        plugins: {
-          textColor: textColorPluginKey
-        },
-        render: ({
-          textColor
-        }) => /*#__PURE__*/React.createElement(ToolbarTextColor, {
-          pluginState: textColor,
-          isReducedSpacing: isToolbarReducedSpacing,
-          editorView: editorView,
-          popupsMountPoint: popupsMountPoint,
-          popupsBoundariesElement: popupsBoundariesElement,
-          popupsScrollableElement: popupsScrollableElement,
-          dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-          disabled: disabled,
-          pluginInjectionApi: api
-        })
+      return /*#__PURE__*/React.createElement(PrimaryToolbarComponent, {
+        isReducedSpacing: isToolbarReducedSpacing,
+        editorView: editorView,
+        popupsMountPoint: popupsMountPoint,
+        popupsBoundariesElement: popupsBoundariesElement,
+        popupsScrollableElement: popupsScrollableElement,
+        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+        disabled: disabled,
+        api: api
       });
     }
   };

package/dist/es2019/ui/PrimaryToolbarComponent.js

@@ -0,0 +1,28 @@
+import React from 'react';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import ToolbarTextColor from './ToolbarTextColor';
+export function PrimaryToolbarComponent({
+  api,
+  isReducedSpacing,
+  editorView,
+  popupsMountPoint,
+  popupsScrollableElement,
+  popupsBoundariesElement,
+  dispatchAnalyticsEvent,
+  disabled
+}) {
+  const {
+    textColorState
+  } = useSharedPluginState(api, ['textColor']);
+  return /*#__PURE__*/React.createElement(ToolbarTextColor, {
+    pluginState: textColorState,
+    isReducedSpacing: isReducedSpacing,
+    editorView: editorView,
+    popupsMountPoint: popupsMountPoint,
+    popupsBoundariesElement: popupsBoundariesElement,
+    popupsScrollableElement: popupsScrollableElement,
+    dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+    disabled: disabled,
+    pluginInjectionApi: api
+  });
+}

package/dist/esm/plugin.js

@@ -1,9 +1,8 @@
 import React from 'react';
 import { textColor } from '@atlaskit/adf-schema';
-import { WithPluginState } from '@atlaskit/editor-common/with-plugin-state';
 import { changeColor as _changeColor } from './commands/change-color';
 import { createPlugin, pluginKey as textColorPluginKey } from './pm-plugins/main';
-import ToolbarTextColor from './ui/ToolbarTextColor';
+import { PrimaryToolbarComponent } from './ui/PrimaryToolbarComponent';
 var pluginConfig = function pluginConfig(textColorConfig) {
   if (!textColorConfig || typeof textColorConfig === 'boolean') {
     return undefined;
@@ -50,24 +49,15 @@ export var textColorPlugin = function textColorPlugin(_ref) {
         isToolbarReducedSpacing = _ref3.isToolbarReducedSpacing,
         dispatchAnalyticsEvent = _ref3.dispatchAnalyticsEvent,
         disabled = _ref3.disabled;
-      return /*#__PURE__*/React.createElement(WithPluginState, {
-        plugins: {
-          textColor: textColorPluginKey
-        },
-        render: function render(_ref4) {
-          var textColor = _ref4.textColor;
-          return /*#__PURE__*/React.createElement(ToolbarTextColor, {
-            pluginState: textColor,
-            isReducedSpacing: isToolbarReducedSpacing,
-            editorView: editorView,
-            popupsMountPoint: popupsMountPoint,
-            popupsBoundariesElement: popupsBoundariesElement,
-            popupsScrollableElement: popupsScrollableElement,
-            dispatchAnalyticsEvent: dispatchAnalyticsEvent,
-            disabled: disabled,
-            pluginInjectionApi: api
-          });
-        }
+      return /*#__PURE__*/React.createElement(PrimaryToolbarComponent, {
+        isReducedSpacing: isToolbarReducedSpacing,
+        editorView: editorView,
+        popupsMountPoint: popupsMountPoint,
+        popupsBoundariesElement: popupsBoundariesElement,
+        popupsScrollableElement: popupsScrollableElement,
+        dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+        disabled: disabled,
+        api: api
       });
     }
   };

package/dist/esm/ui/PrimaryToolbarComponent.js

@@ -0,0 +1,26 @@
+import React from 'react';
+import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
+import ToolbarTextColor from './ToolbarTextColor';
+export function PrimaryToolbarComponent(_ref) {
+  var api = _ref.api,
+    isReducedSpacing = _ref.isReducedSpacing,
+    editorView = _ref.editorView,
+    popupsMountPoint = _ref.popupsMountPoint,
+    popupsScrollableElement = _ref.popupsScrollableElement,
+    popupsBoundariesElement = _ref.popupsBoundariesElement,
+    dispatchAnalyticsEvent = _ref.dispatchAnalyticsEvent,
+    disabled = _ref.disabled;
+  var _useSharedPluginState = useSharedPluginState(api, ['textColor']),
+    textColorState = _useSharedPluginState.textColorState;
+  return /*#__PURE__*/React.createElement(ToolbarTextColor, {
+    pluginState: textColorState,
+    isReducedSpacing: isReducedSpacing,
+    editorView: editorView,
+    popupsMountPoint: popupsMountPoint,
+    popupsBoundariesElement: popupsBoundariesElement,
+    popupsScrollableElement: popupsScrollableElement,
+    dispatchAnalyticsEvent: dispatchAnalyticsEvent,
+    disabled: disabled,
+    pluginInjectionApi: api
+  });
+}

package/dist/types/ui/PrimaryToolbarComponent.d.ts

@@ -0,0 +1,17 @@
+/// <reference types="react" />
+import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { TextColorPlugin } from '../types';
+interface PrimaryToolbarComponentProps {
+    isReducedSpacing: boolean;
+    editorView: EditorView;
+    popupsMountPoint?: HTMLElement;
+    popupsBoundariesElement?: HTMLElement;
+    popupsScrollableElement?: HTMLElement;
+    dispatchAnalyticsEvent?: DispatchAnalyticsEvent;
+    disabled: boolean;
+    api: ExtractInjectionAPI<TextColorPlugin> | undefined;
+}
+export declare function PrimaryToolbarComponent({ api, isReducedSpacing, editorView, popupsMountPoint, popupsScrollableElement, popupsBoundariesElement, dispatchAnalyticsEvent, disabled, }: PrimaryToolbarComponentProps): JSX.Element;
+export {};

package/dist/types-ts4.5/ui/PrimaryToolbarComponent.d.ts

@@ -0,0 +1,17 @@
+/// <reference types="react" />
+import type { DispatchAnalyticsEvent } from '@atlaskit/editor-common/analytics';
+import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
+import type { EditorView } from '@atlaskit/editor-prosemirror/view';
+import type { TextColorPlugin } from '../types';
+interface PrimaryToolbarComponentProps {
+    isReducedSpacing: boolean;
+    editorView: EditorView;
+    popupsMountPoint?: HTMLElement;
+    popupsBoundariesElement?: HTMLElement;
+    popupsScrollableElement?: HTMLElement;
+    dispatchAnalyticsEvent?: DispatchAnalyticsEvent;
+    disabled: boolean;
+    api: ExtractInjectionAPI<TextColorPlugin> | undefined;
+}
+export declare function PrimaryToolbarComponent({ api, isReducedSpacing, editorView, popupsMountPoint, popupsScrollableElement, popupsBoundariesElement, dispatchAnalyticsEvent, disabled, }: PrimaryToolbarComponentProps): JSX.Element;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-text-color",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "description": "Text color plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -9,11 +9,12 @@
   },
   "atlassian": {
     "team": "Editor: Lego",
+    "singleton": true,
     "inPublicMirror": false,
     "releaseModel": "continuous",
     "runReact18": false
   },
-  "repository": "https://bitbucket.org/atlassian/atlassian-frontend",
+  "repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "module:es2019": "dist/es2019/index.js",
@@ -33,7 +34,7 @@
   },
   "dependencies": {
     "@atlaskit/adf-schema": "^35.3.0",
-    "@atlaskit/editor-common": "^76.35.0",
+    "@atlaskit/editor-common": "^76.40.0",
     "@atlaskit/editor-palette": "1.5.2",
     "@atlaskit/editor-plugin-analytics": "^0.4.0",
     "@atlaskit/editor-prosemirror": "1.1.0",
@@ -53,7 +54,6 @@
     "@af/visual-regression": "*",
     "@atlaskit/ssr": "*",
     "@atlaskit/visual-regression": "*",
-    "@atlaskit/webdriver-runner": "*",
     "@atlassian/atlassian-frontend-prettier-config-1.0.0": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.0",
     "@testing-library/react": "^12.1.5",
     "react-dom": "^16.8.0",