@atlaskit/editor-plugin-type-ahead 6.5.8 → 6.5.10

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-type-ahead
 
+## 6.5.10
+
+### Patch Changes
+
+- [`4b461c96cc5a0`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/4b461c96cc5a0) -
+  Remove fg platform_editor_legacy_content_macro_typeahead_fix
+- Updated dependencies
+
+## 6.5.9
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 6.5.8
 
 ### Patch Changes

package/dist/cjs/ui/TypeAheadListItem.js

@@ -256,12 +256,7 @@ var TypeAheadListItem = exports.TypeAheadListItem = /*#__PURE__*/_react.default.
       iconBefore: elementIcon,
       isSelected: isSelected,
       "aria-selected": isSelected,
-      "aria-label": title
-      // TODO: ED-26959 - aria-description is in draft for ARIA 1.3.
-      // For now replace it with aria-describedby.
-      // eslint-disable-next-line @atlassian/a11y/aria-props -- TODO: Avoid using "aria-description" as aria attribute. See https://go/a11y-aria-props for more details.
-      ,
-      "aria-description": (0, _platformFeatureFlags.fg)('platform_editor_a11y_fix_aria_description') ? undefined : "".concat(descriptionText, " ").concat(shortcutText),
+      "aria-label": title,
       "aria-describedby": (descriptionText || shortcutText) && (0, _platformFeatureFlags.fg)('platform_editor_a11y_fix_aria_description') ? descriptionId : undefined,
       "aria-setsize": itemsLength,
       "aria-posinset": (0, _expValEquals.expValEquals)('platform_editor_fix_a11y_aria_posinset_0', 'isEnabled', true) ? itemIndex + 1 : itemIndex,

package/dist/cjs/ui/TypeAheadPopup.js

