@atlaskit/editor-plugin-selection-marker 2.1.1 → 2.2.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @atlaskit/editor-plugin-selection-marker
 
+## 2.2.0
+
+### Minor Changes
+
+- [#139139](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/139139)
+  [`7f6b665d778dd`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/7f6b665d778dd) -
+  [https://product-fabric.atlassian.net/browse/ED-27499](ED-27499) - the new
+  `@atlassian/confluence-presets` package with Confluence `full-page` preset is created
+
+### Patch Changes
+
+- Updated dependencies
+
+## 2.1.2
+
+### Patch Changes
+
+- [#137989](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/137989)
+  [`8a449b2a3d26a`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/8a449b2a3d26a) -
+  Fix hiding selection on advanced code blocks in safari.
+
 ## 2.1.1
 
 ### Patch Changes

package/dist/cjs/ui/global-styles.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.GlobalStylesWrapper = void 0;
 var _react = require("@emotion/react");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -20,14 +21,35 @@ var _react = require("@emotion/react");
  * selection highlight will not show on those.
  * - We do not apply this reset when the editor is disabled
  */
-var globalStyles = (0, _react.css)({
+var oldGlobalStyles = (0, _react.css)({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
   '.ProseMirror:not(:focus):not([contenteditable="false"]) ::selection:not(input)': {
     background: 'unset'
   }
 });
+
+/**
+ * Unset the selection background color as we are using our own
+ * Otherwise we might have a mix of grey + our selection marker depending on the state.
+ *
+ * Edge cases:
+ * - We do not apply this reset to input fields or code blocks (ie. expand case) because otherwise
+ * selection highlight will not show on those.
+ * - We do not apply this reset when the editor is disabled
+ */
+var globalStyles = (0, _react.css)({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
+  '.ProseMirror:not(:focus):not([contenteditable="false"]) ::selection:not(input, .cm-editor)': {
+    background: 'unset'
+  }
+});
 var GlobalStylesWrapper = exports.GlobalStylesWrapper = function GlobalStylesWrapper() {
+  if ((0, _experiments.editorExperiment)('platform_editor_advanced_code_blocks', true)) {
+    return (0, _react.jsx)(_react.Global, {
+      styles: globalStyles
+    });
+  }
   return (0, _react.jsx)(_react.Global, {
-    styles: globalStyles
+    styles: oldGlobalStyles
   });
 };

package/dist/es2019/ui/global-styles.js

@@ -4,6 +4,7 @@
  */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-global-styles, @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, Global, jsx } from '@emotion/react';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 
 /**
  * Unset the selection background color as we are using our own
@@ -14,14 +15,35 @@ import { css, Global, jsx } from '@emotion/react';
  * selection highlight will not show on those.
  * - We do not apply this reset when the editor is disabled
  */
-const globalStyles = css({
+const oldGlobalStyles = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
   '.ProseMirror:not(:focus):not([contenteditable="false"]) ::selection:not(input)': {
     background: 'unset'
   }
 });
+
+/**
+ * Unset the selection background color as we are using our own
+ * Otherwise we might have a mix of grey + our selection marker depending on the state.
+ *
+ * Edge cases:
+ * - We do not apply this reset to input fields or code blocks (ie. expand case) because otherwise
+ * selection highlight will not show on those.
+ * - We do not apply this reset when the editor is disabled
+ */
+const globalStyles = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
+  '.ProseMirror:not(:focus):not([contenteditable="false"]) ::selection:not(input, .cm-editor)': {
+    background: 'unset'
+  }
+});
 export const GlobalStylesWrapper = () => {
+  if (editorExperiment('platform_editor_advanced_code_blocks', true)) {
+    return jsx(Global, {
+      styles: globalStyles
+    });
+  }
   return jsx(Global, {
-    styles: globalStyles
+    styles: oldGlobalStyles
   });
 };

package/dist/esm/ui/global-styles.js

@@ -4,6 +4,7 @@
  */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/no-global-styles, @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, Global, jsx } from '@emotion/react';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 
 /**
  * Unset the selection background color as we are using our own
@@ -14,14 +15,35 @@ import { css, Global, jsx } from '@emotion/react';
  * selection highlight will not show on those.
  * - We do not apply this reset when the editor is disabled
  */
-var globalStyles = css({
+var oldGlobalStyles = css({
   // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
   '.ProseMirror:not(:focus):not([contenteditable="false"]) ::selection:not(input)': {
     background: 'unset'
   }
 });
+
+/**
+ * Unset the selection background color as we are using our own
+ * Otherwise we might have a mix of grey + our selection marker depending on the state.
+ *
+ * Edge cases:
+ * - We do not apply this reset to input fields or code blocks (ie. expand case) because otherwise
+ * selection highlight will not show on those.
+ * - We do not apply this reset when the editor is disabled
+ */
+var globalStyles = css({
+  // eslint-disable-next-line @atlaskit/ui-styling-standard/no-nested-selectors, @atlaskit/ui-styling-standard/no-unsafe-selectors -- Ignored via go/DSP-18766
+  '.ProseMirror:not(:focus):not([contenteditable="false"]) ::selection:not(input, .cm-editor)': {
+    background: 'unset'
+  }
+});
 export var GlobalStylesWrapper = function GlobalStylesWrapper() {
+  if (editorExperiment('platform_editor_advanced_code_blocks', true)) {
+    return jsx(Global, {
+      styles: globalStyles
+    });
+  }
   return jsx(Global, {
-    styles: globalStyles
+    styles: oldGlobalStyles
   });
 };

package/dist/types/index.d.ts

@@ -1,2 +1,2 @@
 export { selectionMarkerPlugin } from './selectionMarkerPlugin';
-export type { SelectionMarkerPlugin, SelectionMarkerPluginConfiguration, ReleaseHiddenDecoration, } from './selectionMarkerPluginType';
+export type { SelectionMarkerPlugin, SelectionMarkerPluginConfiguration, SelectionMarkerPluginOptions, ReleaseHiddenDecoration, } from './selectionMarkerPluginType';

package/dist/types/selectionMarkerPluginType.d.ts

@@ -5,16 +5,22 @@ import type { TypeAheadPlugin } from '@atlaskit/editor-plugin-type-ahead';
 export type ReleaseHiddenDecoration = () => boolean | undefined;
 type SetCleanup = (cb: ReleaseHiddenDecoration | undefined) => void;
 type CancelQueue = (() => void) | undefined;
-export type SelectionMarkerPluginConfiguration = {
+export type SelectionMarkerPluginOptions = {
     hideCursorOnInit?: boolean;
 };
+/**
+ * @private
+ * @deprecated Use {@link SelectionMarkerPluginOptions} instead.
+ * @see https://product-fabric.atlassian.net/browse/ED-27496
+ */
+export type SelectionMarkerPluginConfiguration = SelectionMarkerPluginOptions;
 export type SelectionMarkerPlugin = NextEditorPlugin<'selectionMarker', {
     dependencies: [
         FocusPlugin,
         OptionalPlugin<TypeAheadPlugin>,
         OptionalPlugin<EditorDisabledPlugin>
     ];
-    pluginConfiguration?: SelectionMarkerPluginConfiguration;
+    pluginConfiguration?: SelectionMarkerPluginOptions;
     sharedState: {
         isForcedHidden: boolean;
         isMarkerActive: boolean;

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

@@ -1,2 +1,2 @@
 export { selectionMarkerPlugin } from './selectionMarkerPlugin';
-export type { SelectionMarkerPlugin, SelectionMarkerPluginConfiguration, ReleaseHiddenDecoration, } from './selectionMarkerPluginType';
+export type { SelectionMarkerPlugin, SelectionMarkerPluginConfiguration, SelectionMarkerPluginOptions, ReleaseHiddenDecoration, } from './selectionMarkerPluginType';

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

@@ -5,16 +5,22 @@ import type { TypeAheadPlugin } from '@atlaskit/editor-plugin-type-ahead';
 export type ReleaseHiddenDecoration = () => boolean | undefined;
 type SetCleanup = (cb: ReleaseHiddenDecoration | undefined) => void;
 type CancelQueue = (() => void) | undefined;
-export type SelectionMarkerPluginConfiguration = {
+export type SelectionMarkerPluginOptions = {
     hideCursorOnInit?: boolean;
 };
+/**
+ * @private
+ * @deprecated Use {@link SelectionMarkerPluginOptions} instead.
+ * @see https://product-fabric.atlassian.net/browse/ED-27496
+ */
+export type SelectionMarkerPluginConfiguration = SelectionMarkerPluginOptions;
 export type SelectionMarkerPlugin = NextEditorPlugin<'selectionMarker', {
     dependencies: [
         FocusPlugin,
         OptionalPlugin<TypeAheadPlugin>,
         OptionalPlugin<EditorDisabledPlugin>
     ];
-    pluginConfiguration?: SelectionMarkerPluginConfiguration;
+    pluginConfiguration?: SelectionMarkerPluginOptions;
     sharedState: {
         isForcedHidden: boolean;
         isMarkerActive: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-selection-marker",
-	"version": "2.1.1",
+	"version": "2.2.0",
 	"description": "Selection marker plugin for @atlaskit/editor-core.",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -31,14 +31,15 @@
 		".": "./src/index.ts"
 	},
 	"dependencies": {
-		"@atlaskit/editor-common": "^103.0.0",
+		"@atlaskit/editor-common": "^103.4.0",
 		"@atlaskit/editor-plugin-editor-disabled": "^2.0.0",
 		"@atlaskit/editor-plugin-focus": "^1.5.0",
 		"@atlaskit/editor-plugin-type-ahead": "^2.3.0",
 		"@atlaskit/editor-prosemirror": "7.0.0",
 		"@atlaskit/platform-feature-flags": "^1.1.0",
-		"@atlaskit/primitives": "^14.3.0",
+		"@atlaskit/primitives": "^14.4.0",
 		"@atlaskit/theme": "^18.0.0",
+		"@atlaskit/tmp-editor-statsig": "^4.6.0",
 		"@atlaskit/tokens": "^4.7.0",
 		"@babel/runtime": "^7.0.0",
 		"@emotion/react": "^11.7.1",