@atlaskit/editor-plugin-expand 2.6.0 → 2.6.2

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-expand
 
+## 2.6.2
+
+### Patch Changes
+
+- [#139052](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/139052)
+  [`6e5c1f6bbf028`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6e5c1f6bbf028) -
+  removed 'platform' from cardPlugin configs
+- Updated dependencies
+
+## 2.6.1
+
+### Patch Changes
+
+- [#138299](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/138299)
+  [`7bab5c1cce65c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/7bab5c1cce65c) -
+  [ED-24860] Split out ADF schema change for nesting nestedExpand in expand
+- [#138118](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/138118)
+  [`5e4d9eb1aefe4`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/5e4d9eb1aefe4) -
+  NOISSUE: Upgrades editor React peer dependencies to v18
+- Updated dependencies
+
 ## 2.6.0
 
 ### Minor Changes

package/dist/cjs/legacyExpand/plugin.js

@@ -30,13 +30,14 @@ var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
     api = _ref.api;
   // Confluence is injecting the FF through editor props, from an experiment
   // Jira is pulling it in through platform feature flags, from a feature gate
+  var isNestingExpandsSchemaChanged = (0, _platformFeatureFlags.fg)('platform_editor_nested_expand_in_expand_adf_change') || (0, _platformFeatureFlags.fg)('platform_editor_nest_nested_expand_in_expand_jira');
   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');
   return {
     name: 'expand',
     nodes: function nodes() {
       return [{
         name: 'expand',
-        node: isNestingExpandsSupported ? _adfSchema.expandWithNestedExpand : _adfSchema.expand
+        node: isNestingExpandsSchemaChanged ? _adfSchema.expandWithNestedExpand : _adfSchema.expand
       }, {
         name: 'nestedExpand',
         node: _adfSchema.nestedExpand

package/dist/cjs/legacyExpand/pm-plugins/main.js

@@ -25,7 +25,7 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, getInt
   var allowInteractiveExpand = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
   var __livePage = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
   var state = (0, _pluginFactory.createPluginState)(dispatch, {});
-  var isMobile = appearance === 'mobile';
+  var isMobile = false;
   return new _safePlugin.SafePlugin({
     state: state,
     key: _pluginFactory.pluginKey,

package/dist/cjs/legacyExpand/ui/ExpandIconButton.js

@@ -24,10 +24,10 @@ var _chevronRight = _interopRequireDefault(require("@atlaskit/icon/glyph/chevron
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _excluded = ["buttonStyles"];
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
+function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = (0, _getPrototypeOf2.default)(t); if (r) { var s = (0, _getPrototypeOf2.default)(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return (0, _possibleConstructorReturn2.default)(this, e); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); } /**
  * @jsxRuntime classic
  * @jsx jsx

package/dist/cjs/singlePlayerExpand/plugin.js

@@ -23,13 +23,14 @@ var expandPlugin = exports.expandPlugin = function expandPlugin(_ref) {
     api = _ref.api;
   // Confluence is injecting the FF through editor props, from an experiment
   // Jira is pulling it in through platform feature flags, from a feature gate
+  var isNestingExpandsSchemaChanged = (0, _platformFeatureFlags.fg)('platform_editor_nested_expand_in_expand_adf_change') || (0, _platformFeatureFlags.fg)('platform_editor_nest_nested_expand_in_expand_jira');
   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');
   return {
     name: 'expand',
     nodes: function nodes() {
       return [{
         name: 'expand',
-        node: isNestingExpandsSupported ? _adfSchema.expandWithNestedExpand : _adfSchema.expand
+        node: isNestingExpandsSchemaChanged ? _adfSchema.expandWithNestedExpand : _adfSchema.expand
       }, {
         name: 'nestedExpand',
         node: _adfSchema.nestedExpand

package/dist/cjs/singlePlayerExpand/pm-plugins/main.js

@@ -22,7 +22,7 @@ var createPlugin = exports.createPlugin = function createPlugin(dispatch, getInt
   var api = arguments.length > 4 ? arguments[4] : undefined;
   var allowInteractiveExpand = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
   var __livePage = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
-  var isMobile = appearance === 'mobile';
+  var isMobile = false;
   return new _safePlugin.SafePlugin({
     key: pluginKey,
     props: {

package/dist/cjs/singlePlayerExpand/ui/ExpandButton.js

@@ -24,7 +24,7 @@ var _excluded = ["buttonStyles"];
  */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function withTooltip(Component) {

package/dist/es2019/legacyExpand/plugin.js

@@ -17,13 +17,14 @@ export const expandPlugin = ({
   var _api$featureFlags, _api$featureFlags$sha, _api$analytics, _api$analytics2;
   // Confluence is injecting the FF through editor props, from an experiment
   // Jira is pulling it in through platform feature flags, from a feature gate
+  const isNestingExpandsSchemaChanged = fg('platform_editor_nested_expand_in_expand_adf_change') || fg('platform_editor_nest_nested_expand_in_expand_jira');
   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');
   return {
     name: 'expand',
     nodes() {
       return [{
         name: 'expand',
-        node: isNestingExpandsSupported ? expandWithNestedExpand : expand
+        node: isNestingExpandsSchemaChanged ? expandWithNestedExpand : expand
       }, {
         name: 'nestedExpand',
         node: nestedExpand

package/dist/es2019/legacyExpand/pm-plugins/main.js

@@ -12,7 +12,7 @@ export function containsClass(element, className) {
 }
 export const createPlugin = (dispatch, getIntl, appearance = 'full-page', useLongPressSelection = false, api, allowInteractiveExpand = true, __livePage = false) => {
   const state = createPluginState(dispatch, {});
-  const isMobile = appearance === 'mobile';
+  const isMobile = false;
   return new SafePlugin({
     state: state,
     key: pluginKey,

package/dist/es2019/singlePlayerExpand/plugin.js

@@ -16,13 +16,14 @@ export const expandPlugin = ({
   var _api$featureFlags, _api$featureFlags$sha, _api$analytics, _api$analytics2;
   // Confluence is injecting the FF through editor props, from an experiment
   // Jira is pulling it in through platform feature flags, from a feature gate
+  const isNestingExpandsSchemaChanged = fg('platform_editor_nested_expand_in_expand_adf_change') || fg('platform_editor_nest_nested_expand_in_expand_jira');
   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');
   return {
     name: 'expand',
     nodes() {
       return [{
         name: 'expand',
-        node: isNestingExpandsSupported ? expandWithNestedExpand : expand
+        node: isNestingExpandsSchemaChanged ? expandWithNestedExpand : expand
       }, {
         name: 'nestedExpand',
         node: nestedExpand

package/dist/es2019/singlePlayerExpand/pm-plugins/main.js

@@ -9,7 +9,7 @@ export function containsClass(element, className) {
   return Boolean(element === null || element === void 0 ? void 0 : (_element$classList = element.classList) === null || _element$classList === void 0 ? void 0 : _element$classList.contains(className));
 }
 export const createPlugin = (dispatch, getIntl, appearance = 'full-page', useLongPressSelection = false, api, allowInteractiveExpand = true, __livePage = false) => {
-  const isMobile = appearance === 'mobile';
+  const isMobile = false;
   return new SafePlugin({
     key: pluginKey,
     props: {

package/dist/esm/legacyExpand/plugin.js

@@ -17,13 +17,14 @@ export var expandPlugin = function expandPlugin(_ref) {
     api = _ref.api;
   // Confluence is injecting the FF through editor props, from an experiment
   // Jira is pulling it in through platform feature flags, from a feature gate
+  var isNestingExpandsSchemaChanged = fg('platform_editor_nested_expand_in_expand_adf_change') || fg('platform_editor_nest_nested_expand_in_expand_jira');
   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');
   return {
     name: 'expand',
     nodes: function nodes() {
       return [{
         name: 'expand',
-        node: isNestingExpandsSupported ? expandWithNestedExpand : expand
+        node: isNestingExpandsSchemaChanged ? expandWithNestedExpand : expand
       }, {
         name: 'nestedExpand',
         node: nestedExpand

package/dist/esm/legacyExpand/pm-plugins/main.js

@@ -17,7 +17,7 @@ export var createPlugin = function createPlugin(dispatch, getIntl) {
   var allowInteractiveExpand = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
   var __livePage = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
   var state = createPluginState(dispatch, {});
-  var isMobile = appearance === 'mobile';
+  var isMobile = false;
   return new SafePlugin({
     state: state,
     key: pluginKey,

package/dist/esm/legacyExpand/ui/ExpandIconButton.js

@@ -9,7 +9,7 @@ import _getPrototypeOf from "@babel/runtime/helpers/getPrototypeOf";
 var _excluded = ["buttonStyles"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+function _createSuper(t) { var r = _isNativeReflectConstruct(); return function () { var e, o = _getPrototypeOf(t); if (r) { var s = _getPrototypeOf(this).constructor; e = Reflect.construct(o, arguments, s); } else e = o.apply(this, arguments); return _possibleConstructorReturn(this, e); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 /**
  * @jsxRuntime classic

package/dist/esm/singlePlayerExpand/plugin.js

@@ -16,13 +16,14 @@ export var expandPlugin = function expandPlugin(_ref) {
     api = _ref.api;
   // Confluence is injecting the FF through editor props, from an experiment
   // Jira is pulling it in through platform feature flags, from a feature gate
+  var isNestingExpandsSchemaChanged = fg('platform_editor_nested_expand_in_expand_adf_change') || fg('platform_editor_nest_nested_expand_in_expand_jira');
   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');
   return {
     name: 'expand',
     nodes: function nodes() {
       return [{
         name: 'expand',
-        node: isNestingExpandsSupported ? expandWithNestedExpand : expand
+        node: isNestingExpandsSchemaChanged ? expandWithNestedExpand : expand
       }, {
         name: 'nestedExpand',
         node: nestedExpand

package/dist/esm/singlePlayerExpand/pm-plugins/main.js

@@ -14,7 +14,7 @@ export var createPlugin = function createPlugin(dispatch, getIntl) {
   var api = arguments.length > 4 ? arguments[4] : undefined;
   var allowInteractiveExpand = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : true;
   var __livePage = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
-  var isMobile = appearance === 'mobile';
+  var isMobile = false;
   return new SafePlugin({
     key: pluginKey,
     props: {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-expand",
-	"version": "2.6.0",
+	"version": "2.6.2",
 	"description": "Expand plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -10,9 +10,7 @@
 	"atlassian": {
 		"team": "Editor: Jenga",
 		"singleton": true,
-		"inPublicMirror": false,
-		"releaseModel": "continuous",
-		"runReact18": false
+		"runReact18": true
 	},
 	"repository": "https://bitbucket.org/atlassian/atlassian-frontend-mirror",
 	"main": "dist/cjs/index.js",
@@ -35,7 +33,7 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^40.9.0",
 		"@atlaskit/button": "^20.1.0",
-		"@atlaskit/editor-common": "^88.3.0",
+		"@atlaskit/editor-common": "^89.0.0",
 		"@atlaskit/editor-plugin-analytics": "^1.8.0",
 		"@atlaskit/editor-plugin-decorations": "^1.3.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^1.3.0",
@@ -44,7 +42,7 @@
 		"@atlaskit/editor-prosemirror": "5.0.1",
 		"@atlaskit/editor-shared-styles": "^2.13.0",
 		"@atlaskit/editor-tables": "^2.8.0",
-		"@atlaskit/icon": "^22.15.0",
+		"@atlaskit/icon": "^22.16.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/tooltip": "^18.7.0",
 		"@babel/runtime": "^7.0.0",
@@ -52,8 +50,8 @@
 		"w3c-keyname": "^2.1.8"
 	},
 	"peerDependencies": {
-		"react": "^16.8.0",
-		"react-dom": "^16.8.0",
+		"react": "^16.8.0 || ^17.0.0 || ~18.2.0",
+		"react-dom": "^16.8.0 || ^17.0.0 || ~18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"devDependencies": {
@@ -116,6 +114,9 @@
 		},
 		"platform_editor_nest_nested_expand_in_expand_jira": {
 			"type": "boolean"
+		},
+		"platform_editor_nested_expand_in_expand_adf_change": {
+			"type": "boolean"
 		}
 	}
 }