@atlaskit/editor-plugin-floating-toolbar 1.14.2 → 1.14.4

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-floating-toolbar
 
+## 1.14.4
+
+### Patch Changes
+
+- [#161539](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/161539)
+  [`a3538a83b5e02`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a3538a83b5e02) -
+  set floating toolbar icon color when active
+
+## 1.14.3
+
+### Patch Changes
+
+- [#159777](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/159777)
+  [`e708d0a9e4b36`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e708d0a9e4b36) -
+  Refactoring plugins to meet folder standards.
+- Updated dependencies
+
 ## 1.14.2
 
 ### Patch Changes

package/dist/cjs/{plugin.js → floatingToolbarPlugin.js}

@@ -24,9 +24,9 @@ var _forceFocus = _interopRequireWildcard(require("./pm-plugins/force-focus"));
 var _commands = require("./pm-plugins/toolbar-data/commands");
 var _plugin = require("./pm-plugins/toolbar-data/plugin");
 var _pluginKey = require("./pm-plugins/toolbar-data/plugin-key");
+var _utils2 = require("./pm-plugins/utils");
 var _ConfirmationModal = require("./ui/ConfirmationModal");
 var _ToolbarLoader = require("./ui/ToolbarLoader");
-var _utils2 = require("./utils");
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }

package/dist/cjs/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "floatingToolbarPlugin", {
   enumerable: true,
   get: function get() {
-    return _plugin.floatingToolbarPlugin;
+    return _floatingToolbarPlugin.floatingToolbarPlugin;
   }
 });
-var _plugin = require("./plugin");
+var _floatingToolbarPlugin = require("./floatingToolbarPlugin");

package/dist/cjs/ui/Toolbar.js

@@ -103,6 +103,15 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
             }
           }
         };
