@atlaskit/editor-plugin-expand 2.6.0 → 2.6.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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,17 @@
1
1
  # @atlaskit/editor-plugin-expand
2
2
 
3
+ ## 2.6.1
4
+
5
+ ### Patch Changes
6
+
7
+ - [#138299](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/138299)
8
+ [`7bab5c1cce65c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/7bab5c1cce65c) -
9
+ [ED-24860] Split out ADF schema change for nesting nestedExpand in expand
10
+ - [#138118](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/138118)
11
+ [`5e4d9eb1aefe4`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5e4d9eb1aefe4) -
12
+ NOISSUE: Upgrades editor React peer dependencies to v18
13
+ - Updated dependencies
14
+
3
15
  ## 2.6.0
4
16
 
5
17
  ### Minor Changes
@@ -30,13 +30,14 @@ var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
30
30
  api = _ref.api;
31
31
  // Confluence is injecting the FF through editor props, from an experiment
32
32
  // Jira is pulling it in through platform feature flags, from a feature gate
33
+ var isNestingExpandsSchemaChanged = (0, _platformFeatureFlags.fg)('platform_editor_nested_expand_in_expand_adf_change') || (0, _platformFeatureFlags.fg)('platform_editor_nest_nested_expand_in_expand_jira');
33
34
  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');
34
35
  return {
35
36
  name: 'expand',
36
37
  nodes: function nodes() {
37
38
  return [{
38
39
  name: 'expand',
39
- node: isNestingExpandsSupported ? _adfSchema.expandWithNestedExpand : _adfSchema.expand
40
+ node: isNestingExpandsSchemaChanged ? _adfSchema.expandWithNestedExpand : _adfSchema.expand
40
41
  }, {
41
42
  name: 'nestedExpand',
42
43
  node: _adfSchema.nestedExpand
@@ -23,13 +23,14 @@ var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
23
23
  api = _ref.api;
24
24
  // Confluence is injecting the FF through editor props, from an experiment
25
25
  // Jira is pulling it in through platform feature flags, from a feature gate
26
+ var isNestingExpandsSchemaChanged = (0, _platformFeatureFlags.fg)('platform_editor_nested_expand_in_expand_adf_change') || (0, _platformFeatureFlags.fg)('platform_editor_nest_nested_expand_in_expand_jira');
26
27
  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');
27
28
  return {
28
29
  name: 'expand',
29
30
  nodes: function nodes() {
30
31
  return [{
31
32
  name: 'expand',
32
- node: isNestingExpandsSupported ? _adfSchema.expandWithNestedExpand : _adfSchema.expand
33
+ node: isNestingExpandsSchemaChanged ? _adfSchema.expandWithNestedExpand : _adfSchema.expand
33
34
  }, {
34
35
  name: 'nestedExpand',
35
36
  node: _adfSchema.nestedExpand
@@ -17,13 +17,14 @@ export const expandPlugin = ({
17
17
  var _api$featureFlags, _api$featureFlags$sha, _api$analytics, _api$analytics2;
18
18
  // Confluence is injecting the FF through editor props, from an experiment
19
19
  // Jira is pulling it in through platform feature flags, from a feature gate
20
+ const isNestingExpandsSchemaChanged = fg('platform_editor_nested_expand_in_expand_adf_change') || fg('platform_editor_nest_nested_expand_in_expand_jira');
20
21
  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');
21
22
  return {
22
23
  name: 'expand',
23
24
  nodes() {
24
25
  return [{
25
26
  name: 'expand',
26
- node: isNestingExpandsSupported ? expandWithNestedExpand : expand
27
+ node: isNestingExpandsSchemaChanged ? expandWithNestedExpand : expand
27
28
  }, {
28
29
  name: 'nestedExpand',
29
30
  node: nestedExpand
@@ -16,13 +16,14 @@ export const expandPlugin = ({
16
16
  var _api$featureFlags, _api$featureFlags$sha, _api$analytics, _api$analytics2;
17
17
  // Confluence is injecting the FF through editor props, from an experiment
18
18
  // Jira is pulling it in through platform feature flags, from a feature gate
19
+ const isNestingExpandsSchemaChanged = fg('platform_editor_nested_expand_in_expand_adf_change') || fg('platform_editor_nest_nested_expand_in_expand_jira');
19
20
  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');
20
21
  return {
21
22
  name: 'expand',
22
23
  nodes() {
23
24
  return [{
24
25
  name: 'expand',
25
- node: isNestingExpandsSupported ? expandWithNestedExpand : expand
26
+ node: isNestingExpandsSchemaChanged ? expandWithNestedExpand : expand
26
27
  }, {
27
28
  name: 'nestedExpand',
28
29
  node: nestedExpand
@@ -17,13 +17,14 @@ export var expandPlugin = function expandPlugin(_ref) {
17
17
  api = _ref.api;
18
18
  // Confluence is injecting the FF through editor props, from an experiment
19
19
  // Jira is pulling it in through platform feature flags, from a feature gate
20
+ var isNestingExpandsSchemaChanged = fg('platform_editor_nested_expand_in_expand_adf_change') || fg('platform_editor_nest_nested_expand_in_expand_jira');
20
21
  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');
21
22
  return {
22
23
  name: 'expand',
23
24
  nodes: function nodes() {
24
25
  return [{
25
26
  name: 'expand',
26
- node: isNestingExpandsSupported ? expandWithNestedExpand : expand
27
+ node: isNestingExpandsSchemaChanged ? expandWithNestedExpand : expand
27
28
  }, {
28
29
  name: 'nestedExpand',
29
30
  node: nestedExpand
@@ -16,13 +16,14 @@ export var expandPlugin = function expandPlugin(_ref) {
16
16
  api = _ref.api;
17
17
  // Confluence is injecting the FF through editor props, from an experiment
18
18
  // Jira is pulling it in through platform feature flags, from a feature gate
19
+ var isNestingExpandsSchemaChanged = fg('platform_editor_nested_expand_in_expand_adf_change') || fg('platform_editor_nest_nested_expand_in_expand_jira');
19
20
  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');
20
21
  return {
21
22
  name: 'expand',
22
23
  nodes: function nodes() {
23
24
  return [{
24
25
  name: 'expand',
25
- node: isNestingExpandsSupported ? expandWithNestedExpand : expand
26
+ node: isNestingExpandsSchemaChanged ? expandWithNestedExpand : expand
26
27
  }, {
27
28
  name: 'nestedExpand',
28
29
  node: nestedExpand
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-plugin-expand",
3
- "version": "2.6.0",
3
+ "version": "2.6.1",
4
4
  "description": "Expand plugin for @atlaskit/editor-core",
5
5
  "author": "Atlassian Pty Ltd",
6
6
  "license": "Apache-2.0",
@@ -10,9 +10,7 @@
10
10
  "atlassian": {
11
11
  "team": "Editor: Jenga",
12
12
  "singleton": true,
13
- "inPublicMirror": false,
14
- "releaseModel": "continuous",
15
- "runReact18": false
13
+ "runReact18": true
16
14
  },
17
15
  "repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
18
16
  "main": "dist/cjs/index.js",
@@ -35,7 +33,7 @@
35
33
  "dependencies": {
36
34
  "@atlaskit/adf-schema": "^40.9.0",
37
35
  "@atlaskit/button": "^20.1.0",
38
- "@atlaskit/editor-common": "^88.3.0",
36
+ "@atlaskit/editor-common": "^88.12.0",
39
37
  "@atlaskit/editor-plugin-analytics": "^1.8.0",
40
38
  "@atlaskit/editor-plugin-decorations": "^1.3.0",
41
39
  "@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
@@ -44,7 +42,7 @@
44
42
  "@atlaskit/editor-prosemirror": "5.0.1",
45
43
  "@atlaskit/editor-shared-styles": "^2.13.0",
46
44
  "@atlaskit/editor-tables": "^2.8.0",
47
- "@atlaskit/icon": "^22.15.0",
45
+ "@atlaskit/icon": "^22.16.0",
48
46
  "@atlaskit/platform-feature-flags": "^0.3.0",
49
47
  "@atlaskit/tooltip": "^18.7.0",
50
48
  "@babel/runtime": "^7.0.0",
@@ -52,8 +50,8 @@
52
50
  "w3c-keyname": "^2.1.8"
53
51
  },
54
52
  "peerDependencies": {
55
- "react": "^16.8.0",
56
- "react-dom": "^16.8.0",
53
+ "react": "^16.8.0 || ^17.0.0 || ~18.2.0",
54
+ "react-dom": "^16.8.0 || ^17.0.0 || ~18.2.0",
57
55
  "react-intl-next": "npm:react-intl@^5.18.1"
58
56
  },
59
57
  "devDependencies": {
@@ -116,6 +114,9 @@
116
114
  },
117
115
  "platform_editor_nest_nested_expand_in_expand_jira": {
118
116
  "type": "boolean"
117
+ },
118
+ "platform_editor_nested_expand_in_expand_adf_change": {
119
+ "type": "boolean"
119
120
  }
120
121
  }
121
122
  }