@atlaskit/renderer 118.6.4 → 118.6.5

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,20 @@
1
1
  # @atlaskit/renderer
2
2
 
3
+ ## 118.6.5
4
+
5
+ ### Patch Changes
6
+
7
+ - [#164058](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/164058)
8
+ [`0d27c81dc4607`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/0d27c81dc4607) -
9
+ [ux] EDITOR-843 - remove focus style for renderer annotation comment mark element
10
+ - [#164607](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/164607)
11
+ [`e0b155ba0f97c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e0b155ba0f97c) -
12
+ EDITOR-857 - Click a selected comment should deselect it in renderer
13
+ - [#163939](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/163939)
14
+ [`c8320043adccd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c8320043adccd) -
15
+ Reducing children validation in RendererActions behind an FG and sending track analytics event
16
+ - Updated dependencies
17
+
3
18
  ## 118.6.4
4
19
 
5
20
  ### Patch Changes
@@ -62,7 +62,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
62
62
  var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
63
63
  var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
64
64
  var packageName = "@atlaskit/renderer";
65
- var packageVersion = "118.6.4";
65
+ var packageVersion = "118.6.5";
66
66
  var setAsQueryContainerStyles = (0, _react2.css)({
67
67
  containerName: 'ak-renderer-wrapper',
68
68
  containerType: 'inline-size'
@@ -8,17 +8,45 @@ Object.defineProperty(exports, "__esModule", {
8
8
  exports.RendererActionsContext = RendererActionsContext;
9
9
  exports.RendererContext = exports.RendererActionsContextConsumer = void 0;
10
10
  var _react = _interopRequireWildcard(require("react"));
11
+ var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
12
+ var _analyticsNext = require("@atlaskit/analytics-next");
13
+ var _analyticsListeners = require("@atlaskit/analytics-listeners");
14
+ var _analytics = require("@atlaskit/editor-common/analytics");
11
15
  var _index = _interopRequireDefault(require("../../actions/index"));
12
16
  function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
13
17
  var RendererContext = exports.RendererContext = /*#__PURE__*/_react.default.createContext(new _index.default());
14
18
  function RendererActionsContext(_ref) {
15
19
  var children = _ref.children,
16
20
  context = _ref.context;
21
+ var _useAnalyticsEvents = (0, _analyticsNext.useAnalyticsEvents)(),
22
+ createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
17
23
  var actions = (0, _react.useMemo)(function () {
18
24
  return new _index.default(true);
19
25
  }, []);
26
+
27
+ // Remove this eventually when root cause is assessed
28
+ if (_react.default.Children.count(children) > 1 && (0, _platformFeatureFlags.fg)('confluence_frontend_fix_view_page_slo')) {
29
+ // Send event when we get more than 1 child
30
+
31
+ try {
32
+ throw new Error('Too many children');
33
+ } catch (e) {
34
+ var _ref2 = e,
35
+ stack = _ref2.stack;
36
+ createAnalyticsEvent({
37
+ eventType: _analytics.EVENT_TYPE.TRACK,
38
+ action: 'rendered',
39
+ actionSubject: 'multipleChildren',
40
+ actionSubjectId: 'rendererActionsContext',
41
+ attributes: {
42
+ numChildren: _react.default.Children.count(children),
43
+ stackTrace: stack
44
+ }
45
+ }).fire(_analyticsListeners.FabricChannel.editor);
46
+ }
47
+ }
20
48
  return /*#__PURE__*/_react.default.createElement(RendererContext.Provider, {
21
49
  value: context || actions
22
- }, _react.default.Children.only(children));
50
+ }, (0, _platformFeatureFlags.fg)('confluence_frontend_fix_view_page_slo') ? _react.default.Children.only(children) : children);
23
51
  }
24
52
  var RendererActionsContextConsumer = exports.RendererActionsContextConsumer = RendererContext.Consumer;
@@ -46,6 +46,9 @@ var MarkElement = exports.MarkElement = function MarkElement(_ref) {
46
46
  annotationIds = props.annotationIds;
47
47
  if (annotationManager) {
48
48
  if (hasFocus) {
49
+ dispatch({
50
+ type: 'resetSelectedAnnotation'
51
+ });
49
52
  return;
50
53
  }
51
54
  annotationManager.checkPreemptiveGate().then(function (canSelect) {
@@ -28,7 +28,7 @@ var markStyles = (0, _react2.css)((0, _defineProperty2.default)({
28
28
  background: "var(--ds-background-accent-yellow-subtlest, #FFF7D6)",
29
29
  borderBottom: "2px solid ".concat("var(--ds-border-accent-yellow, #B38600)"),
30
30
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
31
- '&:focus, &[data-has-focus="true"]': {
31
+ '&[data-has-focus="true"]': {
32
32
  background: "var(--ds-background-accent-yellow-subtler, #F8E6A0)",
33
33
  borderBottom: "2px solid ".concat("var(--ds-border-accent-yellow, #B38600)"),
34
34
  // TODO: DSP-4147 - Annotation shadow
@@ -43,7 +43,7 @@ var markStylesLayeringFix = (0, _react2.css)((0, _defineProperty2.default)({}, "
43
43
  backgroundColor: 'transparent'
44
44
  },
45
45
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
46
- '.fabric-background-color-mark &[data-has-focus="true"], &:focus, &[data-has-focus="true"]': {
46
+ '.fabric-background-color-mark &[data-has-focus="true"], &[data-has-focus="true"]': {
47
47
  background: "var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)",
48
48
  borderBottomColor: "var(--ds-border-accent-yellow, #B38600)",
49
49
  boxShadow: "var(--ds-shadow-raised, 0px 1px 1px #091E4240, 0px 0px 1px #091E424f)"
@@ -51,7 +51,7 @@ var markStylesLayeringFix = (0, _react2.css)((0, _defineProperty2.default)({}, "
51
51
  }));
52
52
  var markStylesWithUpdatedShadow = (0, _react2.css)((0, _defineProperty2.default)({}, "&[data-mark-annotation-state='".concat(_adfSchema.AnnotationMarkStates.ACTIVE, "']"), {
53
53
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
54
- '&:focus, &[data-has-focus="true"]': {
54
+ '&[data-has-focus="true"]': {
55
55
  background: "var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)",
56
56
  borderBottomColor: "var(--ds-border-accent-yellow, #B38600)",
57
57
  boxShadow: "var(--ds-shadow-raised, 0px 1px 1px #091E4240, 0px 0px 1px #091E424f)"
@@ -75,7 +75,7 @@ var markStylesWithInlineComments = (0, _react2.css)((0, _defineProperty2.default
75
75
  background: "var(--ds-background-accent-yellow-subtlest, #FFF7D6)",
76
76
  borderBottomColor: "var(--ds-border-accent-yellow, #B38600)",
77
77
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
78
- '&:focus, &[data-has-focus="true"]': {
78
+ '&[data-has-focus="true"]': {
79
79
  background: "var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)",
80
80
  borderBottomColor: "var(--ds-border-accent-yellow, #B38600)",
81
81
  boxShadow: "var(--ds-shadow-overlay, 0px 8px 12px #091E4226, 0px 0px 1px #091E424f)"
@@ -48,7 +48,7 @@ import { PortalContext } from './PortalContext';
48
48
  export const NORMAL_SEVERITY_THRESHOLD = 2000;
49
49
  export const DEGRADED_SEVERITY_THRESHOLD = 3000;
50
50
  const packageName = "@atlaskit/renderer";
51
- const packageVersion = "118.6.4";
51
+ const packageVersion = "118.6.5";
52
52
  const setAsQueryContainerStyles = css({
53
53
  containerName: 'ak-renderer-wrapper',
54
54
  containerType: 'inline-size'
@@ -1,13 +1,43 @@
1
1
  import React, { useMemo } from 'react';
2
+ import { fg } from '@atlaskit/platform-feature-flags';
3
+ import { useAnalyticsEvents } from '@atlaskit/analytics-next';
4
+ import { FabricChannel } from '@atlaskit/analytics-listeners';
5
+ import { EVENT_TYPE } from '@atlaskit/editor-common/analytics';
2
6
  import RendererActions from '../../actions/index';
3
7
  export const RendererContext = /*#__PURE__*/React.createContext(new RendererActions());
4
8
  export function RendererActionsContext({
5
9
  children,
6
10
  context
7
11
  }) {
12
+ const {
13
+ createAnalyticsEvent
14
+ } = useAnalyticsEvents();
8
15
  const actions = useMemo(() => new RendererActions(true), []);
16
+
17
+ // Remove this eventually when root cause is assessed
18
+ if (React.Children.count(children) > 1 && fg('confluence_frontend_fix_view_page_slo')) {
19
+ // Send event when we get more than 1 child
20
+
21
+ try {
22
+ throw new Error('Too many children');
23
+ } catch (e) {
24
+ const {
25
+ stack
26
+ } = e;
27
+ createAnalyticsEvent({
28
+ eventType: EVENT_TYPE.TRACK,
29
+ action: 'rendered',
30
+ actionSubject: 'multipleChildren',
31
+ actionSubjectId: 'rendererActionsContext',
32
+ attributes: {
33
+ numChildren: React.Children.count(children),
34
+ stackTrace: stack
35
+ }
36
+ }).fire(FabricChannel.editor);
37
+ }
38
+ }
9
39
  return /*#__PURE__*/React.createElement(RendererContext.Provider, {
10
40
  value: context || actions
11
- }, React.Children.only(children));
41
+ }, fg('confluence_frontend_fix_view_page_slo') ? React.Children.only(children) : children);
12
42
  }
13
43
  export const RendererActionsContextConsumer = RendererContext.Consumer;
@@ -41,6 +41,9 @@ const MarkElement = ({
41
41
  } = props;
42
42
  if (annotationManager) {
43
43
  if (hasFocus) {
44
+ dispatch({
45
+ type: 'resetSelectedAnnotation'
46
+ });
44
47
  return;
45
48
  }
46
49
  annotationManager.checkPreemptiveGate().then(canSelect => {
@@ -21,7 +21,7 @@ const markStyles = css({
21
21
  background: "var(--ds-background-accent-yellow-subtlest, #FFF7D6)",
22
22
  borderBottom: `2px solid ${"var(--ds-border-accent-yellow, #B38600)"}`,
23
23
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
24
- '&:focus, &[data-has-focus="true"]': {
24
+ '&[data-has-focus="true"]': {
25
25
  background: "var(--ds-background-accent-yellow-subtler, #F8E6A0)",
26
26
  borderBottom: `2px solid ${"var(--ds-border-accent-yellow, #B38600)"}`,
27
27
  // TODO: DSP-4147 - Annotation shadow
@@ -39,7 +39,7 @@ const markStylesLayeringFix = css({
39
39
  backgroundColor: 'transparent'
40
40
  },
41
41
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
42
- '.fabric-background-color-mark &[data-has-focus="true"], &:focus, &[data-has-focus="true"]': {
42
+ '.fabric-background-color-mark &[data-has-focus="true"], &[data-has-focus="true"]': {
43
43
  background: "var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)",
44
44
  borderBottomColor: "var(--ds-border-accent-yellow, #B38600)",
45
45
  boxShadow: "var(--ds-shadow-raised, 0px 1px 1px #091E4240, 0px 0px 1px #091E424f)"
@@ -50,7 +50,7 @@ const markStylesWithUpdatedShadow = css({
50
50
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
51
51
  [`&[data-mark-annotation-state='${AnnotationMarkStates.ACTIVE}']`]: {
52
52
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
53
- '&:focus, &[data-has-focus="true"]': {
53
+ '&[data-has-focus="true"]': {
54
54
  background: "var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)",
55
55
  borderBottomColor: "var(--ds-border-accent-yellow, #B38600)",
56
56
  boxShadow: "var(--ds-shadow-raised, 0px 1px 1px #091E4240, 0px 0px 1px #091E424f)"
@@ -77,7 +77,7 @@ const markStylesWithInlineComments = css({
77
77
  background: "var(--ds-background-accent-yellow-subtlest, #FFF7D6)",
78
78
  borderBottomColor: "var(--ds-border-accent-yellow, #B38600)",
79
79
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
80
- '&:focus, &[data-has-focus="true"]': {
80
+ '&[data-has-focus="true"]': {
81
81
  background: "var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)",
82
82
  borderBottomColor: "var(--ds-border-accent-yellow, #B38600)",
83
83
  boxShadow: "var(--ds-shadow-overlay, 0px 8px 12px #091E4226, 0px 0px 1px #091E424f)"
@@ -53,7 +53,7 @@ import { PortalContext } from './PortalContext';
53
53
  export var NORMAL_SEVERITY_THRESHOLD = 2000;
54
54
  export var DEGRADED_SEVERITY_THRESHOLD = 3000;
55
55
  var packageName = "@atlaskit/renderer";
56
- var packageVersion = "118.6.4";
56
+ var packageVersion = "118.6.5";
57
57
  var setAsQueryContainerStyles = css({
58
58
  containerName: 'ak-renderer-wrapper',
59
59
  containerType: 'inline-size'
@@ -1,14 +1,42 @@
1
1
  import React, { useMemo } from 'react';
2
+ import { fg } from '@atlaskit/platform-feature-flags';
3
+ import { useAnalyticsEvents } from '@atlaskit/analytics-next';
4
+ import { FabricChannel } from '@atlaskit/analytics-listeners';
5
+ import { EVENT_TYPE } from '@atlaskit/editor-common/analytics';
2
6
  import RendererActions from '../../actions/index';
3
7
  export var RendererContext = /*#__PURE__*/React.createContext(new RendererActions());
4
8
  export function RendererActionsContext(_ref) {
5
9
  var children = _ref.children,
6
10
  context = _ref.context;
11
+ var _useAnalyticsEvents = useAnalyticsEvents(),
12
+ createAnalyticsEvent = _useAnalyticsEvents.createAnalyticsEvent;
7
13
  var actions = useMemo(function () {
8
14
  return new RendererActions(true);
9
15
  }, []);
16
+
17
+ // Remove this eventually when root cause is assessed
18
+ if (React.Children.count(children) > 1 && fg('confluence_frontend_fix_view_page_slo')) {
19
+ // Send event when we get more than 1 child
20
+
21
+ try {
22
+ throw new Error('Too many children');
23
+ } catch (e) {
24
+ var _ref2 = e,
25
+ stack = _ref2.stack;
26
+ createAnalyticsEvent({
27
+ eventType: EVENT_TYPE.TRACK,
28
+ action: 'rendered',
29
+ actionSubject: 'multipleChildren',
30
+ actionSubjectId: 'rendererActionsContext',
31
+ attributes: {
32
+ numChildren: React.Children.count(children),
33
+ stackTrace: stack
34
+ }
35
+ }).fire(FabricChannel.editor);
36
+ }
37
+ }
10
38
  return /*#__PURE__*/React.createElement(RendererContext.Provider, {
11
39
  value: context || actions
12
- }, React.Children.only(children));
40
+ }, fg('confluence_frontend_fix_view_page_slo') ? React.Children.only(children) : children);
13
41
  }
14
42
  export var RendererActionsContextConsumer = RendererContext.Consumer;
@@ -38,6 +38,9 @@ var MarkElement = function MarkElement(_ref) {
38
38
  annotationIds = props.annotationIds;
39
39
  if (annotationManager) {
40
40
  if (hasFocus) {
41
+ dispatch({
42
+ type: 'resetSelectedAnnotation'
43
+ });
41
44
  return;
42
45
  }
43
46
  annotationManager.checkPreemptiveGate().then(function (canSelect) {
@@ -24,7 +24,7 @@ var markStyles = css(_defineProperty({
24
24
  background: "var(--ds-background-accent-yellow-subtlest, #FFF7D6)",
25
25
  borderBottom: "2px solid ".concat("var(--ds-border-accent-yellow, #B38600)"),
26
26
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
27
- '&:focus, &[data-has-focus="true"]': {
27
+ '&[data-has-focus="true"]': {
28
28
  background: "var(--ds-background-accent-yellow-subtler, #F8E6A0)",
29
29
  borderBottom: "2px solid ".concat("var(--ds-border-accent-yellow, #B38600)"),
30
30
  // TODO: DSP-4147 - Annotation shadow
@@ -39,7 +39,7 @@ var markStylesLayeringFix = css(_defineProperty({}, "&[data-mark-annotation-stat
39
39
  backgroundColor: 'transparent'
40
40
  },
41
41
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
42
- '.fabric-background-color-mark &[data-has-focus="true"], &:focus, &[data-has-focus="true"]': {
42
+ '.fabric-background-color-mark &[data-has-focus="true"], &[data-has-focus="true"]': {
43
43
  background: "var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)",
44
44
  borderBottomColor: "var(--ds-border-accent-yellow, #B38600)",
45
45
  boxShadow: "var(--ds-shadow-raised, 0px 1px 1px #091E4240, 0px 0px 1px #091E424f)"
@@ -47,7 +47,7 @@ var markStylesLayeringFix = css(_defineProperty({}, "&[data-mark-annotation-stat
47
47
  }));
48
48
  var markStylesWithUpdatedShadow = css(_defineProperty({}, "&[data-mark-annotation-state='".concat(AnnotationMarkStates.ACTIVE, "']"), {
49
49
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
50
- '&:focus, &[data-has-focus="true"]': {
50
+ '&[data-has-focus="true"]': {
51
51
  background: "var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)",
52
52
  borderBottomColor: "var(--ds-border-accent-yellow, #B38600)",
53
53
  boxShadow: "var(--ds-shadow-raised, 0px 1px 1px #091E4240, 0px 0px 1px #091E424f)"
@@ -71,7 +71,7 @@ var markStylesWithInlineComments = css(_defineProperty({}, "&[data-mark-annotati
71
71
  background: "var(--ds-background-accent-yellow-subtlest, #FFF7D6)",
72
72
  borderBottomColor: "var(--ds-border-accent-yellow, #B38600)",
73
73
  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
74
- '&:focus, &[data-has-focus="true"]': {
74
+ '&[data-has-focus="true"]': {
75
75
  background: "var(--ds-background-accent-yellow-subtlest-pressed, #F5CD47)",
76
76
  borderBottomColor: "var(--ds-border-accent-yellow, #B38600)",
77
77
  boxShadow: "var(--ds-shadow-overlay, 0px 8px 12px #091E4226, 0px 0px 1px #091E424f)"
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/renderer",
3
- "version": "118.6.4",
3
+ "version": "118.6.5",
4
4
  "description": "Renderer component",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -56,7 +56,7 @@
56
56
  "@atlaskit/status": "^3.0.0",
57
57
  "@atlaskit/task-decision": "^19.2.0",
58
58
  "@atlaskit/theme": "^18.0.0",
59
- "@atlaskit/tmp-editor-statsig": "^5.7.0",
59
+ "@atlaskit/tmp-editor-statsig": "^5.8.0",
60
60
  "@atlaskit/tokens": "^5.0.0",
61
61
  "@atlaskit/tooltip": "^20.2.0",
62
62
  "@atlaskit/visually-hidden": "^3.0.0",
@@ -259,6 +259,9 @@
259
259
  },
260
260
  "dst-a11y__replace-anchor-with-link__editor": {
261
261
  "type": "boolean"
262
+ },
263
+ "confluence_frontend_fix_view_page_slo": {
264
+ "type": "boolean"
262
265
  }
263
266
  },
264
267
  "af:exports": {