@atlaskit/renderer 118.1.0 → 118.1.1

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

@@ -14,7 +14,6 @@ import { AnnotationMarkStates } from '@atlaskit/adf-schema';
 import { fg } from '@atlaskit/platform-feature-flags';
 import { useIntl } from 'react-intl-next';
 import { inlineCommentMessages } from '../../../messages';
-import { useAnnotationManagerDispatch, useAnnotationManagerState } from '../contexts/AnnotationManagerContext';
 var markStyles = css(_defineProperty({
   color: 'inherit',
   backgroundColor: 'unset',
@@ -123,20 +122,6 @@ export var MarkComponent = function MarkComponent(_ref) {
   var annotationIds = useMemo(function () {
     return _toConsumableArray(new Set([].concat(_toConsumableArray(annotationParentIds), [id])));
   }, [id, annotationParentIds]);
-  var _useAnnotationManager = useAnnotationManagerDispatch(),
-    dispatch = _useAnnotationManager.dispatch;
-  var _useAnnotationManager2 = useAnnotationManagerState(),
-    currentSelectedAnnotationId = _useAnnotationManager2.currentSelectedAnnotationId;
-  var markRef = useCallback(function (node) {
-    if (id === currentSelectedAnnotationId && node) {
-      dispatch({
-        type: 'setSelectedMarkRef',
-        data: {
-          markRef: node
-        }
-      });
-    }
-  }, [dispatch, id, currentSelectedAnnotationId]);
   var onMarkClick = useCallback(function (event) {
     // prevent inline mark logic for media block marks
     if (event.currentTarget instanceof HTMLElement && event.currentTarget.getAttribute('data-block-mark')) {
@@ -163,13 +148,22 @@ export var MarkComponent = function MarkComponent(_ref) {
       // prevents from opening link URL inside webView in Safari
       event.preventDefault();
     }
-
-    // Ignored via go/ees005
-    // eslint-disable-next-line @atlaskit/editor/no-as-casting
-    onClick({
-      eventTarget: event.target,
-      annotationIds: annotationIds
-    });
+    if (fg('platform_editor_comments_api_manager')) {
+      // currentTarget is the right element if there are multiple overlapping annotations
+      // Ignored via go/ees005
+      // eslint-disable-next-line @atlaskit/editor/no-as-casting
+      onClick({
+        eventTarget: event.currentTarget,
+        annotationIds: annotationIds
+      });
+    } else {
+      // Ignored via go/ees005
+      // eslint-disable-next-line @atlaskit/editor/no-as-casting
+      onClick({
+        eventTarget: event.target,
+        annotationIds: annotationIds
+      });
+    }
   }, [annotationIds, onClick, state]);
   var onMarkEnter = function onMarkEnter(evt) {
     var _document$activeEleme;
@@ -195,7 +189,6 @@ export var MarkComponent = function MarkComponent(_ref) {
     'aria-details': annotationIds.join(', ')
   }, desktopAccessibilityAttributes);
   return jsx(useBlockLevel ? 'div' : 'mark', _objectSpread(_objectSpread(_objectSpread(_defineProperty({
-    ref: id === currentSelectedAnnotationId ? markRef : undefined,
     id: id
   }, fg('editor_inline_comments_on_inline_nodes') ? 'onClickCapture' : 'onClick', onMarkClick), accessibility), overriddenData), !useBlockLevel && {
     css: [markStyles, fg('platform_renderer_nested_annotation_styling') && markStylesLayeringFix, fg('editor_inline_comments_on_inline_nodes') && markStylesWithInlineComments, fg('confluence-frontend-comments-panel') && markStylesWithCommentsPanel, !isMobile() && accessibilityStyles, markStylesWithUpdatedShadow],

package/dist/esm/ui/annotations/hooks/use-events.js

@@ -194,7 +194,7 @@ export var useAnnotationClickEvent = function useAnnotationClickEvent(props) {
     }
   }, [updateSubscriber, createAnalyticsEvent, isNestedRender]);
   if (fg('platform_editor_comments_api_manager')) {
-    return selectedAnnotation;
+    return isNestedRender ? null : selectedAnnotation;
   } else {
     return annotationClickEvent;
   }

package/dist/types/react/nodes/table/table.d.ts

@@ -4,6 +4,7 @@ type TableProps = SharedTableProps & {
     innerRef?: React.RefObject<HTMLTableElement>;
     children: React.ReactNode[];
     isPresentational?: boolean;
+    fixTableSSRResizing?: boolean;
 };
-export declare const Table: React.MemoExoticComponent<({ innerRef, isNumberColumnEnabled, columnWidths, layout, renderWidth, children, tableNode, rendererAppearance, isInsideOfBlockNode, isInsideOfTable, isinsideMultiBodiedExtension, allowTableResizing, isPresentational, }: TableProps) => React.JSX.Element>;
+export declare const Table: React.MemoExoticComponent<({ innerRef, isNumberColumnEnabled, columnWidths, layout, renderWidth, children, tableNode, rendererAppearance, isInsideOfBlockNode, isInsideOfTable, isinsideMultiBodiedExtension, allowTableResizing, isPresentational, fixTableSSRResizing, }: TableProps) => React.JSX.Element>;
 export {};

package/dist/types/react/nodes/table.d.ts

@@ -42,7 +42,7 @@ export interface TableState {
     headerRowHeight: number;
 }
 /**
- * Class for Tables in Renderer
+ *
  */
 export declare class TableContainer extends React.Component<TableProps & OverflowShadowProps & WithSmartCardStorageProps, TableState> {
     state: TableState;

package/dist/types/react/nodes/tableNew.d.ts

@@ -42,6 +42,9 @@ export interface TableState {
     wrapperWidth: number;
     headerRowHeight: number;
 }
+/**
+ * TableContainer renders tables using only CSS-based rules
+ */
 export declare class TableContainer extends React.Component<TableProps & OverflowShadowProps & WithSmartCardStorageProps, TableState> {
     state: TableState;
     tableRef: React.RefObject<HTMLTableElement>;
@@ -55,26 +58,56 @@ export declare class TableContainer extends React.Component<TableProps & Overflo
     updatedLayout: TableLayout | 'custom';
     private resizeObserver;
     private applyResizerChange;
+    /**
+     *
+     * @example
+     */
     componentDidMount(): void;
+    /**
+     *
+     * @param prevProps
+     * @param prevState
+     * @example
+     */
     componentDidUpdate(prevProps: TableProps, prevState: TableState): void;
     componentWillUnmount: () => void;
     getScrollTop: () => number;
     updateSticky: () => void;
     onScroll: () => void;
     onWrapperScrolled: () => void;
+    /**
+     *
+     */
     get pinTop(): number | undefined;
+    /**
+     *
+     */
     get shouldAddOverflowParentOffsetTop_DO_NOT_USE(): boolean | null | undefined;
+    /**
+     *
+     */
     get stickyTop(): number | undefined;
+    /**
+     *
+     * @example
+     */
     render(): React.JSX.Element;
     private grabFirstRowRef;
 }
 type TableProcessorState = {
     tableOrderStatus?: TableOrderStatus;
 };
+/**
+ *
+ */
 export declare class TableProcessorWithContainerStyles extends React.Component<TableProps & OverflowShadowProps & WithSmartCardStorageProps, TableProcessorState> {
     state: {
         tableOrderStatus: undefined;
     };
+    /**
+     *
+     * @example
+     */
     render(): React.JSX.Element | null;
     private addSortableColumn;
     private changeSortOrder;

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

@@ -27,7 +27,6 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'data-id': string;
     'data-mark-annotation-state'?: AnnotationMarkStates | undefined;
     'aria-disabled': boolean;
-    ref: ((node: HTMLElement | null) => void) | undefined;
     id: string;
 } | {
     css?: (false | import("@emotion/react").SerializedStyles)[] | undefined;
@@ -42,7 +41,6 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'data-mark-annotation-type': import("@atlaskit/adf-schema").AnnotationTypes;
     'data-id': string;
     'aria-disabled': boolean;
-    ref: ((node: HTMLElement | null) => void) | undefined;
     id: string;
 } | {
     css?: (false | import("@emotion/react").SerializedStyles)[] | undefined;
@@ -60,7 +58,6 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'aria-expanded'?: undefined;
     'aria-details': string;
     'aria-disabled'?: undefined;
-    ref: ((node: HTMLElement | null) => void) | undefined;
     id: string;
 } | {
     css?: (false | import("@emotion/react").SerializedStyles)[] | undefined;
@@ -80,7 +77,6 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'aria-expanded'?: undefined;
     'aria-details': string;
     'aria-disabled'?: undefined;
-    ref: ((node: HTMLElement | null) => void) | undefined;
     id: string;
 } | {
     css?: (false | import("@emotion/react").SerializedStyles)[] | undefined;
@@ -98,7 +94,6 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'aria-expanded': boolean;
     'aria-details': string;
     'aria-disabled'?: undefined;
-    ref: ((node: HTMLElement | null) => void) | undefined;
     id: string;
 } | {
     css?: (false | import("@emotion/react").SerializedStyles)[] | undefined;
@@ -118,7 +113,6 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'aria-expanded': boolean;
     'aria-details': string;
     'aria-disabled'?: undefined;
-    ref: ((node: HTMLElement | null) => void) | undefined;
     id: string;
 }, string | React.JSXElementConstructor<any>>;
 export {};

package/dist/types-ts4.5/react/nodes/table/table.d.ts

@@ -4,6 +4,7 @@ type TableProps = SharedTableProps & {
     innerRef?: React.RefObject<HTMLTableElement>;
     children: React.ReactNode[];
     isPresentational?: boolean;
+    fixTableSSRResizing?: boolean;
 };
-export declare const Table: React.MemoExoticComponent<({ innerRef, isNumberColumnEnabled, columnWidths, layout, renderWidth, children, tableNode, rendererAppearance, isInsideOfBlockNode, isInsideOfTable, isinsideMultiBodiedExtension, allowTableResizing, isPresentational, }: TableProps) => React.JSX.Element>;
+export declare const Table: React.MemoExoticComponent<({ innerRef, isNumberColumnEnabled, columnWidths, layout, renderWidth, children, tableNode, rendererAppearance, isInsideOfBlockNode, isInsideOfTable, isinsideMultiBodiedExtension, allowTableResizing, isPresentational, fixTableSSRResizing, }: TableProps) => React.JSX.Element>;
 export {};

package/dist/types-ts4.5/react/nodes/table.d.ts

@@ -42,7 +42,7 @@ export interface TableState {
     headerRowHeight: number;
 }
 /**
- * Class for Tables in Renderer
+ *
  */
 export declare class TableContainer extends React.Component<TableProps & OverflowShadowProps & WithSmartCardStorageProps, TableState> {
     state: TableState;

package/dist/types-ts4.5/react/nodes/tableNew.d.ts

@@ -42,6 +42,9 @@ export interface TableState {
     wrapperWidth: number;
     headerRowHeight: number;
 }
+/**
+ * TableContainer renders tables using only CSS-based rules
+ */
 export declare class TableContainer extends React.Component<TableProps & OverflowShadowProps & WithSmartCardStorageProps, TableState> {
     state: TableState;
     tableRef: React.RefObject<HTMLTableElement>;
@@ -55,26 +58,56 @@ export declare class TableContainer extends React.Component<TableProps & Overflo
     updatedLayout: TableLayout | 'custom';
     private resizeObserver;
     private applyResizerChange;
+    /**
+     *
+     * @example
+     */
     componentDidMount(): void;
+    /**
+     *
+     * @param prevProps
+     * @param prevState
+     * @example
+     */
     componentDidUpdate(prevProps: TableProps, prevState: TableState): void;
     componentWillUnmount: () => void;
     getScrollTop: () => number;
     updateSticky: () => void;
     onScroll: () => void;
     onWrapperScrolled: () => void;
+    /**
+     *
+     */
     get pinTop(): number | undefined;
+    /**
+     *
+     */
     get shouldAddOverflowParentOffsetTop_DO_NOT_USE(): boolean | null | undefined;
+    /**
+     *
+     */
     get stickyTop(): number | undefined;
+    /**
+     *
+     * @example
+     */
     render(): React.JSX.Element;
     private grabFirstRowRef;
 }
 type TableProcessorState = {
     tableOrderStatus?: TableOrderStatus;
 };
+/**
+ *
+ */
 export declare class TableProcessorWithContainerStyles extends React.Component<TableProps & OverflowShadowProps & WithSmartCardStorageProps, TableProcessorState> {
     state: {
         tableOrderStatus: undefined;
     };
+    /**
+     *
+     * @example
+     */
     render(): React.JSX.Element | null;
     private addSortableColumn;
     private changeSortOrder;

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

@@ -27,7 +27,6 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'data-id': string;
     'data-mark-annotation-state'?: AnnotationMarkStates | undefined;
     'aria-disabled': boolean;
-    ref: ((node: HTMLElement | null) => void) | undefined;
     id: string;
 } | {
     css?: (false | import("@emotion/react").SerializedStyles)[] | undefined;
@@ -42,7 +41,6 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'data-mark-annotation-type': import("@atlaskit/adf-schema").AnnotationTypes;
     'data-id': string;
     'aria-disabled': boolean;
-    ref: ((node: HTMLElement | null) => void) | undefined;
     id: string;
 } | {
     css?: (false | import("@emotion/react").SerializedStyles)[] | undefined;
@@ -60,7 +58,6 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'aria-expanded'?: undefined;
     'aria-details': string;
     'aria-disabled'?: undefined;
-    ref: ((node: HTMLElement | null) => void) | undefined;
     id: string;
 } | {
     css?: (false | import("@emotion/react").SerializedStyles)[] | undefined;
@@ -80,7 +77,6 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'aria-expanded'?: undefined;
     'aria-details': string;
     'aria-disabled'?: undefined;
-    ref: ((node: HTMLElement | null) => void) | undefined;
     id: string;
 } | {
     css?: (false | import("@emotion/react").SerializedStyles)[] | undefined;
@@ -98,7 +94,6 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'aria-expanded': boolean;
     'aria-details': string;
     'aria-disabled'?: undefined;
-    ref: ((node: HTMLElement | null) => void) | undefined;
     id: string;
 } | {
     css?: (false | import("@emotion/react").SerializedStyles)[] | undefined;
@@ -118,7 +113,6 @@ export declare const MarkComponent: ({ annotationParentIds, children, dataAttrib
     'aria-expanded': boolean;
     'aria-details': string;
     'aria-disabled'?: undefined;
-    ref: ((node: HTMLElement | null) => void) | undefined;
     id: string;
 }, string | React.JSXElementConstructor<any>>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "118.1.0",
+	"version": "118.1.1",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -29,9 +29,9 @@
 		"@atlaskit/analytics-listeners": "^9.0.0",
 		"@atlaskit/analytics-namespaced-context": "^7.0.0",
 		"@atlaskit/analytics-next": "^11.0.0",
-		"@atlaskit/button": "^23.0.0",
+		"@atlaskit/button": "^23.2.0",
 		"@atlaskit/code": "^17.2.0",
-		"@atlaskit/editor-common": "^105.5.0",
+		"@atlaskit/editor-common": "^105.6.0",
 		"@atlaskit/editor-json-transformer": "^8.24.0",
 		"@atlaskit/editor-palette": "^2.1.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
@@ -39,7 +39,7 @@
 		"@atlaskit/editor-tables": "^2.9.0",
 		"@atlaskit/emoji": "^69.2.0",
 		"@atlaskit/feature-gate-js-client": "^5.3.0",
-		"@atlaskit/icon": "^26.0.0",
+		"@atlaskit/icon": "^26.1.0",
 		"@atlaskit/link-datasource": "^4.10.0",
 		"@atlaskit/media-card": "^79.2.0",
 		"@atlaskit/media-client": "^33.3.0",
@@ -50,13 +50,13 @@
 		"@atlaskit/media-viewer": "^52.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/platform-feature-flags-react": "^0.2.0",
-		"@atlaskit/react-ufo": "^3.12.0",
-		"@atlaskit/smart-card": "^38.1.0",
+		"@atlaskit/react-ufo": "^3.13.0",
+		"@atlaskit/smart-card": "^38.2.0",
 		"@atlaskit/status": "^3.0.0",
 		"@atlaskit/task-decision": "^19.2.0",
 		"@atlaskit/theme": "^18.0.0",
 		"@atlaskit/tmp-editor-statsig": "^4.22.0",
-		"@atlaskit/tokens": "^4.8.0",
+		"@atlaskit/tokens": "^4.9.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@atlaskit/visually-hidden": "^3.0.0",
 		"@babel/runtime": "^7.0.0",
@@ -79,7 +79,7 @@
 		"@af/visual-regression": "workspace:^",
 		"@atlaskit/analytics-gas-types": "^5.1.0",
 		"@atlaskit/checkbox": "^17.1.0",
-		"@atlaskit/css-reset": "^7.2.0",
+		"@atlaskit/css-reset": "^7.3.0",
 		"@atlaskit/link-provider": "^3.0.0",
 		"@atlaskit/link-test-helpers": "^8.0.0",
 		"@atlaskit/linking-common": "^9.0.0",
@@ -132,9 +132,6 @@
 		"cc_complexit_reduce_portal_rerenders": {
 			"type": "boolean"
 		},
-		"cc_perf_reduce_rerenders": {
-			"type": "boolean"
-		},
 		"cc_complexit_fe_reduce_fragment_serialization": {
 			"type": "boolean"
 		},
@@ -185,6 +182,9 @@
 		"platform_editor_accessible_heading_copy_link": {
 			"type": "boolean"
 		},
+		"platform_editor_fix_vc90_bug_with_files": {
+			"type": "boolean"
+		},
 		"editor_a11y_status_renderer_description": {
 			"type": "boolean"
 		},