@atlaskit/editor-core 189.4.18 → 189.5.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,23 @@
1
1
  # @atlaskit/editor-core
2
2
 
3
+ ## 189.5.0
4
+
5
+ ### Minor Changes
6
+
7
+ - [#58193](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/58193) [`142df4424484`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/142df4424484) - NO-ISSUE Added new editor plugin to enable Loom video recording in the Editor
8
+
9
+ ### Patch Changes
10
+
11
+ - [#58193](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/58193) [`c03518e00722`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/c03518e00722) - NO-ISSUE Improved Loom unit tests
12
+ - Updated dependencies
13
+
14
+ ## 189.4.19
15
+
16
+ ### Patch Changes
17
+
18
+ - [#58316](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/58316) [`eb496c9a3474`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/eb496c9a3474) - Bug fixes for configuraton panel boolean & enum fields
19
+ - [#58763](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/58763) [`0fdbd64522bf`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/0fdbd64522bf) - update ADF schema
20
+
3
21
  ## 189.4.18
4
22
 
5
23
  ### Patch Changes
@@ -8,44 +8,45 @@ exports.default = createUniversalPreset;
8
8
  exports.isExpandInsertionEnabled = isExpandInsertionEnabled;
9
9
  var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
10
10
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
11
- var _plugins = require("../plugins");
11
+ var _editorPluginBorder = require("@atlaskit/editor-plugin-border");
12
+ var _editorPluginCaption = require("@atlaskit/editor-plugin-caption");
13
+ var _editorPluginCard = require("@atlaskit/editor-plugin-card");
12
14
  var _editorPluginCodeBidiWarning = require("@atlaskit/editor-plugin-code-bidi-warning");
13
- var _editorPluginTasksAndDecisions = require("@atlaskit/editor-plugin-tasks-and-decisions");
14
- var _editorPluginPanel = require("@atlaskit/editor-plugin-panel");
15
- var _editorPluginTextColor = require("@atlaskit/editor-plugin-text-color");
15
+ var _editorPluginContentInsertion = require("@atlaskit/editor-plugin-content-insertion");
16
+ var _editorPluginContextPanel = require("@atlaskit/editor-plugin-context-panel");
17
+ var _editorPluginDate = require("@atlaskit/editor-plugin-date");
18
+ var _editorPluginEmoji = require("@atlaskit/editor-plugin-emoji");
19
+ var _editorPluginExpand = require("@atlaskit/editor-plugin-expand");
20
+ var _editorPluginFragment = require("@atlaskit/editor-plugin-fragment");
21
+ var _editorPluginGrid = require("@atlaskit/editor-plugin-grid");
22
+ var _editorPluginGuideline = require("@atlaskit/editor-plugin-guideline");
23
+ var _editorPluginHelpDialog = require("@atlaskit/editor-plugin-help-dialog");
16
24
  var _editorPluginHistory = require("@atlaskit/editor-plugin-history");
25
+ var _editorPluginImageUpload = require("@atlaskit/editor-plugin-image-upload");
17
26
  var _editorPluginIndentation = require("@atlaskit/editor-plugin-indentation");
18
- var _editorPluginStatus = require("@atlaskit/editor-plugin-status");
19
27
  var _editorPluginInsertBlock = require("@atlaskit/editor-plugin-insert-block");
20
- var _editorPluginDate = require("@atlaskit/editor-plugin-date");
28
+ var _editorPluginLayout = require("@atlaskit/editor-plugin-layout");
29
+ var _editorPluginList = require("@atlaskit/editor-plugin-list");
30
+ var _editorPluginLoom = require("@atlaskit/editor-plugin-loom");
21
31
  var _editorPluginMaxContentSize = require("@atlaskit/editor-plugin-max-content-size");
22
- var _editorPluginCaption = require("@atlaskit/editor-plugin-caption");
23
- var _editorPluginBorder = require("@atlaskit/editor-plugin-border");
24
- var _editorPluginHelpDialog = require("@atlaskit/editor-plugin-help-dialog");
25
32
  var _editorPluginMedia = require("@atlaskit/editor-plugin-media");
26
- var _editorPluginRule = require("@atlaskit/editor-plugin-rule");
27
- var _editorPluginFragment = require("@atlaskit/editor-plugin-fragment");
28
- var _editorPluginEmoji = require("@atlaskit/editor-plugin-emoji");
33
+ var _editorPluginMentions = require("@atlaskit/editor-plugin-mentions");
34
+ var _editorPluginPanel = require("@atlaskit/editor-plugin-panel");
29
35
  var _editorPluginPasteOptionsToolbar = require("@atlaskit/editor-plugin-paste-options-toolbar");
30
- var _editorPluginList = require("@atlaskit/editor-plugin-list");
31
- var _editorPluginImageUpload = require("@atlaskit/editor-plugin-image-upload");
32
- var _editorPluginGuideline = require("@atlaskit/editor-plugin-guideline");
33
- var _editorPluginContextPanel = require("@atlaskit/editor-plugin-context-panel");
34
- var _editorPluginGrid = require("@atlaskit/editor-plugin-grid");
35
- var _editorPluginCard = require("@atlaskit/editor-plugin-card");
36
- var _editorPluginLayout = require("@atlaskit/editor-plugin-layout");
36
+ var _editorPluginPlaceholderText = require("@atlaskit/editor-plugin-placeholder-text");
37
+ var _editorPluginRule = require("@atlaskit/editor-plugin-rule");
38
+ var _editorPluginSaveOnEnter = require("@atlaskit/editor-plugin-save-on-enter");
39
+ var _editorPluginScrollIntoView = require("@atlaskit/editor-plugin-scroll-into-view");
40
+ var _editorPluginStatus = require("@atlaskit/editor-plugin-status");
37
41
  var _editorPluginTable = require("@atlaskit/editor-plugin-table");
42
+ var _editorPluginTasksAndDecisions = require("@atlaskit/editor-plugin-tasks-and-decisions");
43
+ var _editorPluginTextColor = require("@atlaskit/editor-plugin-text-color");
38
44
  var _editorPluginToolbarListsIndentation = require("@atlaskit/editor-plugin-toolbar-lists-indentation");
39
- var _editorPluginContentInsertion = require("@atlaskit/editor-plugin-content-insertion");
40
45
  var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
41
- var _editorPluginSaveOnEnter = require("@atlaskit/editor-plugin-save-on-enter");
42
- var _editorPluginScrollIntoView = require("@atlaskit/editor-plugin-scroll-into-view");
43
- var _editorPluginMentions = require("@atlaskit/editor-plugin-mentions");
44
- var _editorPluginPlaceholderText = require("@atlaskit/editor-plugin-placeholder-text");
45
- var _editorPluginExpand = require("@atlaskit/editor-plugin-expand");
46
+ var _plugins = require("../plugins");
47
+ var _utils = require("@atlaskit/editor-common/utils");
46
48
  var _isFullPage = require("../utils/is-full-page");
47
49
  var _default = require("./default");
48
- var _utils = require("@atlaskit/editor-common/utils");
49
50
  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; }
50
51
  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; }
51
52
  /**
@@ -419,7 +420,12 @@ function createUniversalPreset(appearance, props, featureFlags, prevAppearance,
419
420
  return builder;
420
421
  }).add([_editorPluginCodeBidiWarning.codeBidiWarningPlugin, {
421
422
  appearance: appearance
422
- }]);
423
+ }]).maybeAdd(_editorPluginLoom.loomPlugin, function (loomPlugin, builder) {
424
+ if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.loom-integration')) {
425
+ return builder.add(loomPlugin);
426
+ }
427
+ return builder;
428
+ });
423
429
  return finalPreset;
424
430
  }
425
431
  function isExpandInsertionEnabled(_ref) {
@@ -29,6 +29,12 @@ function _validate(value, isRequired) {
29
29
  return _types.ValidationError.Required;
30
30
  }
31
31
  }
32
+ function parseBoolean(value) {
33
+ if (typeof value === 'boolean') {
34
+ return value;
35
+ }
36
+ return value === 'true';
37
+ }
32
38
  function handleOnChange(onChange, onFieldChange, event) {
33
39
  var _event$target;
34
40
  onChange((event === null || event === void 0 || (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.checked) || false);
@@ -67,7 +73,7 @@ function Checkbox(_ref) {
67
73
  onChange: function onChange(event) {
68
74
  return handleOnChange(fieldProps.onChange, onFieldChange, event);
69
75
  },
70
- isChecked: isChecked
76
+ isChecked: parseBoolean(isChecked)
71
77
  })), /*#__PURE__*/_react.default.createElement(_FieldMessages.default, {
72
78
  error: error,
73
79
  description: description
@@ -110,7 +116,7 @@ function Toggle(_ref3) {
110
116
  onChange: function onChange(event) {
111
117
  return handleOnChange(fieldProps.onChange, onFieldChange, event);
112
118
  },
113
- isChecked: isChecked
119
+ isChecked: parseBoolean(isChecked)
114
120
  }))), /*#__PURE__*/_react.default.createElement(_FieldMessages.default, {
115
121
  error: error,
116
122
  description: description
@@ -45,9 +45,9 @@ function FieldComponent(_ref) {
45
45
  var parentedName = (0, _utils.getSafeParentedName)(name, parentName);
46
46
  var fieldDefaultValue = field.type === 'enum' ? field.defaultValue : undefined;
47
47
  if (name in parameters && !(0, _extensions.isFieldset)(field)) {
48
- field = _objectSpread(_objectSpread({}, field), {}, {
48
+ field = _objectSpread(_objectSpread({}, field), defaultValue != null ? {
49
49
  defaultValue: defaultValue
50
- });
50
+ } : {});
51
51
  }
52
52
  switch (field.type) {
53
53
  case 'string':
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
6
6
  });
7
7
  exports.validateRequired = exports.validate = exports.isDuplicateField = exports.getSafeParentedName = exports.getOptionFromValue = exports.getNameFromDuplicateField = exports.getLoggedParameters = void 0;
8
8
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
9
+ var _select = require("@atlaskit/select");
9
10
  var _types = require("./types");
10
11
  var _constants = require("./constants");
11
12
  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; }
@@ -19,6 +20,11 @@ var isEmptyString = function isEmptyString(value) {
19
20
  var isEmptyArray = function isEmptyArray(value) {
20
21
  return Array.isArray(value) && value.length === 0;
21
22
  };
23
+ var getUngroupedOptions = function getUngroupedOptions(groupedOptions) {
24
+ return groupedOptions.flatMap(function (option) {
25
+ return option.options;
26
+ });
27
+ };
22
28
  var validateRequired = exports.validateRequired = function validateRequired(_ref, value) {
23
29
  var isRequired = _ref.isRequired,
24
30
  isMultiple = _ref.isMultiple;
@@ -34,10 +40,20 @@ var getOptionFromValue = exports.getOptionFromValue = function getOptionFromValu
34
40
  return undefined;
35
41
  }
36
42
  if (Array.isArray(value)) {
43
+ if ((0, _select.isOptionsGrouped)(options)) {
44
+ return getUngroupedOptions(options).filter(function (option) {
45
+ return value.includes(option.value);
46
+ });
47
+ }
37
48
  return options.filter(function (option) {
38
49
  return value.includes(option.value);
39
50
  });
40
51
  }
52
+ if ((0, _select.isOptionsGrouped)(options)) {
53
+ return getUngroupedOptions(options).find(function (option) {
54
+ return value === option.value;
55
+ });
56
+ }
41
57
  return options.find(function (option) {
42
58
  return value === option.value;
43
59
  });
@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports.version = exports.name = void 0;
7
7
  var name = exports.name = "@atlaskit/editor-core";
8
- var version = exports.version = "189.4.18";
8
+ var version = exports.version = "189.5.0";
@@ -1,41 +1,42 @@
1
- import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, extensionPlugin, jiraIssuePlugin, alignmentPlugin, customAutoformatPlugin, feedbackDialogPlugin, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin } from '../plugins';
1
+ import { borderPlugin } from '@atlaskit/editor-plugin-border';
2
+ import { captionPlugin } from '@atlaskit/editor-plugin-caption';
3
+ import { cardPlugin } from '@atlaskit/editor-plugin-card';
2
4
  import { codeBidiWarningPlugin } from '@atlaskit/editor-plugin-code-bidi-warning';
3
- import { tasksAndDecisionsPlugin } from '@atlaskit/editor-plugin-tasks-and-decisions';
4
- import { panelPlugin } from '@atlaskit/editor-plugin-panel';
5
- import { textColorPlugin } from '@atlaskit/editor-plugin-text-color';
5
+ import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
6
+ import { contextPanelPlugin } from '@atlaskit/editor-plugin-context-panel';
7
+ import { datePlugin } from '@atlaskit/editor-plugin-date';
8
+ import { emojiPlugin } from '@atlaskit/editor-plugin-emoji';
9
+ import { expandPlugin } from '@atlaskit/editor-plugin-expand';
10
+ import { fragmentPlugin } from '@atlaskit/editor-plugin-fragment';
11
+ import { gridPlugin } from '@atlaskit/editor-plugin-grid';
12
+ import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
13
+ import { helpDialogPlugin } from '@atlaskit/editor-plugin-help-dialog';
6
14
  import { historyPlugin } from '@atlaskit/editor-plugin-history';
15
+ import { imageUploadPlugin } from '@atlaskit/editor-plugin-image-upload';
7
16
  import { indentationPlugin } from '@atlaskit/editor-plugin-indentation';
8
- import { statusPlugin } from '@atlaskit/editor-plugin-status';
9
17
  import { insertBlockPlugin } from '@atlaskit/editor-plugin-insert-block';
10
- import { datePlugin } from '@atlaskit/editor-plugin-date';
18
+ import { layoutPlugin } from '@atlaskit/editor-plugin-layout';
19
+ import { listPlugin } from '@atlaskit/editor-plugin-list';
20
+ import { loomPlugin } from '@atlaskit/editor-plugin-loom';
11
21
  import { maxContentSizePlugin } from '@atlaskit/editor-plugin-max-content-size';
12
- import { captionPlugin } from '@atlaskit/editor-plugin-caption';
13
- import { borderPlugin } from '@atlaskit/editor-plugin-border';
14
- import { helpDialogPlugin } from '@atlaskit/editor-plugin-help-dialog';
15
22
  import { mediaPlugin } from '@atlaskit/editor-plugin-media';
16
- import { rulePlugin } from '@atlaskit/editor-plugin-rule';
17
- import { fragmentPlugin } from '@atlaskit/editor-plugin-fragment';
18
- import { emojiPlugin } from '@atlaskit/editor-plugin-emoji';
23
+ import { mentionsPlugin } from '@atlaskit/editor-plugin-mentions';
24
+ import { panelPlugin } from '@atlaskit/editor-plugin-panel';
19
25
  import { pasteOptionsToolbarPlugin } from '@atlaskit/editor-plugin-paste-options-toolbar';
20
- import { listPlugin } from '@atlaskit/editor-plugin-list';
21
- import { imageUploadPlugin } from '@atlaskit/editor-plugin-image-upload';
22
- import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
23
- import { contextPanelPlugin } from '@atlaskit/editor-plugin-context-panel';
24
- import { gridPlugin } from '@atlaskit/editor-plugin-grid';
25
- import { cardPlugin } from '@atlaskit/editor-plugin-card';
26
- import { layoutPlugin } from '@atlaskit/editor-plugin-layout';
26
+ import { placeholderTextPlugin } from '@atlaskit/editor-plugin-placeholder-text';
27
+ import { rulePlugin } from '@atlaskit/editor-plugin-rule';
28
+ import { saveOnEnterPlugin } from '@atlaskit/editor-plugin-save-on-enter';
29
+ import { scrollIntoViewPlugin } from '@atlaskit/editor-plugin-scroll-into-view';
30
+ import { statusPlugin } from '@atlaskit/editor-plugin-status';
27
31
  import { tablesPlugin } from '@atlaskit/editor-plugin-table';
32
+ import { tasksAndDecisionsPlugin } from '@atlaskit/editor-plugin-tasks-and-decisions';
33
+ import { textColorPlugin } from '@atlaskit/editor-plugin-text-color';
28
34
  import { toolbarListsIndentationPlugin } from '@atlaskit/editor-plugin-toolbar-lists-indentation';
29
- import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
30
35
  import { getBooleanFF } from '@atlaskit/platform-feature-flags';
31
- import { saveOnEnterPlugin } from '@atlaskit/editor-plugin-save-on-enter';
32
- import { scrollIntoViewPlugin } from '@atlaskit/editor-plugin-scroll-into-view';
33
- import { mentionsPlugin } from '@atlaskit/editor-plugin-mentions';
34
- import { placeholderTextPlugin } from '@atlaskit/editor-plugin-placeholder-text';
35
- import { expandPlugin } from '@atlaskit/editor-plugin-expand';
36
+ import { alignmentPlugin, annotationPlugin, avatarGroupPlugin, beforePrimaryToolbarPlugin, breakoutPlugin, collabEditPlugin, customAutoformatPlugin, dataConsumerMarkPlugin, extensionPlugin, feedbackDialogPlugin, findReplacePlugin, jiraIssuePlugin, mobileDimensionsPlugin, mobileSelectionPlugin, viewUpdateSubscriptionPlugin } from '../plugins';
37
+ import { shouldForceTracking } from '@atlaskit/editor-common/utils';
36
38
  import { isFullPage as fullPageCheck } from '../utils/is-full-page';
37
39
  import { createDefaultPreset } from './default';
38
- import { shouldForceTracking } from '@atlaskit/editor-common/utils';
39
40
  /**
40
41
  * Creates a preset with all of the available plugins.
41
42
  * Basis for create-plugins-list and can be used to migrate from Editor -> EditorNext (Presets project)
@@ -415,7 +416,12 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
415
416
  return builder;
416
417
  }).add([codeBidiWarningPlugin, {
417
418
  appearance
418
- }]);
419
+ }]).maybeAdd(loomPlugin, (loomPlugin, builder) => {
420
+ if (getBooleanFF('platform.editor.loom-integration')) {
421
+ return builder.add(loomPlugin);
422
+ }
423
+ return builder;
424
+ });
419
425
  return finalPreset;
420
426
  }
421
427
  export function isExpandInsertionEnabled({
@@ -20,6 +20,12 @@ function validate(value, isRequired) {
20
20
  return ValidationError.Required;
21
21
  }
22
22
  }
23
+ function parseBoolean(value) {
24
+ if (typeof value === 'boolean') {
25
+ return value;
26
+ }
27
+ return value === 'true';
28
+ }
23
29
  function handleOnChange(onChange, onFieldChange, event) {
24
30
  var _event$target;
25
31
  onChange((event === null || event === void 0 ? void 0 : (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.checked) || false);
@@ -58,7 +64,7 @@ function Checkbox({
58
64
  return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(AKCheckbox, _extends({}, restFieldProps, {
59
65
  label: label,
60
66
  onChange: event => handleOnChange(fieldProps.onChange, onFieldChange, event),
61
- isChecked: isChecked
67
+ isChecked: parseBoolean(isChecked)
62
68
  })), /*#__PURE__*/React.createElement(FieldMessages, {
63
69
  error: error,
64
70
  description: description
@@ -101,7 +107,7 @@ function Toggle({
101
107
  "aria-hidden": "true"
102
108
  }, "*") : null), /*#__PURE__*/React.createElement(AKToggle, _extends({}, restFieldProps, {
103
109
  onChange: event => handleOnChange(fieldProps.onChange, onFieldChange, event),
104
- isChecked: isChecked
110
+ isChecked: parseBoolean(isChecked)
105
111
  }))), /*#__PURE__*/React.createElement(FieldMessages, {
106
112
  error: error,
107
113
  description: description
@@ -38,7 +38,9 @@ export function FieldComponent({
38
38
  if (name in parameters && !isFieldset(field)) {
39
39
  field = {
40
40
  ...field,
41
- defaultValue
41
+ ...(defaultValue != null ? {
42
+ defaultValue
43
+ } : {})
42
44
  };
43
45
  }
44
46
  switch (field.type) {
@@ -1,3 +1,4 @@
1
+ import { isOptionsGrouped } from '@atlaskit/select';
1
2
  import { ValidationError } from './types';
2
3
  import { ALLOWED_LOGGED_MACRO_PARAMS, ALLOWED_PARAM_TYPES } from './constants';
3
4
  export const validate = (field, value) => {
@@ -5,6 +6,9 @@ export const validate = (field, value) => {
5
6
  };
6
7
  const isEmptyString = value => typeof value === 'string' && value === '';
7
8
  const isEmptyArray = value => Array.isArray(value) && value.length === 0;
9
+ const getUngroupedOptions = groupedOptions => {
10
+ return groupedOptions.flatMap(option => option.options);
11
+ };
8
12
  export const validateRequired = ({
9
13
  isRequired,
10
14
  isMultiple
@@ -21,8 +25,14 @@ export const getOptionFromValue = (options, value) => {
21
25
  return undefined;
22
26
  }
23
27
  if (Array.isArray(value)) {
28
+ if (isOptionsGrouped(options)) {
29
+ return getUngroupedOptions(options).filter(option => value.includes(option.value));
30
+ }
24
31
  return options.filter(option => value.includes(option.value));
25
32
  }
33
+ if (isOptionsGrouped(options)) {
34
+ return getUngroupedOptions(options).find(option => value === option.value);
35
+ }
26
36
  return options.find(option => value === option.value);
27
37
  };
28
38
 
@@ -1,2 +1,2 @@
1
1
  export const name = "@atlaskit/editor-core";
2
- export const version = "189.4.18";
2
+ export const version = "189.5.0";
@@ -2,44 +2,45 @@ import _typeof from "@babel/runtime/helpers/typeof";
2
2
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
3
3
  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; }
4
4
  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; }
5
- import { breakoutPlugin, collabEditPlugin, dataConsumerMarkPlugin, extensionPlugin, jiraIssuePlugin, alignmentPlugin, customAutoformatPlugin, feedbackDialogPlugin, mobileDimensionsPlugin, findReplacePlugin, mobileSelectionPlugin, annotationPlugin, avatarGroupPlugin, viewUpdateSubscriptionPlugin, beforePrimaryToolbarPlugin } from '../plugins';
5
+ import { borderPlugin } from '@atlaskit/editor-plugin-border';
6
+ import { captionPlugin } from '@atlaskit/editor-plugin-caption';
7
+ import { cardPlugin } from '@atlaskit/editor-plugin-card';
6
8
  import { codeBidiWarningPlugin } from '@atlaskit/editor-plugin-code-bidi-warning';
7
- import { tasksAndDecisionsPlugin } from '@atlaskit/editor-plugin-tasks-and-decisions';
8
- import { panelPlugin } from '@atlaskit/editor-plugin-panel';
9
- import { textColorPlugin } from '@atlaskit/editor-plugin-text-color';
9
+ import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
10
+ import { contextPanelPlugin } from '@atlaskit/editor-plugin-context-panel';
11
+ import { datePlugin } from '@atlaskit/editor-plugin-date';
12
+ import { emojiPlugin } from '@atlaskit/editor-plugin-emoji';
13
+ import { expandPlugin } from '@atlaskit/editor-plugin-expand';
14
+ import { fragmentPlugin } from '@atlaskit/editor-plugin-fragment';
15
+ import { gridPlugin } from '@atlaskit/editor-plugin-grid';
16
+ import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
17
+ import { helpDialogPlugin } from '@atlaskit/editor-plugin-help-dialog';
10
18
  import { historyPlugin } from '@atlaskit/editor-plugin-history';
19
+ import { imageUploadPlugin } from '@atlaskit/editor-plugin-image-upload';
11
20
  import { indentationPlugin } from '@atlaskit/editor-plugin-indentation';
12
- import { statusPlugin } from '@atlaskit/editor-plugin-status';
13
21
  import { insertBlockPlugin } from '@atlaskit/editor-plugin-insert-block';
14
- import { datePlugin } from '@atlaskit/editor-plugin-date';
22
+ import { layoutPlugin } from '@atlaskit/editor-plugin-layout';
23
+ import { listPlugin } from '@atlaskit/editor-plugin-list';
24
+ import { loomPlugin } from '@atlaskit/editor-plugin-loom';
15
25
  import { maxContentSizePlugin } from '@atlaskit/editor-plugin-max-content-size';
16
- import { captionPlugin } from '@atlaskit/editor-plugin-caption';
17
- import { borderPlugin } from '@atlaskit/editor-plugin-border';
18
- import { helpDialogPlugin } from '@atlaskit/editor-plugin-help-dialog';
19
26
  import { mediaPlugin } from '@atlaskit/editor-plugin-media';
20
- import { rulePlugin } from '@atlaskit/editor-plugin-rule';
21
- import { fragmentPlugin } from '@atlaskit/editor-plugin-fragment';
22
- import { emojiPlugin } from '@atlaskit/editor-plugin-emoji';
27
+ import { mentionsPlugin } from '@atlaskit/editor-plugin-mentions';
28
+ import { panelPlugin } from '@atlaskit/editor-plugin-panel';
23
29
  import { pasteOptionsToolbarPlugin } from '@atlaskit/editor-plugin-paste-options-toolbar';
24
- import { listPlugin } from '@atlaskit/editor-plugin-list';
25
- import { imageUploadPlugin } from '@atlaskit/editor-plugin-image-upload';
26
- import { guidelinePlugin } from '@atlaskit/editor-plugin-guideline';
27
- import { contextPanelPlugin } from '@atlaskit/editor-plugin-context-panel';
28
- import { gridPlugin } from '@atlaskit/editor-plugin-grid';
29
- import { cardPlugin } from '@atlaskit/editor-plugin-card';
30
- import { layoutPlugin } from '@atlaskit/editor-plugin-layout';
30
+ import { placeholderTextPlugin } from '@atlaskit/editor-plugin-placeholder-text';
31
+ import { rulePlugin } from '@atlaskit/editor-plugin-rule';
32
+ import { saveOnEnterPlugin } from '@atlaskit/editor-plugin-save-on-enter';
33
+ import { scrollIntoViewPlugin } from '@atlaskit/editor-plugin-scroll-into-view';
34
+ import { statusPlugin } from '@atlaskit/editor-plugin-status';
31
35
  import { tablesPlugin } from '@atlaskit/editor-plugin-table';
36
+ import { tasksAndDecisionsPlugin } from '@atlaskit/editor-plugin-tasks-and-decisions';
37
+ import { textColorPlugin } from '@atlaskit/editor-plugin-text-color';
32
38
  import { toolbarListsIndentationPlugin } from '@atlaskit/editor-plugin-toolbar-lists-indentation';
33
- import { contentInsertionPlugin } from '@atlaskit/editor-plugin-content-insertion';
34
39
  import { getBooleanFF } from '@atlaskit/platform-feature-flags';
35
- import { saveOnEnterPlugin } from '@atlaskit/editor-plugin-save-on-enter';
36
- import { scrollIntoViewPlugin } from '@atlaskit/editor-plugin-scroll-into-view';
37
- import { mentionsPlugin } from '@atlaskit/editor-plugin-mentions';
38
- import { placeholderTextPlugin } from '@atlaskit/editor-plugin-placeholder-text';
39
- import { expandPlugin } from '@atlaskit/editor-plugin-expand';
40
+ import { alignmentPlugin, annotationPlugin, avatarGroupPlugin, beforePrimaryToolbarPlugin, breakoutPlugin, collabEditPlugin, customAutoformatPlugin, dataConsumerMarkPlugin, extensionPlugin, feedbackDialogPlugin, findReplacePlugin, jiraIssuePlugin, mobileDimensionsPlugin, mobileSelectionPlugin, viewUpdateSubscriptionPlugin } from '../plugins';
41
+ import { shouldForceTracking } from '@atlaskit/editor-common/utils';
40
42
  import { isFullPage as fullPageCheck } from '../utils/is-full-page';
41
43
  import { createDefaultPreset } from './default';
42
- import { shouldForceTracking } from '@atlaskit/editor-common/utils';
43
44
  /**
44
45
  * Creates a preset with all of the available plugins.
45
46
  * Basis for create-plugins-list and can be used to migrate from Editor -> EditorNext (Presets project)
@@ -411,7 +412,12 @@ export default function createUniversalPreset(appearance, props, featureFlags, p
411
412
  return builder;
412
413
  }).add([codeBidiWarningPlugin, {
413
414
  appearance: appearance
414
- }]);
415
+ }]).maybeAdd(loomPlugin, function (loomPlugin, builder) {
416
+ if (getBooleanFF('platform.editor.loom-integration')) {
417
+ return builder.add(loomPlugin);
418
+ }
419
+ return builder;
420
+ });
415
421
  return finalPreset;
416
422
  }
417
423
  export function isExpandInsertionEnabled(_ref) {
@@ -19,6 +19,12 @@ function _validate(value, isRequired) {
19
19
  return ValidationError.Required;
20
20
  }
21
21
  }
22
+ function parseBoolean(value) {
23
+ if (typeof value === 'boolean') {
24
+ return value;
25
+ }
26
+ return value === 'true';
27
+ }
22
28
  function handleOnChange(onChange, onFieldChange, event) {
23
29
  var _event$target;
24
30
  onChange((event === null || event === void 0 || (_event$target = event.target) === null || _event$target === void 0 ? void 0 : _event$target.checked) || false);
@@ -57,7 +63,7 @@ function Checkbox(_ref) {
57
63
  onChange: function onChange(event) {
58
64
  return handleOnChange(fieldProps.onChange, onFieldChange, event);
59
65
  },
60
- isChecked: isChecked
66
+ isChecked: parseBoolean(isChecked)
61
67
  })), /*#__PURE__*/React.createElement(FieldMessages, {
62
68
  error: error,
63
69
  description: description
@@ -100,7 +106,7 @@ function Toggle(_ref3) {
100
106
  onChange: function onChange(event) {
101
107
  return handleOnChange(fieldProps.onChange, onFieldChange, event);
102
108
  },
103
- isChecked: isChecked
109
+ isChecked: parseBoolean(isChecked)
104
110
  }))), /*#__PURE__*/React.createElement(FieldMessages, {
105
111
  error: error,
106
112
  description: description
@@ -37,9 +37,9 @@ export function FieldComponent(_ref) {
37
37
  var parentedName = getSafeParentedName(name, parentName);
38
38
  var fieldDefaultValue = field.type === 'enum' ? field.defaultValue : undefined;
39
39
  if (name in parameters && !isFieldset(field)) {
40
- field = _objectSpread(_objectSpread({}, field), {}, {
40
+ field = _objectSpread(_objectSpread({}, field), defaultValue != null ? {
41
41
  defaultValue: defaultValue
42
- });
42
+ } : {});
43
43
  }
44
44
  switch (field.type) {
45
45
  case 'string':
@@ -1,6 +1,7 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/defineProperty";
2
2
  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; }
3
3
  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; }
4
+ import { isOptionsGrouped } from '@atlaskit/select';
4
5
  import { ValidationError } from './types';
5
6
  import { ALLOWED_LOGGED_MACRO_PARAMS, ALLOWED_PARAM_TYPES } from './constants';
6
7
  export var validate = function validate(field, value) {
@@ -12,6 +13,11 @@ var isEmptyString = function isEmptyString(value) {
12
13
  var isEmptyArray = function isEmptyArray(value) {
13
14
  return Array.isArray(value) && value.length === 0;
14
15
  };
16
+ var getUngroupedOptions = function getUngroupedOptions(groupedOptions) {
17
+ return groupedOptions.flatMap(function (option) {
18
+ return option.options;
19
+ });
20
+ };
15
21
  export var validateRequired = function validateRequired(_ref, value) {
16
22
  var isRequired = _ref.isRequired,
17
23
  isMultiple = _ref.isMultiple;
@@ -27,10 +33,20 @@ export var getOptionFromValue = function getOptionFromValue(options, value) {
27
33
  return undefined;
28
34
  }
29
35
  if (Array.isArray(value)) {
36
+ if (isOptionsGrouped(options)) {
37
+ return getUngroupedOptions(options).filter(function (option) {
38
+ return value.includes(option.value);
39
+ });
40
+ }
30
41
  return options.filter(function (option) {
31
42
  return value.includes(option.value);
32
43
  });
33
44
  }
45
+ if (isOptionsGrouped(options)) {
46
+ return getUngroupedOptions(options).find(function (option) {
47
+ return value === option.value;
48
+ });
49
+ }
34
50
  return options.find(function (option) {
35
51
  return value === option.value;
36
52
  });
@@ -1,2 +1,2 @@
1
1
  export var name = "@atlaskit/editor-core";
2
- export var version = "189.4.18";
2
+ export var version = "189.5.0";
@@ -1,11 +1,11 @@
1
1
  import type { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next';
2
2
  import type { EditorAppearance } from '@atlaskit/editor-common/types';
3
+ import type { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
3
4
  import type { EditorProps } from '../types';
5
+ import type { EditorPluginFeatureProps, EditorProviderProps, EditorSharedPropsWithPlugins } from '../types/editor-props';
6
+ import type { FeatureFlags } from '../types/feature-flags';
4
7
  import type { DefaultPresetPluginOptions } from './default';
5
8
  import type { EditorPresetProps } from './types';
6
- import type { EditorSharedPropsWithPlugins, EditorPluginFeatureProps, EditorProviderProps } from '../types/editor-props';
7
- import type { FeatureFlags } from '../types/feature-flags';
8
- import type { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
9
9
  type UniversalPresetProps = EditorPresetProps & DefaultPresetPluginOptions & EditorSharedPropsWithPlugins & EditorPluginFeatureProps & EditorProviderProps;
10
10
  /**
11
11
  * Creates a preset with all of the available plugins.
@@ -1,6 +1,6 @@
1
1
  import { jsx } from '@emotion/react';
2
- import { BooleanField } from '@atlaskit/editor-common/extensions';
3
- import { OnFieldChange } from '../types';
2
+ import type { BooleanField } from '@atlaskit/editor-common/extensions';
3
+ import type { OnFieldChange } from '../types';
4
4
  export default function Boolean({ name, field, onFieldChange, }: {
5
5
  name: string;
6
6
  field: BooleanField;
@@ -1,4 +1,4 @@
1
1
  /// <reference types="react" />
2
- import { FieldComponentProps, FormContentProps } from './types';
2
+ import type { FieldComponentProps, FormContentProps } from './types';
3
3
  export declare function FieldComponent({ field, parameters, parentName, extensionManifest, firstVisibleFieldName, onFieldChange, featureFlags, }: FieldComponentProps): JSX.Element;
4
4
  export default function FormContent({ fields, parentName, parameters, extensionManifest, canRemoveFields, onClickRemove, onFieldChange, firstVisibleFieldName, contextIdentifierProvider, featureFlags, }: FormContentProps): JSX.Element;
@@ -1,3 +1,4 @@
1
+ import type { GroupBase } from 'react-select';
1
2
  import type { Option, FieldDefinition, Parameters } from '@atlaskit/editor-common/extensions';
2
3
  import { ValidationError } from './types';
3
4
  export declare const validate: <T>(field: Partial<FieldDefinition>, value: T) => ValidationError | undefined;
@@ -6,7 +7,7 @@ type ValidationProps = {
6
7
  isMultiple?: boolean;
7
8
  };
8
9
  export declare const validateRequired: <T>({ isRequired, isMultiple }: ValidationProps, value: T) => ValidationError | undefined;
9
- export declare const getOptionFromValue: (options: Option[], value: string | string[] | undefined) => Option | Option[] | undefined;
10
+ export declare const getOptionFromValue: (options: Option[] | GroupBase<Option>[], value: string | string[] | undefined) => Option | Option[] | undefined;
10
11
  export declare const getSafeParentedName: (name: string, parentName?: string) => string;
11
12
  export declare const isDuplicateField: (key: string) => boolean;
12
13
  export declare const getNameFromDuplicateField: (key: string) => string;
@@ -1,11 +1,11 @@
1
1
  import type { CreateUIAnalyticsEvent } from '@atlaskit/analytics-next';
2
2
  import type { EditorAppearance } from '@atlaskit/editor-common/types';
3
+ import type { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
3
4
  import type { EditorProps } from '../types';
5
+ import type { EditorPluginFeatureProps, EditorProviderProps, EditorSharedPropsWithPlugins } from '../types/editor-props';
6
+ import type { FeatureFlags } from '../types/feature-flags';
4
7
  import type { DefaultPresetPluginOptions } from './default';
5
8
  import type { EditorPresetProps } from './types';
6
- import type { EditorSharedPropsWithPlugins, EditorPluginFeatureProps, EditorProviderProps } from '../types/editor-props';
7
- import type { FeatureFlags } from '../types/feature-flags';
8
- import type { EditorPresetBuilder } from '@atlaskit/editor-common/preset';
9
9
  type UniversalPresetProps = EditorPresetProps & DefaultPresetPluginOptions & EditorSharedPropsWithPlugins & EditorPluginFeatureProps & EditorProviderProps;
10
10
  /**
11
11
  * Creates a preset with all of the available plugins.
@@ -1,6 +1,6 @@
1
1
  import { jsx } from '@emotion/react';
2
- import { BooleanField } from '@atlaskit/editor-common/extensions';
3
- import { OnFieldChange } from '../types';
2
+ import type { BooleanField } from '@atlaskit/editor-common/extensions';
3
+ import type { OnFieldChange } from '../types';
4
4
  export default function Boolean({ name, field, onFieldChange, }: {
5
5
  name: string;
6
6
  field: BooleanField;
@@ -1,4 +1,4 @@
1
1
  /// <reference types="react" />
2
- import { FieldComponentProps, FormContentProps } from './types';
2
+ import type { FieldComponentProps, FormContentProps } from './types';
3
3
  export declare function FieldComponent({ field, parameters, parentName, extensionManifest, firstVisibleFieldName, onFieldChange, featureFlags, }: FieldComponentProps): JSX.Element;
4
4
  export default function FormContent({ fields, parentName, parameters, extensionManifest, canRemoveFields, onClickRemove, onFieldChange, firstVisibleFieldName, contextIdentifierProvider, featureFlags, }: FormContentProps): JSX.Element;
@@ -1,3 +1,4 @@
1
+ import type { GroupBase } from 'react-select';
1
2
  import type { Option, FieldDefinition, Parameters } from '@atlaskit/editor-common/extensions';
2
3
  import { ValidationError } from './types';
3
4
  export declare const validate: <T>(field: Partial<FieldDefinition>, value: T) => ValidationError | undefined;
@@ -6,7 +7,7 @@ type ValidationProps = {
6
7
  isMultiple?: boolean;
7
8
  };
8
9
  export declare const validateRequired: <T>({ isRequired, isMultiple }: ValidationProps, value: T) => ValidationError | undefined;
9
- export declare const getOptionFromValue: (options: Option[], value: string | string[] | undefined) => Option | Option[] | undefined;
10
+ export declare const getOptionFromValue: (options: Option[] | GroupBase<Option>[], value: string | string[] | undefined) => Option | Option[] | undefined;
10
11
  export declare const getSafeParentedName: (name: string, parentName?: string) => string;
11
12
  export declare const isDuplicateField: (key: string) => boolean;
12
13
  export declare const getNameFromDuplicateField: (key: string) => string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-core",
3
- "version": "189.4.18",
3
+ "version": "189.5.0",
4
4
  "description": "A package contains Atlassian editor core functionality",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -40,7 +40,7 @@
40
40
  },
41
41
  "dependencies": {
42
42
  "@atlaskit/activity-provider": "^2.4.0",
43
- "@atlaskit/adf-schema": "^34.0.1",
43
+ "@atlaskit/adf-schema": "^35.0.0",
44
44
  "@atlaskit/adf-utils": "^19.0.0",
45
45
  "@atlaskit/analytics-namespaced-context": "^6.7.0",
46
46
  "@atlaskit/analytics-next": "^9.1.0",
@@ -51,7 +51,7 @@
51
51
  "@atlaskit/checkbox": "^13.0.0",
52
52
  "@atlaskit/date": "^0.10.0",
53
53
  "@atlaskit/datetime-picker": "^13.0.0",
54
- "@atlaskit/editor-common": "^76.24.0",
54
+ "@atlaskit/editor-common": "^76.25.0",
55
55
  "@atlaskit/editor-json-transformer": "^8.10.0",
56
56
  "@atlaskit/editor-markdown-transformer": "^5.2.5",
57
57
  "@atlaskit/editor-plugin-analytics": "^0.3.0",
@@ -89,6 +89,7 @@
89
89
  "@atlaskit/editor-plugin-insert-block": "^0.2.0",
90
90
  "@atlaskit/editor-plugin-layout": "^0.1.0",
91
91
  "@atlaskit/editor-plugin-list": "^1.4.0",
92
+ "@atlaskit/editor-plugin-loom": "^0.1.0",
92
93
  "@atlaskit/editor-plugin-max-content-size": "^0.1.0",
93
94
  "@atlaskit/editor-plugin-media": "^0.4.0",
94
95
  "@atlaskit/editor-plugin-mentions": "^0.1.0",
@@ -170,7 +171,7 @@
170
171
  "@af/visual-regression": "*",
171
172
  "@atlaskit/analytics-listeners": "^8.7.0",
172
173
  "@atlaskit/code": "^15.1.0",
173
- "@atlaskit/collab-provider": "9.18.1",
174
+ "@atlaskit/collab-provider": "9.18.2",
174
175
  "@atlaskit/dropdown-menu": "^12.1.0",
175
176
  "@atlaskit/editor-extension-dropbox": "^0.4.0",
176
177
  "@atlaskit/editor-palette": "1.5.2",
@@ -349,6 +350,9 @@
349
350
  "platform.editor.ordered-list-auto-join-improvements_mrlv5": {
350
351
  "type": "boolean",
351
352
  "referenceOnly": "true"
353
+ },
354
+ "platform.editor.loom-integration": {
355
+ "type": "boolean"
352
356
  }
353
357
  }
354
358
  }