@atlaskit/editor-plugin-code-block-advanced 16.0.6 → 16.0.8

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-code-block-advanced
 
+## 16.0.8
+
+### Patch Changes
+
+- [`c4385174a8662`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/c4385174a8662) -
+  Clean up experiment `editor_a11y_role_textbox`.
+- Updated dependencies
+
+## 16.0.7
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 16.0.6
 
 ### Patch Changes

package/dist/cjs/nodeviews/codeBlockAdvanced.js

@@ -14,9 +14,7 @@ var _language = require("@codemirror/language");
 var _state = require("@codemirror/state");
 var _view = require("@codemirror/view");
 var _bindEventListener = require("bind-event-listener");
-var _browser = require("@atlaskit/editor-common/browser");
 var _codeBlock = require("@atlaskit/editor-common/code-block");
-var _floatingToolbar = require("@atlaskit/editor-common/floating-toolbar");
 var _messages = require("@atlaskit/editor-common/messages");
 var _whitespace = require("@atlaskit/editor-common/whitespace");
 var _state2 = require("@atlaskit/editor-prosemirror/state");
@@ -35,7 +33,6 @@ var _keymap = require("./extensions/keymap");
 var _manageSelectionMarker = require("./extensions/manageSelectionMarker");
 var _prosemirrorDecorations = require("./extensions/prosemirrorDecorations");
 var _tripleClickExtension = require("./extensions/tripleClickExtension");
-var _getLanguageName = _interopRequireDefault(require("./languages/getLanguageName"));
 var _loader = require("./languages/loader");
 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; }
