@atlaskit/editor-plugin-status 2.6.5 → 2.6.7

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-status
 
+## 2.6.7
+
+### Patch Changes
+
+- [#103440](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/103440)
+  [`2a34d82d95e38`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/2a34d82d95e38) -
+  Cleaned up feature flag that cleans up findDOMNode usages
+
+## 2.6.6
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 2.6.5
 
 ### Patch Changes

package/dist/cjs/ui/statusPicker.js

@@ -17,7 +17,6 @@ var _analyticsNext = require("@atlaskit/analytics-next");
 var _ui = require("@atlaskit/editor-common/ui");
 var _uiReact = require("@atlaskit/editor-common/ui-react");
 var _editorSharedStyles = require("@atlaskit/editor-shared-styles");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _picker = require("@atlaskit/status/picker");
 var _colors = require("@atlaskit/theme/colors");
 var _constants = require("@atlaskit/theme/constants");
@@ -52,6 +51,7 @@ var pickerContainerStyles = (0, _react2.css)({
   },
   // eslint-disable-next-line @atlaskit/design-system/no-nested-styles, @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   input: {
+    // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
     textTransform: 'uppercase'
   }
 });
@@ -316,16 +316,11 @@ var StatusPickerWithoutAnalytcs = exports.StatusPickerWithoutAnalytcs = /*#__PUR
     key: "render",
     value: function render() {
       var _this$props2 = this.props,
-        isNew = _this$props2.isNew,
         target = _this$props2.target,
         mountTo = _this$props2.mountTo,
         boundariesElement = _this$props2.boundariesElement,
         scrollableElement = _this$props2.scrollableElement,
-        focusStatusInput = _this$props2.focusStatusInput,
         editorView = _this$props2.editorView;
-      var _this$state4 = this.state,
-        color = _this$state4.color,
-        text = _this$state4.text;
       if (!(editorView !== null && editorView !== void 0 && editorView.editable)) {
         return null;
       }
@@ -340,22 +335,7 @@ var StatusPickerWithoutAnalytcs = exports.StatusPickerWithoutAnalytcs = /*#__PUR
         boundariesElement: boundariesElement,
         scrollableElement: scrollableElement,
         closeOnTab: false
-      }, (0, _platformFeatureFlags.fg)('platform_editor_replace_finddomnode_in_common') ? (0, _react2.jsx)(_uiReact.OutsideClickTargetRefContext.Consumer, null, this.renderWithSetOutsideClickTargetRef.bind(this)) :
-      // eslint-disable-next-line jsx-a11y/no-static-element-interactions
-      (0, _react2.jsx)("div", {
-        css: pickerContainerStyles,
-        tabIndex: -1,
-        onClick: this.handlePopupClick,
-        onKeyDown: this.onKeyDown
-      }, (0, _react2.jsx)(_picker.StatusPicker, {
-        autoFocus: isNew || focusStatusInput,
-        selectedColor: color,
-        text: text,
-        onColorClick: this.onColorClick,
-        onColorHover: this.onColorHover,
-        onTextChanged: this.onTextChanged,
-        onEnter: this.onEnter
-      })));
+      }, (0, _react2.jsx)(_uiReact.OutsideClickTargetRefContext.Consumer, null, this.renderWithSetOutsideClickTargetRef.bind(this)));
     }
   }]);
 }(_react.default.Component);

package/dist/es2019/ui/statusPicker.js

@@ -12,7 +12,6 @@ import { withAnalyticsEvents } from '@atlaskit/analytics-next';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { OutsideClickTargetRefContext, withReactEditorViewOuterListeners as withOuterListeners } from '@atlaskit/editor-common/ui-react';
 import { akEditorFloatingDialogZIndex } from '@atlaskit/editor-shared-styles';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { StatusPicker as AkStatusPicker } from '@atlaskit/status/picker';
 import { N0 } from '@atlaskit/theme/colors';
 import { borderRadius } from '@atlaskit/theme/constants';
@@ -42,6 +41,7 @@ const pickerContainerStyles = css({
   },
   // eslint-disable-next-line @atlaskit/design-system/no-nested-styles, @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   input: {
+    // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
     textTransform: 'uppercase'
   }
 });
@@ -289,18 +289,12 @@ export class StatusPickerWithoutAnalytcs extends React.Component {
   }
   render() {
     const {
-      isNew,
       target,
       mountTo,
       boundariesElement,
       scrollableElement,
-      focusStatusInput,
       editorView
     } = this.props;
-    const {
-      color,
-      text
-    } = this.state;
     if (!(editorView !== null && editorView !== void 0 && editorView.editable)) {
       return null;
     }
@@ -315,22 +309,7 @@ export class StatusPickerWithoutAnalytcs extends React.Component {
       boundariesElement: boundariesElement,
       scrollableElement: scrollableElement,
       closeOnTab: false
-    }, fg('platform_editor_replace_finddomnode_in_common') ? jsx(OutsideClickTargetRefContext.Consumer, null, this.renderWithSetOutsideClickTargetRef.bind(this)) :
-    // eslint-disable-next-line jsx-a11y/no-static-element-interactions
-    jsx("div", {
-      css: pickerContainerStyles,
-      tabIndex: -1,
-      onClick: this.handlePopupClick,
-      onKeyDown: this.onKeyDown
-    }, jsx(AkStatusPicker, {
-      autoFocus: isNew || focusStatusInput,
-      selectedColor: color,
-      text: text,
-      onColorClick: this.onColorClick,
-      onColorHover: this.onColorHover,
-      onTextChanged: this.onTextChanged,
-      onEnter: this.onEnter
-    })));
+    }, jsx(OutsideClickTargetRefContext.Consumer, null, this.renderWithSetOutsideClickTargetRef.bind(this)));
   }
 }
 export default withAnalyticsEvents()(StatusPickerWithoutAnalytcs);

package/dist/esm/ui/statusPicker.js

@@ -19,7 +19,6 @@ import { withAnalyticsEvents } from '@atlaskit/analytics-next';
 import { Popup } from '@atlaskit/editor-common/ui';
 import { OutsideClickTargetRefContext, withReactEditorViewOuterListeners as withOuterListeners } from '@atlaskit/editor-common/ui-react';
 import { akEditorFloatingDialogZIndex } from '@atlaskit/editor-shared-styles';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { StatusPicker as AkStatusPicker } from '@atlaskit/status/picker';
 import { N0 } from '@atlaskit/theme/colors';
 import { borderRadius } from '@atlaskit/theme/constants';
@@ -49,6 +48,7 @@ var pickerContainerStyles = css({
   },
   // eslint-disable-next-line @atlaskit/design-system/no-nested-styles, @atlaskit/ui-styling-standard/no-nested-selectors -- Ignored via go/DSP-18766
   input: {
+    // eslint-disable-next-line @atlaskit/design-system/use-tokens-typography
     textTransform: 'uppercase'
   }
 });
@@ -313,16 +313,11 @@ export var StatusPickerWithoutAnalytcs = /*#__PURE__*/function (_React$Component
     key: "render",
     value: function render() {
       var _this$props2 = this.props,
-        isNew = _this$props2.isNew,
         target = _this$props2.target,
         mountTo = _this$props2.mountTo,
         boundariesElement = _this$props2.boundariesElement,
         scrollableElement = _this$props2.scrollableElement,
-        focusStatusInput = _this$props2.focusStatusInput,
         editorView = _this$props2.editorView;
-      var _this$state4 = this.state,
-        color = _this$state4.color,
-        text = _this$state4.text;
       if (!(editorView !== null && editorView !== void 0 && editorView.editable)) {
         return null;
       }
@@ -337,22 +332,7 @@ export var StatusPickerWithoutAnalytcs = /*#__PURE__*/function (_React$Component
         boundariesElement: boundariesElement,
         scrollableElement: scrollableElement,
         closeOnTab: false
-      }, fg('platform_editor_replace_finddomnode_in_common') ? jsx(OutsideClickTargetRefContext.Consumer, null, this.renderWithSetOutsideClickTargetRef.bind(this)) :
-      // eslint-disable-next-line jsx-a11y/no-static-element-interactions
-      jsx("div", {
-        css: pickerContainerStyles,
-        tabIndex: -1,
-        onClick: this.handlePopupClick,
-        onKeyDown: this.onKeyDown
-      }, jsx(AkStatusPicker, {
-        autoFocus: isNew || focusStatusInput,
-        selectedColor: color,
-        text: text,
-        onColorClick: this.onColorClick,
-        onColorHover: this.onColorHover,
-        onTextChanged: this.onTextChanged,
-        onEnter: this.onEnter
-      })));
+      }, jsx(OutsideClickTargetRefContext.Consumer, null, this.renderWithSetOutsideClickTargetRef.bind(this)));
     }
   }]);
 }(React.Component);

