@atlaskit/editor-plugin-table 8.4.0 → 8.4.2

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-table
 
+## 8.4.2
+
+### Patch Changes
+
+- [#172333](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/172333)
+  [`e5c206f3f7783`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/e5c206f3f7783) -
+  [ux] ED-25533 Set default size of nested tables to 2x2
+
+## 8.4.1
+
+### Patch Changes
+
+- [#168321](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/168321)
+  [`01cada6d7a4d7`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/01cada6d7a4d7) -
+  Fix bug where new icon types had an additional prop isFacadeDisabled that was not used
+- Updated dependencies
+
 ## 8.4.0
 
 ### Minor Changes

package/dist/cjs/commands/insert.js

@@ -264,18 +264,10 @@ var insertTableWithNestingSupport = exports.insertTableWithNestingSupport = func
     var _api$contentInsertion;
     var tr = _ref3.tr;
     var schema = tr.doc.type.schema;
-    var node = (0, _utils3.createTableWithWidth)({
-      isTableScalingEnabled: isTableScalingEnabled,
-      isTableAlignmentEnabled: isTableAlignmentEnabled,
-      isFullWidthModeEnabled: isFullWidthModeEnabled,
-      isCommentEditor: isCommentEditor,
-      isChromelessEditor: isChromelessEditor,
-      isTableResizingEnabled: isTableResizingEnabled,
-      createTableProps: createTableProps
-    })(schema);
 
     // If the cursor is inside a table
     var insertAt;
+    var isNestedTable = false;
     if ((0, _utils.hasParentNodeOfType)(schema.nodes.table)(tr.selection) && (0, _platformFeatureFlags.fg)('platform_editor_use_nested_table_pm_nodes')) {
       // If the experiment is disabled, or we're trying to nest deeper than one level, we insert the table after the top table
       if ((0, _experiments.editorExperiment)('nested-tables-in-tables', false, {
@@ -286,8 +278,21 @@ var insertTableWithNestingSupport = exports.insertTableWithNestingSupport = func
           return tr;
         }
         insertAt = _state.TextSelection.create(tr.doc, positionAfterTopTable);
+      } else {
+        // Table can be nested in parent table
+        isNestedTable = true;
       }
     }
+    var node = (0, _utils3.createTableWithWidth)({
+      isTableScalingEnabled: isTableScalingEnabled,
+      isTableAlignmentEnabled: isTableAlignmentEnabled,
+      isFullWidthModeEnabled: isFullWidthModeEnabled,
+      isCommentEditor: isCommentEditor,
+      isChromelessEditor: isChromelessEditor,
+      isTableResizingEnabled: isTableResizingEnabled,
+      isNestedTable: isNestedTable,
+      createTableProps: createTableProps
+    })(schema);
     api === null || api === void 0 || (_api$contentInsertion = api.contentInsertion) === null || _api$contentInsertion === void 0 || (_api$contentInsertion = _api$contentInsertion.commands) === null || _api$contentInsertion === void 0 || _api$contentInsertion.insert({
       node: node,
       options: {

package/dist/cjs/plugin.js

@@ -555,14 +555,15 @@ var tablesPlugin = function tablesPlugin(_ref) {
             var _api$table;
             // see comment on tablesPlugin.getSharedState on usage
             var tableState = api === null || api === void 0 || (_api$table = api.table) === null || _api$table === void 0 ? void 0 : _api$table.sharedState.currentState();
-            var tableNode = (0, _utils2.createTableWithWidth)({
+            var tableNodeProps = {
               isTableScalingEnabled: options === null || options === void 0 ? void 0 : options.isTableScalingEnabled,
               isTableAlignmentEnabled: options === null || options === void 0 ? void 0 : options.tableOptions.allowTableAlignment,
               isFullWidthModeEnabled: tableState === null || tableState === void 0 ? void 0 : tableState.isFullWidthModeEnabled,
               isCommentEditor: options === null || options === void 0 ? void 0 : options.isCommentEditor,
               isChromelessEditor: options === null || options === void 0 ? void 0 : options.isChromelessEditor,
               isTableResizingEnabled: options === null || options === void 0 ? void 0 : options.tableOptions.allowTableResizing
-            })(state.schema);
+            };
+            var tableNode = (0, _utils2.createTableWithWidth)(tableNodeProps)(state.schema);
             var tr = state.tr;
             // If the cursor is inside a table
             if ((0, _utils.hasParentNodeOfType)(state.schema.nodes.table)(state.selection) && (0, _platformFeatureFlags.fg)('platform_editor_use_nested_table_pm_nodes')) {
@@ -576,6 +577,9 @@ var tablesPlugin = function tablesPlugin(_ref) {
                 tr.scrollIntoView();
               } else {
                 // Table can be nested in parent table
+                tableNode = (0, _utils2.createTableWithWidth)(_objectSpread(_objectSpread({}, tableNodeProps), {}, {
+                  isNestedTable: true
+                }))(state.schema);
                 tr = insert(tableNode);
               }
             } else {

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

@@ -86,8 +86,7 @@ var FloatingContextualButtonInner = /*#__PURE__*/_react.default.memo(function (p
     onClick: handleClick,
     iconBefore: (0, _react2.jsx)(_chevronDown.default, {
       label: "",
-      color: "currentColor",
-      isFacadeDisabled: true
+      color: "currentColor"
     }),
     "aria-label": labelCellOptions,
     "aria-expanded": isContextualMenuOpen

package/dist/cjs/utils/create.js

@@ -10,6 +10,8 @@ var _utils = require("@atlaskit/editor-tables/utils");
 var _utils2 = require("../pm-plugins/table-resizing/utils");
 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; }
 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) { (0, _defineProperty2.default)(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 NESTED_TABLE_DEFAULT_ROWS = 2;
+var NESTED_TABLE_DEFAULT_COLS = 2;
 var createTableWithWidth = exports.createTableWithWidth = function createTableWithWidth(_ref) {
   var isTableScalingEnabled = _ref.isTableScalingEnabled,
     isTableAlignmentEnabled = _ref.isTableAlignmentEnabled,
@@ -17,9 +19,14 @@ var createTableWithWidth = exports.createTableWithWidth = function createTableWi
     isCommentEditor = _ref.isCommentEditor,
     isChromelessEditor = _ref.isChromelessEditor,
     isTableResizingEnabled = _ref.isTableResizingEnabled,
+    isNestedTable = _ref.isNestedTable,
     createTableProps = _ref.createTableProps;
   return function (schema) {
     var attrsOverrides = {};
+    if (isNestedTable) {
+      attrsOverrides.rowsCount = createTableProps !== null && createTableProps !== void 0 && createTableProps.rowsCount ? createTableProps === null || createTableProps === void 0 ? void 0 : createTableProps.rowsCount : NESTED_TABLE_DEFAULT_ROWS;
+      attrsOverrides.colsCount = createTableProps !== null && createTableProps !== void 0 && createTableProps.colsCount ? createTableProps === null || createTableProps === void 0 ? void 0 : createTableProps.colsCount : NESTED_TABLE_DEFAULT_COLS;
+    }
     if (isTableScalingEnabled && isFullWidthModeEnabled && !isCommentEditor) {
       attrsOverrides.tableWidth = _utils2.TABLE_MAX_WIDTH;
     }

package/dist/es2019/commands/insert.js

@@ -224,18 +224,10 @@ export const insertTableWithNestingSupport = ({
   const {
     schema
   } = tr.doc.type;
-  const node = createTableWithWidth({
-    isTableScalingEnabled,
-    isTableAlignmentEnabled,
-    isFullWidthModeEnabled,
-    isCommentEditor,
-    isChromelessEditor,
-    isTableResizingEnabled,
-    createTableProps
-  })(schema);
 
   // If the cursor is inside a table
   let insertAt;
+  let isNestedTable = false;
   if (hasParentNodeOfType(schema.nodes.table)(tr.selection) && fg('platform_editor_use_nested_table_pm_nodes')) {
     // If the experiment is disabled, or we're trying to nest deeper than one level, we insert the table after the top table
     if (editorExperiment('nested-tables-in-tables', false, {
@@ -246,8 +238,21 @@ export const insertTableWithNestingSupport = ({
         return tr;
       }
       insertAt = TextSelection.create(tr.doc, positionAfterTopTable);
+    } else {
+      // Table can be nested in parent table
+      isNestedTable = true;
     }
   }
+  const node = createTableWithWidth({
+    isTableScalingEnabled,
+    isTableAlignmentEnabled,
+    isFullWidthModeEnabled,
+    isCommentEditor,
+    isChromelessEditor,
+    isTableResizingEnabled,
+    isNestedTable,
+    createTableProps
+  })(schema);
   api === null || api === void 0 ? void 0 : (_api$contentInsertion = api.contentInsertion) === null || _api$contentInsertion === void 0 ? void 0 : (_api$contentInsertion2 = _api$contentInsertion.commands) === null || _api$contentInsertion2 === void 0 ? void 0 : _api$contentInsertion2.insert({
     node,
     options: {

package/dist/es2019/plugin.js

@@ -548,14 +548,15 @@ const tablesPlugin = ({
           var _api$table;
           // see comment on tablesPlugin.getSharedState on usage
           const tableState = api === null || api === void 0 ? void 0 : (_api$table = api.table) === null || _api$table === void 0 ? void 0 : _api$table.sharedState.currentState();
-          const tableNode = createTableWithWidth({
+          const tableNodeProps = {
             isTableScalingEnabled: options === null || options === void 0 ? void 0 : options.isTableScalingEnabled,
             isTableAlignmentEnabled: options === null || options === void 0 ? void 0 : options.tableOptions.allowTableAlignment,
             isFullWidthModeEnabled: tableState === null || tableState === void 0 ? void 0 : tableState.isFullWidthModeEnabled,
             isCommentEditor: options === null || options === void 0 ? void 0 : options.isCommentEditor,
             isChromelessEditor: options === null || options === void 0 ? void 0 : options.isChromelessEditor,
             isTableResizingEnabled: options === null || options === void 0 ? void 0 : options.tableOptions.allowTableResizing
-          })(state.schema);
+          };
+          let tableNode = createTableWithWidth(tableNodeProps)(state.schema);
           let {
             tr
           } = state;
@@ -571,6 +572,10 @@ const tablesPlugin = ({
               tr.scrollIntoView();
             } else {
               // Table can be nested in parent table
+              tableNode = createTableWithWidth({
+                ...tableNodeProps,
+                isNestedTable: true
+              })(state.schema);
               tr = insert(tableNode);
             }
           } else {

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

@@ -83,8 +83,7 @@ const FloatingContextualButtonInner = /*#__PURE__*/React.memo(props => {
     onClick: handleClick,
     iconBefore: jsx(ExpandIcon, {
       label: "",
-      color: "currentColor",
-      isFacadeDisabled: true
+      color: "currentColor"
     }),
     "aria-label": labelCellOptions,
     "aria-expanded": isContextualMenuOpen

package/dist/es2019/utils/create.js

@@ -1,5 +1,7 @@
 import { createTable } from '@atlaskit/editor-tables/utils';
 import { TABLE_MAX_WIDTH } from '../pm-plugins/table-resizing/utils';
+const NESTED_TABLE_DEFAULT_ROWS = 2;
+const NESTED_TABLE_DEFAULT_COLS = 2;
 export const createTableWithWidth = ({
   isTableScalingEnabled,
   isTableAlignmentEnabled,
@@ -7,9 +9,14 @@ export const createTableWithWidth = ({
   isCommentEditor,
   isChromelessEditor,
   isTableResizingEnabled,
+  isNestedTable,
   createTableProps
 }) => schema => {
   const attrsOverrides = {};
+  if (isNestedTable) {
+    attrsOverrides.rowsCount = createTableProps !== null && createTableProps !== void 0 && createTableProps.rowsCount ? createTableProps === null || createTableProps === void 0 ? void 0 : createTableProps.rowsCount : NESTED_TABLE_DEFAULT_ROWS;
+    attrsOverrides.colsCount = createTableProps !== null && createTableProps !== void 0 && createTableProps.colsCount ? createTableProps === null || createTableProps === void 0 ? void 0 : createTableProps.colsCount : NESTED_TABLE_DEFAULT_COLS;
+  }
   if (isTableScalingEnabled && isFullWidthModeEnabled && !isCommentEditor) {
     attrsOverrides.tableWidth = TABLE_MAX_WIDTH;
   }

package/dist/esm/commands/insert.js

@@ -256,18 +256,10 @@ export var insertTableWithNestingSupport = function insertTableWithNestingSuppor
     var _api$contentInsertion;
     var tr = _ref3.tr;
     var schema = tr.doc.type.schema;
-    var node = createTableWithWidth({
-      isTableScalingEnabled: isTableScalingEnabled,
-      isTableAlignmentEnabled: isTableAlignmentEnabled,
-      isFullWidthModeEnabled: isFullWidthModeEnabled,
-      isCommentEditor: isCommentEditor,
-      isChromelessEditor: isChromelessEditor,
-      isTableResizingEnabled: isTableResizingEnabled,
-      createTableProps: createTableProps
-    })(schema);
 
     // If the cursor is inside a table
     var insertAt;
+    var isNestedTable = false;
     if (hasParentNodeOfType(schema.nodes.table)(tr.selection) && fg('platform_editor_use_nested_table_pm_nodes')) {
       // If the experiment is disabled, or we're trying to nest deeper than one level, we insert the table after the top table
       if (editorExperiment('nested-tables-in-tables', false, {
@@ -278,8 +270,21 @@ export var insertTableWithNestingSupport = function insertTableWithNestingSuppor
           return tr;
         }
         insertAt = TextSelection.create(tr.doc, positionAfterTopTable);
+      } else {
+        // Table can be nested in parent table
+        isNestedTable = true;
       }
     }
+    var node = createTableWithWidth({
+      isTableScalingEnabled: isTableScalingEnabled,
+      isTableAlignmentEnabled: isTableAlignmentEnabled,
+      isFullWidthModeEnabled: isFullWidthModeEnabled,
+      isCommentEditor: isCommentEditor,
+      isChromelessEditor: isChromelessEditor,
+      isTableResizingEnabled: isTableResizingEnabled,
+      isNestedTable: isNestedTable,
+      createTableProps: createTableProps
+    })(schema);
     api === null || api === void 0 || (_api$contentInsertion = api.contentInsertion) === null || _api$contentInsertion === void 0 || (_api$contentInsertion = _api$contentInsertion.commands) === null || _api$contentInsertion === void 0 || _api$contentInsertion.insert({
       node: node,
       options: {

package/dist/esm/plugin.js

@@ -548,14 +548,15 @@ var tablesPlugin = function tablesPlugin(_ref) {
             var _api$table;
             // see comment on tablesPlugin.getSharedState on usage
             var tableState = api === null || api === void 0 || (_api$table = api.table) === null || _api$table === void 0 ? void 0 : _api$table.sharedState.currentState();
-            var tableNode = createTableWithWidth({
+            var tableNodeProps = {
               isTableScalingEnabled: options === null || options === void 0 ? void 0 : options.isTableScalingEnabled,
               isTableAlignmentEnabled: options === null || options === void 0 ? void 0 : options.tableOptions.allowTableAlignment,
               isFullWidthModeEnabled: tableState === null || tableState === void 0 ? void 0 : tableState.isFullWidthModeEnabled,
               isCommentEditor: options === null || options === void 0 ? void 0 : options.isCommentEditor,
               isChromelessEditor: options === null || options === void 0 ? void 0 : options.isChromelessEditor,
               isTableResizingEnabled: options === null || options === void 0 ? void 0 : options.tableOptions.allowTableResizing
-            })(state.schema);
+            };
+            var tableNode = createTableWithWidth(tableNodeProps)(state.schema);
             var tr = state.tr;
             // If the cursor is inside a table
             if (hasParentNodeOfType(state.schema.nodes.table)(state.selection) && fg('platform_editor_use_nested_table_pm_nodes')) {
@@ -569,6 +570,9 @@ var tablesPlugin = function tablesPlugin(_ref) {
                 tr.scrollIntoView();
               } else {
                 // Table can be nested in parent table
+                tableNode = createTableWithWidth(_objectSpread(_objectSpread({}, tableNodeProps), {}, {
+                  isNestedTable: true
+                }))(state.schema);
                 tr = insert(tableNode);
               }
             } else {

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

@@ -75,8 +75,7 @@ var FloatingContextualButtonInner = /*#__PURE__*/React.memo(function (props) {
     onClick: handleClick,
     iconBefore: jsx(ExpandIcon, {
       label: "",
-      color: "currentColor",
-      isFacadeDisabled: true
+      color: "currentColor"
     }),
     "aria-label": labelCellOptions,
     "aria-expanded": isContextualMenuOpen

package/dist/esm/utils/create.js

@@ -3,6 +3,8 @@ 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; }
 import { createTable } from '@atlaskit/editor-tables/utils';
 import { TABLE_MAX_WIDTH } from '../pm-plugins/table-resizing/utils';
+var NESTED_TABLE_DEFAULT_ROWS = 2;
+var NESTED_TABLE_DEFAULT_COLS = 2;
 export var createTableWithWidth = function createTableWithWidth(_ref) {
   var isTableScalingEnabled = _ref.isTableScalingEnabled,
     isTableAlignmentEnabled = _ref.isTableAlignmentEnabled,
@@ -10,9 +12,14 @@ export var createTableWithWidth = function createTableWithWidth(_ref) {
     isCommentEditor = _ref.isCommentEditor,
     isChromelessEditor = _ref.isChromelessEditor,
     isTableResizingEnabled = _ref.isTableResizingEnabled,
+    isNestedTable = _ref.isNestedTable,
     createTableProps = _ref.createTableProps;
   return function (schema) {
     var attrsOverrides = {};
+    if (isNestedTable) {
+      attrsOverrides.rowsCount = createTableProps !== null && createTableProps !== void 0 && createTableProps.rowsCount ? createTableProps === null || createTableProps === void 0 ? void 0 : createTableProps.rowsCount : NESTED_TABLE_DEFAULT_ROWS;
+      attrsOverrides.colsCount = createTableProps !== null && createTableProps !== void 0 && createTableProps.colsCount ? createTableProps === null || createTableProps === void 0 ? void 0 : createTableProps.colsCount : NESTED_TABLE_DEFAULT_COLS;
+    }
     if (isTableScalingEnabled && isFullWidthModeEnabled && !isCommentEditor) {
       attrsOverrides.tableWidth = TABLE_MAX_WIDTH;
     }

package/dist/types/utils/create.d.ts

@@ -1,11 +1,12 @@
 import type { Schema } from '@atlaskit/editor-prosemirror/model';
-export declare const createTableWithWidth: ({ isTableScalingEnabled, isTableAlignmentEnabled, isFullWidthModeEnabled, isCommentEditor, isChromelessEditor, isTableResizingEnabled, createTableProps, }: {
+export declare const createTableWithWidth: ({ isTableScalingEnabled, isTableAlignmentEnabled, isFullWidthModeEnabled, isCommentEditor, isChromelessEditor, isTableResizingEnabled, isNestedTable, createTableProps, }: {
     isTableScalingEnabled?: boolean | undefined;
     isTableAlignmentEnabled?: boolean | undefined;
     isFullWidthModeEnabled?: boolean | undefined;
     isCommentEditor?: boolean | undefined;
     isChromelessEditor?: boolean | undefined;
     isTableResizingEnabled?: boolean | undefined;
+    isNestedTable?: boolean | undefined;
     createTableProps?: {
         rowsCount?: number | undefined;
         colsCount?: number | undefined;

package/dist/types-ts4.5/utils/create.d.ts

@@ -1,11 +1,12 @@
 import type { Schema } from '@atlaskit/editor-prosemirror/model';
-export declare const createTableWithWidth: ({ isTableScalingEnabled, isTableAlignmentEnabled, isFullWidthModeEnabled, isCommentEditor, isChromelessEditor, isTableResizingEnabled, createTableProps, }: {
+export declare const createTableWithWidth: ({ isTableScalingEnabled, isTableAlignmentEnabled, isFullWidthModeEnabled, isCommentEditor, isChromelessEditor, isTableResizingEnabled, isNestedTable, createTableProps, }: {
     isTableScalingEnabled?: boolean | undefined;
     isTableAlignmentEnabled?: boolean | undefined;
     isFullWidthModeEnabled?: boolean | undefined;
     isCommentEditor?: boolean | undefined;
     isChromelessEditor?: boolean | undefined;
     isTableResizingEnabled?: boolean | undefined;
+    isNestedTable?: boolean | undefined;
     createTableProps?: {
         rowsCount?: number | undefined;
         colsCount?: number | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-table",
-	"version": "8.4.0",
+	"version": "8.4.2",
 	"description": "Table plugin for the @atlaskit/editor",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -30,11 +30,11 @@
 		"@atlaskit/adf-schema": "^46.1.0",
 		"@atlaskit/button": "^20.3.0",
 		"@atlaskit/custom-steps": "^0.9.0",
-		"@atlaskit/editor-common": "^95.11.0",
+		"@atlaskit/editor-common": "^96.0.0",
 		"@atlaskit/editor-palette": "1.6.3",
 		"@atlaskit/editor-plugin-accessibility-utils": "^1.2.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
-		"@atlaskit/editor-plugin-batch-attribute-updates": "1.1.6",
+		"@atlaskit/editor-plugin-batch-attribute-updates": "1.1.7",
 		"@atlaskit/editor-plugin-content-insertion": "^1.11.0",
 		"@atlaskit/editor-plugin-editor-viewmode": "^2.1.0",
 		"@atlaskit/editor-plugin-guideline": "^1.2.0",

package/src/commands/insert.ts

@@ -378,18 +378,10 @@ export const insertTableWithNestingSupport: InsertTableWithNestingSupportCommand
 	) =>
 	({ tr }) => {
 		const { schema } = tr.doc.type;
-		const node = createTableWithWidth({
-			isTableScalingEnabled,
-			isTableAlignmentEnabled,
-			isFullWidthModeEnabled,
-			isCommentEditor,
-			isChromelessEditor,
-			isTableResizingEnabled,
-			createTableProps,
-		})(schema);
 
 		// If the cursor is inside a table
 		let insertAt: Selection | undefined;
+		let isNestedTable = false;
 		if (
 			hasParentNodeOfType(schema.nodes.table)(tr.selection) &&
 			fg('platform_editor_use_nested_table_pm_nodes')
@@ -406,9 +398,23 @@ export const insertTableWithNestingSupport: InsertTableWithNestingSupportCommand
 					return tr;
 				}
 				insertAt = TextSelection.create(tr.doc, positionAfterTopTable);
+			} else {
+				// Table can be nested in parent table
+				isNestedTable = true;
 			}
 		}
 
+		const node = createTableWithWidth({
+			isTableScalingEnabled,
+			isTableAlignmentEnabled,
+			isFullWidthModeEnabled,
+			isCommentEditor,
+			isChromelessEditor,
+			isTableResizingEnabled,
+			isNestedTable,
+			createTableProps,
+		})(schema);
+
 		api?.contentInsertion?.commands?.insert({
 			node,
 			options: {

package/src/plugin.tsx

@@ -786,15 +786,16 @@ const tablesPlugin: TablePlugin = ({ config: options, api }) => {
 					action(insert, state) {
 						// see comment on tablesPlugin.getSharedState on usage
 						const tableState = api?.table?.sharedState.currentState();
-
-						const tableNode = createTableWithWidth({
+						const tableNodeProps = {
 							isTableScalingEnabled: options?.isTableScalingEnabled,
 							isTableAlignmentEnabled: options?.tableOptions.allowTableAlignment,
 							isFullWidthModeEnabled: tableState?.isFullWidthModeEnabled,
 							isCommentEditor: options?.isCommentEditor,
 							isChromelessEditor: options?.isChromelessEditor,
 							isTableResizingEnabled: options?.tableOptions.allowTableResizing,
-						})(state.schema);
+						};
+
+						let tableNode = createTableWithWidth(tableNodeProps)(state.schema);
 
 						let { tr } = state;
 						// If the cursor is inside a table
@@ -815,6 +816,10 @@ const tablesPlugin: TablePlugin = ({ config: options, api }) => {
 								tr.scrollIntoView();
 							} else {
 								// Table can be nested in parent table
+								tableNode = createTableWithWidth({
+									...tableNodeProps,
+									isNestedTable: true,
+								})(state.schema);
 								tr = insert(tableNode);
 							}
 						} else {

package/src/ui/FloatingContextualButton/index.tsx

@@ -105,7 +105,7 @@ const FloatingContextualButtonInner = React.memo((props: Props & WrappedComponen
 				title={labelCellOptions}
 				keymap={focusToContextMenuTrigger}
 				onClick={handleClick}
-				iconBefore={<ExpandIcon label="" color="currentColor" isFacadeDisabled={true} />}
+				iconBefore={<ExpandIcon label="" color="currentColor" />}
 				aria-label={labelCellOptions}
 				aria-expanded={isContextualMenuOpen}
 			/>

package/src/utils/create.ts

@@ -3,10 +3,14 @@ import type { Schema } from '@atlaskit/editor-prosemirror/model';
 import { createTable } from '@atlaskit/editor-tables/utils';
 
 import { TABLE_MAX_WIDTH } from '../pm-plugins/table-resizing/utils';
+const NESTED_TABLE_DEFAULT_ROWS = 2;
+const NESTED_TABLE_DEFAULT_COLS = 2;
 
 type CreateTableOverrides = {
 	tableWidth?: TableAttributes['width'] | 'inherit';
 	layout?: TableAttributes['layout'];
+	rowsCount?: number;
+	colsCount?: number;
 };
 
 export const createTableWithWidth =
@@ -17,6 +21,7 @@ export const createTableWithWidth =
 		isCommentEditor,
 		isChromelessEditor,
 		isTableResizingEnabled,
+		isNestedTable,
 		createTableProps,
 	}: {
 		isTableScalingEnabled?: boolean;
@@ -25,6 +30,7 @@ export const createTableWithWidth =
 		isCommentEditor?: boolean;
 		isChromelessEditor?: boolean;
 		isTableResizingEnabled?: boolean;
+		isNestedTable?: boolean;
 		createTableProps?: {
 			rowsCount?: number;
 			colsCount?: number;
@@ -32,6 +38,14 @@ export const createTableWithWidth =
 	}) =>
 	(schema: Schema) => {
 		const attrsOverrides: CreateTableOverrides = {};
+		if (isNestedTable) {
+			attrsOverrides.rowsCount = createTableProps?.rowsCount
+				? createTableProps?.rowsCount
+				: NESTED_TABLE_DEFAULT_ROWS;
+			attrsOverrides.colsCount = createTableProps?.colsCount
+				? createTableProps?.colsCount
+				: NESTED_TABLE_DEFAULT_COLS;
+		}
 		if (isTableScalingEnabled && isFullWidthModeEnabled && !isCommentEditor) {
 			attrsOverrides.tableWidth = TABLE_MAX_WIDTH;
 		}