@atlaskit/editor-common 99.14.1 → 99.15.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-common
 
+## 99.15.0
+
+### Minor Changes
+
+- [#113466](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/113466)
+  [`756bb7e35a24d`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/756bb7e35a24d) -
+  Add new FloatingToolbarOverflowDropdown item to floating toolbar config to support new editor
+  controls, add config in selection-toolbar plugin to add new button to text selection
+
+### Patch Changes
+
+- [#113299](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/113299)
+  [`329821ba1c893`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/329821ba1c893) -
+  [ED-26503] Mark the extension label as non-editable
+
 ## 99.14.1
 
 ### Patch Changes

package/dist/cjs/extensibility/Extension/Lozenge/ExtensionLabel.js

@@ -10,6 +10,7 @@ var _react = require("@emotion/react");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _reactIntlNext = require("react-intl-next");
 var _customize = _interopRequireDefault(require("@atlaskit/icon/core/customize"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
@@ -179,7 +180,8 @@ var ExtensionLabel = exports.ExtensionLabel = function ExtensionLabel(_ref) {
           }));
         }
       },
-      "data-testid": "new-lozenge-container"
+      "data-testid": "new-lozenge-container",
+      contentEditable: (0, _platformFeatureFlags.fg)('platform_editor_legacy_content_macro') ? false : undefined
     }, (0, _react.jsx)(_tooltip.default, {
       content: (0, _react.jsx)(_reactIntlNext.FormattedMessage
       // Ignored via go/ees005

package/dist/cjs/floating-toolbar/index.js

@@ -96,6 +96,7 @@ var isSameItem = exports.isSameItem = function isSameItem(leftItem, rightItem) {
         return false;
       }
       return compareItemWithKeys(leftItem, rightItem, ['type', 'onChange', 'options']);
+    case 'overflow-dropdown':
     case 'dropdown':
       if (makeSameType(leftItem, rightItem) && Array.isArray(leftItem.options) && Array.isArray(rightItem.options) &&
       // @ts-expect-error TS2345: Argument of type 'DropdownOptionT<Function>[]' is not assignable to parameter of type 'any[][]'

package/dist/cjs/monitoring/error.js

@@ -17,7 +17,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 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; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "99.14.1";
+var packageVersion = "99.15.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/cjs/ui/DropList/index.js

@@ -23,7 +23,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "99.14.1";
+var packageVersion = "99.15.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/es2019/extensibility/Extension/Lozenge/ExtensionLabel.js

@@ -9,6 +9,7 @@ import { css, jsx } from '@emotion/react';
 import classnames from 'classnames';
 import { defineMessages, FormattedMessage } from 'react-intl-next';
 import CustomizeIcon from '@atlaskit/icon/core/customize';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, xcss } from '@atlaskit/primitives';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import Tooltip from '@atlaskit/tooltip';
@@ -172,7 +173,8 @@ export const ExtensionLabel = ({
           }));
         }
       },
-      "data-testid": "new-lozenge-container"
+      "data-testid": "new-lozenge-container",
+      contentEditable: fg('platform_editor_legacy_content_macro') ? false : undefined
     }, jsx(Tooltip, {
       content: jsx(FormattedMessage
       // Ignored via go/ees005

package/dist/es2019/floating-toolbar/index.js

@@ -71,6 +71,7 @@ export const isSameItem = (leftItem, rightItem) => {
         return false;
       }
       return compareItemWithKeys(leftItem, rightItem, ['type', 'onChange', 'options']);
+    case 'overflow-dropdown':
     case 'dropdown':
       if (makeSameType(leftItem, rightItem) && Array.isArray(leftItem.options) && Array.isArray(rightItem.options) &&
       // @ts-expect-error TS2345: Argument of type 'DropdownOptionT<Function>[]' is not assignable to parameter of type 'any[][]'

package/dist/es2019/monitoring/error.js

@@ -1,7 +1,7 @@
 import { isFedRamp } from './environment';
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "99.14.1";
+const packageVersion = "99.15.0";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/es2019/ui/DropList/index.js

@@ -13,7 +13,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "99.14.1";
+const packageVersion = "99.15.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/esm/extensibility/Extension/Lozenge/ExtensionLabel.js

@@ -9,6 +9,7 @@ import { css, jsx } from '@emotion/react';
 import classnames from 'classnames';
 import { defineMessages, FormattedMessage } from 'react-intl-next';
 import CustomizeIcon from '@atlaskit/icon/core/customize';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, xcss } from '@atlaskit/primitives';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import Tooltip from '@atlaskit/tooltip';
@@ -171,7 +172,8 @@ export var ExtensionLabel = function ExtensionLabel(_ref) {
           }));
         }
       },
