@atlaskit/editor-plugin-text-formatting 6.1.15 → 6.1.17

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-text-formatting
 
+## 6.1.17
+
+### Patch Changes
+
+- Updated dependencies
+
+## 6.1.16
+
+### Patch Changes
+
+- [`90abe9b926a6f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/90abe9b926a6f) -
+  Icon entrypoint migration
+- Updated dependencies
+
 ## 6.1.15
 
 ### Patch Changes

package/dist/cjs/editor-commands/utils/marks.js

@@ -76,12 +76,8 @@ var nextApplyMarkOnRange = exports.nextApplyMarkOnRange = function nextApplyMark
   var schema = tr.doc.type.schema;
   var code = schema.marks.code;
   if (mark.type === code) {
-    if ((0, _platformFeatureFlags.fg)('platform_editor_resolve_marks')) {
-      var _api$base;
-      api === null || api === void 0 || (_api$base = api.base) === null || _api$base === void 0 || _api$base.actions.resolveMarks(from, to, tr);
-    } else {
-      (0, _mark.transformNonTextNodesToText)(from, to, tr);
-    }
+    var _api$base;
+    api === null || api === void 0 || (_api$base = api.base) === null || _api$base === void 0 || (_api$base = _api$base.actions) === null || _api$base === void 0 || _api$base.resolveMarks(from, to, tr);
   }
 
   /**

package/dist/cjs/pm-plugins/input-rule.js

@@ -17,10 +17,8 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _wrapNativeSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/wrapNativeSuper"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _analytics = require("@atlaskit/editor-common/analytics");
-var _mark = require("@atlaskit/editor-common/mark");
 var _safePlugin = require("@atlaskit/editor-common/safe-plugin");
 var _utils = require("@atlaskit/editor-common/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _prosemirrorInputRules = require("@atlaskit/prosemirror-input-rules");
 var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 function _callSuper(t, o, e) { return o = (0, _getPrototypeOf2.default)(o), (0, _possibleConstructorReturn2.default)(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], (0, _getPrototypeOf2.default)(t).constructor) : o.apply(t, e)); }
@@ -104,12 +102,8 @@ function addMark(markType, _schema, char, api) {
       return null;
     }
     if (markType.name === 'code') {
-      if ((0, _platformFeatureFlags.fg)('platform_editor_resolve_marks')) {
-        var _api$base;
-        api === null || api === void 0 || (_api$base = api.base) === null || _api$base === void 0 || (_api$base = _api$base.actions) === null || _api$base === void 0 || _api$base.resolveMarks(tr.mapping.map(start), tr.mapping.map(end), tr);
-      } else {
-        (0, _mark.transformNonTextNodesToText)(tr.mapping.map(start), tr.mapping.map(end), tr);
-      }
+      var _api$base;
+      api === null || api === void 0 || (_api$base = api.base) === null || _api$base === void 0 || (_api$base = _api$base.actions) === null || _api$base === void 0 || _api$base.resolveMarks(tr.mapping.map(start), tr.mapping.map(end), tr);
     }
     var mappedStart = tr.mapping.map(start);
     var mappedEnd = tr.mapping.map(end);

package/dist/cjs/ui/Toolbar/dropdown-toolbar-button.js

@@ -10,7 +10,7 @@ var _react2 = require("@emotion/react");
 var _styles = require("@atlaskit/editor-common/styles");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
 var _chevronDown = _interopRequireDefault(require("@atlaskit/icon/core/migration/chevron-down"));
-var _textItalicEditorItalic = _interopRequireDefault(require("@atlaskit/icon/core/migration/text-italic--editor-italic"));
+var _textItalic = _interopRequireDefault(require("@atlaskit/icon/core/text-italic"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _types = require("./types");
 /**
@@ -53,7 +53,7 @@ var DropdownToolbarButton = exports.DropdownToolbarButton = function DropdownToo
       // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values
       _styles.triggerWrapperStyles,
       "data-testid": activeIconName ? "editor-toolbar__".concat(activeIconName) : undefined
-    }, iconBefore ? iconBefore : (0, _react2.jsx)(_textItalicEditorItalic.default, {
+    }, iconBefore ? iconBefore : (0, _react2.jsx)(_textItalic.default, {
       color: "currentColor",
       spacing: "spacious",
       label: ""

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

@@ -13,9 +13,9 @@ var _keymaps = require("@atlaskit/editor-common/keymaps");
 var _messages = require("@atlaskit/editor-common/messages");
 var _preset = require("@atlaskit/editor-common/preset");
 var _shortcut = require("@atlaskit/editor-shared-styles/shortcut");
-var _angleBracketsEditorCode = _interopRequireDefault(require("@atlaskit/icon/core/migration/angle-brackets--editor-code"));
-var _textBoldEditorBold = _interopRequireDefault(require("@atlaskit/icon/core/migration/text-bold--editor-bold"));
-var _textItalicEditorItalic = _interopRequireDefault(require("@atlaskit/icon/core/migration/text-italic--editor-italic"));
+var _angleBrackets = _interopRequireDefault(require("@atlaskit/icon/core/angle-brackets"));
+var _textBold = _interopRequireDefault(require("@atlaskit/icon/core/text-bold"));
+var _textItalic = _interopRequireDefault(require("@atlaskit/icon/core/text-italic"));
 var _textStrikethrough = _interopRequireDefault(require("@atlaskit/icon/core/text-strikethrough"));
 var _textUnderline = _interopRequireDefault(require("@atlaskit/icon/core/text-underline"));
 var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
@@ -41,7 +41,7 @@ var IconButtons = function IconButtons(editorAnalyticsAPI, toolbarType) {
       message: _messages.toolbarMessages.bold,
       tooltipKeymap: _keymaps.toggleBold,
       component: function component() {
-        return (0, _react2.jsx)(_textBoldEditorBold.default, {
+        return (0, _react2.jsx)(_textBold.default, {
           color: "currentColor",
           spacing: "spacious",
           label: ""
@@ -54,7 +54,7 @@ var IconButtons = function IconButtons(editorAnalyticsAPI, toolbarType) {
       message: _messages.toolbarMessages.italic,
       tooltipKeymap: _keymaps.toggleItalic,
       component: function component() {
-        return (0, _react2.jsx)(_textItalicEditorItalic.default, {
+        return (0, _react2.jsx)(_textItalic.default, {
           color: "currentColor",
           spacing: "spacious",
           label: ""
@@ -98,14 +98,14 @@ var IconButtons = function IconButtons(editorAnalyticsAPI, toolbarType) {
 };
 var IconBefore = {
   strong: {
-    icon: (0, _react2.jsx)(_textBoldEditorBold.default, {
+    icon: (0, _react2.jsx)(_textBold.default, {
       color: "currentColor",
       spacing: "spacious",
       label: ""
     })
   },
   em: {
-    icon: (0, _react2.jsx)(_textItalicEditorItalic.default, {
+    icon: (0, _react2.jsx)(_textItalic.default, {
       color: "currentColor",
       spacing: "spacious",
       label: ""
@@ -124,7 +124,7 @@ var IconBefore = {
     })
   },
   code: {
-    icon: (0, _react2.jsx)(_angleBracketsEditorCode.default, {
+    icon: (0, _react2.jsx)(_angleBrackets.default, {
       color: "currentColor",
       spacing: "spacious",
       label: ""

package/dist/cjs/ui/Toolbar/more-button.js

@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
 var _react2 = require("@emotion/react");
 var _styles = require("@atlaskit/editor-common/styles");
 var _uiMenu = require("@atlaskit/editor-common/ui-menu");
-var _showMoreHorizontalEditorMore = _interopRequireDefault(require("@atlaskit/icon/core/migration/show-more-horizontal--editor-more"));
+var _showMoreHorizontal = _interopRequireDefault(require("@atlaskit/icon/core/show-more-horizontal"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 /**
  * @jsxRuntime classic
@@ -42,7 +42,7 @@ var MoreButton = exports.MoreButton = /*#__PURE__*/_react.default.memo(function
     // eslint-disable-next-line @atlaskit/design-system/consistent-css-prop-usage, @atlaskit/ui-styling-standard/no-imported-style-values -- Ignored via go/DSP-18766
     (0, _react2.jsx)("div", {
       css: (0, _platformFeatureFlags.fg)('platform-visual-refresh-icons') ? MoreIconStyle : _styles.triggerWrapperStyles
-    }, (0, _react2.jsx)(_showMoreHorizontalEditorMore.default, {
+    }, (0, _react2.jsx)(_showMoreHorizontal.default, {
       label: "",
       color: "currentColor",
       spacing: "spacious",

package/dist/es2019/editor-commands/utils/marks.js

@@ -1,4 +1,4 @@
-import { entireSelectionContainsMark, transformNonTextNodesToText } from '@atlaskit/editor-common/mark';
+import { entireSelectionContainsMark } from '@atlaskit/editor-common/mark';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -73,12 +73,8 @@ export const nextApplyMarkOnRange = (from, to, removeMark, mark, tr, api) => {
     code
   } = schema.marks;
   if (mark.type === code) {
-    if (fg('platform_editor_resolve_marks')) {
-      var _api$base;
-      api === null || api === void 0 ? void 0 : (_api$base = api.base) === null || _api$base === void 0 ? void 0 : _api$base.actions.resolveMarks(from, to, tr);
-    } else {
-      transformNonTextNodesToText(from, to, tr);
-    }
+    var _api$base, _api$base$actions;
+    api === null || api === void 0 ? void 0 : (_api$base = api.base) === null || _api$base === void 0 ? void 0 : (_api$base$actions = _api$base.actions) === null || _api$base$actions === void 0 ? void 0 : _api$base$actions.resolveMarks(from, to, tr);
   }
 
   /**

package/dist/es2019/pm-plugins/input-rule.js

@@ -1,8 +1,6 @@
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { transformNonTextNodesToText } from '@atlaskit/editor-common/mark';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { createRule, inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { createPlugin, leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 var ValidAutoformatChars = /*#__PURE__*/function (ValidAutoformatChars) {
@@ -92,12 +90,8 @@ function addMark(markType, _schema, char, api) {
       return null;
     }
     if (markType.name === 'code') {
-      if (fg('platform_editor_resolve_marks')) {
-        var _api$base, _api$base$actions;
-        api === null || api === void 0 ? void 0 : (_api$base = api.base) === null || _api$base === void 0 ? void 0 : (_api$base$actions = _api$base.actions) === null || _api$base$actions === void 0 ? void 0 : _api$base$actions.resolveMarks(tr.mapping.map(start), tr.mapping.map(end), tr);
-      } else {
-        transformNonTextNodesToText(tr.mapping.map(start), tr.mapping.map(end), tr);
-      }
+      var _api$base, _api$base$actions;
+      api === null || api === void 0 ? void 0 : (_api$base = api.base) === null || _api$base === void 0 ? void 0 : (_api$base$actions = _api$base.actions) === null || _api$base$actions === void 0 ? void 0 : _api$base$actions.resolveMarks(tr.mapping.map(start), tr.mapping.map(end), tr);
     }
     const mappedStart = tr.mapping.map(start);
     const mappedEnd = tr.mapping.map(end);

package/dist/es2019/ui/Toolbar/dropdown-toolbar-button.js

@@ -9,7 +9,7 @@ import { jsx } from '@emotion/react';
 import { expandIconContainerStyle, triggerWrapperStyles, triggerWrapperStylesWithPadding, disableBlueBorderStyles } from '@atlaskit/editor-common/styles';
 import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import ChevronDownIcon from '@atlaskit/icon/core/migration/chevron-down';
-import ItalicIcon from '@atlaskit/icon/core/migration/text-italic--editor-italic';
+import ItalicIcon from '@atlaskit/icon/core/text-italic';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { ToolbarType } from './types';
 export const DropdownToolbarButton = ({

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

@@ -11,9 +11,9 @@ import { getAriaKeyshortcuts, toggleBold, toggleCode, toggleItalic, toggleStrike
 import { toolbarMessages } from '@atlaskit/editor-common/messages';
 import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
 import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
-import AngleBracketsIcon from '@atlaskit/icon/core/migration/angle-brackets--editor-code';
-import BoldIcon from '@atlaskit/icon/core/migration/text-bold--editor-bold';
-import ItalicIcon from '@atlaskit/icon/core/migration/text-italic--editor-italic';
+import AngleBracketsIcon from '@atlaskit/icon/core/angle-brackets';
+import BoldIcon from '@atlaskit/icon/core/text-bold';
+import ItalicIcon from '@atlaskit/icon/core/text-italic';
 import TextStrikethroughIcon from '@atlaskit/icon/core/text-strikethrough';
 import UnderlineIcon from '@atlaskit/icon/core/text-underline';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';

package/dist/es2019/ui/Toolbar/more-button.js

@@ -8,7 +8,7 @@ import React from 'react';
 import { css, jsx } from '@emotion/react';
 import { triggerWrapperStyles } from '@atlaskit/editor-common/styles';
 import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
-import ShowMoreHorizontalIcon from '@atlaskit/icon/core/migration/show-more-horizontal--editor-more';
+import ShowMoreHorizontalIcon from '@atlaskit/icon/core/show-more-horizontal';
 import { fg } from '@atlaskit/platform-feature-flags';
 const MoreIconStyle = css({
   display: 'flex',

package/dist/esm/editor-commands/utils/marks.js

@@ -1,4 +1,4 @@
-import { entireSelectionContainsMark, transformNonTextNodesToText } from '@atlaskit/editor-common/mark';
+import { entireSelectionContainsMark } from '@atlaskit/editor-common/mark';
 import { TextSelection } from '@atlaskit/editor-prosemirror/state';
 import { CellSelection } from '@atlaskit/editor-tables/cell-selection';
 import { fg } from '@atlaskit/platform-feature-flags';
@@ -70,12 +70,8 @@ export var nextApplyMarkOnRange = function nextApplyMarkOnRange(from, to, remove
   var schema = tr.doc.type.schema;
   var code = schema.marks.code;
   if (mark.type === code) {
-    if (fg('platform_editor_resolve_marks')) {
-      var _api$base;
-      api === null || api === void 0 || (_api$base = api.base) === null || _api$base === void 0 || _api$base.actions.resolveMarks(from, to, tr);
-    } else {
-      transformNonTextNodesToText(from, to, tr);
-    }
+    var _api$base;
+    api === null || api === void 0 || (_api$base = api.base) === null || _api$base === void 0 || (_api$base = _api$base.actions) === null || _api$base === void 0 || _api$base.resolveMarks(from, to, tr);
   }
 
   /**

package/dist/esm/pm-plugins/input-rule.js

@@ -11,10 +11,8 @@ function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstruct
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 function _superPropGet(t, o, e, r) { var p = _get(_getPrototypeOf(1 & r ? t.prototype : t), o, e); return 2 & r && "function" == typeof p ? function (t) { return p.apply(e, t); } : p; }
 import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
-import { transformNonTextNodesToText } from '@atlaskit/editor-common/mark';
 import { SafePlugin } from '@atlaskit/editor-common/safe-plugin';
 import { createRule, inputRuleWithAnalytics } from '@atlaskit/editor-common/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { createPlugin, leafNodeReplacementCharacter } from '@atlaskit/prosemirror-input-rules';
 import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 var ValidAutoformatChars = /*#__PURE__*/function (ValidAutoformatChars) {
@@ -95,12 +93,8 @@ function addMark(markType, _schema, char, api) {
       return null;
     }
     if (markType.name === 'code') {
-      if (fg('platform_editor_resolve_marks')) {
-        var _api$base;
-        api === null || api === void 0 || (_api$base = api.base) === null || _api$base === void 0 || (_api$base = _api$base.actions) === null || _api$base === void 0 || _api$base.resolveMarks(tr.mapping.map(start), tr.mapping.map(end), tr);
-      } else {
-        transformNonTextNodesToText(tr.mapping.map(start), tr.mapping.map(end), tr);
-      }
+      var _api$base;
+      api === null || api === void 0 || (_api$base = api.base) === null || _api$base === void 0 || (_api$base = _api$base.actions) === null || _api$base === void 0 || _api$base.resolveMarks(tr.mapping.map(start), tr.mapping.map(end), tr);
     }
     var mappedStart = tr.mapping.map(start);
     var mappedEnd = tr.mapping.map(end);

package/dist/esm/ui/Toolbar/dropdown-toolbar-button.js

@@ -9,7 +9,7 @@ import { jsx } from '@emotion/react';
 import { expandIconContainerStyle, triggerWrapperStyles, triggerWrapperStylesWithPadding, disableBlueBorderStyles } from '@atlaskit/editor-common/styles';
 import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
 import ChevronDownIcon from '@atlaskit/icon/core/migration/chevron-down';
-import ItalicIcon from '@atlaskit/icon/core/migration/text-italic--editor-italic';
+import ItalicIcon from '@atlaskit/icon/core/text-italic';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { ToolbarType } from './types';
 export var DropdownToolbarButton = function DropdownToolbarButton(_ref) {

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

@@ -12,9 +12,9 @@ import { getAriaKeyshortcuts, toggleBold, toggleCode, toggleItalic, toggleStrike
 import { toolbarMessages } from '@atlaskit/editor-common/messages';
 import { editorCommandToPMCommand } from '@atlaskit/editor-common/preset';
 import { shortcutStyle } from '@atlaskit/editor-shared-styles/shortcut';
-import AngleBracketsIcon from '@atlaskit/icon/core/migration/angle-brackets--editor-code';
-import BoldIcon from '@atlaskit/icon/core/migration/text-bold--editor-bold';
-import ItalicIcon from '@atlaskit/icon/core/migration/text-italic--editor-italic';
+import AngleBracketsIcon from '@atlaskit/icon/core/angle-brackets';
+import BoldIcon from '@atlaskit/icon/core/text-bold';
+import ItalicIcon from '@atlaskit/icon/core/text-italic';
 import TextStrikethroughIcon from '@atlaskit/icon/core/text-strikethrough';
 import UnderlineIcon from '@atlaskit/icon/core/text-underline';
 import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';

package/dist/esm/ui/Toolbar/more-button.js

@@ -8,7 +8,7 @@ import React from 'react';
 import { css, jsx } from '@emotion/react';
 import { triggerWrapperStyles } from '@atlaskit/editor-common/styles';
 import { ToolbarButton } from '@atlaskit/editor-common/ui-menu';
-import ShowMoreHorizontalIcon from '@atlaskit/icon/core/migration/show-more-horizontal--editor-more';
+import ShowMoreHorizontalIcon from '@atlaskit/icon/core/show-more-horizontal';
 import { fg } from '@atlaskit/platform-feature-flags';
 var MoreIconStyle = css({
   display: 'flex',

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-text-formatting",
-	"version": "6.1.15",
+	"version": "6.1.17",
 	"description": "Text-formatting plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -29,32 +29,32 @@
 	],
 	"atlaskit:src": "src/index.ts",
 	"dependencies": {
-		"@atlaskit/adf-schema": "^51.5.1",
+		"@atlaskit/adf-schema": "^51.5.0",
 		"@atlaskit/editor-plugin-analytics": "^6.2.0",
 		"@atlaskit/editor-plugin-base": "^7.2.0",
 		"@atlaskit/editor-plugin-primary-toolbar": "^7.0.0",
 		"@atlaskit/editor-plugin-selection-toolbar": "^7.1.0",
 		"@atlaskit/editor-plugin-toolbar": "^3.4.0",
-		"@atlaskit/editor-prosemirror": "7.0.0",
+		"@atlaskit/editor-prosemirror": "^7.2.0",
 		"@atlaskit/editor-shared-styles": "^3.10.0",
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/editor-toolbar": "^0.18.0",
 		"@atlaskit/editor-toolbar-model": "^0.2.0",
-		"@atlaskit/icon": "^29.0.0",
+		"@atlaskit/icon": "^29.3.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/prosemirror-input-rules": "^3.6.0",
-		"@atlaskit/tmp-editor-statsig": "^15.0.0",
-		"@atlaskit/tokens": "^8.4.0",
+		"@atlaskit/tmp-editor-statsig": "^16.0.0",
+		"@atlaskit/tokens": "^8.6.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.40.0",
+		"@atlaskit/editor-common": "^110.46.0",
 		"react": "^18.2.0"
 	},
 	"devDependencies": {
-		"@testing-library/react": "^13.4.0"
+		"@testing-library/react": "^16.3.0"
 	},
 	"techstack": {
 		"@atlassian/frontend": {
@@ -99,9 +99,6 @@
 		"platform-visual-refresh-icons": {
 			"type": "boolean"
 		},
-		"platform_editor_resolve_marks": {
-			"type": "boolean"
-		},
 		"editor_inline_comments_on_inline_nodes": {
 			"type": "boolean"
 		},