@atlaskit/renderer 109.16.0 → 109.17.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/renderer
 
+## 109.17.0
+
+### Minor Changes
+
+- [#88000](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/88000) [`61b44e565851`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/61b44e565851) - [ux] FF clean up platform.editor.show-embed-card-frame-renderer
+
+### Patch Changes
+
+- Updated dependencies
+
+## 109.16.1
+
+### Patch Changes
+
+- [#88763](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/88763) [`9fcd30347b0c`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/9fcd30347b0c) - [ux] Removed annotation styling for media in editor and renderer
+- Updated dependencies
+
 ## 109.16.0
 
 ### Minor Changes

package/dist/cjs/react/nodes/embedCard.js

@@ -11,7 +11,6 @@ var _react = require("@emotion/react");
 var _react2 = require("react");
 var _smartCard = require("@atlaskit/smart-card");
 var _linkProvider = require("@atlaskit/link-provider");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _ui = require("@atlaskit/editor-common/ui");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
 var _utils = require("../../utils");
@@ -63,7 +62,7 @@ function EmbedCard(props) {
     onClick: onClick,
     container: portal,
     platform: platform,
-    frameStyle: (_smartLinks$frameStyl = smartLinks === null || smartLinks === void 0 ? void 0 : smartLinks.frameStyle) !== null && _smartLinks$frameStyl !== void 0 ? _smartLinks$frameStyl : (0, _platformFeatureFlags.getBooleanFF)('platform.editor.show-embed-card-frame-renderer') ? 'show' : undefined,
+    frameStyle: (_smartLinks$frameStyl = smartLinks === null || smartLinks === void 0 ? void 0 : smartLinks.frameStyle) !== null && _smartLinks$frameStyl !== void 0 ? _smartLinks$frameStyl : 'show',
     actionOptions: actionOptions,
     showServerActions: showServerActions
   };

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

@@ -55,7 +55,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
 var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "109.16.0";
+var packageVersion = "109.17.0";
 var Renderer = exports.Renderer = /*#__PURE__*/function (_PureComponent) {
   (0, _inherits2.default)(Renderer, _PureComponent);
   var _super = _createSuper(Renderer);

package/dist/cjs/ui/annotations/element/mark.js

@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.MarkComponent = void 0;
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/taggedTemplateLiteral"));
 var _react = require("react");
 var _react2 = require("@emotion/react");
@@ -21,13 +21,6 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 var markStyles = function markStyles() {
   return (0, _react2.css)(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  color: inherit;\n  background-color: unset;\n  -webkit-tap-highlight-color: transparent;\n\n  &[data-mark-annotation-state='", "'] {\n    ", ";\n\n    &:focus,\n    &[data-has-focus='true'] {\n      ", ";\n    }\n  }\n"])), _adfSchema.AnnotationMarkStates.ACTIVE, (0, _styles.AnnotationSharedCSSByState)().blur, (0, _styles.AnnotationSharedCSSByState)().focus);
 };
-var blockStyles = function blockStyles() {
-  return (0, _react2.css)((0, _defineProperty2.default)({
-    color: 'inherit',
-    backgroundColor: 'unset',
-    WebkitTapHighlightColor: 'transparent'
-  }, "&[data-mark-annotation-state='".concat(_adfSchema.AnnotationMarkStates.ACTIVE, "']"), _styles.mediaAnnotationStyles));
-};
 var MarkComponent = exports.MarkComponent = function MarkComponent(_ref) {
   var annotationParentIds = _ref.annotationParentIds,
     children = _ref.children,
@@ -67,7 +60,7 @@ var MarkComponent = exports.MarkComponent = function MarkComponent(_ref) {
   };
   return (0, _react2.jsx)(useBlockLevel ? 'div' : 'mark', _objectSpread(_objectSpread(_objectSpread((0, _defineProperty2.default)({
     id: id
-  }, (0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes') ? 'onClickCapture' : 'onClick', onMarkClick), accessibility), overriddenData), {}, {
-    css: useBlockLevel ? blockStyles : markStyles
+  }, (0, _platformFeatureFlags.getBooleanFF)('platform.editor.allow-inline-comments-for-inline-nodes') ? 'onClickCapture' : 'onClick', onMarkClick), accessibility), overriddenData), !useBlockLevel && {
+    css: markStyles
   }), children);
 };

package/dist/es2019/react/nodes/embedCard.js

@@ -4,7 +4,6 @@ import { css, jsx } from '@emotion/react';
 import { useMemo, useContext, useState, useRef } from 'react';
 import { Card, EmbedResizeMessageListener } from '@atlaskit/smart-card';
 import { SmartCardContext } from '@atlaskit/link-provider';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { WidthConsumer, UnsupportedBlock, MediaSingle as UIMediaSingle } from '@atlaskit/editor-common/ui';
 import { akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth, DEFAULT_EMBED_CARD_HEIGHT, DEFAULT_EMBED_CARD_WIDTH } from '@atlaskit/editor-shared-styles';
 import { getPlatform } from '../../utils';
@@ -55,7 +54,7 @@ export default function EmbedCard(props) {
     onClick,
     container: portal,
     platform,
-    frameStyle: (_smartLinks$frameStyl = smartLinks === null || smartLinks === void 0 ? void 0 : smartLinks.frameStyle) !== null && _smartLinks$frameStyl !== void 0 ? _smartLinks$frameStyl : getBooleanFF('platform.editor.show-embed-card-frame-renderer') ? 'show' : undefined,
+    frameStyle: (_smartLinks$frameStyl = smartLinks === null || smartLinks === void 0 ? void 0 : smartLinks.frameStyle) !== null && _smartLinks$frameStyl !== void 0 ? _smartLinks$frameStyl : 'show',
     actionOptions,
     showServerActions
   };

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

@@ -36,7 +36,7 @@ import { EditorMediaClientProvider } from '../../react/utils/EditorMediaClientPr
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "109.16.0";
+const packageVersion = "109.17.0";
 export class Renderer extends PureComponent {
   constructor(props) {
     super(props);

package/dist/es2019/ui/annotations/element/mark.js

@@ -2,7 +2,7 @@
 
 import { useMemo, useCallback } from 'react';
 import { css, jsx } from '@emotion/react';
-import { AnnotationSharedCSSByState, mediaAnnotationStyles } from '@atlaskit/editor-common/styles';
+import { AnnotationSharedCSSByState } from '@atlaskit/editor-common/styles';
 import { AnnotationMarkStates } from '@atlaskit/adf-schema';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 
@@ -21,12 +21,6 @@ const markStyles = () => css`
     }
   }
 `;
-const blockStyles = () => css({
-  color: 'inherit',
-  backgroundColor: 'unset',
-  WebkitTapHighlightColor: 'transparent',
-  [`&[data-mark-annotation-state='${AnnotationMarkStates.ACTIVE}']`]: mediaAnnotationStyles
-});
 export const MarkComponent = ({
   annotationParentIds,
   children,
@@ -69,6 +63,8 @@ export const MarkComponent = ({
     [getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes') ? 'onClickCapture' : 'onClick']: onMarkClick,
     ...accessibility,
     ...overriddenData,
-    css: useBlockLevel ? blockStyles : markStyles
+    ...(!useBlockLevel && {
+      css: markStyles
+    })
   }, children);
 };

package/dist/esm/react/nodes/embedCard.js

@@ -5,7 +5,6 @@ import { css, jsx } from '@emotion/react';
 import { useMemo, useContext, useState, useRef } from 'react';
 import { Card, EmbedResizeMessageListener } from '@atlaskit/smart-card';
 import { SmartCardContext } from '@atlaskit/link-provider';
-import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 import { WidthConsumer, UnsupportedBlock, MediaSingle as UIMediaSingle } from '@atlaskit/editor-common/ui';
 import { akEditorDefaultLayoutWidth, akEditorFullWidthLayoutWidth, DEFAULT_EMBED_CARD_HEIGHT, DEFAULT_EMBED_CARD_WIDTH } from '@atlaskit/editor-shared-styles';
 import { getPlatform } from '../../utils';
@@ -55,7 +54,7 @@ export default function EmbedCard(props) {
     onClick: onClick,
     container: portal,
     platform: platform,
-    frameStyle: (_smartLinks$frameStyl = smartLinks === null || smartLinks === void 0 ? void 0 : smartLinks.frameStyle) !== null && _smartLinks$frameStyl !== void 0 ? _smartLinks$frameStyl : getBooleanFF('platform.editor.show-embed-card-frame-renderer') ? 'show' : undefined,
+    frameStyle: (_smartLinks$frameStyl = smartLinks === null || smartLinks === void 0 ? void 0 : smartLinks.frameStyle) !== null && _smartLinks$frameStyl !== void 0 ? _smartLinks$frameStyl : 'show',
     actionOptions: actionOptions,
     showServerActions: showServerActions
   };

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

@@ -46,7 +46,7 @@ import { EditorMediaClientProvider } from '../../react/utils/EditorMediaClientPr
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "109.16.0";
+var packageVersion = "109.17.0";
 export var Renderer = /*#__PURE__*/function (_PureComponent) {
   _inherits(Renderer, _PureComponent);
   var _super = _createSuper(Renderer);

package/dist/esm/ui/annotations/element/mark.js

@@ -1,5 +1,5 @@
-import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
+import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import _taggedTemplateLiteral from "@babel/runtime/helpers/taggedTemplateLiteral";
 var _templateObject;
 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; }
@@ -8,7 +8,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 
 import { useMemo, useCallback } from 'react';
 import { css, jsx } from '@emotion/react';
-import { AnnotationSharedCSSByState, mediaAnnotationStyles } from '@atlaskit/editor-common/styles';
+import { AnnotationSharedCSSByState } from '@atlaskit/editor-common/styles';
 import { AnnotationMarkStates } from '@atlaskit/adf-schema';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 
@@ -16,13 +16,6 @@ import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 var markStyles = function markStyles() {
   return css(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  color: inherit;\n  background-color: unset;\n  -webkit-tap-highlight-color: transparent;\n\n  &[data-mark-annotation-state='", "'] {\n    ", ";\n\n    &:focus,\n    &[data-has-focus='true'] {\n      ", ";\n    }\n  }\n"])), AnnotationMarkStates.ACTIVE, AnnotationSharedCSSByState().blur, AnnotationSharedCSSByState().focus);
 };
-var blockStyles = function blockStyles() {
-  return css(_defineProperty({
-    color: 'inherit',
-    backgroundColor: 'unset',
-    WebkitTapHighlightColor: 'transparent'
-  }, "&[data-mark-annotation-state='".concat(AnnotationMarkStates.ACTIVE, "']"), mediaAnnotationStyles));
-};
 export var MarkComponent = function MarkComponent(_ref) {
   var annotationParentIds = _ref.annotationParentIds,
     children = _ref.children,
@@ -62,7 +55,7 @@ export var MarkComponent = function MarkComponent(_ref) {
   };
   return jsx(useBlockLevel ? 'div' : 'mark', _objectSpread(_objectSpread(_objectSpread(_defineProperty({
     id: id
-  }, getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes') ? 'onClickCapture' : 'onClick', onMarkClick), accessibility), overriddenData), {}, {
-    css: useBlockLevel ? blockStyles : markStyles
+  }, getBooleanFF('platform.editor.allow-inline-comments-for-inline-nodes') ? 'onClickCapture' : 'onClick', onMarkClick), accessibility), overriddenData), !useBlockLevel && {
+    css: markStyles
   }), children);
 };

package/dist/types/ui/annotations/element/mark.d.ts

@@ -12,7 +12,7 @@ type MarkComponentProps = {
     useBlockLevel?: boolean;
 };
 export declare const MarkComponent: ({ annotationParentIds, children, dataAttributes, id, state, hasFocus, onClick, useBlockLevel, }: React.PropsWithChildren<MarkComponentProps>) => React.DetailedReactHTMLElement<{
-    css: () => import("@emotion/react").SerializedStyles;
+    css?: (() => import("@emotion/react").SerializedStyles) | undefined;
     'data-mark-type': string;
     'data-mark-annotation-type': import("@atlaskit/adf-schema").AnnotationTypes;
     'data-id': string;
@@ -21,7 +21,7 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'aria-details'?: undefined;
     id: string;
 } | {
-    css: () => import("@emotion/react").SerializedStyles;
+    css?: (() => import("@emotion/react").SerializedStyles) | undefined;
     'data-mark-annotation-state': AnnotationMarkStates;
     'data-has-focus': boolean;
     'data-mark-type': string;
@@ -31,7 +31,7 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'aria-details'?: undefined;
     id: string;
 } | {
-    css: () => import("@emotion/react").SerializedStyles;
+    css?: (() => import("@emotion/react").SerializedStyles) | undefined;
     'data-mark-type': string;
     'data-mark-annotation-type': import("@atlaskit/adf-schema").AnnotationTypes;
     'data-id': string;
@@ -40,7 +40,7 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'aria-disabled'?: undefined;
     id: string;
 } | {
-    css: () => import("@emotion/react").SerializedStyles;
+    css?: (() => import("@emotion/react").SerializedStyles) | undefined;
     'data-mark-annotation-state': AnnotationMarkStates;
     'data-has-focus': boolean;
     'data-mark-type': string;

package/dist/types-ts4.5/ui/annotations/element/mark.d.ts

@@ -12,7 +12,7 @@ type MarkComponentProps = {
     useBlockLevel?: boolean;
 };
 export declare const MarkComponent: ({ annotationParentIds, children, dataAttributes, id, state, hasFocus, onClick, useBlockLevel, }: React.PropsWithChildren<MarkComponentProps>) => React.DetailedReactHTMLElement<{
-    css: () => import("@emotion/react").SerializedStyles;
+    css?: (() => import("@emotion/react").SerializedStyles) | undefined;
     'data-mark-type': string;
     'data-mark-annotation-type': import("@atlaskit/adf-schema").AnnotationTypes;
     'data-id': string;
@@ -21,7 +21,7 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'aria-details'?: undefined;
     id: string;
 } | {
-    css: () => import("@emotion/react").SerializedStyles;
+    css?: (() => import("@emotion/react").SerializedStyles) | undefined;
     'data-mark-annotation-state': AnnotationMarkStates;
     'data-has-focus': boolean;
     'data-mark-type': string;
@@ -31,7 +31,7 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'aria-details'?: undefined;
     id: string;
 } | {
-    css: () => import("@emotion/react").SerializedStyles;
+    css?: (() => import("@emotion/react").SerializedStyles) | undefined;
     'data-mark-type': string;
     'data-mark-annotation-type': import("@atlaskit/adf-schema").AnnotationTypes;
     'data-id': string;
@@ -40,7 +40,7 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'aria-disabled'?: undefined;
     id: string;
 } | {
-    css: () => import("@emotion/react").SerializedStyles;
+    css?: (() => import("@emotion/react").SerializedStyles) | undefined;
     'data-mark-annotation-state': AnnotationMarkStates;
     'data-has-focus': boolean;
     'data-mark-type': string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/renderer",
-  "version": "109.16.0",
+  "version": "109.17.0",
   "description": "Renderer component",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
@@ -29,9 +29,9 @@
     "@atlaskit/analytics-listeners": "^8.9.0",
     "@atlaskit/analytics-namespaced-context": "^6.9.0",
     "@atlaskit/analytics-next": "^9.2.0",
-    "@atlaskit/button": "^17.11.0",
+    "@atlaskit/button": "^17.12.0",
     "@atlaskit/code": "^15.1.0",
-    "@atlaskit/editor-common": "^78.25.0",
+    "@atlaskit/editor-common": "^78.26.0",
     "@atlaskit/editor-json-transformer": "^8.10.0",
     "@atlaskit/editor-palette": "1.5.3",
     "@atlaskit/editor-prosemirror": "3.0.0",
@@ -44,10 +44,10 @@
     "@atlaskit/media-client-react": "^2.0.0",
     "@atlaskit/media-common": "^11.1.0",
     "@atlaskit/media-filmstrip": "^47.0.0",
-    "@atlaskit/media-ui": "^25.6.0",
+    "@atlaskit/media-ui": "^25.7.0",
     "@atlaskit/media-viewer": "^48.4.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
-    "@atlaskit/smart-card": "^26.52.0",
+    "@atlaskit/smart-card": "^26.53.0",
     "@atlaskit/status": "^1.4.0",
     "@atlaskit/task-decision": "^17.9.0",
     "@atlaskit/theme": "^12.7.0",
@@ -126,9 +126,6 @@
       "type": "boolean",
       "referenceOnly": "true"
     },
-    "platform.editor.show-embed-card-frame-renderer": {
-      "type": "boolean"
-    },
     "platform.editor.inline_extension.extended_lcqdn": {
       "type": "boolean"
     },