@atlaskit/editor-plugin-expand 3.2.2 → 3.2.4

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,22 @@
1
1
  # @atlaskit/editor-plugin-expand
2
2
 
3
+ ## 3.2.4
4
+
5
+ ### Patch Changes
6
+
7
+ - [#135763](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/135763)
8
+ [`9caa26aa0f95f`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9caa26aa0f95f) -
9
+ Clean-up platform_editor_nested_expand_in_expand_adf_change feature gate
10
+
11
+ ## 3.2.3
12
+
13
+ ### Patch Changes
14
+
15
+ - [#134373](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/134373)
16
+ [`2260b25ebfbe9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/2260b25ebfbe9) -
17
+ A11Y-10088 fixing aria-label for expand
18
+ - Updated dependencies
19
+
3
20
  ## 3.2.2
4
21
 
5
22
  ### Patch Changes
@@ -50,6 +50,7 @@ var toDOM = function toDOM(node, __livePage, intl, titleReadOnly, contentEditabl
50
50
  }, ['input', {
51
51
  // prettier-ignore
52
52
  'class': _styles.expandClassNames.titleInput,
53
+ 'aria-label': intl && intl.formatMessage(_ui.expandMessages.expandArialabel) || _ui.expandMessages.expandArialabel.defaultMessage,
53
54
  value: node.attrs.title,
54
55
  placeholder: intl && intl.formatMessage(_ui.expandMessages.expandPlaceholderText) || _ui.expandMessages.expandPlaceholderText.defaultMessage,
55
56
  type: 'text',
@@ -26,7 +26,6 @@ var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
26
26
  api = _ref.api;
27
27
  // Confluence is injecting the FF through editor props, from an experiment
28
28
  // Jira is pulling it in through platform feature flags, from a feature gate
29
- var isNestingExpandsSchemaChanged = (0, _platformFeatureFlags.fg)('platform_editor_nested_expand_in_expand_adf_change') || (0, _platformFeatureFlags.fg)('platform_editor_nest_nested_expand_in_expand_jira');
30
29
  var isNestingExpandsSupported = (api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 || (_api$featureFlags = _api$featureFlags.sharedState.currentState()) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.nestedExpandInExpandEx) || (0, _platformFeatureFlags.fg)('platform_editor_nest_nested_expand_in_expand_jira');
31
30
  var nestedExpandNode = (0, _experiments.editorExperiment)('platform_editor_nested_non_bodied_macros', 'test') ? _adfSchema.nestedExpand : _adfSchema.nestedExpandWithoutNonBodiedMacros;
32
31
  return {
@@ -34,7 +33,7 @@ var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
34
33
  nodes: function nodes() {
35
34
  return [{
36
35
  name: 'expand',
37
- node: isNestingExpandsSchemaChanged ? _adfSchema.expandWithNestedExpand : _adfSchema.expand
36
+ node: _adfSchema.expandWithNestedExpand
38
37
  }, {
39
38
  name: 'nestedExpand',
40
39
  node: nestedExpandNode
@@ -26,7 +26,6 @@ var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
26
26
  api = _ref.api;
27
27
  // Confluence is injecting the FF through editor props, from an experiment
28
28
  // Jira is pulling it in through platform feature flags, from a feature gate
29
- var isNestingExpandsSchemaChanged = (0, _platformFeatureFlags.fg)('platform_editor_nested_expand_in_expand_adf_change') || (0, _platformFeatureFlags.fg)('platform_editor_nest_nested_expand_in_expand_jira');
30
29
  var isNestingExpandsSupported = (api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 || (_api$featureFlags = _api$featureFlags.sharedState.currentState()) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.nestedExpandInExpandEx) || (0, _platformFeatureFlags.fg)('platform_editor_nest_nested_expand_in_expand_jira');
31
30
  var nestedExpandNode = (0, _experiments.editorExperiment)('platform_editor_nested_non_bodied_macros', 'test') ? _adfSchema.nestedExpand : _adfSchema.nestedExpandWithoutNonBodiedMacros;
32
31
  return {
@@ -34,7 +33,7 @@ var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
34
33
  nodes: function nodes() {
35
34
  return [{
36
35
  name: 'expand',
37
- node: isNestingExpandsSchemaChanged ? _adfSchema.expandWithNestedExpand : _adfSchema.expand
36
+ node: _adfSchema.expandWithNestedExpand
38
37
  }, {
39
38
  name: 'nestedExpand',
40
39
  node: nestedExpandNode
@@ -36,6 +36,7 @@ var toDOM = exports.toDOM = function toDOM(node, __livePage, intl, titleReadOnly
36
36
  }, ['input', {
37
37
  // prettier-ignore
38
38
  'class': _styles.expandClassNames.titleInput,
39
+ 'aria-label': intl && intl.formatMessage(_ui.expandMessages.expandArialabel) || _ui.expandMessages.expandArialabel.defaultMessage,
39
40
  value: node.attrs.title,
40
41
  placeholder: intl && typeof intl.formatMessage === 'function' && intl.formatMessage(_ui.expandMessages.expandPlaceholderText) || _ui.expandMessages.expandPlaceholderText.defaultMessage,
41
42
  type: 'text',
@@ -39,6 +39,7 @@ const toDOM = (node, __livePage, intl, titleReadOnly, contentEditable) => ['div'
39
39
  }, ['input', {
40
40
  // prettier-ignore
41
41
  'class': expandClassNames.titleInput,
42
+ 'aria-label': intl && intl.formatMessage(expandMessages.expandArialabel) || expandMessages.expandArialabel.defaultMessage,
42
43
  value: node.attrs.title,
43
44
  placeholder: intl && intl.formatMessage(expandMessages.expandPlaceholderText) || expandMessages.expandPlaceholderText.defaultMessage,
44
45
  type: 'text',
@@ -1,5 +1,5 @@
1
1
  import React from 'react';
2
- import { expand, expandWithNestedExpand, nestedExpand, nestedExpandWithoutNonBodiedMacros } from '@atlaskit/adf-schema';
2
+ import { expandWithNestedExpand, nestedExpand, nestedExpandWithoutNonBodiedMacros } from '@atlaskit/adf-schema';
3
3
  import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
4
4
  import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
5
5
  import { IconExpand } from '@atlaskit/editor-common/quick-insert';
@@ -20,7 +20,6 @@ export let expandPlugin = ({
20
20
  var _api$featureFlags, _api$featureFlags$sha, _api$analytics, _api$analytics2;
21
21
  // Confluence is injecting the FF through editor props, from an experiment
22
22
  // Jira is pulling it in through platform feature flags, from a feature gate
23
- const isNestingExpandsSchemaChanged = fg('platform_editor_nested_expand_in_expand_adf_change') || fg('platform_editor_nest_nested_expand_in_expand_jira');
24
23
  const isNestingExpandsSupported = (api === null || api === void 0 ? void 0 : (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : (_api$featureFlags$sha = _api$featureFlags.sharedState.currentState()) === null || _api$featureFlags$sha === void 0 ? void 0 : _api$featureFlags$sha.nestedExpandInExpandEx) || fg('platform_editor_nest_nested_expand_in_expand_jira');
25
24
  const nestedExpandNode = editorExperiment('platform_editor_nested_non_bodied_macros', 'test') ? nestedExpand : nestedExpandWithoutNonBodiedMacros;
26
25
  return {
@@ -28,7 +27,7 @@ export let expandPlugin = ({
28
27
  nodes() {
29
28
  return [{
30
29
  name: 'expand',
31
- node: isNestingExpandsSchemaChanged ? expandWithNestedExpand : expand
30
+ node: expandWithNestedExpand
32
31
  }, {
33
32
  name: 'nestedExpand',
34
33
  node: nestedExpandNode
@@ -1,5 +1,5 @@
1
1
  import React from 'react';
2
- import { expand, expandWithNestedExpand, nestedExpand, nestedExpandWithoutNonBodiedMacros } from '@atlaskit/adf-schema';
2
+ import { expandWithNestedExpand, nestedExpand, nestedExpandWithoutNonBodiedMacros } from '@atlaskit/adf-schema';
3
3
  import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
4
4
  import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
5
5
  import { IconExpand } from '@atlaskit/editor-common/quick-insert';
@@ -20,7 +20,6 @@ export let expandPlugin = ({
20
20
  var _api$featureFlags, _api$featureFlags$sha, _api$analytics, _api$analytics2;
21
21
  // Confluence is injecting the FF through editor props, from an experiment
22
22
  // Jira is pulling it in through platform feature flags, from a feature gate
23
- const isNestingExpandsSchemaChanged = fg('platform_editor_nested_expand_in_expand_adf_change') || fg('platform_editor_nest_nested_expand_in_expand_jira');
24
23
  const isNestingExpandsSupported = (api === null || api === void 0 ? void 0 : (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 ? void 0 : (_api$featureFlags$sha = _api$featureFlags.sharedState.currentState()) === null || _api$featureFlags$sha === void 0 ? void 0 : _api$featureFlags$sha.nestedExpandInExpandEx) || fg('platform_editor_nest_nested_expand_in_expand_jira');
25
24
  const nestedExpandNode = editorExperiment('platform_editor_nested_non_bodied_macros', 'test') ? nestedExpand : nestedExpandWithoutNonBodiedMacros;
26
25
  return {
@@ -28,7 +27,7 @@ export let expandPlugin = ({
28
27
  nodes() {
29
28
  return [{
30
29
  name: 'expand',
31
- node: isNestingExpandsSchemaChanged ? expandWithNestedExpand : expand
30
+ node: expandWithNestedExpand
32
31
  }, {
33
32
  name: 'nestedExpand',
34
33
  node: nestedExpandNode
@@ -30,6 +30,7 @@ export const toDOM = (node, __livePage, intl, titleReadOnly, contentEditable) =>
30
30
  }, ['input', {
31
31
  // prettier-ignore
32
32
  'class': expandClassNames.titleInput,
33
+ 'aria-label': intl && intl.formatMessage(expandMessages.expandArialabel) || expandMessages.expandArialabel.defaultMessage,
33
34
  value: node.attrs.title,
34
35
  placeholder: intl && typeof intl.formatMessage === 'function' && intl.formatMessage(expandMessages.expandPlaceholderText) || expandMessages.expandPlaceholderText.defaultMessage,
35
36
  type: 'text',
@@ -42,6 +42,7 @@ var toDOM = function toDOM(node, __livePage, intl, titleReadOnly, contentEditabl
42
42
  }, ['input', {
43
43
  // prettier-ignore
44
44
  'class': expandClassNames.titleInput,
45
+ 'aria-label': intl && intl.formatMessage(expandMessages.expandArialabel) || expandMessages.expandArialabel.defaultMessage,
45
46
  value: node.attrs.title,
46
47
  placeholder: intl && intl.formatMessage(expandMessages.expandPlaceholderText) || expandMessages.expandPlaceholderText.defaultMessage,
47
48
  type: 'text',
@@ -1,5 +1,5 @@
1
1
  import React from 'react';
2
- import { expand, expandWithNestedExpand, nestedExpand, nestedExpandWithoutNonBodiedMacros } from '@atlaskit/adf-schema';
2
+ import { expandWithNestedExpand, nestedExpand, nestedExpandWithoutNonBodiedMacros } from '@atlaskit/adf-schema';
3
3
  import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
4
4
  import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
5
5
  import { IconExpand } from '@atlaskit/editor-common/quick-insert';
@@ -20,7 +20,6 @@ export var expandPlugin = function expandPlugin(_ref) {
20
20
  api = _ref.api;
21
21
  // Confluence is injecting the FF through editor props, from an experiment
22
22
  // Jira is pulling it in through platform feature flags, from a feature gate
23
- var isNestingExpandsSchemaChanged = fg('platform_editor_nested_expand_in_expand_adf_change') || fg('platform_editor_nest_nested_expand_in_expand_jira');
24
23
  var isNestingExpandsSupported = (api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 || (_api$featureFlags = _api$featureFlags.sharedState.currentState()) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.nestedExpandInExpandEx) || fg('platform_editor_nest_nested_expand_in_expand_jira');
25
24
  var nestedExpandNode = editorExperiment('platform_editor_nested_non_bodied_macros', 'test') ? nestedExpand : nestedExpandWithoutNonBodiedMacros;
26
25
  return {
@@ -28,7 +27,7 @@ export var expandPlugin = function expandPlugin(_ref) {
28
27
  nodes: function nodes() {
29
28
  return [{
30
29
  name: 'expand',
31
- node: isNestingExpandsSchemaChanged ? expandWithNestedExpand : expand
30
+ node: expandWithNestedExpand
32
31
  }, {
33
32
  name: 'nestedExpand',
34
33
  node: nestedExpandNode
@@ -1,5 +1,5 @@
1
1
  import React from 'react';
2
- import { expand, expandWithNestedExpand, nestedExpand, nestedExpandWithoutNonBodiedMacros } from '@atlaskit/adf-schema';
2
+ import { expandWithNestedExpand, nestedExpand, nestedExpandWithoutNonBodiedMacros } from '@atlaskit/adf-schema';
3
3
  import { ACTION, ACTION_SUBJECT, ACTION_SUBJECT_ID, EVENT_TYPE, INPUT_METHOD } from '@atlaskit/editor-common/analytics';
4
4
  import { toolbarInsertBlockMessages as messages } from '@atlaskit/editor-common/messages';
5
5
  import { IconExpand } from '@atlaskit/editor-common/quick-insert';
@@ -20,7 +20,6 @@ export var expandPlugin = function expandPlugin(_ref) {
20
20
  api = _ref.api;
21
21
  // Confluence is injecting the FF through editor props, from an experiment
22
22
  // Jira is pulling it in through platform feature flags, from a feature gate
23
- var isNestingExpandsSchemaChanged = fg('platform_editor_nested_expand_in_expand_adf_change') || fg('platform_editor_nest_nested_expand_in_expand_jira');
24
23
  var isNestingExpandsSupported = (api === null || api === void 0 || (_api$featureFlags = api.featureFlags) === null || _api$featureFlags === void 0 || (_api$featureFlags = _api$featureFlags.sharedState.currentState()) === null || _api$featureFlags === void 0 ? void 0 : _api$featureFlags.nestedExpandInExpandEx) || fg('platform_editor_nest_nested_expand_in_expand_jira');
25
24
  var nestedExpandNode = editorExperiment('platform_editor_nested_non_bodied_macros', 'test') ? nestedExpand : nestedExpandWithoutNonBodiedMacros;
26
25
  return {
@@ -28,7 +27,7 @@ export var expandPlugin = function expandPlugin(_ref) {
28
27
  nodes: function nodes() {
29
28
  return [{
30
29
  name: 'expand',
31
- node: isNestingExpandsSchemaChanged ? expandWithNestedExpand : expand
30
+ node: expandWithNestedExpand
32
31
  }, {
33
32
  name: 'nestedExpand',
34
33
  node: nestedExpandNode
@@ -30,6 +30,7 @@ export var toDOM = function toDOM(node, __livePage, intl, titleReadOnly, content
30
30
  }, ['input', {
31
31
  // prettier-ignore
32
32
  'class': expandClassNames.titleInput,
33
+ 'aria-label': intl && intl.formatMessage(expandMessages.expandArialabel) || expandMessages.expandArialabel.defaultMessage,
33
34
  value: node.attrs.title,
34
35
  placeholder: intl && typeof intl.formatMessage === 'function' && intl.formatMessage(expandMessages.expandPlaceholderText) || expandMessages.expandPlaceholderText.defaultMessage,
35
36
  type: 'text',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-expand",
3
- "version": "3.2.2",
3
+ "version": "3.2.4",
4
4
  "description": "Expand plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -35,20 +35,20 @@
35
35
  "dependencies": {
36
36
  "@atlaskit/adf-schema": "^47.6.0",
37
37
  "@atlaskit/button": "^23.0.0",
38
- "@atlaskit/editor-common": "^102.16.0",
38
+ "@atlaskit/editor-common": "^102.17.0",
39
39
  "@atlaskit/editor-plugin-analytics": "^2.2.0",
40
40
  "@atlaskit/editor-plugin-decorations": "^2.0.0",
41
41
  "@atlaskit/editor-plugin-editor-disabled": "^2.0.0",
42
42
  "@atlaskit/editor-plugin-editor-viewmode": "^3.0.0",
43
43
  "@atlaskit/editor-plugin-selection": "^2.1.0",
44
- "@atlaskit/editor-plugin-selection-marker": "^2.0.0",
44
+ "@atlaskit/editor-plugin-selection-marker": "^2.1.0",
45
45
  "@atlaskit/editor-prosemirror": "7.0.0",
46
46
  "@atlaskit/editor-shared-styles": "^3.4.0",
47
47
  "@atlaskit/editor-tables": "^2.9.0",
48
48
  "@atlaskit/icon": "^25.4.0",
49
49
  "@atlaskit/platform-feature-flags": "^1.1.0",
50
50
  "@atlaskit/tmp-editor-statsig": "^4.6.0",
51
- "@atlaskit/tokens": "^4.5.0",
51
+ "@atlaskit/tokens": "^4.6.0",
52
52
  "@atlaskit/tooltip": "^20.0.0",
53
53
  "@babel/runtime": "^7.0.0",
54
54
  "@emotion/react": "^11.7.1",
@@ -115,9 +115,6 @@
115
115
  "platform_editor_nest_nested_expand_in_expand_jira": {
116
116
  "type": "boolean"
117
117
  },
118
- "platform_editor_nested_expand_in_expand_adf_change": {
119
- "type": "boolean"
120
- },
121
118
  "platform_editor_long_node_expand": {
122
119
  "type": "boolean",
123
120
  "referenceOnly": true