@atlaskit/editor-common 95.6.3 → 95.7.0

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-common
 
+## 95.7.0
+
+### Minor Changes
+
+- [#168624](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/168624)
+  [`6d928c0cb9227`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6d928c0cb9227) -
+  [ux] [ED-25832] Hide external image badges for atlassian.com domains
+
+### Patch Changes
+
+- [#165765](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/165765)
+  [`3f441f30e6507`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/3f441f30e6507) -
+  Bump adf-schema to 46.0.0
+- Updated dependencies
+
 ## 95.6.3
 
 ### Patch Changes

package/dist/cjs/media-single/ExternalImageBadge.js

@@ -4,10 +4,11 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.ExternalImageBadge = void 0;
+exports.isUnbadgedHostname = exports.ExternalImageBadge = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _reactIntlNext = require("react-intl-next");
 var _info = _interopRequireDefault(require("@atlaskit/icon/glyph/info"));
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _primitives = require("@atlaskit/primitives");
 var _tooltip = _interopRequireDefault(require("@atlaskit/tooltip"));
 var _media = require("../media");
@@ -17,10 +18,35 @@ var baseStyles = (0, _primitives.xcss)({
   lineHeight: "var(--ds-space-200, 16px)",
   cursor: 'pointer'
 });
+
+// On cleanup of 'platform_editor_hide_external_media_badge', make types non-optional
+
+var NO_EXTERNAL_BADGE_HOSTS = ['atlassian.com'];
+var isUnbadgedHostname = exports.isUnbadgedHostname = function isUnbadgedHostname(hostname) {
+  return Boolean(hostname &&
+  // Do not show badge for atlassian domains and subdomains
+  NO_EXTERNAL_BADGE_HOSTS.some(function (host) {
+    return hostname === host || hostname.endsWith(".".concat(host));
+  }));
+};
 var ExternalImageBadge = exports.ExternalImageBadge = function ExternalImageBadge(_ref) {
-  var badgeSize = _ref.badgeSize;
+  var badgeSize = _ref.badgeSize,
+    type = _ref.type,
+    url = _ref.url;
   var intl = (0, _reactIntlNext.useIntl)();
   var message = intl.formatMessage(_media.externalMediaMessages.externalMediaFile);
+  if ((0, _platformFeatureFlags.fg)('platform_editor_hide_external_media_badge')) {
+    var hostname;
+    try {
+      var _URL = new URL(url || '');
+      hostname = _URL.hostname;
+    } catch (e) {
+      // If the URL is invalid (or empty), just carry on showing the badge
+    }
+    if (type !== 'external' || isUnbadgedHostname(hostname)) {
+      return null;
+    }
+  }
   return /*#__PURE__*/_react.default.createElement(_primitives.Box, {
     padding: badgeSize === 'medium' ? 'space.050' : 'space.0',
     xcss: baseStyles,

package/dist/cjs/messages/layout.js

@@ -46,6 +46,16 @@ var toolbarMessages = exports.toolbarMessages = (0, _reactIntlNext.defineMessage
     defaultMessage: 'Three columns with sidebars layout',
     description: 'Layout with 3 columns laid out as 25% - 50% - 25%'
   },
+  threeColumnsWithLeftSidebars: {
+    id: 'fabric.editor.threeColumnsWithLeftSidebars',
+    defaultMessage: 'Three columns with left sidebar layout',
+    description: 'Layout with 3 columns laid out as 25% - 25% - 50%'
+  },
+  threeColumnsWithRightSidebars: {
+    id: 'fabric.editor.threeColumnsWithRightSidebars',
+    defaultMessage: 'Three columns with right sidebar layout',
+    description: 'Layout with 3 columns laid out as 50% - 25% - 25%'
+  },
   floatingToolbarRadioGroupAriaLabel: {
     id: 'fabric.editor.floatingToolbar.floatingToolbarRadioGroupAriaLabel',
     defaultMessage: 'Layout options',

package/dist/cjs/monitoring/error.js

@@ -17,7 +17,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 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; }
 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 = "95.6.3";
+var packageVersion = "95.7.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

@@ -24,7 +24,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "95.6.3";
+var packageVersion = "95.7.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/es2019/media-single/ExternalImageBadge.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { useIntl } from 'react-intl-next';
 import InfoIcon from '@atlaskit/icon/glyph/info';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, xcss } from '@atlaskit/primitives';
 import Tooltip from '@atlaskit/tooltip';
 import { externalMediaMessages } from '../media';
@@ -10,11 +11,33 @@ const baseStyles = xcss({
   lineHeight: "var(--ds-space-200, 16px)",
   cursor: 'pointer'
 });
+
+// On cleanup of 'platform_editor_hide_external_media_badge', make types non-optional
+
+const NO_EXTERNAL_BADGE_HOSTS = ['atlassian.com'];
+export const isUnbadgedHostname = hostname => Boolean(hostname &&
+// Do not show badge for atlassian domains and subdomains
+NO_EXTERNAL_BADGE_HOSTS.some(host => hostname === host || hostname.endsWith(`.${host}`)));
 export const ExternalImageBadge = ({
-  badgeSize
+  badgeSize,
+  type,
+  url
 }) => {
   const intl = useIntl();
   const message = intl.formatMessage(externalMediaMessages.externalMediaFile);
+  if (fg('platform_editor_hide_external_media_badge')) {
+    let hostname;
+    try {
+      ({
+        hostname
+      } = new URL(url || ''));
+    } catch (e) {
+      // If the URL is invalid (or empty), just carry on showing the badge
+    }
+    if (type !== 'external' || isUnbadgedHostname(hostname)) {
+      return null;
+    }
+  }
   return /*#__PURE__*/React.createElement(Box, {
     padding: badgeSize === 'medium' ? 'space.050' : 'space.0',
     xcss: baseStyles,

package/dist/es2019/messages/layout.js

@@ -40,6 +40,16 @@ export const toolbarMessages = defineMessages({
     defaultMessage: 'Three columns with sidebars layout',
     description: 'Layout with 3 columns laid out as 25% - 50% - 25%'
   },
+  threeColumnsWithLeftSidebars: {
+    id: 'fabric.editor.threeColumnsWithLeftSidebars',
+    defaultMessage: 'Three columns with left sidebar layout',
+    description: 'Layout with 3 columns laid out as 25% - 25% - 50%'
+  },
+  threeColumnsWithRightSidebars: {
+    id: 'fabric.editor.threeColumnsWithRightSidebars',
+    defaultMessage: 'Three columns with right sidebar layout',
+    description: 'Layout with 3 columns laid out as 50% - 25% - 25%'
+  },
   floatingToolbarRadioGroupAriaLabel: {
     id: 'fabric.editor.floatingToolbar.floatingToolbarRadioGroupAriaLabel',
     defaultMessage: 'Layout options',

package/dist/es2019/monitoring/error.js

@@ -1,7 +1,7 @@
 import { isFedRamp } from './environment';
 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 = "95.6.3";
+const packageVersion = "95.7.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

@@ -13,7 +13,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "95.6.3";
+const packageVersion = "95.7.0";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 class DropList extends Component {

package/dist/esm/media-single/ExternalImageBadge.js

@@ -1,6 +1,7 @@
 import React from 'react';
 import { useIntl } from 'react-intl-next';
 import InfoIcon from '@atlaskit/icon/glyph/info';
+import { fg } from '@atlaskit/platform-feature-flags';
 import { Box, xcss } from '@atlaskit/primitives';
 import Tooltip from '@atlaskit/tooltip';
 import { externalMediaMessages } from '../media';
@@ -10,10 +11,35 @@ var baseStyles = xcss({
   lineHeight: "var(--ds-space-200, 16px)",
   cursor: 'pointer'
 });
+
+// On cleanup of 'platform_editor_hide_external_media_badge', make types non-optional
+
+var NO_EXTERNAL_BADGE_HOSTS = ['atlassian.com'];
+export var isUnbadgedHostname = function isUnbadgedHostname(hostname) {
+  return Boolean(hostname &&
+  // Do not show badge for atlassian domains and subdomains
+  NO_EXTERNAL_BADGE_HOSTS.some(function (host) {
+    return hostname === host || hostname.endsWith(".".concat(host));
+  }));
+};
 export var ExternalImageBadge = function ExternalImageBadge(_ref) {
-  var badgeSize = _ref.badgeSize;
+  var badgeSize = _ref.badgeSize,
+    type = _ref.type,
+    url = _ref.url;
   var intl = useIntl();
   var message = intl.formatMessage(externalMediaMessages.externalMediaFile);
+  if (fg('platform_editor_hide_external_media_badge')) {
+    var hostname;
+    try {
+      var _URL = new URL(url || '');
+      hostname = _URL.hostname;
+    } catch (e) {
+      // If the URL is invalid (or empty), just carry on showing the badge
+    }
+    if (type !== 'external' || isUnbadgedHostname(hostname)) {
+      return null;
+    }
+  }
   return /*#__PURE__*/React.createElement(Box, {
     padding: badgeSize === 'medium' ? 'space.050' : 'space.0',
     xcss: baseStyles,

package/dist/esm/messages/layout.js

@@ -40,6 +40,16 @@ export var toolbarMessages = defineMessages({
     defaultMessage: 'Three columns with sidebars layout',
     description: 'Layout with 3 columns laid out as 25% - 50% - 25%'
   },
+  threeColumnsWithLeftSidebars: {
+    id: 'fabric.editor.threeColumnsWithLeftSidebars',
+    defaultMessage: 'Three columns with left sidebar layout',
+    description: 'Layout with 3 columns laid out as 25% - 25% - 50%'
+  },
+  threeColumnsWithRightSidebars: {
+    id: 'fabric.editor.threeColumnsWithRightSidebars',
+    defaultMessage: 'Three columns with right sidebar layout',
+    description: 'Layout with 3 columns laid out as 50% - 25% - 25%'
+  },
   floatingToolbarRadioGroupAriaLabel: {
     id: 'fabric.editor.floatingToolbar.floatingToolbarRadioGroupAriaLabel',
     defaultMessage: 'Layout options',

package/dist/esm/monitoring/error.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { isFedRamp } from './environment';
 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 = "95.6.3";
+var packageVersion = "95.7.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

@@ -21,7 +21,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "95.6.3";
+var packageVersion = "95.7.0";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 var DropList = /*#__PURE__*/function (_Component) {

package/dist/types/media-single/ExternalImageBadge.d.ts

@@ -1,6 +1,10 @@
 /// <reference types="react" />
+import { type MediaType } from '@atlaskit/adf-schema';
 type ExternalImageBadgeProps = {
     badgeSize: 'medium' | 'small';
+    type?: MediaType;
+    url?: string | undefined;
 };
-export declare const ExternalImageBadge: ({ badgeSize }: ExternalImageBadgeProps) => JSX.Element;
+export declare const isUnbadgedHostname: (hostname: string | undefined) => boolean;
+export declare const ExternalImageBadge: ({ badgeSize, type, url }: ExternalImageBadgeProps) => JSX.Element | null;
 export {};

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

@@ -39,6 +39,16 @@ export declare const toolbarMessages: {
         defaultMessage: string;
         description: string;
     };
+    threeColumnsWithLeftSidebars: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
+    threeColumnsWithRightSidebars: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
     floatingToolbarRadioGroupAriaLabel: {
         id: string;
         defaultMessage: string;

package/dist/types-ts4.5/media-single/ExternalImageBadge.d.ts

@@ -1,6 +1,10 @@
 /// <reference types="react" />
+import { type MediaType } from '@atlaskit/adf-schema';
 type ExternalImageBadgeProps = {
     badgeSize: 'medium' | 'small';
+    type?: MediaType;
+    url?: string | undefined;
 };
-export declare const ExternalImageBadge: ({ badgeSize }: ExternalImageBadgeProps) => JSX.Element;
+export declare const isUnbadgedHostname: (hostname: string | undefined) => boolean;
+export declare const ExternalImageBadge: ({ badgeSize, type, url }: ExternalImageBadgeProps) => JSX.Element | null;
 export {};

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

@@ -39,6 +39,16 @@ export declare const toolbarMessages: {
         defaultMessage: string;
         description: string;
     };
+    threeColumnsWithLeftSidebars: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
+    threeColumnsWithRightSidebars: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
     floatingToolbarRadioGroupAriaLabel: {
         id: string;
         defaultMessage: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "95.6.3",
+	"version": "95.7.0",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -111,7 +111,7 @@
 	},
 	"dependencies": {
 		"@atlaskit/activity-provider": "^2.5.0",
-		"@atlaskit/adf-schema": "^44.2.0",
+		"@atlaskit/adf-schema": "^46.1.0",
 		"@atlaskit/adf-utils": "^19.13.0",
 		"@atlaskit/analytics-listeners": "^8.13.0",
 		"@atlaskit/analytics-namespaced-context": "^6.12.0",
@@ -152,7 +152,7 @@
 		"@atlaskit/smart-user-picker": "^6.11.0",
 		"@atlaskit/spinner": "^16.3.0",
 		"@atlaskit/task-decision": "^17.11.0",
-		"@atlaskit/textfield": "^6.5.0",
+		"@atlaskit/textfield": "^6.6.0",
 		"@atlaskit/tmp-editor-statsig": "^2.21.0",
 		"@atlaskit/tokens": "^2.3.0",
 		"@atlaskit/tooltip": "^18.9.0",
@@ -293,6 +293,9 @@
 		},
 		"platform_editor_use_nested_table_pm_nodes": {
 			"type": "boolean"
+		},
+		"platform_editor_hide_external_media_badge": {
+			"type": "boolean"
 		}
 	}
 }