@@ -231,25 +231,19 @@ var TypeAheadPopup = exports.TypeAheadPopup = /*#__PURE__*/_react.default.memo(f
 
       // Handles cases like emoji (:) and mention (@) typeaheads that open new typeaheads
       var isTextSelected = ((_window$getSelection = window.getSelection()) === null || _window$getSelection === void 0 ? void 0 : _window$getSelection.type) === 'Range';
-      if ((0, _platformFeatureFlags.fg)('platform_editor_legacy_content_macro_typeahead_fix')) {
-        var innerEditor = anchorElement.closest('.extension-editable-area');
-        if (innerEditor) {
-          // When there is no related target, we default to not closing the popup
-          var newFocusInsideCurrentEditor = !relatedTarget;
-          if (relatedTarget instanceof HTMLElement) {
-            // check if the new focus is inside inner editor, keep popup opens
-            newFocusInsideCurrentEditor = innerEditor.contains(relatedTarget);
-          }
-          if (!isTextSelected && newFocusInsideCurrentEditor) {
-            return;
-          }
-        } else {
-          // if the current focus in outer editor, keep the existing behaviour, do not close the pop up if text is not selected
-          if (!isTextSelected) {
-            return;
-          }
+      var innerEditor = anchorElement.closest('.extension-editable-area');
+      if (innerEditor) {
+        // When there is no related target, we default to not closing the popup
+        var newFocusInsideCurrentEditor = !relatedTarget;
+        if (relatedTarget instanceof HTMLElement) {
+          // check if the new focus is inside inner editor, keep popup opens
+          newFocusInsideCurrentEditor = innerEditor.contains(relatedTarget);
+        }
+        if (!isTextSelected && newFocusInsideCurrentEditor) {
+          return;
         }
       } else {
+        // if the current focus in outer editor, keep the existing behaviour, do not close the pop up if text is not selected
         if (!isTextSelected) {
           return;
         }
@@ -336,9 +330,7 @@ var TypeAheadPopup = exports.TypeAheadPopup = /*#__PURE__*/_react.default.memo(f
       }
     }
   }, (0, _react2.jsx)("div", {
-    css: [typeAheadContent, moreElementsInQuickInsertViewEnabled && typeAheadContentOverride, showMoreOptionsButton && typeAheadWrapperWithViewMoreOverride]
-    // eslint-disable-next-line @atlassian/a11y/no-noninteractive-tabindex
-    ,
+    css: [typeAheadContent, moreElementsInQuickInsertViewEnabled && typeAheadContentOverride, showMoreOptionsButton && typeAheadWrapperWithViewMoreOverride],
     tabIndex: (0, _platformFeatureFlags.fg)('platform_editor_a11y_fix_typeahead_tabindex') ? undefined : 0
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     ,

package/dist/cjs/ui/modern/TypeAheadPopup.js

@@ -203,25 +203,19 @@ var TypeAheadPopup = exports.TypeAheadPopup = /*#__PURE__*/_react.default.memo(f
 
       // Handles cases like emoji and @ typeaheads that open new typeaheads
       var isTextSelected = ((_window$getSelection = window.getSelection()) === null || _window$getSelection === void 0 ? void 0 : _window$getSelection.type) === 'Range';
-      if ((0, _platformFeatureFlags.fg)('platform_editor_legacy_content_macro_typeahead_fix')) {
-        var innerEditor = anchorElement.closest('.extension-editable-area');
-        if (innerEditor) {
-          // When there is no related target, we default to not closing the popup
-          var newFocusInsideCurrentEditor = !relatedTarget;
-          if (relatedTarget instanceof HTMLElement) {
-            // check if the new focus is inside inner editor, keep popup opens
-            newFocusInsideCurrentEditor = innerEditor.contains(relatedTarget);
-          }
-          if (!isTextSelected && newFocusInsideCurrentEditor) {
-            return;
-          }
-        } else {
-          // if the current focus in outer editor, keep the existing behaviour, do not close the pop up if text is not selected
-          if (!isTextSelected) {
-            return;
-          }
+      var innerEditor = anchorElement.closest('.extension-editable-area');
+      if (innerEditor) {
+        // When there is no related target, we default to not closing the popup
+        var newFocusInsideCurrentEditor = !relatedTarget;
+        if (relatedTarget instanceof HTMLElement) {
+          // check if the new focus is inside inner editor, keep popup opens
+          newFocusInsideCurrentEditor = innerEditor.contains(relatedTarget);
+        }
+        if (!isTextSelected && newFocusInsideCurrentEditor) {
+          return;
         }
       } else {
+        // if the current focus in outer editor, keep the existing behaviour, do not close the pop up if text is not selected
         if (!isTextSelected) {
           return;
         }
@@ -310,9 +304,7 @@ var TypeAheadPopup = exports.TypeAheadPopup = /*#__PURE__*/_react.default.memo(f
     ariaLabel: null,
     preventOverflow: true
   }, (0, _react2.jsx)("div", {
-    css: [typeAheadContent]
-    // eslint-disable-next-line @atlassian/a11y/no-noninteractive-tabindex
-    ,
+    css: [typeAheadContent],
     tabIndex: (0, _platformFeatureFlags.fg)('platform_editor_a11y_fix_typeahead_tabindex') ? undefined : 0
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     ,

package/dist/es2019/ui/TypeAheadListItem.js

@@ -270,12 +270,7 @@ export const TypeAheadListItem = /*#__PURE__*/React.memo(({
       iconBefore: elementIcon,
       isSelected: isSelected,
       "aria-selected": isSelected,
-      "aria-label": title
-      // TODO: ED-26959 - aria-description is in draft for ARIA 1.3.
-      // For now replace it with aria-describedby.
-      // eslint-disable-next-line @atlassian/a11y/aria-props -- TODO: Avoid using "aria-description" as aria attribute. See https://go/a11y-aria-props for more details.
-      ,
-      "aria-description": fg('platform_editor_a11y_fix_aria_description') ? undefined : `${descriptionText} ${shortcutText}`,
+      "aria-label": title,
       "aria-describedby": (descriptionText || shortcutText) && fg('platform_editor_a11y_fix_aria_description') ? descriptionId : undefined,
       "aria-setsize": itemsLength,
       "aria-posinset": expValEquals('platform_editor_fix_a11y_aria_posinset_0', 'isEnabled', true) ? itemIndex + 1 : itemIndex,

package/dist/es2019/ui/TypeAheadPopup.js

@@ -222,25 +222,19 @@ export const TypeAheadPopup = /*#__PURE__*/React.memo(props => {
 
       // Handles cases like emoji (:) and mention (@) typeaheads that open new typeaheads
       const isTextSelected = ((_window$getSelection = window.getSelection()) === null || _window$getSelection === void 0 ? void 0 : _window$getSelection.type) === 'Range';
-      if (fg('platform_editor_legacy_content_macro_typeahead_fix')) {
-        const innerEditor = anchorElement.closest('.extension-editable-area');
-        if (innerEditor) {
-          // When there is no related target, we default to not closing the popup
-          let newFocusInsideCurrentEditor = !relatedTarget;
-          if (relatedTarget instanceof HTMLElement) {
-            // check if the new focus is inside inner editor, keep popup opens
-            newFocusInsideCurrentEditor = innerEditor.contains(relatedTarget);
-          }
-          if (!isTextSelected && newFocusInsideCurrentEditor) {
-            return;
-          }
-        } else {
-          // if the current focus in outer editor, keep the existing behaviour, do not close the pop up if text is not selected
-          if (!isTextSelected) {
-            return;
-          }
+      const innerEditor = anchorElement.closest('.extension-editable-area');
+      if (innerEditor) {
+        // When there is no related target, we default to not closing the popup
+        let newFocusInsideCurrentEditor = !relatedTarget;
+        if (relatedTarget instanceof HTMLElement) {
+          // check if the new focus is inside inner editor, keep popup opens
+          newFocusInsideCurrentEditor = innerEditor.contains(relatedTarget);
+        }
+        if (!isTextSelected && newFocusInsideCurrentEditor) {
+          return;
         }
       } else {
+        // if the current focus in outer editor, keep the existing behaviour, do not close the pop up if text is not selected
         if (!isTextSelected) {
           return;
         }
@@ -332,9 +326,7 @@ export const TypeAheadPopup = /*#__PURE__*/React.memo(props => {
       }
     }
   }, jsx("div", {
-    css: [typeAheadContent, moreElementsInQuickInsertViewEnabled && typeAheadContentOverride, showMoreOptionsButton && typeAheadWrapperWithViewMoreOverride]
-    // eslint-disable-next-line @atlassian/a11y/no-noninteractive-tabindex
-    ,
+    css: [typeAheadContent, moreElementsInQuickInsertViewEnabled && typeAheadContentOverride, showMoreOptionsButton && typeAheadWrapperWithViewMoreOverride],
     tabIndex: fg('platform_editor_a11y_fix_typeahead_tabindex') ? undefined : 0
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     ,

package/dist/es2019/ui/modern/TypeAheadPopup.js

@@ -195,25 +195,19 @@ export const TypeAheadPopup = /*#__PURE__*/React.memo(props => {
 
       // Handles cases like emoji and @ typeaheads that open new typeaheads
       const isTextSelected = ((_window$getSelection = window.getSelection()) === null || _window$getSelection === void 0 ? void 0 : _window$getSelection.type) === 'Range';
-      if (fg('platform_editor_legacy_content_macro_typeahead_fix')) {
-        const innerEditor = anchorElement.closest('.extension-editable-area');
-        if (innerEditor) {
-          // When there is no related target, we default to not closing the popup
-          let newFocusInsideCurrentEditor = !relatedTarget;
-          if (relatedTarget instanceof HTMLElement) {
-            // check if the new focus is inside inner editor, keep popup opens
-            newFocusInsideCurrentEditor = innerEditor.contains(relatedTarget);
-          }
-          if (!isTextSelected && newFocusInsideCurrentEditor) {
-            return;
-          }
-        } else {
-          // if the current focus in outer editor, keep the existing behaviour, do not close the pop up if text is not selected
-          if (!isTextSelected) {
-            return;
-          }
+      const innerEditor = anchorElement.closest('.extension-editable-area');
+      if (innerEditor) {
+        // When there is no related target, we default to not closing the popup
+        let newFocusInsideCurrentEditor = !relatedTarget;
+        if (relatedTarget instanceof HTMLElement) {
+          // check if the new focus is inside inner editor, keep popup opens
+          newFocusInsideCurrentEditor = innerEditor.contains(relatedTarget);
+        }
+        if (!isTextSelected && newFocusInsideCurrentEditor) {
+          return;
         }
       } else {
+        // if the current focus in outer editor, keep the existing behaviour, do not close the pop up if text is not selected
         if (!isTextSelected) {
           return;
         }
@@ -304,9 +298,7 @@ export const TypeAheadPopup = /*#__PURE__*/React.memo(props => {
     ariaLabel: null,
     preventOverflow: true
   }, jsx("div", {
-    css: [typeAheadContent]
-    // eslint-disable-next-line @atlassian/a11y/no-noninteractive-tabindex
-    ,
+    css: [typeAheadContent],
     tabIndex: fg('platform_editor_a11y_fix_typeahead_tabindex') ? undefined : 0
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     ,

package/dist/esm/ui/TypeAheadListItem.js

@@ -248,12 +248,7 @@ export var TypeAheadListItem = /*#__PURE__*/React.memo(function (_ref2) {
       iconBefore: elementIcon,
       isSelected: isSelected,
       "aria-selected": isSelected,
-      "aria-label": title
-      // TODO: ED-26959 - aria-description is in draft for ARIA 1.3.
-      // For now replace it with aria-describedby.
-      // eslint-disable-next-line @atlassian/a11y/aria-props -- TODO: Avoid using "aria-description" as aria attribute. See https://go/a11y-aria-props for more details.
-      ,
-      "aria-description": fg('platform_editor_a11y_fix_aria_description') ? undefined : "".concat(descriptionText, " ").concat(shortcutText),
+      "aria-label": title,
       "aria-describedby": (descriptionText || shortcutText) && fg('platform_editor_a11y_fix_aria_description') ? descriptionId : undefined,
       "aria-setsize": itemsLength,
       "aria-posinset": expValEquals('platform_editor_fix_a11y_aria_posinset_0', 'isEnabled', true) ? itemIndex + 1 : itemIndex,

package/dist/esm/ui/TypeAheadPopup.js

@@ -221,25 +221,19 @@ export var TypeAheadPopup = /*#__PURE__*/React.memo(function (props) {
 
       // Handles cases like emoji (:) and mention (@) typeaheads that open new typeaheads
       var isTextSelected = ((_window$getSelection = window.getSelection()) === null || _window$getSelection === void 0 ? void 0 : _window$getSelection.type) === 'Range';
-      if (fg('platform_editor_legacy_content_macro_typeahead_fix')) {
-        var innerEditor = anchorElement.closest('.extension-editable-area');
-        if (innerEditor) {
-          // When there is no related target, we default to not closing the popup
-          var newFocusInsideCurrentEditor = !relatedTarget;
-          if (relatedTarget instanceof HTMLElement) {
-            // check if the new focus is inside inner editor, keep popup opens
-            newFocusInsideCurrentEditor = innerEditor.contains(relatedTarget);
-          }
-          if (!isTextSelected && newFocusInsideCurrentEditor) {
-            return;
-          }
-        } else {
-          // if the current focus in outer editor, keep the existing behaviour, do not close the pop up if text is not selected
-          if (!isTextSelected) {
-            return;
-          }
+      var innerEditor = anchorElement.closest('.extension-editable-area');
+      if (innerEditor) {
+        // When there is no related target, we default to not closing the popup
+        var newFocusInsideCurrentEditor = !relatedTarget;
+        if (relatedTarget instanceof HTMLElement) {
+          // check if the new focus is inside inner editor, keep popup opens
+          newFocusInsideCurrentEditor = innerEditor.contains(relatedTarget);
+        }
+        if (!isTextSelected && newFocusInsideCurrentEditor) {
+          return;
         }
       } else {
+        // if the current focus in outer editor, keep the existing behaviour, do not close the pop up if text is not selected
         if (!isTextSelected) {
           return;
         }
@@ -326,9 +320,7 @@ export var TypeAheadPopup = /*#__PURE__*/React.memo(function (props) {
       }
     }
   }, jsx("div", {
-    css: [typeAheadContent, moreElementsInQuickInsertViewEnabled && typeAheadContentOverride, showMoreOptionsButton && typeAheadWrapperWithViewMoreOverride]
-    // eslint-disable-next-line @atlassian/a11y/no-noninteractive-tabindex
-    ,
+    css: [typeAheadContent, moreElementsInQuickInsertViewEnabled && typeAheadContentOverride, showMoreOptionsButton && typeAheadWrapperWithViewMoreOverride],
     tabIndex: fg('platform_editor_a11y_fix_typeahead_tabindex') ? undefined : 0
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     ,

package/dist/esm/ui/modern/TypeAheadPopup.js

@@ -194,25 +194,19 @@ export var TypeAheadPopup = /*#__PURE__*/React.memo(function (props) {
 
       // Handles cases like emoji and @ typeaheads that open new typeaheads
       var isTextSelected = ((_window$getSelection = window.getSelection()) === null || _window$getSelection === void 0 ? void 0 : _window$getSelection.type) === 'Range';
-      if (fg('platform_editor_legacy_content_macro_typeahead_fix')) {
-        var innerEditor = anchorElement.closest('.extension-editable-area');
-        if (innerEditor) {
-          // When there is no related target, we default to not closing the popup
-          var newFocusInsideCurrentEditor = !relatedTarget;
-          if (relatedTarget instanceof HTMLElement) {
-            // check if the new focus is inside inner editor, keep popup opens
-            newFocusInsideCurrentEditor = innerEditor.contains(relatedTarget);
-          }
-          if (!isTextSelected && newFocusInsideCurrentEditor) {
-            return;
-          }
-        } else {
-          // if the current focus in outer editor, keep the existing behaviour, do not close the pop up if text is not selected
-          if (!isTextSelected) {
-            return;
-          }
+      var innerEditor = anchorElement.closest('.extension-editable-area');
+      if (innerEditor) {
+        // When there is no related target, we default to not closing the popup
+        var newFocusInsideCurrentEditor = !relatedTarget;
+        if (relatedTarget instanceof HTMLElement) {
+          // check if the new focus is inside inner editor, keep popup opens
+          newFocusInsideCurrentEditor = innerEditor.contains(relatedTarget);
+        }
+        if (!isTextSelected && newFocusInsideCurrentEditor) {
+          return;
         }
       } else {
+        // if the current focus in outer editor, keep the existing behaviour, do not close the pop up if text is not selected
         if (!isTextSelected) {
           return;
         }
@@ -301,9 +295,7 @@ export var TypeAheadPopup = /*#__PURE__*/React.memo(function (props) {
     ariaLabel: null,
     preventOverflow: true
   }, jsx("div", {
-    css: [typeAheadContent]
-    // eslint-disable-next-line @atlassian/a11y/no-noninteractive-tabindex
-    ,
+    css: [typeAheadContent],
     tabIndex: fg('platform_editor_a11y_fix_typeahead_tabindex') ? undefined : 0
     // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
     ,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-type-ahead",
-	"version": "6.5.8",
+	"version": "6.5.10",
 	"description": "Type-ahead plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -39,15 +39,15 @@
 		"@atlaskit/editor-shared-styles": "^3.8.0",
 		"@atlaskit/heading": "^5.2.0",
 		"@atlaskit/icon": "^28.5.0",
-		"@atlaskit/insm": "^0.1.0",
+		"@atlaskit/insm": "^0.2.0",
 		"@atlaskit/menu": "^8.4.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^16.1.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
 		"@atlaskit/prosemirror-input-rules": "^3.5.0",
 		"@atlaskit/theme": "^21.0.0",
-		"@atlaskit/tmp-editor-statsig": "^13.20.0",
-		"@atlaskit/tokens": "^7.0.0",
+		"@atlaskit/tmp-editor-statsig": "^13.26.0",
+		"@atlaskit/tokens": "^7.1.0",
 		"@atlaskit/visually-hidden": "^3.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",
@@ -58,7 +58,7 @@
 		"w3c-keyname": "^2.1.8"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^110.18.0",
+		"@atlaskit/editor-common": "^110.21.0",
 		"react": "^18.2.0",
 		"react-dom": "^18.2.0",
 		"react-intl-next": "npm:react-intl@^5.18.1"
@@ -93,9 +93,6 @@
 		}
 	},
 	"platform-feature-flags": {
-		"platform_editor_legacy_content_macro_typeahead_fix": {
-			"type": "boolean"
-		},
 		"platform_editor_quick_insert_placeholder": {
 			"type": "boolean"
 		},