@atlaskit/renderer 111.1.8 → 111.1.10

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @atlaskit/renderer
 
+## 111.1.10
+
+### Patch Changes
+
+- [#151121](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/151121)
+  [`7327a31a5aaec`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/7327a31a5aaec) -
+  [ux] [ED-25172] Update resolvePos to handle when endContainer is a non-text node.
+- Updated dependencies
+
+## 111.1.9
+
+### Patch Changes
+
+- [#151050](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/151050)
+  [`50e38f61af619`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/50e38f61af619) -
+  cleaned up ff for extended inline-extensions
+
 ## 111.1.8
 
 ### Patch Changes

package/dist/cjs/steps/index.js

@@ -150,7 +150,25 @@ function resolvePos(node, offset) {
       }
     }
   }
+
+  /**
+   * If anchor node is an element (e.g. after a triple click) the anchorOffset
+   * is the number of child nodes preceding the anchor.
+   * https://developer.mozilla.org/en-US/docs/Web/API/Selection/anchorOffset
+   *
+   * For end pos we calculate the number of characters by stepping through
+   * each of the node's children.
+   */
   if (node instanceof HTMLElement && isPositionPointer(node)) {
+    if (findEnd) {
+      var count = getStartPos(node);
+      var children = node.childNodes;
+      for (var i = 0; i < offset; i++) {
+        var _children$i;
+        count += ((_children$i = children[i]) === null || _children$i === void 0 || (_children$i = _children$i.textContent) === null || _children$i === void 0 ? void 0 : _children$i.length) || 1;
+      }
+      return count;
+    }
     return getStartPos(node) + offset;
   }
   var parent = findParent(node);

package/dist/cjs/ui/ExtensionRenderer.js

