@atlaskit/editor-plugin-status 3.1.10 → 3.1.12

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/editor-plugin-status
 
+## 3.1.12
+
+### Patch Changes
+
+- [#148210](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/148210)
+  [`10eb0681e9681`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/10eb0681e9681) -
+  fix SSR issues
+
+## 3.1.11
+
+### Patch Changes
+
+- [#146371](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/146371)
+  [`9540ed4b36027`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/9540ed4b36027) -
+  [A11Y-9995] Add label to Status editor popup
+- Updated dependencies
+
 ## 3.1.10
 
 ### Patch Changes

package/dist/cjs/nodeviews/StatusNodeView.js

@@ -9,50 +9,36 @@ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/cl
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _messages = require("@atlaskit/editor-common/messages");
-var _monitoring = require("@atlaskit/editor-common/monitoring");
 var _model = require("@atlaskit/editor-prosemirror/model");
 var _statusNodeSpec = require("./statusNodeSpec");
 var StatusNodeView = exports.StatusNodeView = /*#__PURE__*/function () {
   function StatusNodeView(node, intl) {
     (0, _classCallCheck2.default)(this, StatusNodeView);
-    (0, _defineProperty2.default)(this, "dom", document.createElement('div'));
     (0, _defineProperty2.default)(this, "box", null);
     (0, _defineProperty2.default)(this, "textContainer", null);
     this.node = node;
     this.intl = intl;
-    try {
-      var spec = (0, _statusNodeSpec.statusToDOM)(node);
-      var _DOMSerializer$render = _model.DOMSerializer.renderSpec(document, spec),
-        dom = _DOMSerializer$render.dom;
-      if (!(dom instanceof HTMLElement)) {
-        throw new Error('DOMSerializer.renderSpec() did not return HTMLElement');
-      }
-      this.dom = dom;
-      this.box = this.dom.querySelector('.status-lozenge-span');
-      this.textContainer = this.dom.querySelector('.lozenge-text');
-      if (!node.attrs.text) {
-        this.setPlaceholder();
-      }
-    } catch (error) {
-      StatusNodeView.logError(error instanceof Error ? error : new Error('Unknown error on StatusNodeView constructor'));
-      this.renderFallback();
+    var spec = (0, _statusNodeSpec.statusToDOM)(node);
+    var _DOMSerializer$render = _model.DOMSerializer.renderSpec(document, spec),
+      dom = _DOMSerializer$render.dom;
+    this.dom = dom;
+    this.domElement = dom instanceof HTMLElement ? dom : undefined;
+    if (this.domElement) {
+      this.box = this.domElement.querySelector('.status-lozenge-span');
+      this.textContainer = this.domElement.querySelector('.lozenge-text');
+    }
+    if (!node.attrs.text) {
+      this.setPlaceholder();
     }
   }
   return (0, _createClass2.default)(StatusNodeView, [{
     key: "setPlaceholder",
     value: function setPlaceholder() {
-      if (this.textContainer) {
+      if (this.textContainer && this.domElement) {
         this.textContainer.textContent = this.intl.formatMessage(_messages.statusMessages.placeholder);
-        this.dom.style.setProperty('opacity', '0.5');
+        this.domElement.style.setProperty('opacity', '0.5');
       }
     }
-  }, {
-    key: "renderFallback",
-    value: function renderFallback() {
-      var fallbackElement = document.createElement('span');
-      fallbackElement.innerText = this.node.attrs.text;
-      this.dom.appendChild(fallbackElement);
-    }
   }, {
     key: "update",
     value: function update(node) {
@@ -69,18 +55,11 @@ var StatusNodeView = exports.StatusNodeView = /*#__PURE__*/function () {
       if (!node.attrs.text) {
         this.setPlaceholder();
       }
-      if (node.attrs.text) {
-        this.dom.style.setProperty('opacity', '1');
+      if (node.attrs.text && this.domElement) {
+        this.domElement.style.setProperty('opacity', '1');
       }
       this.node = node;
       return true;
     }
-  }], [{
-    key: "logError",
-    value: function logError(error) {
-      void (0, _monitoring.logException)(error, {
-        location: 'editor-plugin-status/StatusNodeView'
-      });
-    }
   }]);
 }();

package/dist/cjs/nodeviews/statusNodeSpec.js

@@ -230,6 +230,7 @@ var statusToDOM = exports.statusToDOM = function statusToDOM(node) {
     class: 'statusView-content-wrap inlineNodeView',
     'data-testid': 'statusContainerView',
     'data-prosemirror-node-view-type': 'vanilla',
+    'data-prosemirror-node-name': 'status',
     'local-id': localId
   };
   var statusElementAttrs = {

package/dist/cjs/ui/statusPicker.js

@@ -330,6 +330,7 @@ var StatusPickerWithIntl = /*#__PURE__*/function (_React$Component) {
         return null;
       }
       return target && (0, _react2.jsx)(PopupWithListeners, {
+        ariaLabel: (0, _platformFeatureFlags.fg)('editor_a11y_aria_label_removal_popup') ? intl.formatMessage(_messages.statusMessages.statusEditorLabel) : undefined,
         target: target,
         offset: [0, 8],
         handleClickOutside: this.handleClickOutside,

package/dist/es2019/nodeviews/StatusNodeView.js

@@ -1,50 +1,33 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { statusMessages as messages } from '@atlaskit/editor-common/messages';
-import { logException } from '@atlaskit/editor-common/monitoring';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { statusToDOM } from './statusNodeSpec';
 export class StatusNodeView {
-  static logError(error) {
-    void logException(error, {
-      location: 'editor-plugin-status/StatusNodeView'
-    });
-  }
   constructor(node, intl) {
-    _defineProperty(this, "dom", document.createElement('div'));
     _defineProperty(this, "box", null);
     _defineProperty(this, "textContainer", null);
     this.node = node;
     this.intl = intl;
-    try {
-      const spec = statusToDOM(node);
-      const {
-        dom
-      } = DOMSerializer.renderSpec(document, spec);
-      if (!(dom instanceof HTMLElement)) {
-        throw new Error('DOMSerializer.renderSpec() did not return HTMLElement');
-      }
-      this.dom = dom;
-      this.box = this.dom.querySelector('.status-lozenge-span');
-      this.textContainer = this.dom.querySelector('.lozenge-text');
-      if (!node.attrs.text) {
-        this.setPlaceholder();
-      }
-    } catch (error) {
-      StatusNodeView.logError(error instanceof Error ? error : new Error('Unknown error on StatusNodeView constructor'));
-      this.renderFallback();
+    const spec = statusToDOM(node);
+    const {
+      dom
+    } = DOMSerializer.renderSpec(document, spec);
+    this.dom = dom;
+    this.domElement = dom instanceof HTMLElement ? dom : undefined;
+    if (this.domElement) {
+      this.box = this.domElement.querySelector('.status-lozenge-span');
+      this.textContainer = this.domElement.querySelector('.lozenge-text');
+    }
+    if (!node.attrs.text) {
+      this.setPlaceholder();
     }
   }
   setPlaceholder() {
-    if (this.textContainer) {
+    if (this.textContainer && this.domElement) {
       this.textContainer.textContent = this.intl.formatMessage(messages.placeholder);
-      this.dom.style.setProperty('opacity', '0.5');
+      this.domElement.style.setProperty('opacity', '0.5');
     }
   }
-  renderFallback() {
-    const fallbackElement = document.createElement('span');
-    fallbackElement.innerText = this.node.attrs.text;
-    this.dom.appendChild(fallbackElement);
-  }
   update(node) {
     if (node.type !== this.node.type) {
       return false;
@@ -59,8 +42,8 @@ export class StatusNodeView {
     if (!node.attrs.text) {
       this.setPlaceholder();
     }
-    if (node.attrs.text) {
-      this.dom.style.setProperty('opacity', '1');
+    if (node.attrs.text && this.domElement) {
+      this.domElement.style.setProperty('opacity', '1');
     }
     this.node = node;
     return true;

package/dist/es2019/nodeviews/statusNodeSpec.js

@@ -226,6 +226,7 @@ export const statusToDOM = node => {
     class: 'statusView-content-wrap inlineNodeView',
     'data-testid': 'statusContainerView',
     'data-prosemirror-node-view-type': 'vanilla',
+    'data-prosemirror-node-name': 'status',
     'local-id': localId
   };
   const statusElementAttrs = {

package/dist/es2019/ui/statusPicker.js

@@ -304,6 +304,7 @@ class StatusPickerWithIntl extends React.Component {
       return null;
     }
     return target && jsx(PopupWithListeners, {
+      ariaLabel: fg('editor_a11y_aria_label_removal_popup') ? intl.formatMessage(messages.statusEditorLabel) : undefined,
       target: target,
       offset: [0, 8],
       handleClickOutside: this.handleClickOutside,

package/dist/esm/nodeviews/StatusNodeView.js

@@ -2,50 +2,36 @@ import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import { statusMessages as messages } from '@atlaskit/editor-common/messages';
-import { logException } from '@atlaskit/editor-common/monitoring';
 import { DOMSerializer } from '@atlaskit/editor-prosemirror/model';
 import { statusToDOM } from './statusNodeSpec';
 export var StatusNodeView = /*#__PURE__*/function () {
   function StatusNodeView(node, intl) {
     _classCallCheck(this, StatusNodeView);
-    _defineProperty(this, "dom", document.createElement('div'));
     _defineProperty(this, "box", null);
     _defineProperty(this, "textContainer", null);
     this.node = node;
     this.intl = intl;
-    try {
-      var spec = statusToDOM(node);
-      var _DOMSerializer$render = DOMSerializer.renderSpec(document, spec),
-        dom = _DOMSerializer$render.dom;
-      if (!(dom instanceof HTMLElement)) {
-        throw new Error('DOMSerializer.renderSpec() did not return HTMLElement');
-      }
-      this.dom = dom;
-      this.box = this.dom.querySelector('.status-lozenge-span');
-      this.textContainer = this.dom.querySelector('.lozenge-text');
-      if (!node.attrs.text) {
-        this.setPlaceholder();
-      }
-    } catch (error) {
-      StatusNodeView.logError(error instanceof Error ? error : new Error('Unknown error on StatusNodeView constructor'));
-      this.renderFallback();
+    var spec = statusToDOM(node);
+    var _DOMSerializer$render = DOMSerializer.renderSpec(document, spec),
+      dom = _DOMSerializer$render.dom;
+    this.dom = dom;
+    this.domElement = dom instanceof HTMLElement ? dom : undefined;
+    if (this.domElement) {
+      this.box = this.domElement.querySelector('.status-lozenge-span');
+      this.textContainer = this.domElement.querySelector('.lozenge-text');
+    }
+    if (!node.attrs.text) {
+      this.setPlaceholder();
     }
   }
   return _createClass(StatusNodeView, [{
     key: "setPlaceholder",
     value: function setPlaceholder() {
-      if (this.textContainer) {
+      if (this.textContainer && this.domElement) {
         this.textContainer.textContent = this.intl.formatMessage(messages.placeholder);
-        this.dom.style.setProperty('opacity', '0.5');
+        this.domElement.style.setProperty('opacity', '0.5');
       }
     }
-  }, {
-    key: "renderFallback",
-    value: function renderFallback() {
-      var fallbackElement = document.createElement('span');
-      fallbackElement.innerText = this.node.attrs.text;
-      this.dom.appendChild(fallbackElement);
-    }
   }, {
     key: "update",
     value: function update(node) {
@@ -62,18 +48,11 @@ export var StatusNodeView = /*#__PURE__*/function () {
       if (!node.attrs.text) {
         this.setPlaceholder();
       }
-      if (node.attrs.text) {
-        this.dom.style.setProperty('opacity', '1');
+      if (node.attrs.text && this.domElement) {
+        this.domElement.style.setProperty('opacity', '1');
       }
       this.node = node;
       return true;
     }
-  }], [{
-    key: "logError",
-    value: function logError(error) {
-      void logException(error, {
-        location: 'editor-plugin-status/StatusNodeView'
-      });
-    }
   }]);
 }();

package/dist/esm/nodeviews/statusNodeSpec.js

@@ -223,6 +223,7 @@ export var statusToDOM = function statusToDOM(node) {
     class: 'statusView-content-wrap inlineNodeView',
     'data-testid': 'statusContainerView',
     'data-prosemirror-node-view-type': 'vanilla',
+    'data-prosemirror-node-name': 'status',
     'local-id': localId
   };
   var statusElementAttrs = {

package/dist/esm/ui/statusPicker.js

@@ -327,6 +327,7 @@ var StatusPickerWithIntl = /*#__PURE__*/function (_React$Component) {
         return null;
       }
       return target && jsx(PopupWithListeners, {
+        ariaLabel: fg('editor_a11y_aria_label_removal_popup') ? intl.formatMessage(messages.statusEditorLabel) : undefined,
         target: target,
         offset: [0, 8],
         handleClickOutside: this.handleClickOutside,

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

@@ -2,14 +2,13 @@ import { IntlShape } from 'react-intl-next';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { NodeView } from '@atlaskit/editor-prosemirror/view';
 export declare class StatusNodeView implements NodeView {
-    dom: HTMLElement;
+    dom: Node;
+    domElement: HTMLElement | undefined;
     private box;
     private textContainer;
     private node;
     private intl;
-    private static logError;
     constructor(node: PMNode, intl: IntlShape);
     private setPlaceholder;
-    private renderFallback;
     update(node: PMNode): boolean;
 }

package/dist/types-ts4.5/nodeviews/StatusNodeView.d.ts

@@ -2,14 +2,13 @@ import { IntlShape } from 'react-intl-next';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
 import type { NodeView } from '@atlaskit/editor-prosemirror/view';
 export declare class StatusNodeView implements NodeView {
-    dom: HTMLElement;
+    dom: Node;
+    domElement: HTMLElement | undefined;
     private box;
     private textContainer;
     private node;
     private intl;
-    private static logError;
     constructor(node: PMNode, intl: IntlShape);
     private setPlaceholder;
-    private renderFallback;
     update(node: PMNode): boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-status",
-	"version": "3.1.10",
+	"version": "3.1.12",
 	"description": "Status plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -35,16 +35,16 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^47.6.0",
 		"@atlaskit/analytics-next": "^11.0.0",
-		"@atlaskit/editor-common": "^103.4.0",
+		"@atlaskit/editor-common": "^103.22.0",
 		"@atlaskit/editor-plugin-analytics": "^2.2.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/editor-shared-styles": "^3.4.0",
-		"@atlaskit/icon": "^25.5.0",
+		"@atlaskit/icon": "^25.6.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/status": "^3.0.0",
 		"@atlaskit/theme": "^18.0.0",
-		"@atlaskit/tmp-editor-statsig": "^4.6.0",
-		"@atlaskit/tokens": "^4.7.0",
+		"@atlaskit/tmp-editor-statsig": "^4.15.0",
+		"@atlaskit/tokens": "^4.8.0",
 		"@atlaskit/visually-hidden": "^3.0.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
@@ -55,9 +55,9 @@
 		"react-intl-next": "npm:react-intl@^5.18.1"
 	},
 	"devDependencies": {
-		"@af/visual-regression": "^1.3.0",
-		"@atlaskit/ssr": "^0.4.0",
-		"@atlaskit/visual-regression": "^0.10.0",
+		"@af/visual-regression": "workspace:^",
+		"@atlaskit/ssr": "workspace:^",
+		"@atlaskit/visual-regression": "workspace:^",
 		"@testing-library/react": "^13.4.0",
 		"raf-stub": "^2.0.1",
 		"typescript": "~5.4.2"
@@ -111,6 +111,9 @@
 		"visual-refresh_drop_5": {
 			"type": "boolean"
 		},
+		"editor_a11y_aria_label_removal_popup": {
+			"type": "boolean"
+		},
 		"platform-lozenge-custom-letterspacing": {
 			"type": "boolean"
 		}