@atlaskit/editor-plugin-synced-block 4.5.5 → 4.5.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/CHANGELOG.md +11 -0
  2. package/afm-cc/tsconfig.json +0 -3
  3. package/afm-jira/tsconfig.json +0 -3
  4. package/afm-products/tsconfig.json +0 -3
  5. package/dist/cjs/editor-commands/index.js +1 -1
  6. package/dist/cjs/ui/SyncBlockLabel.js +9 -7
  7. package/dist/es2019/editor-commands/index.js +2 -2
  8. package/dist/es2019/ui/SyncBlockLabel.js +9 -7
  9. package/dist/esm/editor-commands/index.js +2 -2
  10. package/dist/esm/ui/SyncBlockLabel.js +9 -7
  11. package/package.json +2 -3
package/CHANGELOG.md CHANGED
@@ -1,5 +1,16 @@
1
1
  # @atlaskit/editor-plugin-synced-block
2
2
 
3
+ ## 4.5.6
4
+
5
+ ### Patch Changes
6
+
7
+ - [`50cf7cca6bb76`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/50cf7cca6bb76) -
8
+ [ux] EDITOR-3896 update sync block border styles
9
+ - [`f5c8ad92df993`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f5c8ad92df993) -
10
+ [EDITOR-3950] Fix a bug where bodiedSyncBlock does not get inserted properly when cursor is within
11
+ the bodiedSyncBlock and inbetween content
12
+ - Updated dependencies
13
+
3
14
  ## 4.5.5
4
15
 
5
16
  ### Patch Changes
package/afm-cc/tsconfig.json CHANGED
@@ -74,9 +74,6 @@
74
74
  {
75
75
  "path": "../../../design-system/icon-lab/afm-cc/tsconfig.json"
76
76
  },
77
- {
78
- "path": "../../../design-system/logo/afm-cc/tsconfig.json"
79
- },
80
77
  {
81
78
  "path": "../../../design-system/lozenge/afm-cc/tsconfig.json"
82
79
  },
package/afm-jira/tsconfig.json CHANGED
@@ -74,9 +74,6 @@
74
74
  {
75
75
  "path": "../../../design-system/icon-lab/afm-jira/tsconfig.json"
76
76
  },
77
- {
78
- "path": "../../../design-system/logo/afm-jira/tsconfig.json"
79
- },
80
77
  {
81
78
  "path": "../../../design-system/lozenge/afm-jira/tsconfig.json"
82
79
  },
package/afm-products/tsconfig.json CHANGED
@@ -74,9 +74,6 @@
74
74
  {
75
75
  "path": "../../../design-system/icon-lab/afm-products/tsconfig.json"
76
76
  },
77
- {
78
- "path": "../../../design-system/logo/afm-products/tsconfig.json"
79
- },
80
77
  {
81
78
  "path": "../../../design-system/lozenge/afm-products/tsconfig.json"
82
79
  },
package/dist/cjs/editor-commands/index.js CHANGED
@@ -34,7 +34,7 @@ var createSyncedBlock = exports.createSyncedBlock = function createSyncedBlock(_
34
34
  if (typeAheadInsert) {
35
35
  tr = typeAheadInsert(newBodiedSyncBlockNode);
36
36
  } else {
37
- tr = tr.replaceSelectionWith(newBodiedSyncBlockNode).scrollIntoView();
37
+ tr = (0, _utils.safeInsert)(newBodiedSyncBlockNode)(tr);
38
38
  }
39
39
  } else {
40
40
  var conversionInfo = (0, _utils2.canBeConvertedToSyncBlock)(tr.selection);
package/dist/cjs/ui/SyncBlockLabel.js CHANGED
@@ -9,7 +9,7 @@ var _react = _interopRequireDefault(require("react"));
9
9
  var _reactIntlNext = require("react-intl-next");
10
10
  var _messages = require("@atlaskit/editor-common/messages");
11
11
  var _syncBlock = require("@atlaskit/editor-common/sync-block");
12
- var _logo = require("@atlaskit/logo");
12
+ var _blockSynced = _interopRequireDefault(require("@atlaskit/icon-lab/core/block-synced"));
13
13
  var _compiled = require("@atlaskit/primitives/compiled");
14
14
  var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
15
15
  var _visuallyHidden = _interopRequireDefault(require("@atlaskit/visually-hidden"));
@@ -39,15 +39,17 @@ var SyncBlockLabelComponent = function SyncBlockLabelComponent(_ref) {
39
39
  ,
40
40
  className: _syncBlock.SyncBlockLabelSharedCssClassName.labelClassName,
41
41
  "aria-describedby": ariaDescribedById
42
- }, /*#__PURE__*/_react.default.createElement(_logo.ConfluenceIcon, {
43
- size: "xsmall",
44
- appearance: "neutral",
45
- shouldUseNewLogoDesign: true
42
+ }, /*#__PURE__*/_react.default.createElement(_blockSynced.default, {
43
+ color: "var(--ds-icon-subtle, #505258)",
44
+ size: "small",
45
+ label: ""
46
46
  }), isSource || !title ? /*#__PURE__*/_react.default.createElement(_compiled.Text, {
47
- size: "small"
47
+ size: "small",
48
+ color: "color.text.subtle"
48
49
  }, formatMessage(_messages.syncBlockMessages.syncedBlockLabel)) : /*#__PURE__*/_react.default.createElement(_compiled.Text, {
49
50
  maxLines: 1,
50
- size: "small"
51
+ size: "small",
52
+ color: "color.text.subtle"
51
53
  }, title)), /*#__PURE__*/_react.default.createElement(_visuallyHidden.default, {
52
54
  id: ariaDescribedById
53
55
  }, tooltipContent));