@@ -1,21 +1,17 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = ExtensionRenderer;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = require("@emotion/react");
-var _react2 = _interopRequireWildcard(require("react"));
+var _react2 = _interopRequireDefault(require("react"));
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _extensions = require("@atlaskit/editor-common/extensions");
 var _providerFactory = require("@atlaskit/editor-common/provider-factory");
 var _utils = require("@atlaskit/editor-common/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-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; }
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -129,14 +125,11 @@ function ExtensionRenderer(props) {
 }
 var InlineNodeRendererWrapper = function InlineNodeRendererWrapper(_ref) {
   var children = _ref.children;
-  if ((0, _platformFeatureFlags.fg)('platform.editor.inline_extension.extended_lcqdn')) {
-    return (
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-      (0, _react.jsx)("div", {
-        className: "inline-extension-renderer",
-        css: inlineExtensionStyle
-      }, children)
-    );
-  }
-  return (0, _react.jsx)(_react2.Fragment, null, children);
+  return (
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
+    (0, _react.jsx)("div", {
+      className: "inline-extension-renderer",
+      css: inlineExtensionStyle
+    }, children)
+  );
 };

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

@@ -65,7 +65,7 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 var NORMAL_SEVERITY_THRESHOLD = exports.NORMAL_SEVERITY_THRESHOLD = 2000;
 var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "111.1.8";
+var packageVersion = "111.1.10";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size',
@@ -287,7 +287,7 @@ var __RendererClassComponent = exports.__RendererClassComponent = /*#__PURE__*/f
         nodeComponents: props.nodeComponents,
         // does not currently support SSR, should not be enabled in environments where Renderer is SSR-ed
         allowWindowedCodeBlock: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.allowWindowedCodeBlock,
-        isInsideOfInlineExtension: (0, _platformFeatureFlags.fg)('platform.editor.inline_extension.extended_lcqdn') && props.isInsideOfInlineExtension,
+        isInsideOfInlineExtension: props.isInsideOfInlineExtension,
         textHighlighter: props.UNSTABLE_textHighlighter,
         allowTableAlignment: props.UNSTABLE_allowTableAlignment,
         allowTableResizing: props.UNSTABLE_allowTableResizing
@@ -558,7 +558,7 @@ var RendererWrapper = /*#__PURE__*/_react.default.memo(function (props) {
   , {
     className: "ak-renderer-wrapper is-".concat(appearance),
     "data-appearance": appearance,
-    shouldCheckExistingValue: (0, _platformFeatureFlags.fg)('platform.editor.inline_extension.extended_lcqdn') && isInsideOfInlineExtension
+    shouldCheckExistingValue: isInsideOfInlineExtension
   }, (0, _react2.jsx)(_ui.BaseTheme, {
     baseFontSize: appearance && appearance !== 'comment' ? _editorSharedStyles.akEditorFullPageDefaultFontSize : undefined
   }, (0, _react2.jsx)(_EditorMediaClientProvider.EditorMediaClientProvider, {

package/dist/es2019/steps/index.js

@@ -144,7 +144,25 @@ export function resolvePos(node, offset, findEnd = false) {
       }
     }
   }
+
+  /**
+   * If anchor node is an element (e.g. after a triple click) the anchorOffset
+   * is the number of child nodes preceding the anchor.
+   * https://developer.mozilla.org/en-US/docs/Web/API/Selection/anchorOffset
+   *
+   * For end pos we calculate the number of characters by stepping through
+   * each of the node's children.
+   */
   if (node instanceof HTMLElement && isPositionPointer(node)) {
+    if (findEnd) {
+      let count = getStartPos(node);
+      const children = node.childNodes;
+      for (let i = 0; i < offset; i++) {
+        var _children$i, _children$i$textConte;
+        count += ((_children$i = children[i]) === null || _children$i === void 0 ? void 0 : (_children$i$textConte = _children$i.textContent) === null || _children$i$textConte === void 0 ? void 0 : _children$i$textConte.length) || 1;
+      }
+      return count;
+    }
     return getStartPos(node) + offset;
   }
   const parent = findParent(node);

package/dist/es2019/ui/ExtensionRenderer.js

@@ -4,12 +4,11 @@
  */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
-import React, { Fragment } from 'react';
+import React from 'react';
 import memoizeOne from 'memoize-one';
 import { getNodeRenderer } from '@atlaskit/editor-common/extensions';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { getExtensionRenderer } from '@atlaskit/editor-common/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 const inlineExtensionStyle = css({
   display: 'inline-block',
   maxWidth: '100%',
@@ -113,14 +112,11 @@ export default function ExtensionRenderer(props) {
 const InlineNodeRendererWrapper = ({
   children
 }) => {
-  if (fg('platform.editor.inline_extension.extended_lcqdn')) {
-    return (
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-      jsx("div", {
-        className: "inline-extension-renderer",
-        css: inlineExtensionStyle
-      }, children)
-    );
-  }
-  return jsx(Fragment, null, children);
+  return (
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
+    jsx("div", {
+      className: "inline-extension-renderer",
+      css: inlineExtensionStyle
+    }, children)
+  );
 };

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

@@ -45,7 +45,7 @@ import { nodeToReact } from '../../react/nodes';
 export const NORMAL_SEVERITY_THRESHOLD = 2000;
 export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "111.1.8";
+const packageVersion = "111.1.10";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size',
@@ -265,7 +265,7 @@ export class __RendererClassComponent extends PureComponent {
       nodeComponents: props.nodeComponents,
       // does not currently support SSR, should not be enabled in environments where Renderer is SSR-ed
       allowWindowedCodeBlock: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.allowWindowedCodeBlock,
-      isInsideOfInlineExtension: fg('platform.editor.inline_extension.extended_lcqdn') && props.isInsideOfInlineExtension,
+      isInsideOfInlineExtension: props.isInsideOfInlineExtension,
       textHighlighter: props.UNSTABLE_textHighlighter,
       allowTableAlignment: props.UNSTABLE_allowTableAlignment,
       allowTableResizing: props.UNSTABLE_allowTableResizing
@@ -531,7 +531,7 @@ const RendererWrapper = /*#__PURE__*/React.memo(props => {
   , {
     className: `ak-renderer-wrapper is-${appearance}`,
     "data-appearance": appearance,
-    shouldCheckExistingValue: fg('platform.editor.inline_extension.extended_lcqdn') && isInsideOfInlineExtension
+    shouldCheckExistingValue: isInsideOfInlineExtension
   }, jsx(BaseTheme, {
     baseFontSize: appearance && appearance !== 'comment' ? akEditorFullPageDefaultFontSize : undefined
   }, jsx(EditorMediaClientProvider, {

package/dist/esm/steps/index.js

@@ -141,7 +141,25 @@ export function resolvePos(node, offset) {
       }
     }
   }
+
+  /**
+   * If anchor node is an element (e.g. after a triple click) the anchorOffset
+   * is the number of child nodes preceding the anchor.
+   * https://developer.mozilla.org/en-US/docs/Web/API/Selection/anchorOffset
+   *
+   * For end pos we calculate the number of characters by stepping through
+   * each of the node's children.
+   */
   if (node instanceof HTMLElement && isPositionPointer(node)) {
+    if (findEnd) {
+      var count = getStartPos(node);
+      var children = node.childNodes;
+      for (var i = 0; i < offset; i++) {
+        var _children$i;
+        count += ((_children$i = children[i]) === null || _children$i === void 0 || (_children$i = _children$i.textContent) === null || _children$i === void 0 ? void 0 : _children$i.length) || 1;
+      }
+      return count;
+    }
     return getStartPos(node) + offset;
   }
   var parent = findParent(node);

package/dist/esm/ui/ExtensionRenderer.js

@@ -5,12 +5,11 @@ import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
  */
 // eslint-disable-next-line @atlaskit/ui-styling-standard/use-compiled -- Ignored via go/DSP-18766
 import { css, jsx } from '@emotion/react';
-import React, { Fragment } from 'react';
+import React from 'react';
 import memoizeOne from 'memoize-one';
 import { getNodeRenderer } from '@atlaskit/editor-common/extensions';
 import { WithProviders } from '@atlaskit/editor-common/provider-factory';
 import { getExtensionRenderer } from '@atlaskit/editor-common/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 var inlineExtensionStyle = css({
   display: 'inline-block',
   maxWidth: '100%',
@@ -118,14 +117,11 @@ export default function ExtensionRenderer(props) {
 }
 var InlineNodeRendererWrapper = function InlineNodeRendererWrapper(_ref) {
   var children = _ref.children;
-  if (fg('platform.editor.inline_extension.extended_lcqdn')) {
-    return (
-      // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
-      jsx("div", {
-        className: "inline-extension-renderer",
-        css: inlineExtensionStyle
-      }, children)
-    );
-  }
-  return jsx(Fragment, null, children);
+  return (
+    // eslint-disable-next-line @atlaskit/ui-styling-standard/no-classname-prop -- Ignored via go/DSP-18766
+    jsx("div", {
+      className: "inline-extension-renderer",
+      css: inlineExtensionStyle
+    }, children)
+  );
 };

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

@@ -55,7 +55,7 @@ import { nodeToReact } from '../../react/nodes';
 export var NORMAL_SEVERITY_THRESHOLD = 2000;
 export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "111.1.8";
+var packageVersion = "111.1.10";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size',
@@ -277,7 +277,7 @@ export var __RendererClassComponent = /*#__PURE__*/function (_PureComponent) {
         nodeComponents: props.nodeComponents,
         // does not currently support SSR, should not be enabled in environments where Renderer is SSR-ed
         allowWindowedCodeBlock: featureFlags === null || featureFlags === void 0 ? void 0 : featureFlags.allowWindowedCodeBlock,
-        isInsideOfInlineExtension: fg('platform.editor.inline_extension.extended_lcqdn') && props.isInsideOfInlineExtension,
+        isInsideOfInlineExtension: props.isInsideOfInlineExtension,
         textHighlighter: props.UNSTABLE_textHighlighter,
         allowTableAlignment: props.UNSTABLE_allowTableAlignment,
         allowTableResizing: props.UNSTABLE_allowTableResizing
@@ -548,7 +548,7 @@ var RendererWrapper = /*#__PURE__*/React.memo(function (props) {
   , {
     className: "ak-renderer-wrapper is-".concat(appearance),
     "data-appearance": appearance,
-    shouldCheckExistingValue: fg('platform.editor.inline_extension.extended_lcqdn') && isInsideOfInlineExtension
+    shouldCheckExistingValue: isInsideOfInlineExtension
   }, jsx(BaseTheme, {
     baseFontSize: appearance && appearance !== 'comment' ? akEditorFullPageDefaultFontSize : undefined
   }, jsx(EditorMediaClientProvider, {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "111.1.8",
+	"version": "111.1.10",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -46,7 +46,7 @@
 		"@atlaskit/media-ui": "^25.15.0",
 		"@atlaskit/media-viewer": "^49.1.0",
 		"@atlaskit/platform-feature-flags": "^0.3.0",
-		"@atlaskit/smart-card": "^29.3.0",
+		"@atlaskit/smart-card": "^30.0.0",
 		"@atlaskit/status": "^1.5.0",
 		"@atlaskit/task-decision": "^17.11.0",
 		"@atlaskit/theme": "^13.0.0",