package/dist/types/statusPluginType.d.ts

@@ -21,21 +21,24 @@ type DummyEditorViewModePlugin = NextEditorPlugin<'editorViewMode', {
         mode: 'view' | 'edit';
     };
 }>;
+export type StatusPluginDependencies = [
+    OptionalPlugin<AnalyticsPlugin>,
+    OptionalPlugin<DummyAnnotationPlugin>,
+    OptionalPlugin<DummyEditorViewModePlugin>
+];
+export type StatusPluginActions = {
+    commitStatusPicker: typeof commitStatusPicker;
+    updateStatus: UpdateStatus;
+};
+export type StatusPluginCommands = {
+    removeStatus: typeof removeStatus;
+    insertStatus: ReturnType<typeof insertStatus>;
+};
 export type StatusPlugin = NextEditorPlugin<'status', {
-    dependencies: [
-        OptionalPlugin<AnalyticsPlugin>,
-        OptionalPlugin<DummyAnnotationPlugin>,
-        OptionalPlugin<DummyEditorViewModePlugin>
-    ];
+    dependencies: StatusPluginDependencies;
     pluginConfiguration: StatusPluginOptions | undefined;
-    actions: {
-        commitStatusPicker: typeof commitStatusPicker;
-        updateStatus: UpdateStatus;
-    };
-    commands: {
-        removeStatus: typeof removeStatus;
-        insertStatus: ReturnType<typeof insertStatus>;
-    };
+    actions: StatusPluginActions;
+    commands: StatusPluginCommands;
     sharedState: StatusState | undefined;
 }>;
 export {};