-      "data-testid": "new-lozenge-container"
+      "data-testid": "new-lozenge-container",
+      contentEditable: fg('platform_editor_legacy_content_macro') ? false : undefined
     }, jsx(Tooltip, {
       content: jsx(FormattedMessage
       // Ignored via go/ees005

package/dist/esm/floating-toolbar/index.js

@@ -81,6 +81,7 @@ export var isSameItem = function isSameItem(leftItem, rightItem) {
         return false;
       }
       return compareItemWithKeys(leftItem, rightItem, ['type', 'onChange', 'options']);
+    case 'overflow-dropdown':
     case 'dropdown':
       if (makeSameType(leftItem, rightItem) && Array.isArray(leftItem.options) && Array.isArray(rightItem.options) &&
       // @ts-expect-error TS2345: Argument of type 'DropdownOptionT<Function>[]' is not assignable to parameter of type 'any[][]'

package/dist/esm/monitoring/error.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { isFedRamp } from './environment';
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "99.14.1";
+var packageVersion = "99.15.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

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

@@ -20,7 +20,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "99.14.1";
+var packageVersion = "99.15.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/types/types/floating-toolbar.d.ts

@@ -12,6 +12,32 @@ import type { ProviderFactory } from '../provider-factory';
 import type { PaletteColor } from '../ui-color/ColorPalette/Palettes/type';
 import type { Command, CommandDispatch } from './command';
 import type { MarkOptions, NodeOptions } from './copy-button';
+/**
+ * New dropdown types to support editor controls
+ */
+type OverflowDropdownHeading = {
+    type: 'overflow-dropdown-heading';
+    title: string;
+};
+export type FloatingToolbarOverflowDropdownOptions<T extends Object> = Array<DropdownOptionT<T> | FloatingToolbarSeparator | OverflowDropdownHeading>;
+type FloatingToolbarOverflowDropdown<T extends Object> = {
+    type: 'overflow-dropdown';
+    options: FloatingToolbarOverflowDropdownOptions<T>;
+    testId?: string;
+    id?: string;
+    hidden?: boolean;
+    disabled?: boolean;
+    tooltip?: string;
+    dropdownWidth?: number;
+    showSelected?: boolean;
+    alignDropdownWithToolbar?: boolean;
+    onToggle?: (state: EditorState, dispatch: CommandDispatch | undefined) => boolean;
+    footer?: React.ReactNode;
+    /** If true, the component will have pulse onboarding effect around it. */
+    pulse?: boolean;
+    onMount?: () => void;
+    onClick?: () => void;
+};
 export interface RenderOptionsPropsT<T extends Object> {
     hide: () => void;
     dispatchCommand: (command: T) => void;
@@ -253,7 +279,7 @@ type FloatingToolbarExtensionsPlaceholder = {
  * Make sure that this type is not a FloatingToolbarCustom type.
  */
 export type FloatingToolbarFallbackItem<T extends Object> = FloatingToolbarButton<T> | FloatingToolbarCopyButton | FloatingToolbarDropdown<T> | FloatingToolbarSelect<T> | FloatingToolbarInput<T> | FloatingToolbarSeparator;
-export type FloatingToolbarItem<T extends Object> = FloatingToolbarButton<T> | FloatingToolbarCopyButton | FloatingToolbarDropdown<T> | FloatingToolbarSelect<T> | FloatingToolbarInput<T> | FloatingToolbarCustom<T> | FloatingToolbarSeparator | FloatingToolbarExtensionsPlaceholder;
+export type FloatingToolbarItem<T extends Object> = FloatingToolbarButton<T> | FloatingToolbarCopyButton | FloatingToolbarDropdown<T> | FloatingToolbarSelect<T> | FloatingToolbarInput<T> | FloatingToolbarCustom<T> | FloatingToolbarSeparator | FloatingToolbarExtensionsPlaceholder | FloatingToolbarOverflowDropdown<T>;
 export interface FloatingToolbarConfig {
     /** Used for the ariaLabel on the <Popup /> component */
     title: string;

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

@@ -13,7 +13,7 @@ export type { FeatureFlags, FeatureFlagKey, GetEditorFeatureFlags } from './feat
 export type { Browsers, Range, DisableSpellcheckByBrowser } from './supported-browsers';
 export type { EditorContainerWidth, GetEditorContainerWidth } from './editor-container-width';
 export type { EmptyStateHandler, EmptyStateHandlerParams } from './empty-state-handler';
-export type { RenderOptionsPropsT, DropdownOptionT, DropdownOptions, SelectOption, ButtonAppearance, Icon, RenderOptionsProps, AlignType, ConfirmDialogChildInfo, ConfirmDialogOptions, ConfirmationDialogProps, FloatingToolbarButton, FloatingToolbarCopyButton, FloatingToolbarInput, FloatingToolbarCustom, FloatingToolbarListPicker, FloatingToolbarColorPicker, FloatingToolbarEmojiPicker, FloatingToolbarDatePicker, FloatingToolbarSelect, FloatingToolbarSeparator, FloatingToolbarDropdown, FloatingToolbarFallbackItem, FloatingToolbarItem, FloatingToolbarConfig, FloatingToolbarHandler, FloatingToolbarButtonSpotlightConfig, typeOption, } from './floating-toolbar';
+export type { RenderOptionsPropsT, DropdownOptionT, DropdownOptions, SelectOption, ButtonAppearance, Icon, RenderOptionsProps, AlignType, ConfirmDialogChildInfo, ConfirmDialogOptions, ConfirmationDialogProps, FloatingToolbarButton, FloatingToolbarCopyButton, FloatingToolbarInput, FloatingToolbarCustom, FloatingToolbarListPicker, FloatingToolbarColorPicker, FloatingToolbarEmojiPicker, FloatingToolbarDatePicker, FloatingToolbarSelect, FloatingToolbarSeparator, FloatingToolbarDropdown, FloatingToolbarFallbackItem, FloatingToolbarItem, FloatingToolbarConfig, FloatingToolbarHandler, FloatingToolbarButtonSpotlightConfig, typeOption, FloatingToolbarOverflowDropdownOptions, } from './floating-toolbar';
 export type { MarkOptions, NodeOptions } from './copy-button';
 export type { ContextPanelHandler } from './context-panel';
 export type { EditorAppearance } from './editor-appearance';

package/dist/types-ts4.5/types/floating-toolbar.d.ts

@@ -12,6 +12,32 @@ import type { ProviderFactory } from '../provider-factory';
 import type { PaletteColor } from '../ui-color/ColorPalette/Palettes/type';
 import type { Command, CommandDispatch } from './command';
 import type { MarkOptions, NodeOptions } from './copy-button';
+/**
+ * New dropdown types to support editor controls
+ */
+type OverflowDropdownHeading = {
+    type: 'overflow-dropdown-heading';
+    title: string;
+};
+export type FloatingToolbarOverflowDropdownOptions<T extends Object> = Array<DropdownOptionT<T> | FloatingToolbarSeparator | OverflowDropdownHeading>;
+type FloatingToolbarOverflowDropdown<T extends Object> = {
+    type: 'overflow-dropdown';
+    options: FloatingToolbarOverflowDropdownOptions<T>;
+    testId?: string;
+    id?: string;
+    hidden?: boolean;
+    disabled?: boolean;
+    tooltip?: string;
+    dropdownWidth?: number;
+    showSelected?: boolean;
+    alignDropdownWithToolbar?: boolean;
+    onToggle?: (state: EditorState, dispatch: CommandDispatch | undefined) => boolean;
+    footer?: React.ReactNode;
+    /** If true, the component will have pulse onboarding effect around it. */
+    pulse?: boolean;
+    onMount?: () => void;
+    onClick?: () => void;
+};
 export interface RenderOptionsPropsT<T extends Object> {
     hide: () => void;
     dispatchCommand: (command: T) => void;
@@ -253,7 +279,7 @@ type FloatingToolbarExtensionsPlaceholder = {
  * Make sure that this type is not a FloatingToolbarCustom type.
  */
 export type FloatingToolbarFallbackItem<T extends Object> = FloatingToolbarButton<T> | FloatingToolbarCopyButton | FloatingToolbarDropdown<T> | FloatingToolbarSelect<T> | FloatingToolbarInput<T> | FloatingToolbarSeparator;
-export type FloatingToolbarItem<T extends Object> = FloatingToolbarButton<T> | FloatingToolbarCopyButton | FloatingToolbarDropdown<T> | FloatingToolbarSelect<T> | FloatingToolbarInput<T> | FloatingToolbarCustom<T> | FloatingToolbarSeparator | FloatingToolbarExtensionsPlaceholder;
+export type FloatingToolbarItem<T extends Object> = FloatingToolbarButton<T> | FloatingToolbarCopyButton | FloatingToolbarDropdown<T> | FloatingToolbarSelect<T> | FloatingToolbarInput<T> | FloatingToolbarCustom<T> | FloatingToolbarSeparator | FloatingToolbarExtensionsPlaceholder | FloatingToolbarOverflowDropdown<T>;
 export interface FloatingToolbarConfig {
     /** Used for the ariaLabel on the <Popup /> component */
     title: string;

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

@@ -13,7 +13,7 @@ export type { FeatureFlags, FeatureFlagKey, GetEditorFeatureFlags } from './feat
 export type { Browsers, Range, DisableSpellcheckByBrowser } from './supported-browsers';
 export type { EditorContainerWidth, GetEditorContainerWidth } from './editor-container-width';
 export type { EmptyStateHandler, EmptyStateHandlerParams } from './empty-state-handler';
-export type { RenderOptionsPropsT, DropdownOptionT, DropdownOptions, SelectOption, ButtonAppearance, Icon, RenderOptionsProps, AlignType, ConfirmDialogChildInfo, ConfirmDialogOptions, ConfirmationDialogProps, FloatingToolbarButton, FloatingToolbarCopyButton, FloatingToolbarInput, FloatingToolbarCustom, FloatingToolbarListPicker, FloatingToolbarColorPicker, FloatingToolbarEmojiPicker, FloatingToolbarDatePicker, FloatingToolbarSelect, FloatingToolbarSeparator, FloatingToolbarDropdown, FloatingToolbarFallbackItem, FloatingToolbarItem, FloatingToolbarConfig, FloatingToolbarHandler, FloatingToolbarButtonSpotlightConfig, typeOption, } from './floating-toolbar';
+export type { RenderOptionsPropsT, DropdownOptionT, DropdownOptions, SelectOption, ButtonAppearance, Icon, RenderOptionsProps, AlignType, ConfirmDialogChildInfo, ConfirmDialogOptions, ConfirmationDialogProps, FloatingToolbarButton, FloatingToolbarCopyButton, FloatingToolbarInput, FloatingToolbarCustom, FloatingToolbarListPicker, FloatingToolbarColorPicker, FloatingToolbarEmojiPicker, FloatingToolbarDatePicker, FloatingToolbarSelect, FloatingToolbarSeparator, FloatingToolbarDropdown, FloatingToolbarFallbackItem, FloatingToolbarItem, FloatingToolbarConfig, FloatingToolbarHandler, FloatingToolbarButtonSpotlightConfig, typeOption, FloatingToolbarOverflowDropdownOptions, } from './floating-toolbar';
 export type { MarkOptions, NodeOptions } from './copy-button';
 export type { ContextPanelHandler } from './context-panel';
 export type { EditorAppearance } from './editor-appearance';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "99.14.1",
+	"version": "99.15.0",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"