@atlaskit/renderer 109.13.0 → 109.14.0

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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,21 @@
1
1
  # @atlaskit/renderer
2
2
 
3
+ ## 109.14.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [#87313](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/87313) [`1789491c0687`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/1789491c0687) - [ED-22804] Update renderer action deleteAnnotation to function with media node
8
+
9
+ ### Patch Changes
10
+
11
+ - Updated dependencies
12
+
13
+ ## 109.13.1
14
+
15
+ ### Patch Changes
16
+
17
+ - [#86408](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/86408) [`6bff86c31d81`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6bff86c31d81) - Clean up feature flag for increasing visibility of table scroll shadows
18
+
3
19
  ## 109.13.0
4
20
 
5
21
  ### Minor Changes
@@ -80,8 +80,13 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
80
80
  });
81
81
  var from;
82
82
  var to;
83
+ var nodePos;
84
+ var step;
83
85
  this.doc.descendants(function (node, pos) {
84
86
  var found = mark.isInSet(node.marks);
87
+ if (found && node.type.name === 'media') {
88
+ nodePos = pos;
89
+ }
85
90
  if (found && !from) {
86
91
  // Set both here incase it only spans one node.
87
92
  from = pos;
@@ -93,10 +98,14 @@ var RendererActions = exports.default = /*#__PURE__*/function () {
93
98
  }
94
99
  return true;
95
100
  });
96
- if (from === undefined || to === undefined) {
97
- return false;
101
+ if (nodePos !== undefined) {
102
+ step = new _transform.RemoveNodeMarkStep(nodePos, mark);
103
+ } else {
104
+ if (from === undefined || to === undefined) {
105
+ return false;
106
+ }
107
+ step = new _transform.RemoveMarkStep(from, to, mark);
98
108
  }
99
- var step = new _transform.RemoveMarkStep(from, to, mark);
100
109
  var _step$apply = step.apply(this.doc),
101
110
  doc = _step$apply.doc,
102
111
  failed = _step$apply.failed;
@@ -55,7 +55,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
55
55
  var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
56
56
  var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
57
57
  var packageName = "@atlaskit/renderer";
58
- var packageVersion = "109.13.0";
58
+ var packageVersion = "109.14.0";
59
59
  var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
60
60
  (0, _inherits2.default)(Renderer, _PureComponent);
61
61
  var _super = _createSuper(Renderer);
@@ -13,7 +13,6 @@ var _colors = _interopRequireWildcard(require("@atlaskit/theme/colors"));
13
13
  var colors = _colors;
14
14
  var _typography = require("@atlaskit/theme/typography");
15
15
  var _tokens = require("@atlaskit/tokens");
16
- var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
17
16
  var _mediaInline = require("@atlaskit/editor-common/media-inline");
18
17
  var _styles = require("@atlaskit/editor-common/styles");
19
18
  var _ui = require("@atlaskit/editor-common/ui");
@@ -104,7 +103,7 @@ var breakoutWidthStyle = function breakoutWidthStyle() {
104
103
  return (0, _react.css)(_templateObject7 || (_templateObject7 = (0, _taggedTemplateLiteral2.default)(["\n *:not([data-mark-type='fragment'])\n .", " {\n // TODO - improve inline style logic on table container so important styles aren't required here\n width: 100% !important;\n left: 0 !important;\n }\n\n [data-mark-type='fragment'] * .", " {\n // TODO - improve inline style logic on table container so important styles aren't required here\n width: 100% !important;\n left: 0 !important;\n }\n "])), _styles.TableSharedCssClassName.TABLE_CONTAINER, _styles.TableSharedCssClassName.TABLE_CONTAINER);
105
104
  };
106
105
  var getShadowOverrides = function getShadowOverrides() {
107
- return (0, _platformFeatureFlags.getBooleanFF)('platform.editor.table.increase-shadow-visibility_lh89r') ? (0, _react.css)(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2.default)(["\n /** Shadow overrides */\n &.", "::after,\n &.", "::before {\n width: ", "px;\n background: linear-gradient(\n to left,\n transparent 0,\n ", " 140%\n ),\n linear-gradient(\n to right,\n ", " 0px,\n transparent 1px\n );\n }\n\n &.", "::after {\n background: linear-gradient(\n to right,\n transparent 0,\n ", " 140%\n ),\n linear-gradient(\n to left,\n ", " 0px,\n transparent 1px\n );\n right: 0px;\n }\n "])), _ui.shadowClassNames.RIGHT_SHADOW, _ui.shadowClassNames.LEFT_SHADOW, tableShadowWidth, "var(--ds-shadow-overflow-spread, ".concat(_colors.N40A, ")"), "var(--ds-shadow-overflow-perimeter, transparent)", _ui.shadowClassNames.RIGHT_SHADOW, "var(--ds-shadow-overflow-spread, ".concat(_colors.N40A, ")"), "var(--ds-shadow-overflow-perimeter, transparent)") : '';
106
+ return (0, _react.css)(_templateObject8 || (_templateObject8 = (0, _taggedTemplateLiteral2.default)(["\n /** Shadow overrides */\n &.", "::after,\n &.", "::before {\n width: ", "px;\n background: linear-gradient(\n to left,\n transparent 0,\n ", " 140%\n ),\n linear-gradient(\n to right,\n ", " 0px,\n transparent 1px\n );\n }\n\n &.", "::after {\n background: linear-gradient(\n to right,\n transparent 0,\n ", " 140%\n ),\n linear-gradient(\n to left,\n ", " 0px,\n transparent 1px\n );\n right: 0px;\n }\n "])), _ui.shadowClassNames.RIGHT_SHADOW, _ui.shadowClassNames.LEFT_SHADOW, tableShadowWidth, "var(--ds-shadow-overflow-spread, ".concat(_colors.N40A, ")"), "var(--ds-shadow-overflow-perimeter, transparent)", _ui.shadowClassNames.RIGHT_SHADOW, "var(--ds-shadow-overflow-spread, ".concat(_colors.N40A, ")"), "var(--ds-shadow-overflow-perimeter, transparent)");
108
107
  };
