@atlaskit/renderer 109.32.0 → 109.32.1

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 (8) hide show
  1. package/CHANGELOG.md +9 -0
  2. package/dist/cjs/ui/Renderer/index.js +1 -1
  3. package/dist/cjs/ui/annotations/element/mark.js +13 -5
  4. package/dist/es2019/ui/Renderer/index.js +1 -1
  5. package/dist/es2019/ui/annotations/element/mark.js +13 -5
  6. package/dist/esm/ui/Renderer/index.js +1 -1
  7. package/dist/esm/ui/annotations/element/mark.js +13 -5
  8. package/package.json +3 -3
package/CHANGELOG.md CHANGED
@@ -1,5 +1,14 @@
1
1
  # @atlaskit/renderer
2
2
 
3
+ ## 109.32.1
4
+
5
+ ### Patch Changes
6
+
7
+ - [#109301](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/109301)
8
+ [`a94f80cafee03`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/a94f80cafee03) -
9
+ [ux] [ED-23638] allow clicks on commented links and mentions to work.
10
+ - Updated dependencies
11
+
3
12
  ## 109.32.0
4
13
 
5
14
  ### Minor Changes
package/dist/cjs/ui/Renderer/index.js CHANGED
@@ -56,7 +56,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
56
56
  var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
57
57
  var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
58
58
  var packageName = "@atlaskit/renderer";
59
- var packageVersion = "109.32.0";
59
+ var packageVersion = "109.32.1";
60
60
  var defaultNodeComponents = exports.defaultNodeComponents = _nodes.nodeToReact;
61
61
  var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
62
62
  (0, _inherits2.default)(Renderer, _PureComponent);
package/dist/cjs/ui/annotations/element/mark.js CHANGED
@@ -43,13 +43,21 @@ var MarkComponent = exports.MarkComponent = function MarkComponent(_ref) {
43
43
  if (event.defaultPrevented || state !== _adfSchema.AnnotationMarkStates.ACTIVE) {
44
44
  return;
45
45
  }
46
-
47
- // prevents from opening link URL inside webView in Safari
48
- event.preventDefault();
49
46
  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes')) {
50
- if (event.target instanceof HTMLElement && event.target.closest('[data-inline-card]')) {
51
- event.stopPropagation();
47
+ // We only want to interfere with click events if the click is on some ui inside the renderer document
48
+ // This is to prevent the click events from portaled content (such as link previews and mention profiles)
49
+ if (event.target instanceof HTMLElement && event.target.closest('.ak-renderer-document')) {
50
+ if (event.target.closest('[data-mention-id]')) {
51
+ // don't prevent default for mentions
52
+ } else {
53
+ // prevents from opening link URL inside webView in Safari
54
+ event.preventDefault();
55
+ event.stopPropagation();
56
+ }
52
57
  }
58
+ } else {
59
+ // prevents from opening link URL inside webView in Safari
60
+ event.preventDefault();
53
61
  }
54
62
  onClick({
55
63
  eventTarget: event.target,
package/dist/es2019/ui/Renderer/index.js CHANGED
@@ -37,7 +37,7 @@ import { nodeToReact } from '../../react/nodes';
37
37
  export const NORMAL_SEVERITY_THRESHOLD = 2000;
38
38
  export const DEGRADED_SEVERITY_THRESHOLD = 3000;
39
39
  const packageName = "@atlaskit/renderer";
40
- const packageVersion = "109.32.0";
40
+ const packageVersion = "109.32.1";
41
41
  export const defaultNodeComponents = nodeToReact;
42
42
  export class Renderer extends PureComponent {
43
43
  constructor(props) {
package/dist/es2019/ui/annotations/element/mark.js CHANGED
@@ -42,13 +42,21 @@ export const MarkComponent = ({
42
42
  if (event.defaultPrevented || state !== AnnotationMarkStates.ACTIVE) {
43
43
  return;
44
44
  }
45
-
46
- // prevents from opening link URL inside webView in Safari
47
- event.preventDefault();
48
45
  if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
49
- if (event.target instanceof HTMLElement && event.target.closest('[data-inline-card]')) {
50
- event.stopPropagation();
46
+ // We only want to interfere with click events if the click is on some ui inside the renderer document
47
+ // This is to prevent the click events from portaled content (such as link previews and mention profiles)
48
+ if (event.target instanceof HTMLElement && event.target.closest('.ak-renderer-document')) {
49
+ if (event.target.closest('[data-mention-id]')) {
50
+ // don't prevent default for mentions
51
+ } else {
52
+ // prevents from opening link URL inside webView in Safari
53
+ event.preventDefault();
54
+ event.stopPropagation();
55
+ }
51
56
  }
57
+ } else {
58
+ // prevents from opening link URL inside webView in Safari
59
+ event.preventDefault();
52
60
  }
53
61
  onClick({
54
62
  eventTarget: event.target,
package/dist/esm/ui/Renderer/index.js CHANGED
@@ -47,7 +47,7 @@ import { nodeToReact } from '../../react/nodes';
47
47
  export var NORMAL_SEVERITY_THRESHOLD = 2000;
48
48
  export var DEGRADED_SEVERITY_THRESHOLD = 3000;
49
49
  var packageName = "@atlaskit/renderer";
50
- var packageVersion = "109.32.0";
50
+ var packageVersion = "109.32.1";
51
51
  export var defaultNodeComponents = nodeToReact;
52
52
  export var Renderer = /*#__PURE__*/function (_PureComponent) {
53
53
  _inherits(Renderer, _PureComponent);
package/dist/esm/ui/annotations/element/mark.js CHANGED
@@ -38,13 +38,21 @@ export var MarkComponent = function MarkComponent(_ref) {
38
38
  if (event.defaultPrevented || state !== AnnotationMarkStates.ACTIVE) {
39
39
  return;
40
40
  }
41
-
42
- // prevents from opening link URL inside webView in Safari
43
- event.preventDefault();
44
41
  if (getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes')) {
45
- if (event.target instanceof HTMLElement && event.target.closest('[data-inline-card]')) {
46
- event.stopPropagation();
42
+ // We only want to interfere with click events if the click is on some ui inside the renderer document
43
+ // This is to prevent the click events from portaled content (such as link previews and mention profiles)
44
+ if (event.target instanceof HTMLElement && event.target.closest('.ak-renderer-document')) {
45
+ if (event.target.closest('[data-mention-id]')) {
46
+ // don't prevent default for mentions
47
+ } else {
48
+ // prevents from opening link URL inside webView in Safari
49
+ event.preventDefault();
50
+ event.stopPropagation();
51
+ }
47
52
  }
53
+ } else {
54
+ // prevents from opening link URL inside webView in Safari
55
+ event.preventDefault();
48
56
  }
49
57
  onClick({
50
58
  eventTarget: event.target,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/renderer",
3
- "version": "109.32.0",
3
+ "version": "109.32.1",
4
4
  "description": "Renderer component",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -31,7 +31,7 @@
31
31
  "@atlaskit/analytics-next": "^9.3.0",
32
32
  "@atlaskit/button": "^17.17.0",
33
33
  "@atlaskit/code": "^15.2.0",
34
- "@atlaskit/editor-common": "^82.1.0",
34
+ "@atlaskit/editor-common": "^82.2.0",
35
35
  "@atlaskit/editor-json-transformer": "^8.13.0",
36
36
  "@atlaskit/editor-palette": "1.6.0",
37
37
  "@atlaskit/editor-prosemirror": "4.0.1",
@@ -73,7 +73,7 @@
73
73
  "@atlaskit/analytics-gas-types": "^5.1.0",
74
74
  "@atlaskit/css-reset": "^6.9.0",
75
75
  "@atlaskit/editor-test-helpers": "^18.23.0",
76
- "@atlaskit/link-provider": "^1.10.0",
76
+ "@atlaskit/link-provider": "^1.11.0",
77
77
  "@atlaskit/link-test-helpers": "^7.0.0",
78
78
  "@atlaskit/linking-common": "^5.7.0",
79
79
  "@atlaskit/media-core": "^34.2.0",