package/dist/types-ts4.5/statusPluginType.d.ts

@@ -21,21 +21,24 @@ type DummyEditorViewModePlugin = NextEditorPlugin<'editorViewMode', {
         mode: 'view' | 'edit';
     };
 }>;
+export type StatusPluginDependencies = [
+    OptionalPlugin<AnalyticsPlugin>,
+    OptionalPlugin<DummyAnnotationPlugin>,
+    OptionalPlugin<DummyEditorViewModePlugin>
+];
+export type StatusPluginActions = {
+    commitStatusPicker: typeof commitStatusPicker;
+    updateStatus: UpdateStatus;
+};
+export type StatusPluginCommands = {
+    removeStatus: typeof removeStatus;
+    insertStatus: ReturnType<typeof insertStatus>;
+};
 export type StatusPlugin = NextEditorPlugin<'status', {
-    dependencies: [
-        OptionalPlugin<AnalyticsPlugin>,
-        OptionalPlugin<DummyAnnotationPlugin>,
-        OptionalPlugin<DummyEditorViewModePlugin>
-    ];
+    dependencies: StatusPluginDependencies;
     pluginConfiguration: StatusPluginOptions | undefined;
-    actions: {
-        commitStatusPicker: typeof commitStatusPicker;
-        updateStatus: UpdateStatus;
-    };
-    commands: {
-        removeStatus: typeof removeStatus;
-        insertStatus: ReturnType<typeof insertStatus>;
-    };
+    actions: StatusPluginActions;
+    commands: StatusPluginCommands;
     sharedState: StatusState | undefined;
 }>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-status",
-	"version": "2.6.5",
+	"version": "2.6.7",
 	"description": "Status plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -33,15 +33,15 @@
 	"dependencies": {
 		"@atlaskit/adf-schema": "^46.1.0",
 		"@atlaskit/analytics-next": "^10.2.0",
-		"@atlaskit/editor-common": "^98.0.0",
+		"@atlaskit/editor-common": "^99.3.0",
 		"@atlaskit/editor-plugin-analytics": "^1.10.0",
 		"@atlaskit/editor-prosemirror": "6.2.1",
 		"@atlaskit/editor-shared-styles": "^3.2.0",
-		"@atlaskit/icon": "^23.1.0",
+		"@atlaskit/icon": "^23.4.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
 		"@atlaskit/status": "^1.8.0",
 		"@atlaskit/theme": "^14.0.0",
-		"@atlaskit/tokens": "^2.5.0",
+		"@atlaskit/tokens": "^3.1.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1"
 	},
@@ -101,9 +101,6 @@
 		"platform-component-visual-refresh": {
 			"type": "boolean"
 		},
-		"platform_editor_replace_finddomnode_in_common": {
-			"type": "boolean"
-		},
 		"platform_inline_node_as_valid_annotation_selection": {
 			"type": "boolean"
 		}