+        var getIconColor = function getIconColor(disabled, selected) {
+          if (disabled) {
+            return "var(--ds-icon-disabled, #091E424F)";
+          }
+          if (selected) {
+            return "var(--ds-icon-selected, #0C66E4)";
+          }
+          return "var(--ds-icon, #44546F)";
+        };
         return (0, _react2.jsx)(_ui.FloatingToolbarButton
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
         , {
@@ -111,7 +120,7 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
           title: item.title,
           href: item.href,
           icon: item.icon ? item.iconFallback ? (0, _react2.jsx)(ButtonIcon, {
-            color: item.disabled ? "var(--ds-icon-disabled, #091E424F)" : "var(--ds-icon, #44546F)",
+            color: getIconColor(item.disabled, item.selected),
             spacing: "spacious",
             label: item.title,
             LEGACY_fallbackIcon: item.iconFallback,
@@ -150,7 +159,7 @@ var ToolbarItems = /*#__PURE__*/_react.default.memo(function (_ref) {
           spotlightConfig: item.spotlightConfig
         }, item.showTitle && item.title);
       case 'input':
-        if ((0, _platformFeatureFlags.fg)('platform_editor_react18_phase2')) {
+        if ((0, _platformFeatureFlags.fg)('platform_editor_react18_phase2_v2')) {
           return (0, _react2.jsx)(_Input.InputNew, {
             key: idx,
             mountPoint: popupsMountPoint,

package/dist/es2019/{plugin.js → floatingToolbarPlugin.js}

@@ -12,9 +12,9 @@ import forceFocusPlugin, { forceFocusSelector } from './pm-plugins/force-focus';
 import { hideConfirmDialog } from './pm-plugins/toolbar-data/commands';
 import { createPlugin as floatingToolbarDataPluginFactory } from './pm-plugins/toolbar-data/plugin';
 import { pluginKey as dataPluginKey } from './pm-plugins/toolbar-data/plugin-key';
+import { findNode } from './pm-plugins/utils';
 import { ConfirmationModal } from './ui/ConfirmationModal';
 import { ToolbarLoader } from './ui/ToolbarLoader';
-import { findNode } from './utils';
 
 // AFP-2532 TODO: Fix automatic suppressions below
 export const getRelevantConfig = (selection, configs) => {

package/dist/es2019/index.js

@@ -1 +1 @@
-export { floatingToolbarPlugin } from './plugin';
+export { floatingToolbarPlugin } from './floatingToolbarPlugin';

package/dist/es2019/ui/Toolbar.js

@@ -91,6 +91,15 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
             }
           }
         };
+        const getIconColor = (disabled, selected) => {
+          if (disabled) {
+            return "var(--ds-icon-disabled, #091E424F)";
+          }
+          if (selected) {
+            return "var(--ds-icon-selected, #0C66E4)";
+          }
+          return "var(--ds-icon, #44546F)";
+        };
         return jsx(Button
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
         , {
@@ -99,7 +108,7 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
           title: item.title,
           href: item.href,
           icon: item.icon ? item.iconFallback ? jsx(ButtonIcon, {
-            color: item.disabled ? "var(--ds-icon-disabled, #091E424F)" : "var(--ds-icon, #44546F)",
+            color: getIconColor(item.disabled, item.selected),
             spacing: "spacious",
             label: item.title,
             LEGACY_fallbackIcon: item.iconFallback,
@@ -130,7 +139,7 @@ const ToolbarItems = /*#__PURE__*/React.memo(({
           spotlightConfig: item.spotlightConfig
         }, item.showTitle && item.title);
       case 'input':
-        if (fg('platform_editor_react18_phase2')) {
+        if (fg('platform_editor_react18_phase2_v2')) {
           return jsx(InputNew, {
             key: idx,
             mountPoint: popupsMountPoint,

package/dist/esm/{plugin.js → floatingToolbarPlugin.js}

@@ -15,9 +15,9 @@ import forceFocusPlugin, { forceFocusSelector } from './pm-plugins/force-focus';
 import { hideConfirmDialog } from './pm-plugins/toolbar-data/commands';
 import { createPlugin as floatingToolbarDataPluginFactory } from './pm-plugins/toolbar-data/plugin';
 import { pluginKey as dataPluginKey } from './pm-plugins/toolbar-data/plugin-key';
+import { findNode } from './pm-plugins/utils';
 import { ConfirmationModal } from './ui/ConfirmationModal';
 import { ToolbarLoader } from './ui/ToolbarLoader';
-import { findNode } from './utils';
 
 // AFP-2532 TODO: Fix automatic suppressions below
 export var getRelevantConfig = function getRelevantConfig(selection, configs) {

package/dist/esm/index.js

@@ -1 +1 @@
-export { floatingToolbarPlugin } from './plugin';
+export { floatingToolbarPlugin } from './floatingToolbarPlugin';

package/dist/esm/ui/Toolbar.js

@@ -96,6 +96,15 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
             }
           }
         };
+        var getIconColor = function getIconColor(disabled, selected) {
+          if (disabled) {
+            return "var(--ds-icon-disabled, #091E424F)";
+          }
+          if (selected) {
+            return "var(--ds-icon-selected, #0C66E4)";
+          }
+          return "var(--ds-icon, #44546F)";
+        };
         return jsx(Button
         // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
         , {
@@ -104,7 +113,7 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
           title: item.title,
           href: item.href,
           icon: item.icon ? item.iconFallback ? jsx(ButtonIcon, {
-            color: item.disabled ? "var(--ds-icon-disabled, #091E424F)" : "var(--ds-icon, #44546F)",
+            color: getIconColor(item.disabled, item.selected),
             spacing: "spacious",
             label: item.title,
             LEGACY_fallbackIcon: item.iconFallback,
@@ -143,7 +152,7 @@ var ToolbarItems = /*#__PURE__*/React.memo(function (_ref) {
           spotlightConfig: item.spotlightConfig
         }, item.showTitle && item.title);
       case 'input':
-        if (fg('platform_editor_react18_phase2')) {
+        if (fg('platform_editor_react18_phase2_v2')) {
           return jsx(InputNew, {
             key: idx,
             mountPoint: popupsMountPoint,

package/dist/types/{plugin.d.ts → floatingToolbarPlugin.d.ts}

@@ -5,7 +5,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { ExtractInjectionAPI, FloatingToolbarConfig, FloatingToolbarHandler, UiComponentFactoryParams } from '@atlaskit/editor-common/types';
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import type { ConfigWithNodeInfo, FloatingToolbarPlugin, FloatingToolbarPluginState } from './types';
+import type { ConfigWithNodeInfo, FloatingToolbarPlugin, FloatingToolbarPluginState } from './floatingToolbarPluginType';
 export declare const getRelevantConfig: (selection: Selection, configs: Array<FloatingToolbarConfig>) => ConfigWithNodeInfo | undefined;
 export declare const floatingToolbarPlugin: FloatingToolbarPlugin;
 export declare function ContentComponent({ pluginInjectionApi, editorView, popupsMountPoint, popupsBoundariesElement, popupsScrollableElement, providerFactory, dispatchAnalyticsEvent, }: Pick<UiComponentFactoryParams, 'editorView' | 'popupsMountPoint' | 'popupsBoundariesElement' | 'providerFactory' | 'dispatchAnalyticsEvent' | 'popupsScrollableElement'> & {

package/dist/types/index.d.ts

@@ -1,2 +1,2 @@
-export type { FloatingToolbarPlugin, ForceFocusSelector, ConfigWithNodeInfo, FloatingToolbarPluginData, FloatingToolbarPluginState, } from './types';
-export { floatingToolbarPlugin } from './plugin';
+export type { FloatingToolbarPlugin, ForceFocusSelector, ConfigWithNodeInfo, FloatingToolbarPluginData, FloatingToolbarPluginState, } from './floatingToolbarPluginType';
+export { floatingToolbarPlugin } from './floatingToolbarPlugin';

package/dist/types/pm-plugins/toolbar-data/plugin-key.d.ts

@@ -1,3 +1,3 @@
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import type { FloatingToolbarPluginData } from '../../types';
+import type { FloatingToolbarPluginData } from '../../floatingToolbarPluginType';
 export declare const pluginKey: PluginKey<FloatingToolbarPluginData>;

package/dist/types/pm-plugins/toolbar-data/reducer.d.ts

@@ -1,3 +1,3 @@
-import type { FloatingToolbarPluginData } from '../../types';
+import type { FloatingToolbarPluginData } from '../../floatingToolbarPluginType';
 import type { FloatingToolbarPluginAction } from './types';
 export declare const reducer: (pluginState: FloatingToolbarPluginData, action: FloatingToolbarPluginAction) => FloatingToolbarPluginData;

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

@@ -8,7 +8,7 @@ import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import { type ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { EmojiId } from '@atlaskit/emoji';
-import { type FloatingToolbarPlugin } from '../types';
+import { type FloatingToolbarPlugin } from '../floatingToolbarPluginType';
 export declare const EmojiPickerButton: (props: {
     className?: string | undefined;
     editorView?: EditorView | undefined;
@@ -284,11 +284,11 @@ export declare const EmojiPickerButton: (props: {
             };
         }, import("@atlaskit/editor-plugin-emoji").EmojiPluginOptions | undefined>>];
         actions: {
-            forceFocusSelector: import("../types").ForceFocusSelector;
+            forceFocusSelector: import("../floatingToolbarPluginType").ForceFocusSelector;
         };
         sharedState: {
-            configWithNodeInfo: import("../types").ConfigWithNodeInfo | undefined;
-            floatingToolbarData: import("../types").FloatingToolbarPluginData | undefined;
+            configWithNodeInfo: import("../floatingToolbarPluginType").ConfigWithNodeInfo | undefined;
+            floatingToolbarData: import("../floatingToolbarPluginType").FloatingToolbarPluginData | undefined;
         } | undefined;
     }> | undefined;
 }) => jsx.JSX.Element;

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

@@ -11,7 +11,7 @@ import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { FloatingToolbarPlugin } from '../types';
+import type { FloatingToolbarPlugin } from '../floatingToolbarPluginType';
 export type { Item };
 export interface Props {
     items: Array<Item>;

package/dist/types-ts4.5/{plugin.d.ts → floatingToolbarPlugin.d.ts}

@@ -5,7 +5,7 @@ import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import type { ExtractInjectionAPI, FloatingToolbarConfig, FloatingToolbarHandler, UiComponentFactoryParams } from '@atlaskit/editor-common/types';
 import type { Selection } from '@atlaskit/editor-prosemirror/state';
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import type { ConfigWithNodeInfo, FloatingToolbarPlugin, FloatingToolbarPluginState } from './types';
+import type { ConfigWithNodeInfo, FloatingToolbarPlugin, FloatingToolbarPluginState } from './floatingToolbarPluginType';
 export declare const getRelevantConfig: (selection: Selection, configs: Array<FloatingToolbarConfig>) => ConfigWithNodeInfo | undefined;
 export declare const floatingToolbarPlugin: FloatingToolbarPlugin;
 export declare function ContentComponent({ pluginInjectionApi, editorView, popupsMountPoint, popupsBoundariesElement, popupsScrollableElement, providerFactory, dispatchAnalyticsEvent, }: Pick<UiComponentFactoryParams, 'editorView' | 'popupsMountPoint' | 'popupsBoundariesElement' | 'providerFactory' | 'dispatchAnalyticsEvent' | 'popupsScrollableElement'> & {

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

@@ -1,2 +1,2 @@
-export type { FloatingToolbarPlugin, ForceFocusSelector, ConfigWithNodeInfo, FloatingToolbarPluginData, FloatingToolbarPluginState, } from './types';
-export { floatingToolbarPlugin } from './plugin';
+export type { FloatingToolbarPlugin, ForceFocusSelector, ConfigWithNodeInfo, FloatingToolbarPluginData, FloatingToolbarPluginState, } from './floatingToolbarPluginType';
+export { floatingToolbarPlugin } from './floatingToolbarPlugin';

package/dist/types-ts4.5/pm-plugins/toolbar-data/plugin-key.d.ts

@@ -1,3 +1,3 @@
 import { PluginKey } from '@atlaskit/editor-prosemirror/state';
-import type { FloatingToolbarPluginData } from '../../types';
+import type { FloatingToolbarPluginData } from '../../floatingToolbarPluginType';
 export declare const pluginKey: PluginKey<FloatingToolbarPluginData>;

package/dist/types-ts4.5/pm-plugins/toolbar-data/reducer.d.ts

@@ -1,3 +1,3 @@
-import type { FloatingToolbarPluginData } from '../../types';
+import type { FloatingToolbarPluginData } from '../../floatingToolbarPluginType';
 import type { FloatingToolbarPluginAction } from './types';
 export declare const reducer: (pluginState: FloatingToolbarPluginData, action: FloatingToolbarPluginAction) => FloatingToolbarPluginData;

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

@@ -8,7 +8,7 @@ import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import { type ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { EmojiId } from '@atlaskit/emoji';
-import { type FloatingToolbarPlugin } from '../types';
+import { type FloatingToolbarPlugin } from '../floatingToolbarPluginType';
 export declare const EmojiPickerButton: (props: {
     className?: string | undefined;
     editorView?: EditorView | undefined;
@@ -335,11 +335,11 @@ export declare const EmojiPickerButton: (props: {
             }, import("@atlaskit/editor-plugin-emoji").EmojiPluginOptions | undefined>>
         ];
         actions: {
-            forceFocusSelector: import("../types").ForceFocusSelector;
+            forceFocusSelector: import("../floatingToolbarPluginType").ForceFocusSelector;
         };
         sharedState: {
-            configWithNodeInfo: import("../types").ConfigWithNodeInfo | undefined;
-            floatingToolbarData: import("../types").FloatingToolbarPluginData | undefined;
+            configWithNodeInfo: import("../floatingToolbarPluginType").ConfigWithNodeInfo | undefined;
+            floatingToolbarData: import("../floatingToolbarPluginType").FloatingToolbarPluginData | undefined;
         } | undefined;
     }> | undefined;
 }) => jsx.JSX.Element;

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

@@ -11,7 +11,7 @@ import type { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
 import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
 import type { Node } from '@atlaskit/editor-prosemirror/model';
 import type { EditorView } from '@atlaskit/editor-prosemirror/view';
-import type { FloatingToolbarPlugin } from '../types';
+import type { FloatingToolbarPlugin } from '../floatingToolbarPluginType';
 export type { Item };
 export interface Props {
     items: Array<Item>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-floating-toolbar",
-	"version": "1.14.2",
+	"version": "1.14.4",
 	"description": "Floating toolbar plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -23,10 +23,10 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/adf-utils": "^19.10.0",
+		"@atlaskit/adf-utils": "^19.11.0",
 		"@atlaskit/button": "^20.3.0",
 		"@atlaskit/checkbox": "^15.1.0",
-		"@atlaskit/editor-common": "^94.9.0",
+		"@atlaskit/editor-common": "^94.14.0",
 		"@atlaskit/editor-palette": "1.6.3",
 		"@atlaskit/editor-plugin-block-controls": "^2.13.0",
 		"@atlaskit/editor-plugin-context-panel": "^1.3.0",
@@ -35,8 +35,8 @@
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
 		"@atlaskit/editor-plugin-emoji": "^2.7.0",
-		"@atlaskit/editor-plugin-extension": "^1.15.0",
-		"@atlaskit/editor-plugin-table": "^7.29.0",
+		"@atlaskit/editor-plugin-extension": "^1.16.0",
+		"@atlaskit/editor-plugin-table": "^7.30.0",
 		"@atlaskit/editor-prosemirror": "6.0.0",
 		"@atlaskit/emoji": "^67.9.0",
 		"@atlaskit/icon": "^22.24.0",
@@ -44,9 +44,9 @@
 		"@atlaskit/modal-dialog": "^12.17.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/primitives": "^13.0.0",
-		"@atlaskit/select": "^18.4.0",
+		"@atlaskit/select": "^18.5.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tokens": "^2.0.0",
+		"@atlaskit/tokens": "^2.2.0",
 		"@atlaskit/tooltip": "^18.8.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -70,6 +70,9 @@
 	},
 	"techstack": {
 		"@atlassian/frontend": {
+			"code-structure": [
+				"editor-plugin"
+			],
 			"import-structure": [
 				"atlassian-conventions"
 			],
@@ -107,7 +110,7 @@
 		}
 	},
 	"platform-feature-flags": {
-		"platform_editor_react18_phase2": {
+		"platform_editor_react18_phase2_v2": {
 			"type": "boolean"
 		},
 		"platform_editor_advanced_layouts_pre_release_2": {