package/dist/es2019/editor-commands/index.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
2
2
  import { copyDomNode, toDOM } from '@atlaskit/editor-common/copy-button';
3
3
  import { TextSelection } from '@atlaskit/editor-prosemirror/state';
4
- import { findSelectedNodeOfType, removeParentNodeOfType, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
4
+ import { findSelectedNodeOfType, removeParentNodeOfType, removeSelectedNode, safeInsert } from '@atlaskit/editor-prosemirror/utils';
5
5
  import { syncedBlockPluginKey } from '../pm-plugins/main';
6
6
  import { canBeConvertedToSyncBlock, findSyncBlock, findSyncBlockOrBodiedSyncBlock, isBodiedSyncBlockNode } from '../pm-plugins/utils/utils';
7
7
  import { FLAG_ID } from '../types';
@@ -34,7 +34,7 @@ export const createSyncedBlock = ({
34
34
  if (typeAheadInsert) {
35
35
  tr = typeAheadInsert(newBodiedSyncBlockNode);
36
36
  } else {
37
- tr = tr.replaceSelectionWith(newBodiedSyncBlockNode).scrollIntoView();
37
+ tr = safeInsert(newBodiedSyncBlockNode)(tr);
38
38
  }
39
39
  } else {
40
40
  const conversionInfo = canBeConvertedToSyncBlock(tr.selection);
package/dist/es2019/ui/SyncBlockLabel.js CHANGED
@@ -2,7 +2,7 @@ import React from 'react';
2
2
  import { useIntl } from 'react-intl-next';
3
3
  import { syncBlockMessages as messages } from '@atlaskit/editor-common/messages';
4
4
  import { SyncBlockLabelSharedCssClassName } from '@atlaskit/editor-common/sync-block';
5
- import { ConfluenceIcon } from '@atlaskit/logo';
5
+ import BlockSyncedIcon from '@atlaskit/icon-lab/core/block-synced';
6
6
  import { Text } from '@atlaskit/primitives/compiled';
7
7
  import Tooltip from '@atlaskit/tooltip';
8
8
  import VisuallyHidden from '@atlaskit/visually-hidden';
@@ -34,15 +34,17 @@ const SyncBlockLabelComponent = ({
34
34
  ,
35
35
  className: SyncBlockLabelSharedCssClassName.labelClassName,
36
36
  "aria-describedby": ariaDescribedById
37
- }, /*#__PURE__*/React.createElement(ConfluenceIcon, {
38
- size: "xsmall",
39
- appearance: "neutral",
40
- shouldUseNewLogoDesign: true
37
+ }, /*#__PURE__*/React.createElement(BlockSyncedIcon, {
38
+ color: "var(--ds-icon-subtle, #505258)",
39
+ size: "small",
40
+ label: ""
41
41
  }), isSource || !title ? /*#__PURE__*/React.createElement(Text, {
42
- size: "small"
42
+ size: "small",
43
+ color: "color.text.subtle"
43
44
  }, formatMessage(messages.syncedBlockLabel)) : /*#__PURE__*/React.createElement(Text, {
44
45
  maxLines: 1,
45
- size: "small"
46
+ size: "small",
47
+ color: "color.text.subtle"
46
48
  }, title)), /*#__PURE__*/React.createElement(VisuallyHidden, {
47
49
  id: ariaDescribedById
48
50
  }, tooltipContent));
package/dist/esm/editor-commands/index.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE } from '@atlaskit/editor-common/analytics';
2
2
  import { copyDomNode, toDOM } from '@atlaskit/editor-common/copy-button';
3
3
  import { TextSelection } from '@atlaskit/editor-prosemirror/state';
4
- import { findSelectedNodeOfType, removeParentNodeOfType, removeSelectedNode } from '@atlaskit/editor-prosemirror/utils';
4
+ import { findSelectedNodeOfType, removeParentNodeOfType, removeSelectedNode, safeInsert } from '@atlaskit/editor-prosemirror/utils';
5
5
  import { syncedBlockPluginKey } from '../pm-plugins/main';
6
6
  import { canBeConvertedToSyncBlock, findSyncBlock, findSyncBlockOrBodiedSyncBlock, isBodiedSyncBlockNode } from '../pm-plugins/utils/utils';
7
7
  import { FLAG_ID } from '../types';
@@ -28,7 +28,7 @@ export var createSyncedBlock = function createSyncedBlock(_ref) {
28
28
  if (typeAheadInsert) {
29
29
  tr = typeAheadInsert(newBodiedSyncBlockNode);
30
30
  } else {
31
- tr = tr.replaceSelectionWith(newBodiedSyncBlockNode).scrollIntoView();
31
+ tr = safeInsert(newBodiedSyncBlockNode)(tr);
32
32
  }
33
33
  } else {
34
34
  var conversionInfo = canBeConvertedToSyncBlock(tr.selection);
package/dist/esm/ui/SyncBlockLabel.js CHANGED
@@ -2,7 +2,7 @@ import React from 'react';
2
2
  import { useIntl } from 'react-intl-next';
3
3
  import { syncBlockMessages as messages } from '@atlaskit/editor-common/messages';
4
4
  import { SyncBlockLabelSharedCssClassName } from '@atlaskit/editor-common/sync-block';
5
- import { ConfluenceIcon } from '@atlaskit/logo';
5
+ import BlockSyncedIcon from '@atlaskit/icon-lab/core/block-synced';
6
6
  import { Text } from '@atlaskit/primitives/compiled';
7
7
  import Tooltip from '@atlaskit/tooltip';
8
8
  import VisuallyHidden from '@atlaskit/visually-hidden';
@@ -32,15 +32,17 @@ var SyncBlockLabelComponent = function SyncBlockLabelComponent(_ref) {
32
32
  ,
33
33
  className: SyncBlockLabelSharedCssClassName.labelClassName,
34
34
  "aria-describedby": ariaDescribedById
35
- }, /*#__PURE__*/React.createElement(ConfluenceIcon, {
36
- size: "xsmall",
37
- appearance: "neutral",
38
- shouldUseNewLogoDesign: true
35
+ }, /*#__PURE__*/React.createElement(BlockSyncedIcon, {
36
+ color: "var(--ds-icon-subtle, #505258)",
37
+ size: "small",
38
+ label: ""
39
39
  }), isSource || !title ? /*#__PURE__*/React.createElement(Text, {
40
- size: "small"
40
+ size: "small",
41
+ color: "color.text.subtle"
41
42
  }, formatMessage(messages.syncedBlockLabel)) : /*#__PURE__*/React.createElement(Text, {
42
43
  maxLines: 1,
43
- size: "small"
44
+ size: "small",
45
+ color: "color.text.subtle"
44
46
  }, title)), /*#__PURE__*/React.createElement(VisuallyHidden, {
45
47
  id: ariaDescribedById
46
48
  }, tooltipContent));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-synced-block",
3
- "version": "4.5.5",
3
+ "version": "4.5.6",
4
4
  "description": "SyncedBlock plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -45,11 +45,10 @@
45
45
  "@atlaskit/flag": "^17.6.0",
46
46
  "@atlaskit/icon": "29.1.0",
47
47
  "@atlaskit/icon-lab": "^5.12.0",
48
- "@atlaskit/logo": "^19.9.0",
49
48
  "@atlaskit/lozenge": "^13.1.0",
50
49
  "@atlaskit/modal-dialog": "^14.9.0",
51
50
  "@atlaskit/primitives": "^16.4.0",
52
- "@atlaskit/tmp-editor-statsig": "^15.11.0",
51
+ "@atlaskit/tmp-editor-statsig": "^15.12.0",
53
52
  "@atlaskit/tokens": "8.5.0",
54
53
  "@atlaskit/tooltip": "^20.11.0",
55
54
  "@atlaskit/visually-hidden": "^3.0.0",