@atlaskit/editor-core 193.30.6 → 193.30.9

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-core
 
+## 193.30.9
+
+### Patch Changes
+
+- [#116194](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/116194)
+  [`a6ac14257c10a`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a6ac14257c10a) -
+  [ux] Update button interactions: non-bodied macros stay flush with macro, bodied macros show
+  config icon on hover/select, have default white background, and maintain the indentaion
+
+## 193.30.7
+
+### Patch Changes
+
+- [#114548](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/114548)
+  [`8b2d47bffb50e`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/8b2d47bffb50e) -
+  bump adf-schema version
+- [#116062](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/116062)
+  [`1c26d1ee6fb25`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1c26d1ee6fb25) -
+  Migrated to new atlaskit Buttons.
+- Updated dependencies
+
 ## 193.30.6
 
 ### Patch Changes

package/dist/cjs/ui/Appearance/Comment/Comment.js

@@ -18,8 +18,8 @@ var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _reactIntlNext = require("react-intl-next");
-var _button = _interopRequireDefault(require("@atlaskit/button"));
 var _buttonGroup = _interopRequireDefault(require("@atlaskit/button/button-group"));
+var _new = _interopRequireDefault(require("@atlaskit/button/new"));
 var _hooks = require("@atlaskit/editor-common/hooks");
 var _styles = require("@atlaskit/editor-common/styles");
 var _ui = require("@atlaskit/editor-common/ui");
@@ -236,12 +236,12 @@ var Editor = /*#__PURE__*/function (_React$Component) {
       }))), showSecondaryToolbar && (0, _react2.jsx)("div", {
         css: secondaryToolbarStyles,
         "data-testid": "ak-editor-secondary-toolbar"
-      }, (0, _react2.jsx)(_buttonGroup.default, null, !!onSave && (0, _react2.jsx)(_button.default, {
+      }, (0, _react2.jsx)(_buttonGroup.default, null, !!onSave && (0, _react2.jsx)(_new.default, {
         appearance: "primary",
         onClick: _this.handleSave,
         testId: "comment-save-button",
         isDisabled: disabled || mediaState && !mediaState.allUploadsFinished
-      }, intl.formatMessage(_messages.default.saveButton)), !!onCancel && (0, _react2.jsx)(_button.default, {
+      }, intl.formatMessage(_messages.default.saveButton)), !!onCancel && (0, _react2.jsx)(_new.default, {
         appearance: "subtle",
         onClick: _this.handleCancel,
         isDisabled: disabled
@@ -435,12 +435,12 @@ var EditorNext = function EditorNext(props) {
   }))), showSecondaryToolbar && (0, _react2.jsx)("div", {
     css: secondaryToolbarStyles,
     "data-testid": "ak-editor-secondary-toolbar"
-  }, (0, _react2.jsx)(_buttonGroup.default, null, !!onSave && (0, _react2.jsx)(_button.default, {
+  }, (0, _react2.jsx)(_buttonGroup.default, null, !!onSave && (0, _react2.jsx)(_new.default, {
     appearance: "primary",
     onClick: handleSave,
     testId: "comment-save-button",
     isDisabled: disabled || saveButtonDisabled
-  }, intl.formatMessage(_messages.default.saveButton)), !!onCancel && (0, _react2.jsx)(_button.default, {
+  }, intl.formatMessage(_messages.default.saveButton)), !!onCancel && (0, _react2.jsx)(_new.default, {
     appearance: "subtle",
     onClick: handleCancel,
     isDisabled: disabled

package/dist/cjs/ui/ContentStyles/extension.js

@@ -11,7 +11,7 @@ var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _colors = require("@atlaskit/theme/colors");
 var _templateObject, _templateObject2; // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- Needs manual remediation
-var extensionLabelStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\t&.danger > span > div > .extension-label {\n\t\tbackground-color: ", ";\n\t\tcolor: ", ";\n\t\topacity: 1;\n\t\tbox-shadow: none;\n\t}\n\n\t&:not(.danger).", " > span > div > .extension-label {\n\t\tbackground-color: ", ";\n\t\tcolor: ", ";\n\t\topacity: 1;\n\t\tbox-shadow: none;\n\t}\n"])), "var(--ds-background-accent-red-subtler, ".concat(_colors.R50, ")"), "var(--ds-text-danger, ".concat(_colors.R400, ")"), _editorSharedStyles.akEditorSelectedNodeClassName, "var(--ds-background-selected, ".concat(_colors.B50, ")"), "var(--ds-text-selected, ".concat(_colors.B400, ")"));
+var extensionLabelStyles = (0, _react.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n\t&.danger > span > div > .extension-label {\n\t\tbackground-color: ", ";\n\t\tcolor: ", ";\n\t\topacity: 1;\n\t\tbox-shadow: none;\n\t}\n\n\t&:not(.danger).", " > span > div > .extension-label {\n\t\tbackground-color: ", ";\n\t\tcolor: ", ";\n\t\topacity: 1;\n\t\tbox-shadow: none;\n\t}\n\n\t// Targets the icon for bodied macro styling in button label\n\t&.danger > span > div > .extension-label > span {\n\t\tdisplay: inline;\n\t}\n\n\t&:not(.danger).", " > span > div .extension-label > span {\n\t\tdisplay: inline;\n\t}\n"])), "var(--ds-background-accent-red-subtler, ".concat(_colors.R50, ")"), "var(--ds-text-danger, ".concat(_colors.R400, ")"), _editorSharedStyles.akEditorSelectedNodeClassName, "var(--ds-background-selected, ".concat(_colors.B50, ")"), "var(--ds-text-selected, ".concat(_colors.B400, ")"), _editorSharedStyles.akEditorSelectedNodeClassName);
 var dangerOverlayStyles = (0, _react.css)({
   opacity: 0.3,
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766

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

@@ -19,8 +19,8 @@ var _react = require("react");
 var _react2 = require("@emotion/react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactDom = _interopRequireDefault(require("react-dom"));
-var _button = _interopRequireDefault(require("@atlaskit/button"));
 var _buttonGroup = _interopRequireDefault(require("@atlaskit/button/button-group"));
+var _new = _interopRequireDefault(require("@atlaskit/button/new"));
 var _analytics = require("@atlaskit/editor-common/analytics");
 var _ui = require("@atlaskit/editor-common/ui");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
@@ -193,10 +193,10 @@ var ToolbarFeedbackInternal = /*#__PURE__*/function (_PureComponent) {
         src: EDITOR_IMAGE_URL
       })), (0, _react2.jsx)("div", {
         css: _styles.confirmationText
-      }, (0, _react2.jsx)("div", null, "We are rolling out a new editing experience across Atlassian products. Help us improve by providing feedback."), (0, _react2.jsx)("div", null, "You can opt-out for now by turning off the \"Atlassian Editor\" feature on the Labs page in Bitbucket settings."), (0, _react2.jsx)(_buttonGroup.default, null, (0, _react2.jsx)(_button.default, {
+      }, (0, _react2.jsx)("div", null, "We are rolling out a new editing experience across Atlassian products. Help us improve by providing feedback."), (0, _react2.jsx)("div", null, "You can opt-out for now by turning off the \"Atlassian Editor\" feature on the Labs page in Bitbucket settings."), (0, _react2.jsx)(_buttonGroup.default, null, (0, _react2.jsx)(_new.default, {
         appearance: "primary",
         onClick: this.openFeedbackPopup
-      }, "Give feedback"), (0, _react2.jsx)(_button.default, {
+      }, "Give feedback"), (0, _react2.jsx)(_new.default, {
         appearance: "default",
         onClick: this.openLearnMorePage
       }, "Learn more")))))) : null;

package/dist/cjs/version-wrapper.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "193.30.6";
+var version = exports.version = "193.30.9";

package/dist/es2019/ui/Appearance/Comment/Comment.js

@@ -6,8 +6,8 @@ import React, { Fragment, useCallback, useEffect, useMemo, useState } from 'reac
 import { css, jsx } from '@emotion/react';
 import classnames from 'classnames';
 import { injectIntl } from 'react-intl-next';
-import Button from '@atlaskit/button';
 import ButtonGroup from '@atlaskit/button/button-group';
+import Button from '@atlaskit/button/new';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { GRID_GUTTER } from '@atlaskit/editor-common/styles';
 import { WidthConsumer } from '@atlaskit/editor-common/ui';

package/dist/es2019/ui/ContentStyles/extension.js

@@ -17,6 +17,15 @@ const extensionLabelStyles = css`
 		opacity: 1;
 		box-shadow: none;
 	}
+
+	// Targets the icon for bodied macro styling in button label
+	&.danger > span > div > .extension-label > span {
+		display: inline;
+	}
+
+	&:not(.danger).${akEditorSelectedNodeClassName} > span > div .extension-label > span {
+		display: inline;
+	}
 `;
 const dangerOverlayStyles = css({
   opacity: 0.3,

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

@@ -7,8 +7,8 @@ import { PureComponent } from 'react';
 import { jsx } from '@emotion/react';
 import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
-import Button from '@atlaskit/button';
 import ButtonGroup from '@atlaskit/button/button-group';
+import Button from '@atlaskit/button/new';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';

package/dist/es2019/version-wrapper.js

@@ -1,2 +1,2 @@
 export const name = "@atlaskit/editor-core";
-export const version = "193.30.6";
+export const version = "193.30.9";

package/dist/esm/ui/Appearance/Comment/Comment.js

@@ -15,8 +15,8 @@ import React, { Fragment, useCallback, useEffect, useMemo, useState } from 'reac
 import { css, jsx } from '@emotion/react';
 import classnames from 'classnames';
 import { injectIntl } from 'react-intl-next';
-import Button from '@atlaskit/button';
 import ButtonGroup from '@atlaskit/button/button-group';
+import Button from '@atlaskit/button/new';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';
 import { GRID_GUTTER } from '@atlaskit/editor-common/styles';
 import { WidthConsumer } from '@atlaskit/editor-common/ui';

package/dist/esm/ui/ContentStyles/extension.js

@@ -5,7 +5,7 @@ import { css } from '@emotion/react';
 import { akEditorDeleteBackground, akEditorDeleteBorder, akEditorSelectedBorderSize, akEditorSelectedNodeClassName, blockNodesVerticalMargin, getSelectionStyles, SelectionStyle } from '@atlaskit/editor-shared-styles';
 import { B400, B50, R400, R50 } from '@atlaskit/theme/colors';
 // eslint-disable-next-line @atlaskit/design-system/no-css-tagged-template-expression -- Needs manual remediation
-var extensionLabelStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n\t&.danger > span > div > .extension-label {\n\t\tbackground-color: ", ";\n\t\tcolor: ", ";\n\t\topacity: 1;\n\t\tbox-shadow: none;\n\t}\n\n\t&:not(.danger).", " > span > div > .extension-label {\n\t\tbackground-color: ", ";\n\t\tcolor: ", ";\n\t\topacity: 1;\n\t\tbox-shadow: none;\n\t}\n"])), "var(--ds-background-accent-red-subtler, ".concat(R50, ")"), "var(--ds-text-danger, ".concat(R400, ")"), akEditorSelectedNodeClassName, "var(--ds-background-selected, ".concat(B50, ")"), "var(--ds-text-selected, ".concat(B400, ")"));
+var extensionLabelStyles = css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n\t&.danger > span > div > .extension-label {\n\t\tbackground-color: ", ";\n\t\tcolor: ", ";\n\t\topacity: 1;\n\t\tbox-shadow: none;\n\t}\n\n\t&:not(.danger).", " > span > div > .extension-label {\n\t\tbackground-color: ", ";\n\t\tcolor: ", ";\n\t\topacity: 1;\n\t\tbox-shadow: none;\n\t}\n\n\t// Targets the icon for bodied macro styling in button label\n\t&.danger > span > div > .extension-label > span {\n\t\tdisplay: inline;\n\t}\n\n\t&:not(.danger).", " > span > div .extension-label > span {\n\t\tdisplay: inline;\n\t}\n"])), "var(--ds-background-accent-red-subtler, ".concat(R50, ")"), "var(--ds-text-danger, ".concat(R400, ")"), akEditorSelectedNodeClassName, "var(--ds-background-selected, ".concat(B50, ")"), "var(--ds-text-selected, ".concat(B400, ")"), akEditorSelectedNodeClassName);
 var dangerOverlayStyles = css({
   opacity: 0.3,
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766

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

@@ -19,8 +19,8 @@ import { PureComponent } from 'react';
 import { jsx } from '@emotion/react';
 import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
-import Button from '@atlaskit/button';
 import ButtonGroup from '@atlaskit/button/button-group';
+import Button from '@atlaskit/button/new';
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';

package/dist/esm/version-wrapper.js

@@ -1,2 +1,2 @@
 export var name = "@atlaskit/editor-core";
-export var version = "193.30.6";
+export var version = "193.30.9";

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "193.30.6",
+	"version": "193.30.9",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -40,12 +40,12 @@
 	},
 	"dependencies": {
 		"@atlaskit/activity-provider": "^2.4.0",
-		"@atlaskit/adf-schema": "^38.0.0",
+		"@atlaskit/adf-schema": "^39.0.3",
 		"@atlaskit/analytics-namespaced-context": "^6.10.0",
 		"@atlaskit/analytics-next": "^9.3.0",
 		"@atlaskit/analytics-next-stable-react-context": "1.0.1",
 		"@atlaskit/button": "^18.0.0",
-		"@atlaskit/editor-common": "^83.4.0",
+		"@atlaskit/editor-common": "^83.5.0",
 		"@atlaskit/editor-plugins": "^3.3.0",
 		"@atlaskit/editor-prosemirror": "4.0.1",
 		"@atlaskit/editor-shared-styles": "^2.12.0",
@@ -85,9 +85,9 @@
 		"@af/visual-regression": "*",
 		"@atlaskit/adf-utils": "^19.4.0",
 		"@atlaskit/analytics-listeners": "^8.10.0",
-		"@atlaskit/collab-provider": "9.32.1",
+		"@atlaskit/collab-provider": "9.32.2",
 		"@atlaskit/editor-json-transformer": "^8.15.0",
-		"@atlaskit/editor-plugin-annotation": "1.13.1",
+		"@atlaskit/editor-plugin-annotation": "1.14.0",
 		"@atlaskit/editor-plugin-card": "^2.3.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^2.0.0",
 		"@atlaskit/editor-plugin-list": "^3.5.0",
@@ -107,7 +107,7 @@
 		"@atlaskit/util-data-test": "^17.9.0",
 		"@atlaskit/visual-regression": "*",
 		"@atlassian/adf-schema-json": "^1.16.0",
-		"@atlassian/search-provider": "2.4.87",
+		"@atlassian/search-provider": "2.4.88",
 		"@emotion/jest": "^11.8.0",
 		"@storybook/addon-knobs": "^5.3.18",
 		"@testing-library/react": "^12.1.5",
@@ -357,6 +357,10 @@
 		"platform.editor.review-text-highlighting-styling": {
 			"type": "boolean",
 			"referenceOnly": "true"
+		},
+		"platform.editor.linking-preferences-url-atlassian-context": {
+			"type": "boolean",
+			"referenceOnly": true
 		}
 	},
 	"stricter": {