109
108
  var rendererStyles = exports.rendererStyles = function rendererStyles(wrapperProps) {
110
109
  return function (theme) {
@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
2
  import { JSONTransformer } from '@atlaskit/editor-json-transformer';
3
3
  import { canApplyAnnotationOnRange, getAnnotationIdsFromRange } from '@atlaskit/editor-common/utils';
4
4
  import { AnnotationTypes } from '@atlaskit/adf-schema';
5
- import { RemoveMarkStep } from '@atlaskit/editor-prosemirror/transform';
5
+ import { RemoveMarkStep, RemoveNodeMarkStep } from '@atlaskit/editor-prosemirror/transform';
6
6
  import { createAnnotationStep, getPosFromRange } from '../steps';
7
7
  import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
8
8
  import { getIndexMatch } from './matches-utils';
@@ -61,8 +61,13 @@ export default class RendererActions {
61
61
  });
62
62
  let from;
63
63
  let to;
64
+ let nodePos;
65
+ let step;
64
66
  this.doc.descendants((node, pos) => {
65
67
  const found = mark.isInSet(node.marks);
68
+ if (found && node.type.name === 'media') {
69
+ nodePos = pos;
70
+ }
66
71
  if (found && !from) {
67
72
  // Set both here incase it only spans one node.
68
73
  from = pos;
@@ -74,10 +79,14 @@ export default class RendererActions {
74
79
  }
75
80
  return true;
76
81
  });
77
- if (from === undefined || to === undefined) {
78
- return false;
82
+ if (nodePos !== undefined) {
83
+ step = new RemoveNodeMarkStep(nodePos, mark);
84
+ } else {
85
+ if (from === undefined || to === undefined) {
86
+ return false;
87
+ }
88
+ step = new RemoveMarkStep(from, to, mark);
79
89
  }
80
- const step = new RemoveMarkStep(from, to, mark);
81
90
  const {
82
91
  doc,
83
92
  failed
@@ -36,7 +36,7 @@ import { EditorMediaClientProvider } from '../../react/utils/EditorMediaClientPr
36
36
  export const NORMAL_SEVERITY_THRESHOLD = 2000;
37
37
  export const DEGRADED_SEVERITY_THRESHOLD = 3000;
38
38
  const packageName = "@atlaskit/renderer";
39
- const packageVersion = "109.13.0";
39
+ const packageVersion = "109.14.0";
40
40
  export class Renderer extends PureComponent {
41
41
  constructor(props) {
42
42
  super(props);
@@ -5,7 +5,6 @@ import { fontFamily, fontSize } from '@atlaskit/theme/constants';
5
5
  import * as colors from '@atlaskit/theme/colors';
6
6
  import { headingSizes as headingSizesImport } from '@atlaskit/theme/typography';
7
7
  import { getGlobalTheme } from '@atlaskit/tokens';
8
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
9
8
  import { mediaInlineImageStyles } from '@atlaskit/editor-common/media-inline';
10
9
  import { tableSharedStyle, columnLayoutSharedStyle, blockquoteSharedStyles, headingsSharedStyles, ruleSharedStyles, whitespaceSharedStyles, paragraphSharedStyles, listsSharedStyles, indentationSharedStyles, blockMarksSharedStyles, mediaSingleSharedStyle, TableSharedCssClassName, tableMarginTop, codeMarkSharedStyles, shadowSharedStyle, dateSharedStyle, richMediaClassName, tasksAndDecisionsStyles, smartCardSharedStyles, tableCellPadding, textColorStyles, codeBlockInListSafariFix, SmartCardSharedCssClassName } from '@atlaskit/editor-common/styles';
11
10
  import { shadowClassNames } from '@atlaskit/editor-common/ui';
@@ -360,37 +359,37 @@ const breakoutWidthStyle = () => {
360
359
  `;
361
360
  };
362
361
  const getShadowOverrides = () => {
363
- return getBooleanFF('platform.editor.table.increase-shadow-visibility_lh89r') ? css`
364
- /** Shadow overrides */
365
- &.${shadowClassNames.RIGHT_SHADOW}::after,
366
- &.${shadowClassNames.LEFT_SHADOW}::before {
367
- width: ${tableShadowWidth}px;
368
- background: linear-gradient(
369
- to left,
370
- transparent 0,
371
- ${`var(--ds-shadow-overflow-spread, ${N40A})`} 140%
372
- ),
373
- linear-gradient(
374
- to right,
375
- ${"var(--ds-shadow-overflow-perimeter, transparent)"} 0px,
376
- transparent 1px
377
- );
378
- }
379
-
380
- &.${shadowClassNames.RIGHT_SHADOW}::after {
381
- background: linear-gradient(
382
- to right,
383
- transparent 0,
384
- ${`var(--ds-shadow-overflow-spread, ${N40A})`} 140%
385
- ),
386
- linear-gradient(
387
- to left,
388
- ${"var(--ds-shadow-overflow-perimeter, transparent)"} 0px,
389
- transparent 1px
390
- );
391
- right: 0px;
392
- }
393
- ` : '';
362
+ return css`
363
+ /** Shadow overrides */
364
+ &.${shadowClassNames.RIGHT_SHADOW}::after,
365
+ &.${shadowClassNames.LEFT_SHADOW}::before {
366
+ width: ${tableShadowWidth}px;
367
+ background: linear-gradient(
368
+ to left,
369
+ transparent 0,
370
+ ${`var(--ds-shadow-overflow-spread, ${N40A})`} 140%
371
+ ),
372
+ linear-gradient(
373
+ to right,
374
+ ${"var(--ds-shadow-overflow-perimeter, transparent)"} 0px,
375
+ transparent 1px
376
+ );
377
+ }
378
+
379
+ &.${shadowClassNames.RIGHT_SHADOW}::after {
380
+ background: linear-gradient(
381
+ to right,
382
+ transparent 0,
383
+ ${`var(--ds-shadow-overflow-spread, ${N40A})`} 140%
384
+ ),
385
+ linear-gradient(
386
+ to left,
387
+ ${"var(--ds-shadow-overflow-perimeter, transparent)"} 0px,
388
+ transparent 1px
389
+ );
390
+ right: 0px;
391
+ }
392
+ `;
394
393
  };
395
394
  export const rendererStyles = wrapperProps => theme => {
396
395
  // This is required to be compatible with styled-components prop structure.
@@ -5,7 +5,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
5
5
  import { JSONTransformer } from '@atlaskit/editor-json-transformer';
6
6
  import { canApplyAnnotationOnRange, getAnnotationIdsFromRange } from '@atlaskit/editor-common/utils';
7
7
  import { AnnotationTypes } from '@atlaskit/adf-schema';
8
- import { RemoveMarkStep } from '@atlaskit/editor-prosemirror/transform';
8
+ import { RemoveMarkStep, RemoveNodeMarkStep } from '@atlaskit/editor-prosemirror/transform';
9
9
  import { createAnnotationStep, getPosFromRange } from '../steps';
10
10
  import { ACTION, ACTION_SUBJECT, EVENT_TYPE, ACTION_SUBJECT_ID } from '@atlaskit/editor-common/analytics';
11
11
  import { getIndexMatch } from './matches-utils';
@@ -73,8 +73,13 @@ var RendererActions = /*#__PURE__*/function () {
73
73
  });
74
74
  var from;
75
75
  var to;
76
+ var nodePos;
77
+ var step;
76
78
  this.doc.descendants(function (node, pos) {
77
79
  var found = mark.isInSet(node.marks);
80
+ if (found && node.type.name === 'media') {
81
+ nodePos = pos;
82
+ }
78
83
  if (found && !from) {
79
84
  // Set both here incase it only spans one node.
80
85
  from = pos;
@@ -86,10 +91,14 @@ var RendererActions = /*#__PURE__*/function () {
86
91
  }
87
92
  return true;
88
93
  });
89
- if (from === undefined || to === undefined) {
90
- return false;
94
+ if (nodePos !== undefined) {
95
+ step = new RemoveNodeMarkStep(nodePos, mark);
96
+ } else {
97
+ if (from === undefined || to === undefined) {
98
+ return false;
99
+ }
100
+ step = new RemoveMarkStep(from, to, mark);
91
101
  }
92
- var step = new RemoveMarkStep(from, to, mark);
93
102
  var _step$apply = step.apply(this.doc),
94
103
  doc = _step$apply.doc,
95
104
  failed = _step$apply.failed;
@@ -46,7 +46,7 @@ import { EditorMediaClientProvider } from '../../react/utils/EditorMediaClientPr
46
46
  export var NORMAL_SEVERITY_THRESHOLD = 2000;
47
47
  export var DEGRADED_SEVERITY_THRESHOLD = 3000;
48
48
  var packageName = "@atlaskit/renderer";
49
- var packageVersion = "109.13.0";
49
+ var packageVersion = "109.14.0";
50
50
  export var Renderer = /*#__PURE__*/function (_PureComponent) {
51
51
  _inherits(Renderer, _PureComponent);
52
52
  var _super = _createSuper(Renderer);
@@ -7,7 +7,6 @@ import { fontFamily, fontSize } from '@atlaskit/theme/constants';
7
7
  import * as colors from '@atlaskit/theme/colors';
8
8
  import { headingSizes as headingSizesImport } from '@atlaskit/theme/typography';
9
9
  import { getGlobalTheme } from '@atlaskit/tokens';
10
- import { getBooleanFF } from '@atlaskit/platform-feature-flags';
11
10
  import { mediaInlineImageStyles } from '@atlaskit/editor-common/media-inline';
12
11
  import { tableSharedStyle, columnLayoutSharedStyle, blockquoteSharedStyles, headingsSharedStyles, ruleSharedStyles, whitespaceSharedStyles, paragraphSharedStyles, listsSharedStyles, indentationSharedStyles, blockMarksSharedStyles, mediaSingleSharedStyle, TableSharedCssClassName, tableMarginTop, codeMarkSharedStyles, shadowSharedStyle, dateSharedStyle, richMediaClassName, tasksAndDecisionsStyles, smartCardSharedStyles, tableCellPadding, textColorStyles, codeBlockInListSafariFix, SmartCardSharedCssClassName } from '@atlaskit/editor-common/styles';
13
12
  import { shadowClassNames } from '@atlaskit/editor-common/ui';
@@ -96,7 +95,7 @@ var breakoutWidthStyle = function breakoutWidthStyle() {
96
95
  return css(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n *:not([data-mark-type='fragment'])\n .", " {\n // TODO - improve inline style logic on table container so important styles aren't required here\n width: 100% !important;\n left: 0 !important;\n }\n\n [data-mark-type='fragment'] * .", " {\n // TODO - improve inline style logic on table container so important styles aren't required here\n width: 100% !important;\n left: 0 !important;\n }\n "])), TableSharedCssClassName.TABLE_CONTAINER, TableSharedCssClassName.TABLE_CONTAINER);
97
96
  };
98
97
  var getShadowOverrides = function getShadowOverrides() {
99
- return getBooleanFF('platform.editor.table.increase-shadow-visibility_lh89r') ? css(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n /** Shadow overrides */\n &.", "::after,\n &.", "::before {\n width: ", "px;\n background: linear-gradient(\n to left,\n transparent 0,\n ", " 140%\n ),\n linear-gradient(\n to right,\n ", " 0px,\n transparent 1px\n );\n }\n\n &.", "::after {\n background: linear-gradient(\n to right,\n transparent 0,\n ", " 140%\n ),\n linear-gradient(\n to left,\n ", " 0px,\n transparent 1px\n );\n right: 0px;\n }\n "])), shadowClassNames.RIGHT_SHADOW, shadowClassNames.LEFT_SHADOW, tableShadowWidth, "var(--ds-shadow-overflow-spread, ".concat(N40A, ")"), "var(--ds-shadow-overflow-perimeter, transparent)", shadowClassNames.RIGHT_SHADOW, "var(--ds-shadow-overflow-spread, ".concat(N40A, ")"), "var(--ds-shadow-overflow-perimeter, transparent)") : '';
98
+ return css(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral(["\n /** Shadow overrides */\n &.", "::after,\n &.", "::before {\n width: ", "px;\n background: linear-gradient(\n to left,\n transparent 0,\n ", " 140%\n ),\n linear-gradient(\n to right,\n ", " 0px,\n transparent 1px\n );\n }\n\n &.", "::after {\n background: linear-gradient(\n to right,\n transparent 0,\n ", " 140%\n ),\n linear-gradient(\n to left,\n ", " 0px,\n transparent 1px\n );\n right: 0px;\n }\n "])), shadowClassNames.RIGHT_SHADOW, shadowClassNames.LEFT_SHADOW, tableShadowWidth, "var(--ds-shadow-overflow-spread, ".concat(N40A, ")"), "var(--ds-shadow-overflow-perimeter, transparent)", shadowClassNames.RIGHT_SHADOW, "var(--ds-shadow-overflow-spread, ".concat(N40A, ")"), "var(--ds-shadow-overflow-perimeter, transparent)");
100
99
  };
101
100
  export var rendererStyles = function rendererStyles(wrapperProps) {
102
101
  return function (theme) {
@@ -4,7 +4,6 @@ import type { AnnotationActionResult, AnnotationByMatches } from '@atlaskit/edit
4
4
  import { AnnotationTypes } from '@atlaskit/adf-schema';
5
5
  import type { Node, Schema, Mark } from '@atlaskit/editor-prosemirror/model';
6
6
  import type { Step } from '@atlaskit/editor-prosemirror/transform';
7
- import { RemoveMarkStep } from '@atlaskit/editor-prosemirror/transform';
8
7
  import type { AnalyticsEventPayload } from '../analytics/events';
9
8
  type ActionResult = {
10
9
  step: Step;
@@ -47,7 +46,7 @@ export default class RendererActions implements RendererActionsOptions, Annotati
47
46
  */
48
47
  _privateValidatePositionsForAnnotation(from: number, to: number): boolean;
49
48
  deleteAnnotation(annotationId: string, annotationType: 'inlineComment'): false | {
50
- step: RemoveMarkStep;
49
+ step: Step;
51
50
  doc: JSONDocNode;
52
51
  };
53
52
  annotate(range: Range, annotationId: string, annotationType: 'inlineComment'): AnnotationActionResult;
@@ -4,7 +4,6 @@ import type { AnnotationActionResult, AnnotationByMatches } from '@atlaskit/edit
4
4
  import { AnnotationTypes } from '@atlaskit/adf-schema';
5
5
  import type { Node, Schema, Mark } from '@atlaskit/editor-prosemirror/model';
6
6
  import type { Step } from '@atlaskit/editor-prosemirror/transform';
7
- import { RemoveMarkStep } from '@atlaskit/editor-prosemirror/transform';
8
7
  import type { AnalyticsEventPayload } from '../analytics/events';
9
8
  type ActionResult = {
10
9
  step: Step;
@@ -47,7 +46,7 @@ export default class RendererActions implements RendererActionsOptions, Annotati
47
46
  */
48
47
  _privateValidatePositionsForAnnotation(from: number, to: number): boolean;
49
48
  deleteAnnotation(annotationId: string, annotationType: 'inlineComment'): false | {
50
- step: RemoveMarkStep;
49
+ step: Step;
51
50
  doc: JSONDocNode;
52
51
  };
53
52
  annotate(range: Range, annotationId: string, annotationType: 'inlineComment'): AnnotationActionResult;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/renderer",
3
- "version": "109.13.0",
3
+ "version": "109.14.0",
4
4
  "description": "Renderer component",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -44,14 +44,14 @@
44
44
  "@atlaskit/media-client-react": "^2.0.0",
45
45
  "@atlaskit/media-common": "^11.1.0",
46
46
  "@atlaskit/media-filmstrip": "^47.0.0",
47
- "@atlaskit/media-ui": "^25.4.0",
47
+ "@atlaskit/media-ui": "^25.5.0",
48
48
  "@atlaskit/media-viewer": "^48.4.0",
49
49
  "@atlaskit/platform-feature-flags": "^0.2.0",
50
- "@atlaskit/smart-card": "^26.51.0",
50
+ "@atlaskit/smart-card": "^26.52.0",
51
51
  "@atlaskit/status": "^1.4.0",
52
52
  "@atlaskit/task-decision": "^17.9.0",
53
53
  "@atlaskit/theme": "^12.7.0",
54
- "@atlaskit/tokens": "^1.42.0",
54
+ "@atlaskit/tokens": "^1.43.0",
55
55
  "@atlaskit/tooltip": "^18.1.0",
56
56
  "@babel/runtime": "^7.0.0",
57
57
  "@emotion/react": "^11.7.1",
@@ -121,9 +121,6 @@
121
121
  "platform.editor.custom-table-width": {
122
122
  "type": "boolean"
123
123
  },
124
- "platform.editor.table.increase-shadow-visibility_lh89r": {
125
- "type": "boolean"
126
- },
127
124
  "platform.media-experience.media-viewer-v2_hgsii": {
128
125
  "type": "boolean",
129
126
  "referenceOnly": "true"