@atlaskit/editor-common 77.1.1 → 77.2.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-common
 
+## 77.2.0
+
+### Minor Changes
+
+- [#70612](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/70612) [`87457cd97d6b`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/87457cd97d6b) - [ux] Added a new `datasourceAppearanceTitle` i18n message.
+
+### Patch Changes
+
+- [#68372](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/68372) [`17f42e77e826`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/17f42e77e826) - add allowMediaInlineImage media option to support new media inline image feature
+- Updated dependencies
+
+## 77.1.2
+
+### Patch Changes
+
+- [#70373](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/70373) [`fdcf1d5c6b11`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/fdcf1d5c6b11) - Fix duplicate I18N IDs for media toolbar
+
 ## 77.1.1
 
 ### Patch Changes

package/dist/cjs/media-inline/index.js

@@ -45,14 +45,14 @@ Object.defineProperty(exports, "mediaInlineImageStyles", {
     return _styles.mediaInlineImageStyles;
   }
 });
-Object.defineProperty(exports, "shouldShowInlineImage", {
+Object.defineProperty(exports, "mediaInlineImagesEnabled", {
   enumerable: true,
   get: function get() {
-    return _utils.shouldShowInlineImage;
+    return _utils.mediaInlineImagesEnabled;
   }
 });
 var _mediaInlineImageCard = require("./media-inline-image-card");
-var _utils = require("./utils");
 var _inlineImageWrapper = require("./inline-image-wrapper");
 var _constants = require("./constants");
-var _styles = require("./styles");
+var _styles = require("./styles");
+var _utils = require("./utils");

package/dist/cjs/media-inline/utils.js

@@ -3,11 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.shouldShowInlineImage = void 0;
+exports.mediaInlineImagesEnabled = void 0;
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var shouldShowInlineImage = exports.shouldShowInlineImage = function shouldShowInlineImage(mediaType) {
-  if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.media.inline-image.base-support')) {
-    return mediaType === 'image';
-  }
-  return false;
+/**
+ * Enable media inline images feature based on
+ * mediaOptions.featureFlags.mediaInline, mediaOptions.allowMediaInlineImages and platform FF platform.editor.media.inline-image.base-support
+ *
+ * The reason not using mediaOption as param is because MediaOption is from editor-plugin-media
+ * we want to avoid circular deps
+ * @param allowMediaInline MediaOptions.featureFlags.mediaInline
+ * @param allowMediaInlineImages MediaOptions.allowMediaInlineImages
+ * @returns boolean
+ */
+var mediaInlineImagesEnabled = exports.mediaInlineImagesEnabled = function mediaInlineImagesEnabled(allowMediaInline, allowMediaInlineImages) {
+  return allowMediaInline && allowMediaInlineImages && (0, _platformFeatureFlags.getBooleanFF)('platform.editor.media.inline-image.base-support');
 };

package/dist/cjs/messages/card.js

@@ -91,6 +91,11 @@ var messages = exports.messages = (0, _reactIntlNext.defineMessages)({
     defaultMessage: 'Edit search query',
     description: 'Tooltip of button to edit a card into a datasource'
   },
+  datasourceAppearanceTitle: {
+    id: 'fabric.editor.datasourceAppearanceTitle',
+    defaultMessage: 'Table',
+    description: 'Tooltip of button to change to datasource table appearance'
+  },
   datasourceJiraIssue: {
     id: 'fabric.editor.datasource.jiraIssue',
     defaultMessage: 'Jira Issues',

package/dist/cjs/messages/media-and-embed-toolbar.js

@@ -22,12 +22,12 @@ var toolbarMessages = exports.toolbarMessages = (0, _reactIntlNext.defineMessage
     description: 'In the context of a media inline image, it allows the user to convert it to media single'
   },
   changeToMediaInlineImage: {
-    id: 'fabric.editor.media_change_mediainline',
+    id: 'fabric.editor.media_change_mediainline_default',
     defaultMessage: 'Inline',
     description: 'In the context of media single contains media node, it allows the user to convert media single to media inline image'
   },
-  changeToMediaInlineImageCaptionWanrning: {
-    id: 'fabric.editor.media_change_mediainline',
+  changeToMediaInlineImageCaptionWarning: {
+    id: 'fabric.editor.media_change_mediainline_caption_warn',
     defaultMessage: 'Inline (caption will be removed)',
     description: 'In the context of media single contains media node, it allows the user to convert media single to media inline image and warn user about caption being removed'
   }

package/dist/cjs/monitoring/error.js

@@ -16,7 +16,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "77.1.1";
+var packageVersion = "77.2.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/cjs/ui/DropList/index.js

@@ -22,7 +22,7 @@ var _templateObject, _templateObject2, _templateObject3;
 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 _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } /** @jsx jsx */
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "77.1.1";
+var packageVersion = "77.2.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/es2019/media-inline/index.js

@@ -1,6 +1,6 @@
 export { MediaInlineImageCard } from './media-inline-image-card';
-export { shouldShowInlineImage } from './utils';
 export { InlineImageWrapper } from './inline-image-wrapper';
 export { DEFAULT_IMAGE_WIDTH, DEFAULT_IMAGE_HEIGHT } from './constants';
 export { DEFAULT_INLINE_IMAGE_ASPECT_RATIO } from './constants';
-export { mediaInlineImageStyles, INLINE_IMAGE_WRAPPER_CLASS_NAME } from './styles';
+export { mediaInlineImageStyles, INLINE_IMAGE_WRAPPER_CLASS_NAME } from './styles';
+export { mediaInlineImagesEnabled } from './utils';

package/dist/es2019/media-inline/utils.js

@@ -1,7 +1,15 @@
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
-export const shouldShowInlineImage = mediaType => {
-  if (getBooleanFF('platform.editor.media.inline-image.base-support')) {
-    return mediaType === 'image';
-  }
-  return false;
+
+/**
+ * Enable media inline images feature based on
+ * mediaOptions.featureFlags.mediaInline, mediaOptions.allowMediaInlineImages and platform FF platform.editor.media.inline-image.base-support
+ *
+ * The reason not using mediaOption as param is because MediaOption is from editor-plugin-media
+ * we want to avoid circular deps
+ * @param allowMediaInline MediaOptions.featureFlags.mediaInline
+ * @param allowMediaInlineImages MediaOptions.allowMediaInlineImages
+ * @returns boolean
+ */
+export const mediaInlineImagesEnabled = (allowMediaInline, allowMediaInlineImages) => {
+  return allowMediaInline && allowMediaInlineImages && getBooleanFF('platform.editor.media.inline-image.base-support');
 };

package/dist/es2019/messages/card.js

@@ -85,6 +85,11 @@ export const messages = defineMessages({
     defaultMessage: 'Edit search query',
     description: 'Tooltip of button to edit a card into a datasource'
   },
+  datasourceAppearanceTitle: {
+    id: 'fabric.editor.datasourceAppearanceTitle',
+    defaultMessage: 'Table',
+    description: 'Tooltip of button to change to datasource table appearance'
+  },
   datasourceJiraIssue: {
     id: 'fabric.editor.datasource.jiraIssue',
     defaultMessage: 'Jira Issues',

package/dist/es2019/messages/media-and-embed-toolbar.js

@@ -16,12 +16,12 @@ export const toolbarMessages = defineMessages({
     description: 'In the context of a media inline image, it allows the user to convert it to media single'
   },
   changeToMediaInlineImage: {
-    id: 'fabric.editor.media_change_mediainline',
+    id: 'fabric.editor.media_change_mediainline_default',
     defaultMessage: 'Inline',
     description: 'In the context of media single contains media node, it allows the user to convert media single to media inline image'
   },
-  changeToMediaInlineImageCaptionWanrning: {
-    id: 'fabric.editor.media_change_mediainline',
+  changeToMediaInlineImageCaptionWarning: {
+    id: 'fabric.editor.media_change_mediainline_caption_warn',
     defaultMessage: 'Inline (caption will be removed)',
     description: 'In the context of media single contains media node, it allows the user to convert media single to media inline image and warn user about caption being removed'
   }

package/dist/es2019/monitoring/error.js

@@ -1,6 +1,6 @@
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "77.1.1";
+const packageVersion = "77.2.0";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/es2019/ui/DropList/index.js

@@ -7,7 +7,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "77.1.1";
+const packageVersion = "77.2.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

package/dist/esm/media-inline/index.js

@@ -1,6 +1,6 @@
 export { MediaInlineImageCard } from './media-inline-image-card';
-export { shouldShowInlineImage } from './utils';
 export { InlineImageWrapper } from './inline-image-wrapper';
 export { DEFAULT_IMAGE_WIDTH, DEFAULT_IMAGE_HEIGHT } from './constants';
 export { DEFAULT_INLINE_IMAGE_ASPECT_RATIO } from './constants';
-export { mediaInlineImageStyles, INLINE_IMAGE_WRAPPER_CLASS_NAME } from './styles';
+export { mediaInlineImageStyles, INLINE_IMAGE_WRAPPER_CLASS_NAME } from './styles';
+export { mediaInlineImagesEnabled } from './utils';

package/dist/esm/media-inline/utils.js

@@ -1,7 +1,15 @@
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
-export var shouldShowInlineImage = function shouldShowInlineImage(mediaType) {
-  if (getBooleanFF('platform.editor.media.inline-image.base-support')) {
-    return mediaType === 'image';
-  }
-  return false;
+
+/**
+ * Enable media inline images feature based on
+ * mediaOptions.featureFlags.mediaInline, mediaOptions.allowMediaInlineImages and platform FF platform.editor.media.inline-image.base-support
+ *
+ * The reason not using mediaOption as param is because MediaOption is from editor-plugin-media
+ * we want to avoid circular deps
+ * @param allowMediaInline MediaOptions.featureFlags.mediaInline
+ * @param allowMediaInlineImages MediaOptions.allowMediaInlineImages
+ * @returns boolean
+ */
+export var mediaInlineImagesEnabled = function mediaInlineImagesEnabled(allowMediaInline, allowMediaInlineImages) {
+  return allowMediaInline && allowMediaInlineImages && getBooleanFF('platform.editor.media.inline-image.base-support');
 };

package/dist/esm/messages/card.js

@@ -85,6 +85,11 @@ export var messages = defineMessages({
     defaultMessage: 'Edit search query',
     description: 'Tooltip of button to edit a card into a datasource'
   },
+  datasourceAppearanceTitle: {
+    id: 'fabric.editor.datasourceAppearanceTitle',
+    defaultMessage: 'Table',
+    description: 'Tooltip of button to change to datasource table appearance'
+  },
   datasourceJiraIssue: {
     id: 'fabric.editor.datasource.jiraIssue',
     defaultMessage: 'Jira Issues',

package/dist/esm/messages/media-and-embed-toolbar.js

@@ -16,12 +16,12 @@ export var toolbarMessages = defineMessages({
     description: 'In the context of a media inline image, it allows the user to convert it to media single'
   },
   changeToMediaInlineImage: {
-    id: 'fabric.editor.media_change_mediainline',
+    id: 'fabric.editor.media_change_mediainline_default',
     defaultMessage: 'Inline',
     description: 'In the context of media single contains media node, it allows the user to convert media single to media inline image'
   },
-  changeToMediaInlineImageCaptionWanrning: {
-    id: 'fabric.editor.media_change_mediainline',
+  changeToMediaInlineImageCaptionWarning: {
+    id: 'fabric.editor.media_change_mediainline_caption_warn',
     defaultMessage: 'Inline (caption will be removed)',
     description: 'In the context of media single contains media node, it allows the user to convert media single to media inline image and warn user about caption being removed'
   }

package/dist/esm/monitoring/error.js

@@ -6,7 +6,7 @@ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbol
 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; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "77.1.1";
+var packageVersion = "77.2.0";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // TODO: Sanitise the URL instead of just removing it

package/dist/esm/ui/DropList/index.js

@@ -17,7 +17,7 @@ import { createAndFireEvent, withAnalyticsContext, withAnalyticsEvents } from '@
 import { N0, N50A, N60A, N900 } from '@atlaskit/theme/colors';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "77.1.1";
+var packageVersion = "77.2.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/types/media-inline/index.d.ts

@@ -1,7 +1,7 @@
 export { MediaInlineImageCard } from './media-inline-image-card';
-export { shouldShowInlineImage } from './utils';
 export { InlineImageWrapper } from './inline-image-wrapper';
 export { DEFAULT_IMAGE_WIDTH, DEFAULT_IMAGE_HEIGHT } from './constants';
 export type { MediaInlineAttrs } from './types';
 export { DEFAULT_INLINE_IMAGE_ASPECT_RATIO } from './constants';
 export { mediaInlineImageStyles, INLINE_IMAGE_WRAPPER_CLASS_NAME, } from './styles';
+export { mediaInlineImagesEnabled } from './utils';

package/dist/types/media-inline/utils.d.ts

@@ -1 +1,11 @@
-export declare const shouldShowInlineImage: (mediaType: string) => boolean;
+/**
+ * Enable media inline images feature based on
+ * mediaOptions.featureFlags.mediaInline, mediaOptions.allowMediaInlineImages and platform FF platform.editor.media.inline-image.base-support
+ *
+ * The reason not using mediaOption as param is because MediaOption is from editor-plugin-media
+ * we want to avoid circular deps
+ * @param allowMediaInline MediaOptions.featureFlags.mediaInline
+ * @param allowMediaInlineImages MediaOptions.allowMediaInlineImages
+ * @returns boolean
+ */
+export declare const mediaInlineImagesEnabled: (allowMediaInline?: boolean, allowMediaInlineImages?: boolean) => boolean | undefined;

package/dist/types/messages/card.d.ts

@@ -84,6 +84,11 @@ export declare const messages: {
         defaultMessage: string;
         description: string;
     };
+    datasourceAppearanceTitle: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
     datasourceJiraIssue: {
         id: string;
         defaultMessage: string;

package/dist/types/messages/media-and-embed-toolbar.d.ts

@@ -19,7 +19,7 @@ export declare const toolbarMessages: {
         defaultMessage: string;
         description: string;
     };
-    changeToMediaInlineImageCaptionWanrning: {
+    changeToMediaInlineImageCaptionWarning: {
         id: string;
         defaultMessage: string;
         description: string;

package/dist/types-ts4.5/media-inline/index.d.ts

@@ -1,7 +1,7 @@
 export { MediaInlineImageCard } from './media-inline-image-card';
-export { shouldShowInlineImage } from './utils';
 export { InlineImageWrapper } from './inline-image-wrapper';
 export { DEFAULT_IMAGE_WIDTH, DEFAULT_IMAGE_HEIGHT } from './constants';
 export type { MediaInlineAttrs } from './types';
 export { DEFAULT_INLINE_IMAGE_ASPECT_RATIO } from './constants';
 export { mediaInlineImageStyles, INLINE_IMAGE_WRAPPER_CLASS_NAME, } from './styles';
+export { mediaInlineImagesEnabled } from './utils';

package/dist/types-ts4.5/media-inline/utils.d.ts

@@ -1 +1,11 @@
-export declare const shouldShowInlineImage: (mediaType: string) => boolean;
+/**
+ * Enable media inline images feature based on
+ * mediaOptions.featureFlags.mediaInline, mediaOptions.allowMediaInlineImages and platform FF platform.editor.media.inline-image.base-support
+ *
+ * The reason not using mediaOption as param is because MediaOption is from editor-plugin-media
+ * we want to avoid circular deps
+ * @param allowMediaInline MediaOptions.featureFlags.mediaInline
+ * @param allowMediaInlineImages MediaOptions.allowMediaInlineImages
+ * @returns boolean
+ */
+export declare const mediaInlineImagesEnabled: (allowMediaInline?: boolean, allowMediaInlineImages?: boolean) => boolean | undefined;

package/dist/types-ts4.5/messages/card.d.ts

@@ -84,6 +84,11 @@ export declare const messages: {
         defaultMessage: string;
         description: string;
     };
+    datasourceAppearanceTitle: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
     datasourceJiraIssue: {
         id: string;
         defaultMessage: string;

package/dist/types-ts4.5/messages/media-and-embed-toolbar.d.ts

@@ -19,7 +19,7 @@ export declare const toolbarMessages: {
         defaultMessage: string;
         description: string;
     };
-    changeToMediaInlineImageCaptionWanrning: {
+    changeToMediaInlineImageCaptionWarning: {
         id: string;
         defaultMessage: string;
         description: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-common",
-  "version": "77.1.1",
+  "version": "77.2.0",
   "description": "A package that contains common classes and components for editor and renderer",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -97,7 +97,7 @@
     "@atlaskit/analytics-namespaced-context": "^6.9.0",
     "@atlaskit/analytics-next": "^9.1.0",
     "@atlaskit/analytics-next-stable-react-context": "1.0.1",
-    "@atlaskit/button": "^17.2.0",
+    "@atlaskit/button": "^17.3.0",
     "@atlaskit/code": "^15.1.0",
     "@atlaskit/codemod-utils": "^4.2.0",
     "@atlaskit/custom-steps": "^0.0.11",
@@ -110,7 +110,7 @@
     "@atlaskit/icon": "^22.0.0",
     "@atlaskit/icon-object": "^6.3.0",
     "@atlaskit/in-product-testing": "^0.2.0",
-    "@atlaskit/link-datasource": "^1.19.0",
+    "@atlaskit/link-datasource": "^1.22.0",
     "@atlaskit/link-picker": "^1.33.0",
     "@atlaskit/media-card": "^77.7.0",
     "@atlaskit/media-client": "^26.1.0",