@atlaskit/editor-core 189.4.18 → 189.4.19

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @atlaskit/editor-core
 
+## 189.4.19
+
+### Patch Changes
+
+- [#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
+- [#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
+
 ## 189.4.18
 
 ### Patch Changes

package/dist/cjs/ui/ConfigPanel/Fields/Boolean.js

@@ -29,6 +29,12 @@ function _validate(value, isRequired) {
     return _types.ValidationError.Required;
   }
 }
+function parseBoolean(value) {
+  if (typeof value === 'boolean') {
+    return value;
+  }
+  return value === 'true';
+}
 function handleOnChange(onChange, onFieldChange, event) {
   var _event$target;
   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) {
       onChange: function onChange(event) {
         return handleOnChange(fieldProps.onChange, onFieldChange, event);
       },
-      isChecked: isChecked
+      isChecked: parseBoolean(isChecked)
     })), /*#__PURE__*/_react.default.createElement(_FieldMessages.default, {
       error: error,
       description: description
@@ -110,7 +116,7 @@ function Toggle(_ref3) {
       onChange: function onChange(event) {
         return handleOnChange(fieldProps.onChange, onFieldChange, event);
       },
-      isChecked: isChecked
+      isChecked: parseBoolean(isChecked)
     }))), /*#__PURE__*/_react.default.createElement(_FieldMessages.default, {
       error: error,
       description: description

package/dist/cjs/ui/ConfigPanel/FormContent.js

@@ -45,9 +45,9 @@ function FieldComponent(_ref) {
   var parentedName = (0, _utils.getSafeParentedName)(name, parentName);
   var fieldDefaultValue = field.type === 'enum' ? field.defaultValue : undefined;
   if (name in parameters && !(0, _extensions.isFieldset)(field)) {
-    field = _objectSpread(_objectSpread({}, field), {}, {
+    field = _objectSpread(_objectSpread({}, field), defaultValue != null ? {
       defaultValue: defaultValue
-    });
+    } : {});
   }
   switch (field.type) {
     case 'string':

package/dist/cjs/ui/ConfigPanel/utils.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.validateRequired = exports.validate = exports.isDuplicateField = exports.getSafeParentedName = exports.getOptionFromValue = exports.getNameFromDuplicateField = exports.getLoggedParameters = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _select = require("@atlaskit/select");
 var _types = require("./types");
 var _constants = require("./constants");
 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) {
 var isEmptyArray = function isEmptyArray(value) {
   return Array.isArray(value) && value.length === 0;
 };
+var getUngroupedOptions = function getUngroupedOptions(groupedOptions) {
+  return groupedOptions.flatMap(function (option) {
+    return option.options;
+  });
+};
 var validateRequired = exports.validateRequired = function validateRequired(_ref, value) {
   var isRequired = _ref.isRequired,
     isMultiple = _ref.isMultiple;
@@ -34,10 +40,20 @@ var getOptionFromValue = exports.getOptionFromValue = function getOptionFromValu
     return undefined;
   }
   if (Array.isArray(value)) {
+    if ((0, _select.isOptionsGrouped)(options)) {
+      return getUngroupedOptions(options).filter(function (option) {
+        return value.includes(option.value);
+      });
+    }
     return options.filter(function (option) {
       return value.includes(option.value);
     });
   }
+  if ((0, _select.isOptionsGrouped)(options)) {
+    return getUngroupedOptions(options).find(function (option) {
+      return value === option.value;
+    });
+  }
   return options.find(function (option) {
     return value === option.value;
   });

package/dist/cjs/version-wrapper.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "189.4.18";
+var version = exports.version = "189.4.19";

package/dist/es2019/ui/ConfigPanel/Fields/Boolean.js

@@ -20,6 +20,12 @@ function validate(value, isRequired) {
     return ValidationError.Required;
   }
 }
+function parseBoolean(value) {
+  if (typeof value === 'boolean') {
+    return value;
+  }
+  return value === 'true';
+}
 function handleOnChange(onChange, onFieldChange, event) {
   var _event$target;
   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({
     return /*#__PURE__*/React.createElement(Fragment, null, /*#__PURE__*/React.createElement(AKCheckbox, _extends({}, restFieldProps, {
       label: label,
       onChange: event => handleOnChange(fieldProps.onChange, onFieldChange, event),
-      isChecked: isChecked
+      isChecked: parseBoolean(isChecked)
     })), /*#__PURE__*/React.createElement(FieldMessages, {
       error: error,
       description: description
@@ -101,7 +107,7 @@ function Toggle({
       "aria-hidden": "true"
     }, "*") : null), /*#__PURE__*/React.createElement(AKToggle, _extends({}, restFieldProps, {
       onChange: event => handleOnChange(fieldProps.onChange, onFieldChange, event),
-      isChecked: isChecked
+      isChecked: parseBoolean(isChecked)
     }))), /*#__PURE__*/React.createElement(FieldMessages, {
       error: error,
       description: description

package/dist/es2019/ui/ConfigPanel/FormContent.js

@@ -38,7 +38,9 @@ export function FieldComponent({
   if (name in parameters && !isFieldset(field)) {
     field = {
       ...field,
-      defaultValue
+      ...(defaultValue != null ? {
+        defaultValue
+      } : {})
     };
   }
   switch (field.type) {

package/dist/es2019/ui/ConfigPanel/utils.js

@@ -1,3 +1,4 @@
+import { isOptionsGrouped } from '@atlaskit/select';
 import { ValidationError } from './types';
 import { ALLOWED_LOGGED_MACRO_PARAMS, ALLOWED_PARAM_TYPES } from './constants';
 export const validate = (field, value) => {
@@ -5,6 +6,9 @@ export const validate = (field, value) => {
 };
 const isEmptyString = value => typeof value === 'string' && value === '';
 const isEmptyArray = value => Array.isArray(value) && value.length === 0;
+const getUngroupedOptions = groupedOptions => {
+  return groupedOptions.flatMap(option => option.options);
+};
 export const validateRequired = ({
   isRequired,
   isMultiple
@@ -21,8 +25,14 @@ export const getOptionFromValue = (options, value) => {
     return undefined;
   }
   if (Array.isArray(value)) {
+    if (isOptionsGrouped(options)) {
+      return getUngroupedOptions(options).filter(option => value.includes(option.value));
+    }
     return options.filter(option => value.includes(option.value));
   }
+  if (isOptionsGrouped(options)) {
+    return getUngroupedOptions(options).find(option => value === option.value);
+  }
   return options.find(option => value === option.value);
 };
 

package/dist/es2019/version-wrapper.js

@@ -1,2 +1,2 @@
 export const name = "@atlaskit/editor-core";
-export const version = "189.4.18";
+export const version = "189.4.19";

package/dist/esm/ui/ConfigPanel/Fields/Boolean.js

@@ -19,6 +19,12 @@ function _validate(value, isRequired) {
     return ValidationError.Required;
   }
 }
+function parseBoolean(value) {
+  if (typeof value === 'boolean') {
+    return value;
+  }
+  return value === 'true';
+}
 function handleOnChange(onChange, onFieldChange, event) {
   var _event$target;
   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) {
       onChange: function onChange(event) {
         return handleOnChange(fieldProps.onChange, onFieldChange, event);
       },
-      isChecked: isChecked
+      isChecked: parseBoolean(isChecked)
     })), /*#__PURE__*/React.createElement(FieldMessages, {
       error: error,
       description: description
@@ -100,7 +106,7 @@ function Toggle(_ref3) {
       onChange: function onChange(event) {
         return handleOnChange(fieldProps.onChange, onFieldChange, event);
       },
-      isChecked: isChecked
+      isChecked: parseBoolean(isChecked)
     }))), /*#__PURE__*/React.createElement(FieldMessages, {
       error: error,
       description: description

package/dist/esm/ui/ConfigPanel/FormContent.js

@@ -37,9 +37,9 @@ export function FieldComponent(_ref) {
   var parentedName = getSafeParentedName(name, parentName);
   var fieldDefaultValue = field.type === 'enum' ? field.defaultValue : undefined;
   if (name in parameters && !isFieldset(field)) {
-    field = _objectSpread(_objectSpread({}, field), {}, {
+    field = _objectSpread(_objectSpread({}, field), defaultValue != null ? {
       defaultValue: defaultValue
-    });
+    } : {});
   }
   switch (field.type) {
     case 'string':

package/dist/esm/ui/ConfigPanel/utils.js

@@ -1,6 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 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; }
+import { isOptionsGrouped } from '@atlaskit/select';
 import { ValidationError } from './types';
 import { ALLOWED_LOGGED_MACRO_PARAMS, ALLOWED_PARAM_TYPES } from './constants';
 export var validate = function validate(field, value) {
@@ -12,6 +13,11 @@ var isEmptyString = function isEmptyString(value) {
 var isEmptyArray = function isEmptyArray(value) {
   return Array.isArray(value) && value.length === 0;
 };
+var getUngroupedOptions = function getUngroupedOptions(groupedOptions) {
+  return groupedOptions.flatMap(function (option) {
+    return option.options;
+  });
+};
 export var validateRequired = function validateRequired(_ref, value) {
   var isRequired = _ref.isRequired,
     isMultiple = _ref.isMultiple;
@@ -27,10 +33,20 @@ export var getOptionFromValue = function getOptionFromValue(options, value) {
     return undefined;
   }
   if (Array.isArray(value)) {
+    if (isOptionsGrouped(options)) {
+      return getUngroupedOptions(options).filter(function (option) {
+        return value.includes(option.value);
+      });
+    }
     return options.filter(function (option) {
       return value.includes(option.value);
     });
   }
+  if (isOptionsGrouped(options)) {
+    return getUngroupedOptions(options).find(function (option) {
+      return value === option.value;
+    });
+  }
   return options.find(function (option) {
     return value === option.value;
   });

package/dist/esm/version-wrapper.js

@@ -1,2 +1,2 @@
 export var name = "@atlaskit/editor-core";
-export var version = "189.4.18";
+export var version = "189.4.19";

package/dist/types/ui/ConfigPanel/Fields/Boolean.d.ts

@@ -1,6 +1,6 @@
 import { jsx } from '@emotion/react';
-import { BooleanField } from '@atlaskit/editor-common/extensions';
-import { OnFieldChange } from '../types';
+import type { BooleanField } from '@atlaskit/editor-common/extensions';
+import type { OnFieldChange } from '../types';
 export default function Boolean({ name, field, onFieldChange, }: {
     name: string;
     field: BooleanField;

package/dist/types/ui/ConfigPanel/FormContent.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
-import { FieldComponentProps, FormContentProps } from './types';
+import type { FieldComponentProps, FormContentProps } from './types';
 export declare function FieldComponent({ field, parameters, parentName, extensionManifest, firstVisibleFieldName, onFieldChange, featureFlags, }: FieldComponentProps): JSX.Element;
 export default function FormContent({ fields, parentName, parameters, extensionManifest, canRemoveFields, onClickRemove, onFieldChange, firstVisibleFieldName, contextIdentifierProvider, featureFlags, }: FormContentProps): JSX.Element;

package/dist/types/ui/ConfigPanel/utils.d.ts

@@ -1,3 +1,4 @@
+import type { GroupBase } from 'react-select';
 import type { Option, FieldDefinition, Parameters } from '@atlaskit/editor-common/extensions';
 import { ValidationError } from './types';
 export declare const validate: <T>(field: Partial<FieldDefinition>, value: T) => ValidationError | undefined;
@@ -6,7 +7,7 @@ type ValidationProps = {
     isMultiple?: boolean;
 };
 export declare const validateRequired: <T>({ isRequired, isMultiple }: ValidationProps, value: T) => ValidationError | undefined;
-export declare const getOptionFromValue: (options: Option[], value: string | string[] | undefined) => Option | Option[] | undefined;
+export declare const getOptionFromValue: (options: Option[] | GroupBase<Option>[], value: string | string[] | undefined) => Option | Option[] | undefined;
 export declare const getSafeParentedName: (name: string, parentName?: string) => string;
 export declare const isDuplicateField: (key: string) => boolean;
 export declare const getNameFromDuplicateField: (key: string) => string;

package/dist/types-ts4.5/ui/ConfigPanel/Fields/Boolean.d.ts

@@ -1,6 +1,6 @@
 import { jsx } from '@emotion/react';
-import { BooleanField } from '@atlaskit/editor-common/extensions';
-import { OnFieldChange } from '../types';
+import type { BooleanField } from '@atlaskit/editor-common/extensions';
+import type { OnFieldChange } from '../types';
 export default function Boolean({ name, field, onFieldChange, }: {
     name: string;
     field: BooleanField;

package/dist/types-ts4.5/ui/ConfigPanel/FormContent.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
-import { FieldComponentProps, FormContentProps } from './types';
+import type { FieldComponentProps, FormContentProps } from './types';
 export declare function FieldComponent({ field, parameters, parentName, extensionManifest, firstVisibleFieldName, onFieldChange, featureFlags, }: FieldComponentProps): JSX.Element;
 export default function FormContent({ fields, parentName, parameters, extensionManifest, canRemoveFields, onClickRemove, onFieldChange, firstVisibleFieldName, contextIdentifierProvider, featureFlags, }: FormContentProps): JSX.Element;

package/dist/types-ts4.5/ui/ConfigPanel/utils.d.ts

@@ -1,3 +1,4 @@
+import type { GroupBase } from 'react-select';
 import type { Option, FieldDefinition, Parameters } from '@atlaskit/editor-common/extensions';
 import { ValidationError } from './types';
 export declare const validate: <T>(field: Partial<FieldDefinition>, value: T) => ValidationError | undefined;
@@ -6,7 +7,7 @@ type ValidationProps = {
     isMultiple?: boolean;
 };
 export declare const validateRequired: <T>({ isRequired, isMultiple }: ValidationProps, value: T) => ValidationError | undefined;
-export declare const getOptionFromValue: (options: Option[], value: string | string[] | undefined) => Option | Option[] | undefined;
+export declare const getOptionFromValue: (options: Option[] | GroupBase<Option>[], value: string | string[] | undefined) => Option | Option[] | undefined;
 export declare const getSafeParentedName: (name: string, parentName?: string) => string;
 export declare const isDuplicateField: (key: string) => boolean;
 export declare const getNameFromDuplicateField: (key: string) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-core",
-  "version": "189.4.18",
+  "version": "189.4.19",
   "description": "A package contains Atlassian editor core functionality",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@atlaskit/activity-provider": "^2.4.0",
-    "@atlaskit/adf-schema": "^34.0.1",
+    "@atlaskit/adf-schema": "^35.0.0",
     "@atlaskit/adf-utils": "^19.0.0",
     "@atlaskit/analytics-namespaced-context": "^6.7.0",
     "@atlaskit/analytics-next": "^9.1.0",
@@ -170,7 +170,7 @@
     "@af/visual-regression": "*",
     "@atlaskit/analytics-listeners": "^8.7.0",
     "@atlaskit/code": "^15.1.0",
-    "@atlaskit/collab-provider": "9.18.1",
+    "@atlaskit/collab-provider": "9.18.2",
     "@atlaskit/dropdown-menu": "^12.1.0",
     "@atlaskit/editor-extension-dropbox": "^0.4.0",
     "@atlaskit/editor-palette": "1.5.2",