@atlaskit/editor-plugin-table 7.16.1 → 7.16.2

package/src/nodeviews/TableContainer.tsx

@@ -1,5 +1,11 @@
 import type { PropsWithChildren } from 'react';
-import React, { forwardRef, useCallback, useRef, useState } from 'react';
+import React, {
+  forwardRef,
+  useCallback,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
 
 import classNames from 'classnames';
 
@@ -50,6 +56,57 @@ export const InnerContainer = forwardRef<
   );
 });
 
+const centerAlignStyle = { display: 'flex', justifyContent: 'center' };
+
+const leftAlignStyle = { display: 'flex', justifyContent: 'flex-start' };
+
+type AlignmentTableContainerProps = {
+  node: PMNode;
+};
+
+const AlignmentTableContainer = ({
+  node,
+  children,
+}: PropsWithChildren<AlignmentTableContainerProps>) => {
+  const alignment = node.attrs.layout;
+
+  const style = useMemo(() => {
+    return alignment === 'align-start' ? leftAlignStyle : centerAlignStyle;
+  }, [alignment]);
+
+  return (
+    <div data-testid="table-alignment-container" style={style}>
+      {children}
+    </div>
+  );
+};
+
+const AlignmentTableContainerWrapper = ({
+  isTableAlignmentEnabled,
+  node,
+  children,
+}: PropsWithChildren<
+  AlignmentTableContainerProps & { isTableAlignmentEnabled?: boolean }
+>) => {
+  if (!isTableAlignmentEnabled) {
+    return (
+      <div
+        data-testid="table-alignment-container"
+        style={{
+          display: 'flex',
+          justifyContent: 'center',
+        }}
+      >
+        {children}
+      </div>
+    );
+  }
+
+  return (
+    <AlignmentTableContainer node={node}>{children}</AlignmentTableContainer>
+  );
+};
+
 type ResizableTableContainerProps = {
   containerWidth: number;
   node: PMNode;
@@ -59,9 +116,11 @@ type ResizableTableContainerProps = {
   tableRef: HTMLTableElement;
   isResizing?: boolean;
   pluginInjectionApi?: PluginInjectionAPI;
-  isTableScalingEnabled?: boolean;
   tableWrapperHeight?: number;
   isWholeTableInDanger?: boolean;
+
+  isTableScalingEnabled?: boolean;
+  isTableAlignmentEnabled?: boolean;
 };
 
 export const ResizableTableContainer = React.memo(
@@ -75,9 +134,10 @@ export const ResizableTableContainer = React.memo(
     tableRef,
     isResizing,
     pluginInjectionApi,
-    isTableScalingEnabled,
     tableWrapperHeight,
     isWholeTableInDanger,
+    isTableScalingEnabled,
+    isTableAlignmentEnabled,
   }: PropsWithChildren<ResizableTableContainerProps>) => {
     const containerRef = useRef<HTMLDivElement | null>(null);
     const tableWidthRef = useRef<number>(akEditorDefaultLayoutWidth);
@@ -204,11 +264,9 @@ export const ResizableTableContainer = React.memo(
     const isLivePageViewMode = editorViewModeState?.mode === 'view';
 
     return (
-      <div
-        style={{
-          display: 'flex',
-          justifyContent: 'center',
-        }}
+      <AlignmentTableContainerWrapper
+        isTableAlignmentEnabled={isTableAlignmentEnabled}
+        node={node}
       >
         <div
           style={{
@@ -237,7 +295,7 @@ export const ResizableTableContainer = React.memo(
             </TableResizer>
           )}
         </div>
-      </div>
+      </AlignmentTableContainerWrapper>
     );
   },
 );
@@ -246,16 +304,18 @@ type TableContainerProps = {
   node: PMNode;
   className: string;
   containerWidth: EditorContainerWidth;
-  isTableResizingEnabled: boolean | undefined;
   editorView: EditorView;
   getPos: () => number | undefined;
   tableRef: HTMLTableElement;
   isNested: boolean;
   isResizing?: boolean;
   pluginInjectionApi?: PluginInjectionAPI;
-  isTableScalingEnabled?: boolean;
   tableWrapperHeight?: number;
   isWholeTableInDanger?: boolean;
+
+  isTableResizingEnabled: boolean | undefined;
+  isTableScalingEnabled?: boolean;
+  isTableAlignmentEnabled?: boolean;
 };
 
 export const TableContainer = ({
@@ -263,7 +323,6 @@ export const TableContainer = ({
   node,
   className,
   containerWidth: { width: editorWidth },
-  isTableResizingEnabled,
   editorView,
   getPos,
   tableRef,
@@ -271,8 +330,10 @@ export const TableContainer = ({
   tableWrapperHeight,
   isResizing,
   pluginInjectionApi,
-  isTableScalingEnabled,
   isWholeTableInDanger,
+  isTableResizingEnabled,
+  isTableScalingEnabled,
+  isTableAlignmentEnabled,
 }: PropsWithChildren<TableContainerProps>) => {
   if (isTableResizingEnabled && !isNested) {
     return (
@@ -288,6 +349,7 @@ export const TableContainer = ({
         pluginInjectionApi={pluginInjectionApi}
         isTableScalingEnabled={isTableScalingEnabled}
         isWholeTableInDanger={isWholeTableInDanger}
+        isTableAlignmentEnabled={isTableAlignmentEnabled}
       >
         {children}
       </ResizableTableContainer>

package/src/nodeviews/table.tsx

@@ -292,7 +292,8 @@ export default class TableView extends ReactNodeView<Props> {
               isHeaderRowEnabled={pluginState!.isHeaderRowEnabled}
               isHeaderColumnEnabled={pluginState!.isHeaderColumnEnabled}
               isDragAndDropEnabled={pluginState!.isDragAndDropEnabled}
-              isTableScalingEnabled={props.options?.isTableScalingEnabled} // this.options?.isTableScalingEnabled sams as TableOptions.isTableScalingEnabled same as pluginState.isTableScalingEnabled
+              isTableScalingEnabled={props.options?.isTableScalingEnabled} // this.options?.isTableScalingEnabled same as TableOptions.isTableScalingEnabled same as pluginState.isTableScalingEnabled
+              isTableAlignmentEnabled={props.options?.isTableAlignmentEnabled}
               tableActive={tableActive}
               ordering={pluginState!.ordering as TableColumnOrdering}
               isResizing={isResizing}
@@ -391,6 +392,7 @@ export const createTableView = (
   getEditorFeatureFlags: GetEditorFeatureFlags,
   dispatchAnalyticsEvent: DispatchAnalyticsEvent,
   pluginInjectionApi?: PluginInjectionAPI,
+  isTableAlignmentEnabled?: boolean,
 ): NodeView => {
   const {
     pluginConfig,
@@ -417,6 +419,7 @@ export const createTableView = (
       isTableResizingEnabled,
       isDragAndDropEnabled,
       isTableScalingEnabled, // same as options.isTableScalingEnabled
+      isTableAlignmentEnabled
     },
     getEditorContainerWidth,
     getEditorFeatureFlags,

package/src/nodeviews/types.ts

@@ -17,6 +17,7 @@ export type TableOptions = {
   isTableResizingEnabled?: boolean;
   isDragAndDropEnabled?: boolean;
   isTableScalingEnabled?: boolean;
+  isTableAlignmentEnabled?: boolean;
 };
 
 export interface Props {

package/src/plugin.tsx

@@ -212,7 +212,13 @@ const tablesPlugin: TablePlugin = ({ config: options, api }) => {
 
               options: {
                 selectNodeInserted: false,
-                analyticsPayload,
+                analyticsPayload: {
+                  ...analyticsPayload,
+                  attributes: {
+                    ...analyticsPayload.attributes,
+                    localId: node.attrs.localId,
+                  },
+                },
               },
             }) ?? false
           );
@@ -638,17 +644,21 @@ const tablesPlugin: TablePlugin = ({ config: options, api }) => {
             // see comment on tablesPlugin.getSharedState on usage
             const tableState = api?.table?.sharedState.currentState();
 
-            const tr = insert(
-              createTableWithWidth(
-                options?.isTableScalingEnabled,
-                tableState?.isFullWidthModeEnabled,
-              )(state.schema),
-            );
+            const tableNode = createTableWithWidth(
+              options?.isTableScalingEnabled,
+              tableState?.isFullWidthModeEnabled,
+            )(state.schema);
+
+            const tr = insert(tableNode);
+
             editorAnalyticsAPI?.attachAnalyticsEvent({
               action: ACTION.INSERTED,
               actionSubject: ACTION_SUBJECT.DOCUMENT,
               actionSubjectId: ACTION_SUBJECT_ID.TABLE,
-              attributes: { inputMethod: INPUT_METHOD.QUICK_INSERT },
+              attributes: {
+                inputMethod: INPUT_METHOD.QUICK_INSERT,
+                localId: tableNode.attrs.localId,
+              },
               eventType: EVENT_TYPE.TRACK,
             })(tr);
             return tr;

package/src/pm-plugins/keymap.ts

@@ -1,13 +1,7 @@
 import type { IntlShape } from 'react-intl-next/src/types';
 
 import type { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
-import {
-  ACTION,
-  ACTION_SUBJECT,
-  ACTION_SUBJECT_ID,
-  EVENT_TYPE,
-  INPUT_METHOD,
-} from '@atlaskit/editor-common/analytics';
+import { INPUT_METHOD } from '@atlaskit/editor-common/analytics';
 import {
   addColumnAfter,
   addColumnBefore,
@@ -37,7 +31,7 @@ import { chainCommands } from '@atlaskit/editor-prosemirror/commands';
 import { keymap } from '@atlaskit/editor-prosemirror/keymap';
 import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 
-import { createTable, goToNextCell, moveCursorBackward } from '../commands';
+import { goToNextCell, moveCursorBackward } from '../commands';
 import {
   addRowAroundSelection,
   changeColumnWidthByStepWithAnalytics,
@@ -53,25 +47,10 @@ import {
 import {
   addColumnAfter as addColumnAfterCommand,
   addColumnBefore as addColumnBeforeCommand,
+  createTable,
 } from '../commands/insert';
 import { moveSourceWithAnalyticsViaShortcut } from '../pm-plugins/drag-and-drop/commands-with-analytics';
 import type { PluginInjectionAPIWithA11y } from '../types';
-import { withEditorAnalyticsAPI } from '../utils/analytics';
-
-const createTableWithAnalytics = (
-  isTableScalingEnabled: boolean,
-  isFullWidthModeEnabled: boolean,
-  editorAnalyticsAPI: EditorAnalyticsAPI | undefined | null,
-) =>
-  withEditorAnalyticsAPI({
-    action: ACTION.INSERTED,
-    actionSubject: ACTION_SUBJECT.DOCUMENT,
-    actionSubjectId: ACTION_SUBJECT_ID.TABLE,
-    attributes: { inputMethod: INPUT_METHOD.SHORTCUT },
-    eventType: EVENT_TYPE.TRACK,
-  })(editorAnalyticsAPI)(
-    createTable(isTableScalingEnabled, isFullWidthModeEnabled),
-  );
 
 export function keymapPlugin(
   getEditorContainerWidth: GetEditorContainerWidth,
@@ -99,7 +78,7 @@ export function keymapPlugin(
   );
   bindKeymapWithCommand(
     toggleTable.common!,
-    createTableWithAnalytics(
+    createTable(
       isTableScalingEnabled,
       !!isFullWidthEnabled,
       editorAnalyticsAPI,

package/src/pm-plugins/main.ts

@@ -411,6 +411,7 @@ export const createPlugin = (
             getEditorFeatureFlags,
             dispatchAnalyticsEvent,
             pluginInjectionApi,
+            isTableAlignmentEnabled,
           ),
         tableRow: (node, view, getPos) =>
           new TableRow(node, view, getPos, eventDispatcher),