@atlaskit/editor-common 102.3.0 → 102.3.2

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @atlaskit/editor-common
 
+## 102.3.2
+
+### Patch Changes
+
+- [#122826](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/122826)
+  [`3408f60558726`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3408f60558726) -
+  [ux] Fixes issue where macro interaction is showing up in live view after editor API update
+- Updated dependencies
+
+## 102.3.1
+
+### Patch Changes
+
+- [#125193](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/pull-requests/125193)
+  [`246f1e93ab0d1`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/246f1e93ab0d1) -
+  ED-26834 Fire exposure for experiment `platform_editor_nested_non_bodied_macros` when rendering a
+  non bodied macro rendered in a nested expand, blockquote, panel or listItem in editor
+
 ## 102.3.0
 
 ### Minor Changes

package/dist/cjs/ai-messages/ai.js

@@ -33,6 +33,16 @@ var aiMessages = exports.aiMessages = (0, _reactIntlNext.defineMessages)({
     defaultMessage: 'Tell Atlassian Intelligence to improve the writing of your selection',
     description: 'Tooltip text for an option to use Atlassian Intellgience to improve the writing of content currently selected by the user'
   },
+  askAIToolbarIconTitle: {
+    id: 'fabric.editor.ai.toolbar.askAI.title',
+    defaultMessage: 'Ask AI',
+    description: 'Title for an option to use Atlassian Intellgience'
+  },
+  askAIToolbarIconTooltip: {
+    id: 'fabric.editor.ai.toolbar.tryAI.tooltip',
+    defaultMessage: 'Open Atlassian Intelligence',
+    description: 'Tooltip text for an option to use Atlassian Intellgience'
+  },
   tryAIToolbarIconTitle: {
     id: 'fabric.editor.ai.toolbar.tryAI.title',
     defaultMessage: 'Try AI',

package/dist/cjs/extensibility/Extension/Extension/index.js

@@ -13,6 +13,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _react2 = require("@emotion/react");
 var _classnames2 = _interopRequireDefault(require("classnames"));
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
 var _hooks = require("../../../hooks");
 var _ui = require("../../../ui");
 var _utils = require("../../../utils");
@@ -125,6 +126,30 @@ function ExtensionWithPluginState(props) {
       setIsNodeHovered(didHover);
     }
   };
+  var shouldFireNbmExperimentExposure = _react.default.useMemo(function () {
+    if (node.type.name === 'extension' && typeof getPos === 'function') {
+      var pos = getPos();
+      if (!isNaN(pos)) {
+        var _view$state$doc$resol;
+        var parentNameType = (_view$state$doc$resol = view.state.doc.resolve(pos).parent) === null || _view$state$doc$resol === void 0 || (_view$state$doc$resol = _view$state$doc$resol.type) === null || _view$state$doc$resol === void 0 ? void 0 : _view$state$doc$resol.name;
+        if (['listItem', 'nestedExpand', 'blockquote', 'panel'].includes(parentNameType)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }, [node, getPos, view]);
+  (0, _react.useEffect)(function () {
+    if (shouldFireNbmExperimentExposure) {
+      // No-op editorExperiment evaluation to track usage of nested non-bodied macros
+      // these can't be tracked at the point of diversion of the experience because that is a toggle of the
+      // ProseMirror schema nodes for listItems, nestedExpand, blockquote, and panel. At that point the customer
+      // has not yet been exposed
+      (0, _experiments.editorExperiment)('platform_editor_nested_non_bodied_macros', 'test', {
+        exposure: true
+      });
+    }
+  }, [shouldFireNbmExperimentExposure]);
   return (0, _react2.jsx)(_react.Fragment, null, showMacroInteractionDesignUpdates && !isLivePageViewMode && (0, _react2.jsx)(_Lozenge.default, {
     isNodeSelected: isNodeSelected,
     isNodeHovered: isNodeHovered,
@@ -207,6 +232,7 @@ var Extension = function Extension(props) {
   var pluginInjectionApi = props.pluginInjectionApi;
   var _useSharedPluginState = (0, _hooks.useSharedPluginState)(pluginInjectionApi, ['width']),
     widthState = _useSharedPluginState.widthState;
+
   // Ignored via go/ees005
   // eslint-disable-next-line react/jsx-props-no-spreading
   return (0, _react2.jsx)(ExtensionWithPluginState, (0, _extends2.default)({

package/dist/cjs/extensibility/Extension.js

@@ -49,8 +49,9 @@ var Extension = exports.Extension = /*#__PURE__*/function (_Component) {
       // @ts-ignore
       var currentState = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$e = pluginInjectionApi.editorViewMode) === null || _pluginInjectionApi$e === void 0 || (_pluginInjectionApi$e = _pluginInjectionApi$e.sharedState) === null || _pluginInjectionApi$e === void 0 ? void 0 : _pluginInjectionApi$e.currentState();
       var _ref2 = currentState || {},
-        contentMode = _ref2.contentMode;
-      var isLivePageViewMode = contentMode === 'live-view';
+        contentMode = _ref2.contentMode,
+        mode = _ref2.mode;
+      var isLivePageViewMode = contentMode === 'live-view' || mode === 'view';
       return /*#__PURE__*/_react.default.createElement(_ExtensionComponent.ExtensionComponent, {
         editorView: editorView,
         node: node,

package/dist/cjs/monitoring/error.js

@@ -17,7 +17,7 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "102.3.0";
+var packageVersion = "102.3.2";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/cjs/ui/DropList/index.js

@@ -23,7 +23,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
  * @jsx jsx
  */ // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "102.3.0";
+var packageVersion = "102.3.2";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/es2019/ai-messages/ai.js

@@ -27,6 +27,16 @@ export const aiMessages = defineMessages({
     defaultMessage: 'Tell Atlassian Intelligence to improve the writing of your selection',
     description: 'Tooltip text for an option to use Atlassian Intellgience to improve the writing of content currently selected by the user'
   },
+  askAIToolbarIconTitle: {
+    id: 'fabric.editor.ai.toolbar.askAI.title',
+    defaultMessage: 'Ask AI',
+    description: 'Title for an option to use Atlassian Intellgience'
+  },
+  askAIToolbarIconTooltip: {
+    id: 'fabric.editor.ai.toolbar.tryAI.tooltip',
+    defaultMessage: 'Open Atlassian Intelligence',
+    description: 'Tooltip text for an option to use Atlassian Intellgience'
+  },
   tryAIToolbarIconTitle: {
     id: 'fabric.editor.ai.toolbar.tryAI.title',
     defaultMessage: 'Try AI',

package/dist/es2019/extensibility/Extension/Extension/index.js

@@ -4,12 +4,13 @@ import _extends from "@babel/runtime/helpers/extends";
  * @jsx jsx
  */
 
-import React, { Fragment } from 'react';
+import React, { Fragment, useEffect } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import classnames from 'classnames';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { useSharedPluginState } from '../../../hooks';
 import { overflowShadow } from '../../../ui';
 import { calculateBreakoutStyles } from '../../../utils';
@@ -123,6 +124,30 @@ function ExtensionWithPluginState(props) {
       setIsNodeHovered(didHover);
     }
   };
+  const shouldFireNbmExperimentExposure = React.useMemo(() => {
+    if (node.type.name === 'extension' && typeof getPos === 'function') {
+      const pos = getPos();
+      if (!isNaN(pos)) {
+        var _view$state$doc$resol, _view$state$doc$resol2;
+        const parentNameType = (_view$state$doc$resol = view.state.doc.resolve(pos).parent) === null || _view$state$doc$resol === void 0 ? void 0 : (_view$state$doc$resol2 = _view$state$doc$resol.type) === null || _view$state$doc$resol2 === void 0 ? void 0 : _view$state$doc$resol2.name;
+        if (['listItem', 'nestedExpand', 'blockquote', 'panel'].includes(parentNameType)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }, [node, getPos, view]);
+  useEffect(() => {
+    if (shouldFireNbmExperimentExposure) {
+      // No-op editorExperiment evaluation to track usage of nested non-bodied macros
+      // these can't be tracked at the point of diversion of the experience because that is a toggle of the
+      // ProseMirror schema nodes for listItems, nestedExpand, blockquote, and panel. At that point the customer
+      // has not yet been exposed
+      editorExperiment('platform_editor_nested_non_bodied_macros', 'test', {
+        exposure: true
+      });
+    }
+  }, [shouldFireNbmExperimentExposure]);
   return jsx(Fragment, null, showMacroInteractionDesignUpdates && !isLivePageViewMode && jsx(ExtensionLozenge, {
     isNodeSelected: isNodeSelected,
     isNodeHovered: isNodeHovered,
@@ -204,6 +229,7 @@ const Extension = props => {
   const {
     widthState
   } = useSharedPluginState(pluginInjectionApi, ['width']);
+
   // Ignored via go/ees005
   // eslint-disable-next-line react/jsx-props-no-spreading
   return jsx(ExtensionWithPluginState, _extends({

package/dist/es2019/extensibility/Extension.js

@@ -32,9 +32,10 @@ export class Extension extends Component {
       // @ts-ignore
       const currentState = pluginInjectionApi === null || pluginInjectionApi === void 0 ? void 0 : (_pluginInjectionApi$e = pluginInjectionApi.editorViewMode) === null || _pluginInjectionApi$e === void 0 ? void 0 : (_pluginInjectionApi$e2 = _pluginInjectionApi$e.sharedState) === null || _pluginInjectionApi$e2 === void 0 ? void 0 : _pluginInjectionApi$e2.currentState();
       const {
-        contentMode
+        contentMode,
+        mode
       } = currentState || {};
-      const isLivePageViewMode = contentMode === 'live-view';
+      const isLivePageViewMode = contentMode === 'live-view' || mode === 'view';
       return /*#__PURE__*/React.createElement(ExtensionComponent, {
         editorView: editorView,
         node: node,

package/dist/es2019/monitoring/error.js

@@ -1,7 +1,7 @@
 import { isFedRamp } from './environment';
 const SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 const packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-const packageVersion = "102.3.0";
+const packageVersion = "102.3.2";
 const sanitiseSentryEvents = (data, _hint) => {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/es2019/ui/DropList/index.js

@@ -13,7 +13,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 const packageName = "@atlaskit/editor-common";
-const packageVersion = "102.3.0";
+const packageVersion = "102.3.2";
 const halfFocusRing = 1;
 const dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/esm/ai-messages/ai.js

@@ -27,6 +27,16 @@ export var aiMessages = defineMessages({
     defaultMessage: 'Tell Atlassian Intelligence to improve the writing of your selection',
     description: 'Tooltip text for an option to use Atlassian Intellgience to improve the writing of content currently selected by the user'
   },
+  askAIToolbarIconTitle: {
+    id: 'fabric.editor.ai.toolbar.askAI.title',
+    defaultMessage: 'Ask AI',
+    description: 'Title for an option to use Atlassian Intellgience'
+  },
+  askAIToolbarIconTooltip: {
+    id: 'fabric.editor.ai.toolbar.tryAI.tooltip',
+    defaultMessage: 'Open Atlassian Intelligence',
+    description: 'Tooltip text for an option to use Atlassian Intellgience'
+  },
   tryAIToolbarIconTitle: {
     id: 'fabric.editor.ai.toolbar.tryAI.title',
     defaultMessage: 'Try AI',

package/dist/esm/extensibility/Extension/Extension/index.js

@@ -9,12 +9,13 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
  * @jsx jsx
  */
 
-import React, { Fragment } from 'react';
+import React, { Fragment, useEffect } from 'react';
 
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { jsx } from '@emotion/react';
 import classnames from 'classnames';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
 import { useSharedPluginState } from '../../../hooks';
 import { overflowShadow } from '../../../ui';
 import { calculateBreakoutStyles } from '../../../utils';
@@ -117,6 +118,30 @@ function ExtensionWithPluginState(props) {
       setIsNodeHovered(didHover);
     }
   };
+  var shouldFireNbmExperimentExposure = React.useMemo(function () {
+    if (node.type.name === 'extension' && typeof getPos === 'function') {
+      var pos = getPos();
+      if (!isNaN(pos)) {
+        var _view$state$doc$resol;
+        var parentNameType = (_view$state$doc$resol = view.state.doc.resolve(pos).parent) === null || _view$state$doc$resol === void 0 || (_view$state$doc$resol = _view$state$doc$resol.type) === null || _view$state$doc$resol === void 0 ? void 0 : _view$state$doc$resol.name;
+        if (['listItem', 'nestedExpand', 'blockquote', 'panel'].includes(parentNameType)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }, [node, getPos, view]);
+  useEffect(function () {
+    if (shouldFireNbmExperimentExposure) {
+      // No-op editorExperiment evaluation to track usage of nested non-bodied macros
+      // these can't be tracked at the point of diversion of the experience because that is a toggle of the
+      // ProseMirror schema nodes for listItems, nestedExpand, blockquote, and panel. At that point the customer
+      // has not yet been exposed
+      editorExperiment('platform_editor_nested_non_bodied_macros', 'test', {
+        exposure: true
+      });
+    }
+  }, [shouldFireNbmExperimentExposure]);
   return jsx(Fragment, null, showMacroInteractionDesignUpdates && !isLivePageViewMode && jsx(ExtensionLozenge, {
     isNodeSelected: isNodeSelected,
     isNodeHovered: isNodeHovered,
@@ -199,6 +224,7 @@ var Extension = function Extension(props) {
   var pluginInjectionApi = props.pluginInjectionApi;
   var _useSharedPluginState = useSharedPluginState(pluginInjectionApi, ['width']),
     widthState = _useSharedPluginState.widthState;
+
   // Ignored via go/ees005
   // eslint-disable-next-line react/jsx-props-no-spreading
   return jsx(ExtensionWithPluginState, _extends({

package/dist/esm/extensibility/Extension.js

@@ -39,8 +39,9 @@ export var Extension = /*#__PURE__*/function (_Component) {
       // @ts-ignore
       var currentState = pluginInjectionApi === null || pluginInjectionApi === void 0 || (_pluginInjectionApi$e = pluginInjectionApi.editorViewMode) === null || _pluginInjectionApi$e === void 0 || (_pluginInjectionApi$e = _pluginInjectionApi$e.sharedState) === null || _pluginInjectionApi$e === void 0 ? void 0 : _pluginInjectionApi$e.currentState();
       var _ref2 = currentState || {},
-        contentMode = _ref2.contentMode;
-      var isLivePageViewMode = contentMode === 'live-view';
+        contentMode = _ref2.contentMode,
+        mode = _ref2.mode;
+      var isLivePageViewMode = contentMode === 'live-view' || mode === 'view';
       return /*#__PURE__*/React.createElement(ExtensionComponent, {
         editorView: editorView,
         node: node,

package/dist/esm/monitoring/error.js

@@ -7,7 +7,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 import { isFedRamp } from './environment';
 var SENTRY_DSN = 'https://0b10c8e02fb44d8796c047b102c9bee8@o55978.ingest.sentry.io/4505129224110080';
 var packageName = 'editor-common'; // Sentry doesn't accept '/' in its releases https://docs.sentry.io/platforms/javascript/configuration/releases/
-var packageVersion = "102.3.0";
+var packageVersion = "102.3.2";
 var sanitiseSentryEvents = function sanitiseSentryEvents(data, _hint) {
   // Remove URL as it has UGC
   // Ignored via go/ees007

package/dist/esm/ui/DropList/index.js

@@ -20,7 +20,7 @@ import withAnalyticsContext from '@atlaskit/analytics-next/withAnalyticsContext'
 import withAnalyticsEvents from '@atlaskit/analytics-next/withAnalyticsEvents';
 import Layer from '../Layer';
 var packageName = "@atlaskit/editor-common";
-var packageVersion = "102.3.0";
+var packageVersion = "102.3.2";
 var halfFocusRing = 1;
 var dropOffset = '0, 8';
 // Ignored via go/ees005

package/dist/types/ai-messages/ai.d.ts

@@ -24,6 +24,16 @@ export declare const aiMessages: {
         defaultMessage: string;
         description: string;
     };
+    askAIToolbarIconTitle: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
+    askAIToolbarIconTooltip: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
     tryAIToolbarIconTitle: {
         id: string;
         defaultMessage: string;

package/dist/types-ts4.5/ai-messages/ai.d.ts

@@ -24,6 +24,16 @@ export declare const aiMessages: {
         defaultMessage: string;
         description: string;
     };
+    askAIToolbarIconTitle: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
+    askAIToolbarIconTooltip: {
+        id: string;
+        defaultMessage: string;
+        description: string;
+    };
     tryAIToolbarIconTitle: {
         id: string;
         defaultMessage: string;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-common",
-	"version": "102.3.0",
+	"version": "102.3.2",
 	"description": "A package that contains common classes and components for editor and renderer",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -161,7 +161,7 @@
 		"@atlaskit/task-decision": "^19.0.0",
 		"@atlaskit/textfield": "^8.0.0",
 		"@atlaskit/tmp-editor-statsig": "^3.5.0",
-		"@atlaskit/tokens": "^4.3.0",
+		"@atlaskit/tokens": "^4.4.0",
 		"@atlaskit/tooltip": "^20.0.0",
 		"@atlaskit/width-detector": "^5.0.0",
 		"@babel/runtime": "^7.0.0",