@atlaskit/editor-core 212.0.1 → 212.1.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @atlaskit/editor-core
 
+## 212.1.0
+
+### Minor Changes
+
+- [`4edb2aee0da9c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4edb2aee0da9c) -
+  Add conditionalHooksFactory and migrate usage of useSharedPluginStateSelector to useEditorToolbar
+  and useSharedPluginStateWithSelector
+
+### Patch Changes
+
+- [`c0656bad0f992`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c0656bad0f992) -
+  EDITOR-1389 fix table container width behind platform_editor_table_container_width_fix
+- [`f0662cd7a143e`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/f0662cd7a143e) -
+  Internal changes to how borders are applied.
+- Updated dependencies
+
 ## 212.0.1
 
 ### Patch Changes

package/dist/cjs/ui/ContentStyles/tasks-and-decisions.js

@@ -17,7 +17,7 @@ var taskDecisionStyles = exports.taskDecisionStyles = (0, _react.css)({
   '.ak-editor-selected-node > [data-decision-wrapper], ol[data-node-type="decisionList"].ak-editor-selected-node':
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
   [{
-    borderRadius: '4px'
+    borderRadius: "var(--ds-radius-small, 4px)"
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
   (0, _editorSharedStyles.getSelectionStyles)([_editorSharedStyles.SelectionStyle.BoxShadow, _editorSharedStyles.SelectionStyle.Blanket])],

package/dist/cjs/ui/EditorContentContainer/EditorContentContainer.js

@@ -358,7 +358,9 @@ var EditorContentContainer = /*#__PURE__*/_react.default.forwardRef(function (pr
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _mediaStyles.mediaAlignmentStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    _tableStyles.tableLayoutFixes,
+    _tableStyles.tableLayoutFixes, (0, _expValEquals.expValEquals)('platform_editor_table_container_width_fix', 'isEnabled', true)
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    && _tableStyles.tableContainerStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     _link.hyperLinkFloatingToolbarStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

package/dist/cjs/ui/EditorContentContainer/styles/blockTypeStyles.js

@@ -19,7 +19,7 @@ var blocktypeStyles = exports.blocktypeStyles = (0, _react.css)({
       width: '100%',
       display: 'inline-block',
       paddingLeft: "var(--ds-space-200, 16px)",
-      borderLeftWidth: '2px',
+      borderLeftWidth: "var(--ds-border-width-selected, 2px)",
       borderLeftStyle: 'solid',
       borderLeftColor: "var(--ds-border, #091E4224)",
       margin: '0.75rem 0 0 0',

package/dist/cjs/ui/EditorContentContainer/styles/expandStyles.js

@@ -16,7 +16,7 @@ var expandStyles = exports.expandStyles = (0, _react.css)({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '.ak-editor-expand': {
     // sharedExpandStyles.containerStyles({ expanded: false, focused: false })(),
-    borderWidth: '1px',
+    borderWidth: "var(--ds-border-width, 1px)",
     borderStyle: 'solid',
     borderColor: 'transparent',
     borderRadius: "var(--ds-radius-small, 4px)",

package/dist/cjs/ui/EditorContentContainer/styles/tableStyles.js

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.tableLayoutFixes = exports.tableCommentEditorStyles = exports.tableCommentEditorMarginOverride = void 0;
+exports.tableLayoutFixes = exports.tableContainerStyles = exports.tableCommentEditorStyles = exports.tableCommentEditorMarginOverride = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = require("@emotion/react");
 var _scrollbarStyles = require("./scrollbarStyles");
@@ -32,4 +32,27 @@ var tableCommentEditorMarginOverride = exports.tableCommentEditorMarginOverride
 });
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
-var tableCommentEditorStyles = exports.tableCommentEditorStyles = (0, _react.css)((0, _defineProperty2.default)({}, ".ProseMirror .pm-table-wrapper > table", [tableCommentEditorMarginOverride, _scrollbarStyles.scrollbarStyles]));
+var tableCommentEditorStyles = exports.tableCommentEditorStyles = (0, _react.css)((0, _defineProperty2.default)({}, ".ProseMirror .pm-table-wrapper > table", [tableCommentEditorMarginOverride, _scrollbarStyles.scrollbarStyles]));
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+var tableContainerStyles = exports.tableContainerStyles = (0, _react.css)({
+  /* Fix for HOT-119925: Ensure table containers have proper width constraints and overflow handling */
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror .pm-table-wrapper': {
+    maxWidth: '100%',
+    overflowX: 'auto',
+    overflowY: 'visible',
+    // Ensure the wrapper doesn't grow beyond its container
+    width: '100%',
+    boxSizing: 'border-box'
+  },
+  /* Fix for HOT-119925: Ensure table elements are responsive and don't overflow */
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror .pm-table-wrapper table': {
+    maxWidth: '100%',
+    width: '100%',
+    tableLayout: 'fixed',
+    // Ensure tables can be scrolled horizontally if needed
+    minWidth: 'auto'
+  }
+});

package/dist/cjs/ui/EditorContentContainer/styles/tasksAndDecisionsStyles.js

@@ -77,7 +77,7 @@ var tasksAndDecisionsStyles = exports.tasksAndDecisionsStyles = (0, _react.css)(
 var decisionStyles = exports.decisionStyles = (0, _react.css)((_css = {}, (0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)(_css, ".".concat(akEditorSelectedNodeClassName, " > [data-decision-wrapper], ol[data-node-type='decisionList'].").concat(akEditorSelectedNodeClassName),
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
 [{
-  borderRadius: '4px'
+  borderRadius: "var(--ds-radius-small, 4px)"
 },
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
 _selectionStyles.boxShadowSelectionStyles,

package/dist/cjs/ui/Toolbar/Toolbar.js

@@ -6,11 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ToolbarNext = exports.Toolbar = void 0;
 var _react = _interopRequireDefault(require("react"));
+var _hooks = require("@atlaskit/editor-common/hooks");
 var _toolbar = require("@atlaskit/editor-common/toolbar");
 var _types = require("@atlaskit/editor-common/types");
 var _useSharedPluginStateSelector = require("@atlaskit/editor-common/use-shared-plugin-state-selector");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
 var _editorToolbarModel = require("@atlaskit/editor-toolbar-model");
+var _platformFeatureFlagsReact = require("@atlaskit/platform-feature-flags-react");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _ToolbarInner = require("./ToolbarInner");
 /**
  * *Warning:* With `platform_editor_toolbar_aifc` enabled this component is no longer used and is replaced with `<ToolbarNext />`.
@@ -35,6 +38,26 @@ var Toolbar = exports.Toolbar = function Toolbar(props) {
     containerElement: props.containerElement
   });
 };
+var usePluginState = (0, _platformFeatureFlagsReact.conditionalHooksFactory)(function () {
+  return (0, _expValEquals.expValEquals)('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true);
+}, function (api) {
+  return (0, _hooks.useSharedPluginStateWithSelector)(api, ['connectivity', 'editorViewMode', 'userPreferences'], function (state) {
+    var _state$connectivitySt, _state$editorViewMode, _state$userPreference;
+    return {
+      connectivityStateMode: (_state$connectivitySt = state.connectivityState) === null || _state$connectivitySt === void 0 ? void 0 : _state$connectivitySt.mode,
+      editorViewMode: (_state$editorViewMode = state.editorViewModeState) === null || _state$editorViewMode === void 0 ? void 0 : _state$editorViewMode.mode,
+      editorToolbarDockingPreference: (_state$userPreference = state.userPreferencesState) === null || _state$userPreference === void 0 || (_state$userPreference = _state$userPreference.preferences) === null || _state$userPreference === void 0 ? void 0 : _state$userPreference.toolbarDockingPosition
+    };
+  });
+}, function (api) {
+  var connectivityStateMode = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(api, 'connectivity.mode');
+  return {
+    connectivityStateMode: connectivityStateMode,
+    editorViewMode: undefined,
+    editorToolbarDockingPreference: undefined
+  };
+});
+
 /**
  * Renders a primary toolbar, driven by components registed by `editor-plugin-toolbar`. `ToolbarModelRenderer` will just
  * render the toolbar structure, the design is driven per component registered including the toolbar itself.
@@ -50,11 +73,16 @@ var ToolbarNext = exports.ToolbarNext = function ToolbarNext(_ref) {
     editorAppearance = _ref.editorAppearance,
     popupsBoundariesElement = _ref.popupsBoundariesElement,
     popupsScrollableElement = _ref.popupsScrollableElement;
-  var connectivityStateMode = (0, _useSharedPluginStateSelector.useSharedPluginStateSelector)(editorAPI, 'connectivity.mode');
+  var _usePluginState = usePluginState(editorAPI),
+    connectivityStateMode = _usePluginState.connectivityStateMode,
+    editorViewMode = _usePluginState.editorViewMode,
+    editorToolbarDockingPreference = _usePluginState.editorToolbarDockingPreference;
   var isOffline = connectivityStateMode === 'offline';
   return /*#__PURE__*/_react.default.createElement(_toolbar.EditorToolbarProvider, {
     editorView: editorView !== null && editorView !== void 0 ? editorView : null,
-    editorAppearance: editorAppearance
+    editorAppearance: editorAppearance,
+    editorViewMode: editorViewMode,
+    editorToolbarDockingPreference: editorToolbarDockingPreference
   }, /*#__PURE__*/_react.default.createElement(_toolbar.EditorToolbarUIProvider, {
     api: editorAPI,
     isDisabled: isOffline,

package/dist/cjs/version-wrapper.js

@@ -5,4 +5,4 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.version = exports.name = void 0;
 var name = exports.name = "@atlaskit/editor-core";
-var version = exports.version = "212.0.0";
+var version = exports.version = "212.0.1";

package/dist/es2019/ui/ContentStyles/tasks-and-decisions.js

@@ -8,7 +8,7 @@ export const taskDecisionStyles = css({
   '.ak-editor-selected-node > [data-decision-wrapper], ol[data-node-type="decisionList"].ak-editor-selected-node':
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
   [{
-    borderRadius: '4px'
+    borderRadius: "var(--ds-radius-small, 4px)"
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
   getSelectionStyles([SelectionStyle.BoxShadow, SelectionStyle.Blanket])],

package/dist/es2019/ui/EditorContentContainer/EditorContentContainer.js

@@ -57,7 +57,7 @@ import { selectionToolbarAnimationStyles } from './styles/selectionToolbarStyles
 import { shadowStyles } from './styles/shadowStyles';
 import { editorControlsSmartCardStyles, linkingVisualRefreshV1Styles, smartCardStyles, smartCardStylesWithSearchMatch, smartCardStylesWithSearchMatchAndBlockMenuDangerStyles, smartCardStylesWithSearchMatchAndPreviewPanelResponsiveness, smartLinksInLivePagesStyles } from './styles/smartCardStyles';
 import { statusDangerStyles, statusStyles, statusStylesMixin_fg_platform_component_visual_refresh, statusStylesMixin_fg_platform_component_visual_refresh_with_search_match, statusStylesMixin_without_fg_platform_component_visual_refresh, statusStylesMixin_without_fg_platform_component_visual_refresh_with_search_match } from './styles/statusStyles';
-import { tableCommentEditorStyles, tableLayoutFixes } from './styles/tableStyles';
+import { tableCommentEditorStyles, tableContainerStyles, tableLayoutFixes } from './styles/tableStyles';
 import { decisionStyles, tasksAndDecisionsStyles, decisionIconWithVisualRefresh, decisionIconWithoutVisualRefresh, taskItemStyles, taskItemStylesWithBlockTaskItem, decisionDangerStyles } from './styles/tasksAndDecisionsStyles';
 import { telepointerColorAndCommonStyle, telepointerStyle } from './styles/telepointerStyles';
 import { textColorStyles } from './styles/textColorStyles';
@@ -353,7 +353,9 @@ const EditorContentContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     mediaAlignmentStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    tableLayoutFixes,
+    tableLayoutFixes, expValEquals('platform_editor_table_container_width_fix', 'isEnabled', true)
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    && tableContainerStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     hyperLinkFloatingToolbarStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

package/dist/es2019/ui/EditorContentContainer/styles/blockTypeStyles.js

@@ -12,7 +12,7 @@ export const blocktypeStyles = css({
       width: '100%',
       display: 'inline-block',
       paddingLeft: "var(--ds-space-200, 16px)",
-      borderLeftWidth: '2px',
+      borderLeftWidth: "var(--ds-border-width-selected, 2px)",
       borderLeftStyle: 'solid',
       borderLeftColor: "var(--ds-border, #091E4224)",
       margin: '0.75rem 0 0 0',

package/dist/es2019/ui/EditorContentContainer/styles/expandStyles.js

@@ -9,7 +9,7 @@ export const expandStyles = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '.ak-editor-expand': {
     // sharedExpandStyles.containerStyles({ expanded: false, focused: false })(),
-    borderWidth: '1px',
+    borderWidth: "var(--ds-border-width, 1px)",
     borderStyle: 'solid',
     borderColor: 'transparent',
     borderRadius: "var(--ds-radius-small, 4px)",

package/dist/es2019/ui/EditorContentContainer/styles/tableStyles.js

@@ -28,4 +28,27 @@ export const tableCommentEditorStyles = css({
   // TODO: ED-28075 - refactor array include to unblock Compiled CSS migration
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-values, @atlaskit/ui-styling-standard/no-imported-style-values
   [`.ProseMirror .pm-table-wrapper > table`]: [tableCommentEditorMarginOverride, scrollbarStyles]
+});
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export const tableContainerStyles = css({
+  /* Fix for HOT-119925: Ensure table containers have proper width constraints and overflow handling */
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror .pm-table-wrapper': {
+    maxWidth: '100%',
+    overflowX: 'auto',
+    overflowY: 'visible',
+    // Ensure the wrapper doesn't grow beyond its container
+    width: '100%',
+    boxSizing: 'border-box'
+  },
+  /* Fix for HOT-119925: Ensure table elements are responsive and don't overflow */
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror .pm-table-wrapper table': {
+    maxWidth: '100%',
+    width: '100%',
+    tableLayout: 'fixed',
+    // Ensure tables can be scrolled horizontally if needed
+    minWidth: 'auto'
+  }
 });

package/dist/es2019/ui/EditorContentContainer/styles/tasksAndDecisionsStyles.js

@@ -80,7 +80,7 @@ export const decisionStyles = css({
   [`.${akEditorSelectedNodeClassName} > [data-decision-wrapper], ol[data-node-type='decisionList'].${akEditorSelectedNodeClassName}`]:
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
   [{
-    borderRadius: '4px'
+    borderRadius: "var(--ds-radius-small, 4px)"
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
   boxShadowSelectionStyles,

package/dist/es2019/ui/Toolbar/Toolbar.js

@@ -1,9 +1,12 @@
 import React from 'react';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { EditorToolbarProvider, EditorToolbarUIProvider } from '@atlaskit/editor-common/toolbar';
 import { ToolbarSize } from '@atlaskit/editor-common/types';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { ToolbarButtonGroup, ToolbarDropdownItemSection, ToolbarSection } from '@atlaskit/editor-toolbar';
 import { ToolbarModelRenderer } from '@atlaskit/editor-toolbar-model';
+import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { ToolbarInner } from './ToolbarInner';
 
 /**
@@ -29,6 +32,24 @@ export const Toolbar = props => {
     containerElement: props.containerElement
   });
 };
+const usePluginState = conditionalHooksFactory(() => expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true), api => {
+  return useSharedPluginStateWithSelector(api, ['connectivity', 'editorViewMode', 'userPreferences'], state => {
+    var _state$connectivitySt, _state$editorViewMode, _state$userPreference, _state$userPreference2;
+    return {
+      connectivityStateMode: (_state$connectivitySt = state.connectivityState) === null || _state$connectivitySt === void 0 ? void 0 : _state$connectivitySt.mode,
+      editorViewMode: (_state$editorViewMode = state.editorViewModeState) === null || _state$editorViewMode === void 0 ? void 0 : _state$editorViewMode.mode,
+      editorToolbarDockingPreference: (_state$userPreference = state.userPreferencesState) === null || _state$userPreference === void 0 ? void 0 : (_state$userPreference2 = _state$userPreference.preferences) === null || _state$userPreference2 === void 0 ? void 0 : _state$userPreference2.toolbarDockingPosition
+    };
+  });
+}, api => {
+  const connectivityStateMode = useSharedPluginStateSelector(api, 'connectivity.mode');
+  return {
+    connectivityStateMode,
+    editorViewMode: undefined,
+    editorToolbarDockingPreference: undefined
+  };
+});
+
 /**
  * Renders a primary toolbar, driven by components registed by `editor-plugin-toolbar`. `ToolbarModelRenderer` will just
  * render the toolbar structure, the design is driven per component registered including the toolbar itself.
@@ -45,11 +66,17 @@ export const ToolbarNext = ({
   popupsBoundariesElement,
   popupsScrollableElement
 }) => {
-  const connectivityStateMode = useSharedPluginStateSelector(editorAPI, 'connectivity.mode');
+  const {
+    connectivityStateMode,
+    editorViewMode,
+    editorToolbarDockingPreference
+  } = usePluginState(editorAPI);
   const isOffline = connectivityStateMode === 'offline';
   return /*#__PURE__*/React.createElement(EditorToolbarProvider, {
     editorView: editorView !== null && editorView !== void 0 ? editorView : null,
-    editorAppearance: editorAppearance
+    editorAppearance: editorAppearance,
+    editorViewMode: editorViewMode,
+    editorToolbarDockingPreference: editorToolbarDockingPreference
   }, /*#__PURE__*/React.createElement(EditorToolbarUIProvider, {
     api: editorAPI,
     isDisabled: isOffline,

package/dist/es2019/version-wrapper.js

@@ -1,2 +1,2 @@
 export const name = "@atlaskit/editor-core";
-export const version = "212.0.0";
+export const version = "212.0.1";

package/dist/esm/ui/ContentStyles/tasks-and-decisions.js

@@ -9,7 +9,7 @@ export var taskDecisionStyles = css({
   '.ak-editor-selected-node > [data-decision-wrapper], ol[data-node-type="decisionList"].ak-editor-selected-node':
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
   [{
-    borderRadius: '4px'
+    borderRadius: "var(--ds-radius-small, 4px)"
   },
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
   getSelectionStyles([SelectionStyle.BoxShadow, SelectionStyle.Blanket])],

package/dist/esm/ui/EditorContentContainer/EditorContentContainer.js

@@ -57,7 +57,7 @@ import { selectionToolbarAnimationStyles } from './styles/selectionToolbarStyles
 import { shadowStyles } from './styles/shadowStyles';
 import { editorControlsSmartCardStyles, linkingVisualRefreshV1Styles, smartCardStyles, smartCardStylesWithSearchMatch, smartCardStylesWithSearchMatchAndBlockMenuDangerStyles, smartCardStylesWithSearchMatchAndPreviewPanelResponsiveness, smartLinksInLivePagesStyles } from './styles/smartCardStyles';
 import { statusDangerStyles, statusStyles, statusStylesMixin_fg_platform_component_visual_refresh, statusStylesMixin_fg_platform_component_visual_refresh_with_search_match, statusStylesMixin_without_fg_platform_component_visual_refresh, statusStylesMixin_without_fg_platform_component_visual_refresh_with_search_match } from './styles/statusStyles';
-import { tableCommentEditorStyles, tableLayoutFixes } from './styles/tableStyles';
+import { tableCommentEditorStyles, tableContainerStyles, tableLayoutFixes } from './styles/tableStyles';
 import { decisionStyles, tasksAndDecisionsStyles, decisionIconWithVisualRefresh, decisionIconWithoutVisualRefresh, taskItemStyles, taskItemStylesWithBlockTaskItem, decisionDangerStyles } from './styles/tasksAndDecisionsStyles';
 import { telepointerColorAndCommonStyle, telepointerStyle } from './styles/telepointerStyles';
 import { textColorStyles } from './styles/textColorStyles';
@@ -350,7 +350,9 @@ var EditorContentContainer = /*#__PURE__*/React.forwardRef(function (props, ref)
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     mediaAlignmentStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
-    tableLayoutFixes,
+    tableLayoutFixes, expValEquals('platform_editor_table_container_width_fix', 'isEnabled', true)
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
+    && tableContainerStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
     hyperLinkFloatingToolbarStyles,
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values

package/dist/esm/ui/EditorContentContainer/styles/blockTypeStyles.js

@@ -12,7 +12,7 @@ export var blocktypeStyles = css({
       width: '100%',
       display: 'inline-block',
       paddingLeft: "var(--ds-space-200, 16px)",
-      borderLeftWidth: '2px',
+      borderLeftWidth: "var(--ds-border-width-selected, 2px)",
       borderLeftStyle: 'solid',
       borderLeftColor: "var(--ds-border, #091E4224)",
       margin: '0.75rem 0 0 0',

package/dist/esm/ui/EditorContentContainer/styles/expandStyles.js

@@ -9,7 +9,7 @@ export var expandStyles = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
   '.ak-editor-expand': {
     // sharedExpandStyles.containerStyles({ expanded: false, focused: false })(),
-    borderWidth: '1px',
+    borderWidth: "var(--ds-border-width, 1px)",
     borderStyle: 'solid',
     borderColor: 'transparent',
     borderRadius: "var(--ds-radius-small, 4px)",

package/dist/esm/ui/EditorContentContainer/styles/tableStyles.js

@@ -25,4 +25,27 @@ export var tableCommentEditorMarginOverride = css({
 });
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
-export var tableCommentEditorStyles = css(_defineProperty({}, ".ProseMirror .pm-table-wrapper > table", [tableCommentEditorMarginOverride, scrollbarStyles]));
+export var tableCommentEditorStyles = css(_defineProperty({}, ".ProseMirror .pm-table-wrapper > table", [tableCommentEditorMarginOverride, scrollbarStyles]));
+
+// eslint-disable-next-line @atlaskit/ui-styling-standard/no-exported-styles
+export var tableContainerStyles = css({
+  /* Fix for HOT-119925: Ensure table containers have proper width constraints and overflow handling */
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror .pm-table-wrapper': {
+    maxWidth: '100%',
+    overflowX: 'auto',
+    overflowY: 'visible',
+    // Ensure the wrapper doesn't grow beyond its container
+    width: '100%',
+    boxSizing: 'border-box'
+  },
+  /* Fix for HOT-119925: Ensure table elements are responsive and don't overflow */
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors
+  '.ProseMirror .pm-table-wrapper table': {
+    maxWidth: '100%',
+    width: '100%',
+    tableLayout: 'fixed',
+    // Ensure tables can be scrolled horizontally if needed
+    minWidth: 'auto'
+  }
+});

package/dist/esm/ui/EditorContentContainer/styles/tasksAndDecisionsStyles.js

@@ -71,7 +71,7 @@ export var tasksAndDecisionsStyles = css({
 export var decisionStyles = css((_css = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_css, ".".concat(akEditorSelectedNodeClassName, " > [data-decision-wrapper], ol[data-node-type='decisionList'].").concat(akEditorSelectedNodeClassName),
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-unsafe-values
 [{
-  borderRadius: '4px'
+  borderRadius: "var(--ds-radius-small, 4px)"
 },
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-imported-style-values
 boxShadowSelectionStyles,

package/dist/esm/ui/Toolbar/Toolbar.js

@@ -1,9 +1,12 @@
 import React from 'react';
+import { useSharedPluginStateWithSelector } from '@atlaskit/editor-common/hooks';
 import { EditorToolbarProvider, EditorToolbarUIProvider } from '@atlaskit/editor-common/toolbar';
 import { ToolbarSize } from '@atlaskit/editor-common/types';
 import { useSharedPluginStateSelector } from '@atlaskit/editor-common/use-shared-plugin-state-selector';
 import { ToolbarButtonGroup, ToolbarDropdownItemSection, ToolbarSection } from '@atlaskit/editor-toolbar';
 import { ToolbarModelRenderer } from '@atlaskit/editor-toolbar-model';
+import { conditionalHooksFactory } from '@atlaskit/platform-feature-flags-react';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import { ToolbarInner } from './ToolbarInner';
 
 /**
@@ -29,6 +32,26 @@ export var Toolbar = function Toolbar(props) {
     containerElement: props.containerElement
   });
 };
+var usePluginState = conditionalHooksFactory(function () {
+  return expValEquals('platform_editor_toolbar_aifc_patch_3', 'isEnabled', true);
+}, function (api) {
+  return useSharedPluginStateWithSelector(api, ['connectivity', 'editorViewMode', 'userPreferences'], function (state) {
+    var _state$connectivitySt, _state$editorViewMode, _state$userPreference;
+    return {
+      connectivityStateMode: (_state$connectivitySt = state.connectivityState) === null || _state$connectivitySt === void 0 ? void 0 : _state$connectivitySt.mode,
+      editorViewMode: (_state$editorViewMode = state.editorViewModeState) === null || _state$editorViewMode === void 0 ? void 0 : _state$editorViewMode.mode,
+      editorToolbarDockingPreference: (_state$userPreference = state.userPreferencesState) === null || _state$userPreference === void 0 || (_state$userPreference = _state$userPreference.preferences) === null || _state$userPreference === void 0 ? void 0 : _state$userPreference.toolbarDockingPosition
+    };
+  });
+}, function (api) {
+  var connectivityStateMode = useSharedPluginStateSelector(api, 'connectivity.mode');
+  return {
+    connectivityStateMode: connectivityStateMode,
+    editorViewMode: undefined,
+    editorToolbarDockingPreference: undefined
+  };
+});
+
 /**
  * Renders a primary toolbar, driven by components registed by `editor-plugin-toolbar`. `ToolbarModelRenderer` will just
  * render the toolbar structure, the design is driven per component registered including the toolbar itself.
@@ -44,11 +67,16 @@ export var ToolbarNext = function ToolbarNext(_ref) {
     editorAppearance = _ref.editorAppearance,
     popupsBoundariesElement = _ref.popupsBoundariesElement,
     popupsScrollableElement = _ref.popupsScrollableElement;
-  var connectivityStateMode = useSharedPluginStateSelector(editorAPI, 'connectivity.mode');
+  var _usePluginState = usePluginState(editorAPI),
+    connectivityStateMode = _usePluginState.connectivityStateMode,
+    editorViewMode = _usePluginState.editorViewMode,
+    editorToolbarDockingPreference = _usePluginState.editorToolbarDockingPreference;
   var isOffline = connectivityStateMode === 'offline';
   return /*#__PURE__*/React.createElement(EditorToolbarProvider, {
     editorView: editorView !== null && editorView !== void 0 ? editorView : null,
-    editorAppearance: editorAppearance
+    editorAppearance: editorAppearance,
+    editorViewMode: editorViewMode,
+    editorToolbarDockingPreference: editorToolbarDockingPreference
   }, /*#__PURE__*/React.createElement(EditorToolbarUIProvider, {
     api: editorAPI,
     isDisabled: isOffline,

package/dist/esm/version-wrapper.js

@@ -1,2 +1,2 @@
 export var name = "@atlaskit/editor-core";
-export var version = "212.0.0";
+export var version = "212.0.1";

package/dist/types/ui/EditorContentContainer/styles/tableStyles.d.ts

@@ -2,3 +2,4 @@ import { type SerializedStyles } from '@emotion/react';
 export declare const tableLayoutFixes: SerializedStyles;
 export declare const tableCommentEditorMarginOverride: SerializedStyles;
 export declare const tableCommentEditorStyles: SerializedStyles;
+export declare const tableContainerStyles: SerializedStyles;

package/dist/types-ts4.5/ui/EditorContentContainer/styles/tableStyles.d.ts

@@ -2,3 +2,4 @@ import { type SerializedStyles } from '@emotion/react';
 export declare const tableLayoutFixes: SerializedStyles;
 export declare const tableCommentEditorMarginOverride: SerializedStyles;
 export declare const tableCommentEditorStyles: SerializedStyles;
+export declare const tableContainerStyles: SerializedStyles;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-core",
-	"version": "212.0.1",
+	"version": "212.1.0",
 	"description": "A package contains Atlassian editor core functionality",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -63,7 +63,7 @@
 		"@atlaskit/platform-feature-flags-react": "^0.3.0",
 		"@atlaskit/react-ufo": "^4.6.0",
 		"@atlaskit/task-decision": "^19.2.0",
-		"@atlaskit/tmp-editor-statsig": "^12.9.0",
+		"@atlaskit/tmp-editor-statsig": "^12.10.0",
 		"@atlaskit/tokens": "^6.3.0",
 		"@atlaskit/tooltip": "^20.4.0",
 		"@atlaskit/width-detector": "^5.0.0",
@@ -80,7 +80,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^109.0.0",
+		"@atlaskit/editor-common": "^109.1.0",
 		"@atlaskit/link-provider": "^3.7.0",
 		"@atlaskit/media-core": "^37.0.0",
 		"react": "^18.2.0",
@@ -106,7 +106,7 @@
 		"@atlaskit/primitives": "^14.14.0",
 		"@atlaskit/renderer": "^122.0.0",
 		"@atlaskit/section-message": "^8.7.0",
-		"@atlaskit/smart-card": "^40.21.0",
+		"@atlaskit/smart-card": "^40.22.0",
 		"@atlaskit/synchrony-test-helpers": "workspace:^",
 		"@atlaskit/toggle": "^15.1.0",
 		"@atlaskit/util-data-test": "^18.1.0",