@@ -114,7 +111,6 @@ var CodeBlockAdvancedNodeView = /*#__PURE__*/function () {
     var _config$getIntl = config.getIntl(),
       formatMessage = _config$getIntl.formatMessage;
     var formattedAriaLabel = formatMessage(_messages.blockTypeMessages.codeblock);
-    var isMacOS = (0, _browser.getBrowserInfo)().mac;
     this.cm = new _view.EditorView({
       doc: this.node.textContent,
       extensions: [].concat((0, _toConsumableArray2.default)(config.extensions), [this.lineWrappingCompartment.of((0, _codeBlock.isCodeBlockWordWrapEnabled)(node) ? _view.EditorView.lineWrapping : []), this.languageCompartment.of([]), this.pmDecorationsCompartment.of(this.pmFacet.compute([], function () {
@@ -143,18 +139,9 @@ var CodeBlockAdvancedNodeView = /*#__PURE__*/function () {
         class: 'code-block'
       }, (0, _fg.fg)('platform_editor_adf_with_localid') && {
         'data-local-id': this.node.attrs.localId
-      })), (0, _manageSelectionMarker.manageSelectionMarker)(config.api), (0, _prosemirrorDecorations.prosemirrorDecorationPlugin)(this.pmFacet, view, getPos), (0, _tripleClickExtension.tripleClickSelectAllExtension)(), (0, _firstCodeBlockInDocument.firstCodeBlockInDocument)(getPos), _view.EditorView.contentAttributes.of(_objectSpread(_objectSpread(_objectSpread({}, !(0, _expValEquals.expValEquals)('editor_a11y_role_textbox', 'isEnabled', true) && {
+      })), (0, _manageSelectionMarker.manageSelectionMarker)(config.api), (0, _prosemirrorDecorations.prosemirrorDecorationPlugin)(this.pmFacet, view, getPos), (0, _tripleClickExtension.tripleClickSelectAllExtension)(), (0, _firstCodeBlockInDocument.firstCodeBlockInDocument)(getPos), _view.EditorView.contentAttributes.of({
         'aria-label': "".concat(formattedAriaLabel)
-      }), isMacOS && (0, _expValEquals.expValEquals)('editor_a11y_role_textbox', 'isEnabled', true) && {
-        role: 'textbox',
-        'aria-roledescription': formatMessage(_messages.roleDescriptionMessages.codeSnippetTextBox),
-        'aria-describedby': "codesnippet-".concat(this.node.attrs.localId),
-        'aria-multiline': 'true',
-        'aria-label': formattedAriaLabel
-      }), !isMacOS && (0, _expValEquals.expValEquals)('editor_a11y_role_textbox', 'isEnabled', true) && {
-        'aria-label': formattedAriaLabel,
-        'aria-describedby': "codesnippet-".concat(this.node.attrs.localId)
-      })), config.allowCodeFolding ? [(0, _foldGutter.foldGutterExtension)({
+      }), config.allowCodeFolding ? [(0, _foldGutter.foldGutterExtension)({
         selectNode: this.selectCodeBlockNodeAndFocus,
         getNode: function getNode() {
           return _this.node;
@@ -197,13 +184,6 @@ var CodeBlockAdvancedNodeView = /*#__PURE__*/function () {
     // The editor's outer node is our DOM representation
     this.dom = this.cm.dom;
     this.dom.appendChild(spaceContainer);
-    if ((0, _expValEquals.expValEquals)('editor_a11y_role_textbox', 'isEnabled', true) && (0, _fg.fg)('platform_editor_adf_with_localid')) {
-      this.invisibleAriaDescription = document.createElement('span');
-      this.invisibleAriaDescription.hidden = true;
-      this.invisibleAriaDescription.id = "codesnippet-".concat(this.node.attrs.localId);
-      this.updateAriaDescription();
-      this.dom.appendChild(this.invisibleAriaDescription);
-    }
 
     // This flag is used to avoid an update loop between the outer and
     // inner editor
@@ -275,27 +255,6 @@ var CodeBlockAdvancedNodeView = /*#__PURE__*/function () {
     key: "updateLanguage",
     value: function updateLanguage() {
       this.languageLoader.updateLanguage(this.node.attrs.language);
-      if ((0, _expValEquals.expValEquals)('editor_a11y_role_textbox', 'isEnabled', true) && (0, _fg.fg)('platform_editor_adf_with_localid')) {
-        this.updateAriaDescription();
-      }
-    }
-  }, {
-    key: "updateAriaDescription",
-    value: function updateAriaDescription() {
-      if (!this.invisibleAriaDescription) {
-        return;
-      }
-      var _this$config$getIntl = this.config.getIntl(),
-        formatMessage = _this$config$getIntl.formatMessage;
-      var languageName = (0, _getLanguageName.default)(this.node.attrs.language);
-      if (languageName) {
-        this.invisibleAriaDescription.textContent = "".concat(formatMessage(_messages.codeBlockMessages.codeblockLanguageAriaDescription, {
-          language: languageName
-        }), " ").concat(formatMessage(_floatingToolbar.messages.floatingToolbarAnnouncer));
-      } else {
-        // If the lanuage is undefined provide a more human readable message
-        this.invisibleAriaDescription.textContent = "".concat(formatMessage(_messages.codeBlockMessages.codeBlockLanguageNotSet), " ").concat(formatMessage(_floatingToolbar.messages.floatingToolbarAnnouncer));
-      }
     }
   }, {
     key: "updateLocalIdAttribute",

package/dist/es2019/nodeviews/codeBlockAdvanced.js

@@ -4,10 +4,8 @@ import { syntaxHighlighting, bracketMatching } from '@codemirror/language';
 import { Compartment, Facet, EditorState as CodeMirrorState } from '@codemirror/state';
 import { EditorView as CodeMirror, lineNumbers, gutters } from '@codemirror/view';
 import { bind } from 'bind-event-listener';
-import { getBrowserInfo } from '@atlaskit/editor-common/browser';
 import { areCodeBlockLineNumbersHidden, isCodeBlockWordWrapEnabled } from '@atlaskit/editor-common/code-block';
-import { messages as floatingToolbarMessages } from '@atlaskit/editor-common/floating-toolbar';
-import { blockTypeMessages, codeBlockMessages, roleDescriptionMessages } from '@atlaskit/editor-common/messages';
+import { blockTypeMessages } from '@atlaskit/editor-common/messages';
 import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/whitespace';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
@@ -25,7 +23,6 @@ import { keymapExtension } from './extensions/keymap';
 import { manageSelectionMarker } from './extensions/manageSelectionMarker';
 import { prosemirrorDecorationPlugin } from './extensions/prosemirrorDecorations';
 import { tripleClickSelectAllExtension } from './extensions/tripleClickExtension';
-import getLanguageName from './languages/getLanguageName';
 import { LanguageLoader } from './languages/loader';
 // Based on: https://prosemirror.net/examples/codemirror/
 class CodeBlockAdvancedNodeView {
@@ -93,7 +90,6 @@ class CodeBlockAdvancedNodeView {
       formatMessage
     } = config.getIntl();
     const formattedAriaLabel = formatMessage(blockTypeMessages.codeblock);
-    const isMacOS = getBrowserInfo().mac;
     this.cm = new CodeMirror({
       doc: this.node.textContent,
       extensions: [...config.extensions, this.lineWrappingCompartment.of(isCodeBlockWordWrapEnabled(node) ? CodeMirror.lineWrapping : []), this.languageCompartment.of([]), this.pmDecorationsCompartment.of(this.pmFacet.compute([], () => innerDecorations)), keymapExtension({
@@ -120,20 +116,7 @@ class CodeBlockAdvancedNodeView {
           'data-local-id': this.node.attrs.localId
         })
       }), manageSelectionMarker(config.api), prosemirrorDecorationPlugin(this.pmFacet, view, getPos), tripleClickSelectAllExtension(), firstCodeBlockInDocument(getPos), CodeMirror.contentAttributes.of({
-        ...(!expValEquals('editor_a11y_role_textbox', 'isEnabled', true) && {
-          'aria-label': `${formattedAriaLabel}`
-        }),
-        ...(isMacOS && expValEquals('editor_a11y_role_textbox', 'isEnabled', true) && {
-          role: 'textbox',
-          'aria-roledescription': formatMessage(roleDescriptionMessages.codeSnippetTextBox),
-          'aria-describedby': `codesnippet-${this.node.attrs.localId}`,
-          'aria-multiline': 'true',
-          'aria-label': formattedAriaLabel
-        }),
-        ...(!isMacOS && expValEquals('editor_a11y_role_textbox', 'isEnabled', true) && {
-          'aria-label': formattedAriaLabel,
-          'aria-describedby': `codesnippet-${this.node.attrs.localId}`
-        })
+        'aria-label': `${formattedAriaLabel}`
       }), config.allowCodeFolding ? [foldGutterExtension({
         selectNode: this.selectCodeBlockNodeAndFocus,
         getNode: () => this.node,
@@ -176,13 +159,6 @@ class CodeBlockAdvancedNodeView {
     // The editor's outer node is our DOM representation
     this.dom = this.cm.dom;
     this.dom.appendChild(spaceContainer);
-    if (expValEquals('editor_a11y_role_textbox', 'isEnabled', true) && fg('platform_editor_adf_with_localid')) {
-      this.invisibleAriaDescription = document.createElement('span');
-      this.invisibleAriaDescription.hidden = true;
-      this.invisibleAriaDescription.id = `codesnippet-${this.node.attrs.localId}`;
-      this.updateAriaDescription();
-      this.dom.appendChild(this.invisibleAriaDescription);
-    }
 
     // This flag is used to avoid an update loop between the outer and
     // inner editor
@@ -244,26 +220,6 @@ class CodeBlockAdvancedNodeView {
   }
   updateLanguage() {
     this.languageLoader.updateLanguage(this.node.attrs.language);
-    if (expValEquals('editor_a11y_role_textbox', 'isEnabled', true) && fg('platform_editor_adf_with_localid')) {
-      this.updateAriaDescription();
-    }
-  }
-  updateAriaDescription() {
-    if (!this.invisibleAriaDescription) {
-      return;
-    }
-    const {
-      formatMessage
-    } = this.config.getIntl();
-    const languageName = getLanguageName(this.node.attrs.language);
-    if (languageName) {
-      this.invisibleAriaDescription.textContent = `${formatMessage(codeBlockMessages.codeblockLanguageAriaDescription, {
-        language: languageName
-      })} ${formatMessage(floatingToolbarMessages.floatingToolbarAnnouncer)}`;
-    } else {
-      // If the lanuage is undefined provide a more human readable message
-      this.invisibleAriaDescription.textContent = `${formatMessage(codeBlockMessages.codeBlockLanguageNotSet)} ${formatMessage(floatingToolbarMessages.floatingToolbarAnnouncer)}`;
-    }
   }
   updateLocalIdAttribute() {
     if (fg('platform_editor_adf_with_localid')) {

package/dist/esm/nodeviews/codeBlockAdvanced.js

@@ -9,10 +9,8 @@ import { syntaxHighlighting, bracketMatching } from '@codemirror/language';
 import { Compartment, Facet, EditorState as CodeMirrorState } from '@codemirror/state';
 import { EditorView as CodeMirror, lineNumbers, gutters } from '@codemirror/view';
 import { bind } from 'bind-event-listener';
-import { getBrowserInfo } from '@atlaskit/editor-common/browser';
 import { areCodeBlockLineNumbersHidden, isCodeBlockWordWrapEnabled } from '@atlaskit/editor-common/code-block';
-import { messages as floatingToolbarMessages } from '@atlaskit/editor-common/floating-toolbar';
-import { blockTypeMessages, codeBlockMessages, roleDescriptionMessages } from '@atlaskit/editor-common/messages';
+import { blockTypeMessages } from '@atlaskit/editor-common/messages';
 import { ZERO_WIDTH_SPACE } from '@atlaskit/editor-common/whitespace';
 import { NodeSelection } from '@atlaskit/editor-prosemirror/state';
 import { DecorationSet } from '@atlaskit/editor-prosemirror/view';
@@ -30,7 +28,6 @@ import { keymapExtension } from './extensions/keymap';
 import { manageSelectionMarker } from './extensions/manageSelectionMarker';
 import { prosemirrorDecorationPlugin } from './extensions/prosemirrorDecorations';
 import { tripleClickSelectAllExtension } from './extensions/tripleClickExtension';
-import getLanguageName from './languages/getLanguageName';
 import { LanguageLoader } from './languages/loader';
 // Based on: https://prosemirror.net/examples/codemirror/
 var CodeBlockAdvancedNodeView = /*#__PURE__*/function () {
@@ -107,7 +104,6 @@ var CodeBlockAdvancedNodeView = /*#__PURE__*/function () {
     var _config$getIntl = config.getIntl(),
       formatMessage = _config$getIntl.formatMessage;
     var formattedAriaLabel = formatMessage(blockTypeMessages.codeblock);
-    var isMacOS = getBrowserInfo().mac;
     this.cm = new CodeMirror({
       doc: this.node.textContent,
       extensions: [].concat(_toConsumableArray(config.extensions), [this.lineWrappingCompartment.of(isCodeBlockWordWrapEnabled(node) ? CodeMirror.lineWrapping : []), this.languageCompartment.of([]), this.pmDecorationsCompartment.of(this.pmFacet.compute([], function () {
@@ -136,18 +132,9 @@ var CodeBlockAdvancedNodeView = /*#__PURE__*/function () {
         class: 'code-block'
       }, fg('platform_editor_adf_with_localid') && {
         'data-local-id': this.node.attrs.localId
-      })), manageSelectionMarker(config.api), prosemirrorDecorationPlugin(this.pmFacet, view, getPos), tripleClickSelectAllExtension(), firstCodeBlockInDocument(getPos), CodeMirror.contentAttributes.of(_objectSpread(_objectSpread(_objectSpread({}, !expValEquals('editor_a11y_role_textbox', 'isEnabled', true) && {
+      })), manageSelectionMarker(config.api), prosemirrorDecorationPlugin(this.pmFacet, view, getPos), tripleClickSelectAllExtension(), firstCodeBlockInDocument(getPos), CodeMirror.contentAttributes.of({
         'aria-label': "".concat(formattedAriaLabel)
-      }), isMacOS && expValEquals('editor_a11y_role_textbox', 'isEnabled', true) && {
-        role: 'textbox',
-        'aria-roledescription': formatMessage(roleDescriptionMessages.codeSnippetTextBox),
-        'aria-describedby': "codesnippet-".concat(this.node.attrs.localId),
-        'aria-multiline': 'true',
-        'aria-label': formattedAriaLabel
-      }), !isMacOS && expValEquals('editor_a11y_role_textbox', 'isEnabled', true) && {
-        'aria-label': formattedAriaLabel,
-        'aria-describedby': "codesnippet-".concat(this.node.attrs.localId)
-      })), config.allowCodeFolding ? [foldGutterExtension({
+      }), config.allowCodeFolding ? [foldGutterExtension({
         selectNode: this.selectCodeBlockNodeAndFocus,
         getNode: function getNode() {
           return _this.node;
@@ -190,13 +177,6 @@ var CodeBlockAdvancedNodeView = /*#__PURE__*/function () {
     // The editor's outer node is our DOM representation
     this.dom = this.cm.dom;
     this.dom.appendChild(spaceContainer);
-    if (expValEquals('editor_a11y_role_textbox', 'isEnabled', true) && fg('platform_editor_adf_with_localid')) {
-      this.invisibleAriaDescription = document.createElement('span');
-      this.invisibleAriaDescription.hidden = true;
-      this.invisibleAriaDescription.id = "codesnippet-".concat(this.node.attrs.localId);
-      this.updateAriaDescription();
-      this.dom.appendChild(this.invisibleAriaDescription);
-    }
 
     // This flag is used to avoid an update loop between the outer and
     // inner editor
@@ -268,27 +248,6 @@ var CodeBlockAdvancedNodeView = /*#__PURE__*/function () {
     key: "updateLanguage",
     value: function updateLanguage() {
       this.languageLoader.updateLanguage(this.node.attrs.language);
-      if (expValEquals('editor_a11y_role_textbox', 'isEnabled', true) && fg('platform_editor_adf_with_localid')) {
-        this.updateAriaDescription();
-      }
-    }
-  }, {
-    key: "updateAriaDescription",
-    value: function updateAriaDescription() {
-      if (!this.invisibleAriaDescription) {
-        return;
-      }
-      var _this$config$getIntl = this.config.getIntl(),
-        formatMessage = _this$config$getIntl.formatMessage;
-      var languageName = getLanguageName(this.node.attrs.language);
-      if (languageName) {
-        this.invisibleAriaDescription.textContent = "".concat(formatMessage(codeBlockMessages.codeblockLanguageAriaDescription, {
-          language: languageName
-        }), " ").concat(formatMessage(floatingToolbarMessages.floatingToolbarAnnouncer));
-      } else {
-        // If the lanuage is undefined provide a more human readable message
-        this.invisibleAriaDescription.textContent = "".concat(formatMessage(codeBlockMessages.codeBlockLanguageNotSet), " ").concat(formatMessage(floatingToolbarMessages.floatingToolbarAnnouncer));
-      }
     }
   }, {
     key: "updateLocalIdAttribute",

package/dist/types/nodeviews/codeBlockAdvanced.d.ts

@@ -32,7 +32,6 @@ declare class CodeBlockAdvancedNodeView implements NodeView {
     private languageLoader;
     private pmFacet;
     private unsubscribeContentFormat;
-    private invisibleAriaDescription?;
     private config;
     private cleanupBorderAreaClick;
     private cleanupBorderAreaMouseDown;
@@ -42,7 +41,6 @@ declare class CodeBlockAdvancedNodeView implements NodeView {
     setSelection(anchor: number, head: number): void;
     private updateReadonlyState;
     private updateLanguage;
-    private updateAriaDescription;
     private updateLocalIdAttribute;
     private selectCodeBlockNode;
     private wordWrappingEnabled;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-code-block-advanced",
-	"version": "16.0.6",
+	"version": "16.0.8",
 	"description": "CodeBlockAdvanced plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,8 +31,8 @@
 		"@atlaskit/editor-prosemirror": "^8.0.0",
 		"@atlaskit/platform-feature-flags": "^2.1.0",
 		"@atlaskit/prosemirror-history": "^1.2.0",
-		"@atlaskit/tmp-editor-statsig": "^166.0.0",
-		"@atlaskit/tokens": "^16.8.0",
+		"@atlaskit/tmp-editor-statsig": "^168.0.0",
+		"@atlaskit/tokens": "^16.9.0",
 		"@babel/runtime": "^7.0.0",
 		"@codemirror/autocomplete": "6.18.4",
 		"@codemirror/commands": "6.7.1",
@@ -50,7 +50,7 @@
 		"codemirror-lang-mermaid": "0.4.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^120.6.0",
+		"@atlaskit/editor-common": "^120.7.0",
 		"react": "^18.2.0 || ^19.2.0",
 		"react-intl": "^5.25.1 || ^6.0.0 || ^7.0.0"
 	},

package/src/nodeviews/codeBlockAdvanced.ts

@@ -7,17 +7,11 @@ import type { ViewUpdate } from '@codemirror/view';
 import { bind } from 'bind-event-listener';
 import type { IntlShape } from 'react-intl';
 
-import { getBrowserInfo } from '@atlaskit/editor-common/browser';
 import {
 	areCodeBlockLineNumbersHidden,
 	isCodeBlockWordWrapEnabled,
 } from '@atlaskit/editor-common/code-block';
-import { messages as floatingToolbarMessages } from '@atlaskit/editor-common/floating-toolbar';
-import {
-	blockTypeMessages,
-	codeBlockMessages,
-	roleDescriptionMessages,
-} from '@atlaskit/editor-common/messages';
+import { blockTypeMessages } from '@atlaskit/editor-common/messages';
 import type { RelativeSelectionPos } from '@atlaskit/editor-common/selection';
 import type {
 	getPosHandler,
@@ -53,7 +47,6 @@ import { keymapExtension } from './extensions/keymap';
 import { manageSelectionMarker } from './extensions/manageSelectionMarker';
 import { prosemirrorDecorationPlugin } from './extensions/prosemirrorDecorations';
 import { tripleClickSelectAllExtension } from './extensions/tripleClickExtension';
-import getLanguageName from './languages/getLanguageName';
 import { LanguageLoader } from './languages/loader';
 
 export interface ConfigProps {
@@ -85,7 +78,6 @@ class CodeBlockAdvancedNodeView implements NodeView {
 	private languageLoader: LanguageLoader;
 	private pmFacet = Facet.define<DecorationSource>();
 	private unsubscribeContentFormat: (() => void) | undefined;
-	private invisibleAriaDescription?: HTMLSpanElement;
 	private config: ConfigProps;
 	private cleanupBorderAreaClick: (() => void) | undefined;
 	private cleanupBorderAreaMouseDown: (() => void) | undefined;
@@ -122,8 +114,6 @@ class CodeBlockAdvancedNodeView implements NodeView {
 		const { formatMessage } = config.getIntl();
 		const formattedAriaLabel = formatMessage(blockTypeMessages.codeblock);
 
-		const isMacOS = getBrowserInfo().mac;
-
 		this.cm = new CodeMirror({
 			doc: this.node.textContent,
 			extensions: [
@@ -173,22 +163,7 @@ class CodeBlockAdvancedNodeView implements NodeView {
 				tripleClickSelectAllExtension(),
 				firstCodeBlockInDocument(getPos),
 				CodeMirror.contentAttributes.of({
-					...(!expValEquals('editor_a11y_role_textbox', 'isEnabled', true) && {
-						'aria-label': `${formattedAriaLabel}`,
-					}),
-					...(isMacOS &&
-						expValEquals('editor_a11y_role_textbox', 'isEnabled', true) && {
-							role: 'textbox',
-							'aria-roledescription': formatMessage(roleDescriptionMessages.codeSnippetTextBox),
-							'aria-describedby': `codesnippet-${this.node.attrs.localId}`,
-							'aria-multiline': 'true',
-							'aria-label': formattedAriaLabel,
-						}),
-					...(!isMacOS &&
-						expValEquals('editor_a11y_role_textbox', 'isEnabled', true) && {
-							'aria-label': formattedAriaLabel,
-							'aria-describedby': `codesnippet-${this.node.attrs.localId}`,
-						}),
+					'aria-label': `${formattedAriaLabel}`,
 				}),
 				config.allowCodeFolding
 					? [
@@ -242,18 +217,6 @@ class CodeBlockAdvancedNodeView implements NodeView {
 		this.dom = this.cm.dom;
 		this.dom.appendChild(spaceContainer);
 
-		if (
-			expValEquals('editor_a11y_role_textbox', 'isEnabled', true) &&
-			fg('platform_editor_adf_with_localid')
-		) {
-			this.invisibleAriaDescription = document.createElement('span');
-			this.invisibleAriaDescription.hidden = true;
-			this.invisibleAriaDescription.id = `codesnippet-${this.node.attrs.localId}`;
-			this.updateAriaDescription();
-
-			this.dom.appendChild(this.invisibleAriaDescription);
-		}
-
 		// This flag is used to avoid an update loop between the outer and
 		// inner editor
 		this.updating = false;
@@ -314,34 +277,6 @@ class CodeBlockAdvancedNodeView implements NodeView {
 
 	private updateLanguage() {
 		this.languageLoader.updateLanguage(this.node.attrs.language);
-		if (
-			expValEquals('editor_a11y_role_textbox', 'isEnabled', true) &&
-			fg('platform_editor_adf_with_localid')
-		) {
-			this.updateAriaDescription();
-		}
-	}
-
-	private updateAriaDescription() {
-		if (!this.invisibleAriaDescription) {
-			return;
-		}
-
-		const { formatMessage } = this.config.getIntl();
-		const languageName = getLanguageName(this.node.attrs.language);
-		if (languageName) {
-			this.invisibleAriaDescription.textContent = `${formatMessage(
-				codeBlockMessages.codeblockLanguageAriaDescription,
-				{
-					language: languageName,
-				},
-			)} ${formatMessage(floatingToolbarMessages.floatingToolbarAnnouncer)}`;
-		} else {
-			// If the lanuage is undefined provide a more human readable message
-			this.invisibleAriaDescription.textContent = `${formatMessage(
-				codeBlockMessages.codeBlockLanguageNotSet,
-			)} ${formatMessage(floatingToolbarMessages.floatingToolbarAnnouncer)}`;
-		}
 	}
 
 	private updateLocalIdAttribute() {