@atlaskit/renderer 128.0.5 → 128.0.7

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/renderer
 
+## 128.0.7
+
+### Patch Changes
+
+- [`3d428e4d1167c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/3d428e4d1167c) -
+  [ux] All inline smart card branches are wrapped with draggable (from pragmatic-drag-and-drop). The
+  draggable logic has been improved to have better native support.
+- Updated dependencies
+
+## 128.0.6
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 128.0.5
 
 ### Patch Changes

package/dist/cjs/react/nodes/inlineCard.js

@@ -207,7 +207,11 @@ var InlineCard = function InlineCard(props) {
     if (
     // eslint-disable-next-line @atlaskit/platform/no-invalid-feature-flag-usage
     (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
-      return (0, _react2.jsx)("span", (0, _extends2.default)({
+      return (0, _react2.jsx)(_editorSmartLinkDraggable.SmartLinkDraggable, {
+        url: url,
+        appearance: _editorSmartLinkDraggable.SMART_LINK_APPEARANCE.INLINE,
+        source: _editorSmartLinkDraggable.SMART_LINK_DRAG_TYPES.RENDERER
+      }, (0, _react2.jsx)("span", (0, _extends2.default)({
         "data-inline-card": true,
         "data-card-data": data ? JSON.stringify(data) : undefined,
         "data-card-url": url
@@ -221,9 +225,13 @@ var InlineCard = function InlineCard(props) {
         showHoverPreview: !hideHoverPreview,
         actionOptions: actionOptions,
         onClick: onClick
-      }))));
+      })))));
     }
-    return (0, _react2.jsx)(_analyticsNext.AnalyticsContext, {
+    return (0, _react2.jsx)(_editorSmartLinkDraggable.SmartLinkDraggable, {
+      url: url,
+      appearance: _editorSmartLinkDraggable.SMART_LINK_APPEARANCE.INLINE,
+      source: _editorSmartLinkDraggable.SMART_LINK_DRAG_TYPES.RENDERER
+    }, (0, _react2.jsx)(_analyticsNext.AnalyticsContext, {
       data: analyticsData
     }, wrapWithSuspense((0, _react2.jsx)(_ssr.CardSSR, {
       appearance: "inline",
@@ -231,14 +239,18 @@ var InlineCard = function InlineCard(props) {
       showHoverPreview: !hideHoverPreview,
       actionOptions: actionOptions,
       onClick: onClick
-    })), CompetitorPromptComponent);
+    })), CompetitorPromptComponent));
   } else if ((ssr || cardState && (0, _expValEquals.expValEquals)('platform_editor_smartlink_local_cache', 'isEnabled', true)) && url && (0, _experiments.editorExperiment)('platform_editor_preview_panel_linking_exp', true, {
     exposure: true
   })) {
     if (
     // eslint-disable-next-line @atlaskit/platform/no-invalid-feature-flag-usage
     (0, _platformFeatureFlags.fg)('editor_inline_comments_on_inline_nodes')) {
-      return (0, _react2.jsx)("span", {
+      return (0, _react2.jsx)(_editorSmartLinkDraggable.SmartLinkDraggable, {
+        url: url,
+        appearance: _editorSmartLinkDraggable.SMART_LINK_APPEARANCE.INLINE,
+        source: _editorSmartLinkDraggable.SMART_LINK_DRAG_TYPES.RENDERER
+      }, (0, _react2.jsx)("span", {
         "data-inline-card": true,
         "data-card-data": data ? JSON.stringify(data) : undefined,
         "data-card-url": url,
@@ -271,9 +283,13 @@ var InlineCard = function InlineCard(props) {
         },
         onError: onError,
         disablePreviewPanel: true
-      })))));
+      }))))));
     }
-    return (0, _react2.jsx)(_analyticsNext.AnalyticsContext, {
+    return (0, _react2.jsx)(_editorSmartLinkDraggable.SmartLinkDraggable, {
+      url: url,
+      appearance: _editorSmartLinkDraggable.SMART_LINK_APPEARANCE.INLINE,
+      source: _editorSmartLinkDraggable.SMART_LINK_DRAG_TYPES.RENDERER
+    }, (0, _react2.jsx)(_analyticsNext.AnalyticsContext, {
       data: analyticsData
     }, (0, _react2.jsx)(MaybeOverlay, {
       url: url || '',
@@ -297,7 +313,7 @@ var InlineCard = function InlineCard(props) {
       },
       onError: onError,
       disablePreviewPanel: true
-    }))), CompetitorPromptComponent);
+    }))), CompetitorPromptComponent));
   }
   return (0, _react2.jsx)(_editorSmartLinkDraggable.SmartLinkDraggable, {
     url: url || '',

package/dist/cjs/render-document.js

@@ -12,6 +12,7 @@ var _analytics = require("@atlaskit/editor-common/analytics");
 var _utils = require("@atlaskit/editor-common/utils");
 var _validator = require("@atlaskit/editor-common/validator");
 var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
+var _expValEquals = require("@atlaskit/tmp-editor-statsig/exp-val-equals");
 var _memoizeOne = _interopRequireDefault(require("memoize-one"));
 var _events = require("./analytics/events");
 var _unsupportedContent = require("./analytics/unsupported-content");
@@ -92,17 +93,17 @@ var _validation = function _validation(doc, schema, adfStage, useSpecBasedValida
       }
     });
   }
-  if (result && (0, _platformFeatureFlags.fg)('platform_editor_native_embeds_fallback_transform')) {
+  if (result && !(0, _expValEquals.expValEquals)('cc-maui-experiment', 'isEnabled', true) && (0, _platformFeatureFlags.fg)('platform_editor_native_embeds_fallback_transform')) {
     var _nativeEmbedsFallback = (0, _transforms.nativeEmbedsFallbackTransform)(result),
       _transformedAdf2 = _nativeEmbedsFallback.transformedAdf,
-      _isTransformed2 = _nativeEmbedsFallback.isTransformed;
-    if (_isTransformed2) {
+      hasValidTransform = _nativeEmbedsFallback.hasValidTransform;
+    if (hasValidTransform && _transformedAdf2) {
       dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 || dispatchAnalyticsEvent({
         action: _analytics.ACTION.NATIVE_EMBEDS_TRANSFORMED,
         actionSubject: _analytics.ACTION_SUBJECT.RENDERER,
         eventType: _analytics.EVENT_TYPE.OPERATIONAL
       });
-      result = _transformedAdf2 || result;
+      result = _transformedAdf2;
     }
   }
   return result;

package/dist/cjs/ui/ExtensionRenderer.js

@@ -13,7 +13,6 @@ 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");
 /**
  * @jsxRuntime classic
  * @jsx jsx
@@ -105,17 +104,11 @@ function ExtensionRenderer(props) {
             actions: actions
           });
         } else if (node.type === 'inlineExtension') {
-          if ((0, _platformFeatureFlags.fg)('platform_editor_renderer_inline_extension_improve')) {
-            result = (0, _react.jsx)(InlineNodeRendererWrapper, {
-              isPlainTextMacro: isPlainTextMacro
-            }, (0, _react.jsx)(NodeRenderer, {
-              node: node
-            }));
-          } else {
-            result = (0, _react.jsx)(InlineNodeRendererWrapper, null, (0, _react.jsx)(NodeRenderer, {
-              node: node
-            }));
-          }
+          result = (0, _react.jsx)(InlineNodeRendererWrapper, {
+            isPlainTextMacro: isPlainTextMacro
+          }, (0, _react.jsx)(NodeRenderer, {
+            node: node
+          }));
         } else {
           result = (0, _react.jsx)(NodeRenderer, {
             node: node

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

@@ -71,7 +71,7 @@ var DEGRADED_SEVERITY_THRESHOLD = exports.DEGRADED_SEVERITY_THRESHOLD = 3000;
 var TABLE_INFO_TIMEOUT = 10000;
 var RENDER_EVENT_SAMPLE_RATE = 0.2;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "0.0.0-development";
+var packageVersion = "128.0.6";
 var setAsQueryContainerStyles = (0, _react2.css)({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/es2019/react/nodes/inlineCard.js

@@ -192,7 +192,11 @@ const InlineCard = props => {
     if (
     // eslint-disable-next-line @atlaskit/platform/no-invalid-feature-flag-usage
     fg('editor_inline_comments_on_inline_nodes')) {
-      return jsx("span", _extends({
+      return jsx(SmartLinkDraggable, {
+        url: url,
+        appearance: SMART_LINK_APPEARANCE.INLINE,
+        source: SMART_LINK_DRAG_TYPES.RENDERER
+      }, jsx("span", _extends({
         "data-inline-card": true,
         "data-card-data": data ? JSON.stringify(data) : undefined,
         "data-card-url": url
@@ -206,9 +210,13 @@ const InlineCard = props => {
         showHoverPreview: !hideHoverPreview,
         actionOptions: actionOptions,
         onClick: onClick
-      }))));
+      })))));
     }
-    return jsx(AnalyticsContext, {
+    return jsx(SmartLinkDraggable, {
+      url: url,
+      appearance: SMART_LINK_APPEARANCE.INLINE,
+      source: SMART_LINK_DRAG_TYPES.RENDERER
+    }, jsx(AnalyticsContext, {
       data: analyticsData
     }, wrapWithSuspense(jsx(CardSSR, {
       appearance: "inline",
@@ -216,14 +224,18 @@ const InlineCard = props => {
       showHoverPreview: !hideHoverPreview,
       actionOptions: actionOptions,
       onClick: onClick
-    })), CompetitorPromptComponent);
+    })), CompetitorPromptComponent));
   } else if ((ssr || cardState && expValEquals('platform_editor_smartlink_local_cache', 'isEnabled', true)) && url && editorExperiment('platform_editor_preview_panel_linking_exp', true, {
     exposure: true
   })) {
     if (
     // eslint-disable-next-line @atlaskit/platform/no-invalid-feature-flag-usage
     fg('editor_inline_comments_on_inline_nodes')) {
-      return jsx("span", {
+      return jsx(SmartLinkDraggable, {
+        url: url,
+        appearance: SMART_LINK_APPEARANCE.INLINE,
+        source: SMART_LINK_DRAG_TYPES.RENDERER
+      }, jsx("span", {
         "data-inline-card": true,
         "data-card-data": data ? JSON.stringify(data) : undefined,
         "data-card-url": url,
@@ -256,9 +268,13 @@ const InlineCard = props => {
         },
         onError: onError,
         disablePreviewPanel: true
-      })))));
+      }))))));
     }
-    return jsx(AnalyticsContext, {
+    return jsx(SmartLinkDraggable, {
+      url: url,
+      appearance: SMART_LINK_APPEARANCE.INLINE,
+      source: SMART_LINK_DRAG_TYPES.RENDERER
+    }, jsx(AnalyticsContext, {
       data: analyticsData
     }, jsx(MaybeOverlay, {
       url: url || '',
@@ -282,7 +298,7 @@ const InlineCard = props => {
       },
       onError: onError,
       disablePreviewPanel: true
-    }))), CompetitorPromptComponent);
+    }))), CompetitorPromptComponent));
   }
   return jsx(SmartLinkDraggable, {
     url: url || '',

package/dist/es2019/render-document.js

@@ -7,6 +7,7 @@ import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/anal
 import { findAndTrackUnsupportedContentNodes, validateADFEntity } from '@atlaskit/editor-common/utils';
 import { getValidDocument } from '@atlaskit/editor-common/validator';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import memoizeOne from 'memoize-one';
 import { PLATFORM } from './analytics/events';
 import { trackUnsupportedContentLevels } from './analytics/unsupported-content';
@@ -86,18 +87,18 @@ const _validation = (doc, schema, adfStage, useSpecBasedValidator, dispatchAnaly
       }
     });
   }
-  if (result && fg('platform_editor_native_embeds_fallback_transform')) {
+  if (result && !expValEquals('cc-maui-experiment', 'isEnabled', true) && fg('platform_editor_native_embeds_fallback_transform')) {
     const {
       transformedAdf,
-      isTransformed
+      hasValidTransform
     } = nativeEmbedsFallbackTransform(result);
-    if (isTransformed) {
+    if (hasValidTransform && transformedAdf) {
       dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 ? void 0 : dispatchAnalyticsEvent({
         action: ACTION.NATIVE_EMBEDS_TRANSFORMED,
         actionSubject: ACTION_SUBJECT.RENDERER,
         eventType: EVENT_TYPE.OPERATIONAL
       });
-      result = transformedAdf || result;
+      result = transformedAdf;
     }
   }
   return result;

package/dist/es2019/ui/ExtensionRenderer.js

@@ -9,7 +9,6 @@ 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%',
@@ -90,17 +89,11 @@ export default function ExtensionRenderer(props) {
             actions: actions
           });
         } else if (node.type === 'inlineExtension') {
-          if (fg('platform_editor_renderer_inline_extension_improve')) {
-            result = jsx(InlineNodeRendererWrapper, {
-              isPlainTextMacro: isPlainTextMacro
-            }, jsx(NodeRenderer, {
-              node: node
-            }));
-          } else {
-            result = jsx(InlineNodeRendererWrapper, null, jsx(NodeRenderer, {
-              node: node
-            }));
-          }
+          result = jsx(InlineNodeRendererWrapper, {
+            isPlainTextMacro: isPlainTextMacro
+          }, jsx(NodeRenderer, {
+            node: node
+          }));
         } else {
           result = jsx(NodeRenderer, {
             node: node

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

@@ -57,7 +57,7 @@ export const DEGRADED_SEVERITY_THRESHOLD = 3000;
 const TABLE_INFO_TIMEOUT = 10000;
 const RENDER_EVENT_SAMPLE_RATE = 0.2;
 const packageName = "@atlaskit/renderer";
-const packageVersion = "0.0.0-development";
+const packageVersion = "128.0.6";
 const setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/dist/esm/react/nodes/inlineCard.js

@@ -198,7 +198,11 @@ var InlineCard = function InlineCard(props) {
     if (
     // eslint-disable-next-line @atlaskit/platform/no-invalid-feature-flag-usage
     fg('editor_inline_comments_on_inline_nodes')) {
-      return jsx("span", _extends({
+      return jsx(SmartLinkDraggable, {
+        url: url,
+        appearance: SMART_LINK_APPEARANCE.INLINE,
+        source: SMART_LINK_DRAG_TYPES.RENDERER
+      }, jsx("span", _extends({
         "data-inline-card": true,
         "data-card-data": data ? JSON.stringify(data) : undefined,
         "data-card-url": url
@@ -212,9 +216,13 @@ var InlineCard = function InlineCard(props) {
         showHoverPreview: !hideHoverPreview,
         actionOptions: actionOptions,
         onClick: onClick
-      }))));
+      })))));
     }
-    return jsx(AnalyticsContext, {
+    return jsx(SmartLinkDraggable, {
+      url: url,
+      appearance: SMART_LINK_APPEARANCE.INLINE,
+      source: SMART_LINK_DRAG_TYPES.RENDERER
+    }, jsx(AnalyticsContext, {
       data: analyticsData
     }, wrapWithSuspense(jsx(CardSSR, {
       appearance: "inline",
@@ -222,14 +230,18 @@ var InlineCard = function InlineCard(props) {
       showHoverPreview: !hideHoverPreview,
       actionOptions: actionOptions,
       onClick: onClick
-    })), CompetitorPromptComponent);
+    })), CompetitorPromptComponent));
   } else if ((ssr || cardState && expValEquals('platform_editor_smartlink_local_cache', 'isEnabled', true)) && url && editorExperiment('platform_editor_preview_panel_linking_exp', true, {
     exposure: true
   })) {
     if (
     // eslint-disable-next-line @atlaskit/platform/no-invalid-feature-flag-usage
     fg('editor_inline_comments_on_inline_nodes')) {
-      return jsx("span", {
+      return jsx(SmartLinkDraggable, {
+        url: url,
+        appearance: SMART_LINK_APPEARANCE.INLINE,
+        source: SMART_LINK_DRAG_TYPES.RENDERER
+      }, jsx("span", {
         "data-inline-card": true,
         "data-card-data": data ? JSON.stringify(data) : undefined,
         "data-card-url": url,
@@ -262,9 +274,13 @@ var InlineCard = function InlineCard(props) {
         },
         onError: onError,
         disablePreviewPanel: true
-      })))));
+      }))))));
     }
-    return jsx(AnalyticsContext, {
+    return jsx(SmartLinkDraggable, {
+      url: url,
+      appearance: SMART_LINK_APPEARANCE.INLINE,
+      source: SMART_LINK_DRAG_TYPES.RENDERER
+    }, jsx(AnalyticsContext, {
       data: analyticsData
     }, jsx(MaybeOverlay, {
       url: url || '',
@@ -288,7 +304,7 @@ var InlineCard = function InlineCard(props) {
       },
       onError: onError,
       disablePreviewPanel: true
-    }))), CompetitorPromptComponent);
+    }))), CompetitorPromptComponent));
   }
   return jsx(SmartLinkDraggable, {
     url: url || '',

package/dist/esm/render-document.js

@@ -8,6 +8,7 @@ import { ACTION, ACTION_SUBJECT, EVENT_TYPE } from '@atlaskit/editor-common/anal
 import { findAndTrackUnsupportedContentNodes, validateADFEntity } from '@atlaskit/editor-common/utils';
 import { getValidDocument } from '@atlaskit/editor-common/validator';
 import { fg } from '@atlaskit/platform-feature-flags';
+import { expValEquals } from '@atlaskit/tmp-editor-statsig/exp-val-equals';
 import memoizeOne from 'memoize-one';
 import { PLATFORM } from './analytics/events';
 import { trackUnsupportedContentLevels } from './analytics/unsupported-content';
@@ -85,17 +86,17 @@ var _validation = function _validation(doc, schema, adfStage, useSpecBasedValida
       }
     });
   }
-  if (result && fg('platform_editor_native_embeds_fallback_transform')) {
+  if (result && !expValEquals('cc-maui-experiment', 'isEnabled', true) && fg('platform_editor_native_embeds_fallback_transform')) {
     var _nativeEmbedsFallback = nativeEmbedsFallbackTransform(result),
       _transformedAdf2 = _nativeEmbedsFallback.transformedAdf,
-      _isTransformed2 = _nativeEmbedsFallback.isTransformed;
-    if (_isTransformed2) {
+      hasValidTransform = _nativeEmbedsFallback.hasValidTransform;
+    if (hasValidTransform && _transformedAdf2) {
       dispatchAnalyticsEvent === null || dispatchAnalyticsEvent === void 0 || dispatchAnalyticsEvent({
         action: ACTION.NATIVE_EMBEDS_TRANSFORMED,
         actionSubject: ACTION_SUBJECT.RENDERER,
         eventType: EVENT_TYPE.OPERATIONAL
       });
-      result = _transformedAdf2 || result;
+      result = _transformedAdf2;
     }
   }
   return result;

package/dist/esm/ui/ExtensionRenderer.js

@@ -10,7 +10,6 @@ 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%',
@@ -96,17 +95,11 @@ export default function ExtensionRenderer(props) {
             actions: actions
           });
         } else if (node.type === 'inlineExtension') {
-          if (fg('platform_editor_renderer_inline_extension_improve')) {
-            result = jsx(InlineNodeRendererWrapper, {
-              isPlainTextMacro: isPlainTextMacro
-            }, jsx(NodeRenderer, {
-              node: node
-            }));
-          } else {
-            result = jsx(InlineNodeRendererWrapper, null, jsx(NodeRenderer, {
-              node: node
-            }));
-          }
+          result = jsx(InlineNodeRendererWrapper, {
+            isPlainTextMacro: isPlainTextMacro
+          }, jsx(NodeRenderer, {
+            node: node
+          }));
         } else {
           result = jsx(NodeRenderer, {
             node: node

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

@@ -62,7 +62,7 @@ export var DEGRADED_SEVERITY_THRESHOLD = 3000;
 var TABLE_INFO_TIMEOUT = 10000;
 var RENDER_EVENT_SAMPLE_RATE = 0.2;
 var packageName = "@atlaskit/renderer";
-var packageVersion = "0.0.0-development";
+var packageVersion = "128.0.6";
 var setAsQueryContainerStyles = css({
   containerName: 'ak-renderer-wrapper',
   containerType: 'inline-size'

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/renderer",
-	"version": "128.0.5",
+	"version": "128.0.7",
 	"description": "Renderer component",
 	"publishConfig": {
 		"registry": "https://registry.npmjs.org/"
@@ -23,7 +23,7 @@
 		}
 	},
 	"dependencies": {
-		"@atlaskit/adf-schema": "^52.2.0",
+		"@atlaskit/adf-schema": "^52.3.0",
 		"@atlaskit/adf-utils": "^19.27.0",
 		"@atlaskit/afm-i18n-platform-editor-renderer": "2.10.0",
 		"@atlaskit/analytics-listeners": "^10.0.0",
@@ -39,7 +39,7 @@
 		"@atlaskit/editor-smart-link-draggable": "^0.1.0",
 		"@atlaskit/emoji": "^69.10.0",
 		"@atlaskit/feature-gate-js-client": "^5.5.0",
-		"@atlaskit/icon": "^32.0.0",
+		"@atlaskit/icon": "^32.1.0",
 		"@atlaskit/link": "^3.3.0",
 		"@atlaskit/link-datasource": "^4.34.0",
 		"@atlaskit/link-extractors": "^2.4.0",
@@ -59,7 +59,7 @@
 		"@atlaskit/status": "^3.1.0",
 		"@atlaskit/task-decision": "^19.3.0",
 		"@atlaskit/theme": "^22.0.0",
-		"@atlaskit/tmp-editor-statsig": "^38.0.0",
+		"@atlaskit/tmp-editor-statsig": "^40.0.0",
 		"@atlaskit/tokens": "^11.1.0",
 		"@atlaskit/tooltip": "^20.14.0",
 		"@atlaskit/visually-hidden": "^3.0.0",
@@ -73,7 +73,7 @@
 		"uuid": "^3.1.0"
 	},
 	"peerDependencies": {
-		"@atlaskit/editor-common": "^112.2.0",
+		"@atlaskit/editor-common": "^112.4.0",
 		"@atlaskit/link-provider": "^4.2.0",
 		"@atlaskit/media-core": "^37.0.0",
 		"react": "^18.2.0",
@@ -195,9 +195,6 @@
 		"platform_editor_numbered_column_in_include": {
 			"type": "boolean"
 		},
-		"platform_editor_renderer_inline_extension_improve": {
-			"type": "boolean"
-		},
 		"jfp-magma-ssr-iv-editor-media": {
 			"type": "boolean"
 		},