@atlaskit/editor-plugin-block-menu 9.0.13 → 9.0.15

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @atlaskit/editor-plugin-block-menu
 
+## 9.0.15
+
+### Patch Changes
+
+- [`ca8aefc573cc5`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/ca8aefc573cc5) -
+  Clean up feature gates `platform_editor_block_menu_divider_patch` and
+  `platform_editor_block_menu_copy_section` (both rolled out as true).
+- Updated dependencies
+
+## 9.0.14
+
+### Patch Changes
+
+- Updated dependencies
+
 ## 9.0.13
 
 ### Patch Changes

package/dist/cjs/ui/block-menu-components.js

@@ -10,7 +10,6 @@ var _react = _interopRequireDefault(require("react"));
 var _blockMenu = require("@atlaskit/editor-common/block-menu");
 var _messages = require("@atlaskit/editor-common/messages");
 var _editorToolbar = require("@atlaskit/editor-toolbar");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var _utils = require("./block-menu-renderer/utils");
 var _copyLink = require("./copy-link");
 var _copySection = require("./copy-section");
@@ -88,9 +87,9 @@ var getTurnIntoMenuComponents = function getTurnIntoMenuComponents(api) {
         api: api
       }, children);
     },
-    isHidden: (0, _platformFeatureFlags.fg)('platform_editor_block_menu_divider_patch') ? function () {
+    isHidden: function isHidden() {
       return (0, _checkIsFormatMenuHidden.checkIsFormatMenuHidden)(api);
-    } : undefined
+    }
   }, {
     type: 'block-menu-section',
     key: _blockMenu.TRANSFORM_SUGGESTED_MENU_SECTION.key,
@@ -209,11 +208,9 @@ var getBlockMenuComponents = exports.getBlockMenuComponents = function getBlockM
     rank: _blockMenu.MAIN_BLOCK_MENU_SECTION_RANK[_blockMenu.BLOCK_ACTIONS_MENU_SECTION.key],
     component: function component(_ref8) {
       var children = _ref8.children;
-      return /*#__PURE__*/_react.default.createElement(_copySection.CopySection, {
-        api: api
-      }, children);
+      return /*#__PURE__*/_react.default.createElement(_copySection.CopySection, null, children);
     }
-  }], (0, _toConsumableArray2.default)((0, _platformFeatureFlags.fg)('platform_editor_block_menu_copy_section') ? [{
+  }, {
     type: 'block-menu-section',
     key: _blockMenu.BLOCK_ACTIONS_COPY_MENU_SECTION.key,
     rank: _blockMenu.MAIN_BLOCK_MENU_SECTION_RANK[_blockMenu.BLOCK_ACTIONS_COPY_MENU_SECTION.key],
@@ -237,21 +234,7 @@ var getBlockMenuComponents = exports.getBlockMenuComponents = function getBlockM
         config: config
       });
     }
-  }] : [{
-    type: 'block-menu-item',
-    key: _blockMenu.BLOCK_ACTIONS_COPY_LINK_TO_BLOCK_MENU_ITEM.key,
-    parent: {
-      type: 'block-menu-section',
-      key: _blockMenu.BLOCK_ACTIONS_MENU_SECTION.key,
-      rank: _blockMenu.BLOCK_ACTIONS_MENU_SECTION_RANK[_blockMenu.BLOCK_ACTIONS_COPY_LINK_TO_BLOCK_MENU_ITEM.key]
-    },
-    component: function component() {
-      return /*#__PURE__*/_react.default.createElement(_copyLink.CopyLinkDropdownItem, {
-        api: api,
-        config: config
-      });
-    }
-  }]), [{
+  }, {
     type: 'block-menu-section',
     key: _blockMenu.POSITION_MENU_SECTION.key,
     rank: _blockMenu.MAIN_BLOCK_MENU_SECTION_RANK[_blockMenu.POSITION_MENU_SECTION.key],

package/dist/cjs/ui/copy-section.js

@@ -1,24 +1,15 @@
 "use strict";
 
-var _typeof = require("@babel/runtime/helpers/typeof");
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.CopySection = void 0;
-var _react = _interopRequireWildcard(require("react"));
+var _react = _interopRequireDefault(require("react"));
 var _editorToolbar = require("@atlaskit/editor-toolbar");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
-var _experiments = require("@atlaskit/tmp-editor-statsig/experiments");
-var _checkIsFormatMenuHidden = require("./utils/checkIsFormatMenuHidden");
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var CopySection = exports.CopySection = function CopySection(_ref) {
-  var api = _ref.api,
-    children = _ref.children;
-  var isFormatMenuHidden = (0, _react.useCallback)(function () {
-    return (0, _checkIsFormatMenuHidden.checkIsFormatMenuHidden)(api);
-  }, [api]);
-  var hasSeparator = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_divider_patch') ? true : (0, _experiments.editorExperiment)('platform_synced_block', true) ? true : !isFormatMenuHidden();
+  var children = _ref.children;
   return /*#__PURE__*/_react.default.createElement(_editorToolbar.ToolbarDropdownItemSection, {
-    hasSeparator: hasSeparator
+    hasSeparator: true
   }, children);
 };

package/dist/cjs/ui/utils/checkIsFormatMenuHidden.js

@@ -5,18 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.checkIsFormatMenuHidden = void 0;
 var _utils = require("@atlaskit/editor-prosemirror/utils");
-var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 var getIsFormatMenuHidden = function getIsFormatMenuHidden(selection, schema) {
   var nodes = schema.nodes;
   if (!nodes) {
     return false;
   }
-
-  // When platform_editor_block_menu_divider_patch is enabled, the "Copy synced block"
-  // item is placed inside TRANSFORM_MENU_SECTION, so we must not hide the section for
-  // syncBlock/bodiedSyncBlock nodes — the "Turn into" nested item has its own isHidden
-  // guard that will still hide it for those node types.
-  var disabledOnNodes = (0, _platformFeatureFlags.fg)('platform_editor_block_menu_divider_patch') ? [nodes.rule] : [nodes.syncBlock, nodes.bodiedSyncBlock, nodes.rule];
+  var disabledOnNodes = [nodes.rule];
   var disabledNode = (0, _utils.findSelectedNodeOfType)(disabledOnNodes)(selection);
   return !!disabledNode;
 };

package/dist/es2019/ui/block-menu-components.js

@@ -1,8 +1,7 @@
 import React from 'react';
-import { BLOCK_ACTIONS_COPY_MENU_SECTION, BLOCK_ACTIONS_COPY_MENU_SECTION_RANK, BLOCK_ACTIONS_COPY_LINK_TO_BLOCK_MENU_ITEM, BLOCK_ACTIONS_MENU_SECTION, BLOCK_ACTIONS_MENU_SECTION_RANK, DELETE_MENU_SECTION, DELETE_MENU_SECTION_RANK, DELETE_MENU_ITEM, POSITION_MENU_SECTION, POSITION_MENU_SECTION_RANK, POSITION_MOVE_DOWN_MENU_ITEM, POSITION_MOVE_UP_MENU_ITEM, TRANSFORM_MENU_ITEM, TRANSFORM_MENU_ITEM_RANK, TRANSFORM_MENU_SECTION, TRANSFORM_MENU_SECTION_RANK, TRANSFORM_CREATE_MENU_SECTION, TRANSFORM_SUGGESTED_MENU_SECTION, TRANSFORM_STRUCTURE_MENU_SECTION, TRANSFORM_HEADINGS_MENU_SECTION, MAIN_BLOCK_MENU_SECTION_RANK, TRANSFORM_SUGGESTED_MENU_SECTION_RANK, TRANSFORM_SUGGESTED_MENU_ITEM } from '@atlaskit/editor-common/block-menu';
+import { BLOCK_ACTIONS_COPY_MENU_SECTION, BLOCK_ACTIONS_COPY_MENU_SECTION_RANK, BLOCK_ACTIONS_COPY_LINK_TO_BLOCK_MENU_ITEM, BLOCK_ACTIONS_MENU_SECTION, DELETE_MENU_SECTION, DELETE_MENU_SECTION_RANK, DELETE_MENU_ITEM, POSITION_MENU_SECTION, POSITION_MENU_SECTION_RANK, POSITION_MOVE_DOWN_MENU_ITEM, POSITION_MOVE_UP_MENU_ITEM, TRANSFORM_MENU_ITEM, TRANSFORM_MENU_ITEM_RANK, TRANSFORM_MENU_SECTION, TRANSFORM_MENU_SECTION_RANK, TRANSFORM_CREATE_MENU_SECTION, TRANSFORM_SUGGESTED_MENU_SECTION, TRANSFORM_STRUCTURE_MENU_SECTION, TRANSFORM_HEADINGS_MENU_SECTION, MAIN_BLOCK_MENU_SECTION_RANK, TRANSFORM_SUGGESTED_MENU_SECTION_RANK, TRANSFORM_SUGGESTED_MENU_ITEM } from '@atlaskit/editor-common/block-menu';
 import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { buildChildrenMap, getChildrenMapKey, willComponentRender } from './block-menu-renderer/utils';
 import { CopyLinkDropdownItem } from './copy-link';
 import { CopySection } from './copy-section';
@@ -74,7 +73,7 @@ const getTurnIntoMenuComponents = api => {
         api: api
       }, children);
     },
-    isHidden: fg('platform_editor_block_menu_divider_patch') ? () => checkIsFormatMenuHidden(api) : undefined
+    isHidden: () => checkIsFormatMenuHidden(api)
   }, {
     type: 'block-menu-section',
     key: TRANSFORM_SUGGESTED_MENU_SECTION.key,
@@ -191,10 +190,8 @@ export const getBlockMenuComponents = ({
     rank: MAIN_BLOCK_MENU_SECTION_RANK[BLOCK_ACTIONS_MENU_SECTION.key],
     component: ({
       children
-    }) => /*#__PURE__*/React.createElement(CopySection, {
-      api: api
-    }, children)
-  }, ...(fg('platform_editor_block_menu_copy_section') ? [{
+    }) => /*#__PURE__*/React.createElement(CopySection, null, children)
+  }, {
     type: 'block-menu-section',
     key: BLOCK_ACTIONS_COPY_MENU_SECTION.key,
     rank: MAIN_BLOCK_MENU_SECTION_RANK[BLOCK_ACTIONS_COPY_MENU_SECTION.key],
@@ -215,19 +212,7 @@ export const getBlockMenuComponents = ({
       api: api,
       config: config
     })
-  }] : [{
-    type: 'block-menu-item',
-    key: BLOCK_ACTIONS_COPY_LINK_TO_BLOCK_MENU_ITEM.key,
-    parent: {
-      type: 'block-menu-section',
-      key: BLOCK_ACTIONS_MENU_SECTION.key,
-      rank: BLOCK_ACTIONS_MENU_SECTION_RANK[BLOCK_ACTIONS_COPY_LINK_TO_BLOCK_MENU_ITEM.key]
-    },
-    component: () => /*#__PURE__*/React.createElement(CopyLinkDropdownItem, {
-      api: api,
-      config: config
-    })
-  }]), {
+  }, {
     type: 'block-menu-section',
     key: POSITION_MENU_SECTION.key,
     rank: MAIN_BLOCK_MENU_SECTION_RANK[POSITION_MENU_SECTION.key],

package/dist/es2019/ui/copy-section.js

@@ -1,17 +1,9 @@
-import React, { useCallback } from 'react';
+import React from 'react';
 import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { checkIsFormatMenuHidden } from './utils/checkIsFormatMenuHidden';
 export const CopySection = ({
-  api,
   children
 }) => {
-  const isFormatMenuHidden = useCallback(() => {
-    return checkIsFormatMenuHidden(api);
-  }, [api]);
-  const hasSeparator = fg('platform_editor_block_menu_divider_patch') ? true : editorExperiment('platform_synced_block', true) ? true : !isFormatMenuHidden();
   return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
-    hasSeparator: hasSeparator
+    hasSeparator: true
   }, children);
 };

package/dist/es2019/ui/utils/checkIsFormatMenuHidden.js

@@ -1,16 +1,10 @@
 import { findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 const getIsFormatMenuHidden = (selection, schema) => {
   const nodes = schema.nodes;
   if (!nodes) {
     return false;
   }
-
-  // When platform_editor_block_menu_divider_patch is enabled, the "Copy synced block"
-  // item is placed inside TRANSFORM_MENU_SECTION, so we must not hide the section for
-  // syncBlock/bodiedSyncBlock nodes — the "Turn into" nested item has its own isHidden
-  // guard that will still hide it for those node types.
-  const disabledOnNodes = fg('platform_editor_block_menu_divider_patch') ? [nodes.rule] : [nodes.syncBlock, nodes.bodiedSyncBlock, nodes.rule];
+  const disabledOnNodes = [nodes.rule];
   const disabledNode = findSelectedNodeOfType(disabledOnNodes)(selection);
   return !!disabledNode;
 };

package/dist/esm/ui/block-menu-components.js

@@ -1,9 +1,8 @@
 import _toConsumableArray from "@babel/runtime/helpers/toConsumableArray";
 import React from 'react';
-import { BLOCK_ACTIONS_COPY_MENU_SECTION, BLOCK_ACTIONS_COPY_MENU_SECTION_RANK, BLOCK_ACTIONS_COPY_LINK_TO_BLOCK_MENU_ITEM, BLOCK_ACTIONS_MENU_SECTION, BLOCK_ACTIONS_MENU_SECTION_RANK, DELETE_MENU_SECTION, DELETE_MENU_SECTION_RANK, DELETE_MENU_ITEM, POSITION_MENU_SECTION, POSITION_MENU_SECTION_RANK, POSITION_MOVE_DOWN_MENU_ITEM, POSITION_MOVE_UP_MENU_ITEM, TRANSFORM_MENU_ITEM, TRANSFORM_MENU_ITEM_RANK, TRANSFORM_MENU_SECTION, TRANSFORM_MENU_SECTION_RANK, TRANSFORM_CREATE_MENU_SECTION, TRANSFORM_SUGGESTED_MENU_SECTION, TRANSFORM_STRUCTURE_MENU_SECTION, TRANSFORM_HEADINGS_MENU_SECTION, MAIN_BLOCK_MENU_SECTION_RANK, TRANSFORM_SUGGESTED_MENU_SECTION_RANK, TRANSFORM_SUGGESTED_MENU_ITEM } from '@atlaskit/editor-common/block-menu';
+import { BLOCK_ACTIONS_COPY_MENU_SECTION, BLOCK_ACTIONS_COPY_MENU_SECTION_RANK, BLOCK_ACTIONS_COPY_LINK_TO_BLOCK_MENU_ITEM, BLOCK_ACTIONS_MENU_SECTION, DELETE_MENU_SECTION, DELETE_MENU_SECTION_RANK, DELETE_MENU_ITEM, POSITION_MENU_SECTION, POSITION_MENU_SECTION_RANK, POSITION_MOVE_DOWN_MENU_ITEM, POSITION_MOVE_UP_MENU_ITEM, TRANSFORM_MENU_ITEM, TRANSFORM_MENU_ITEM_RANK, TRANSFORM_MENU_SECTION, TRANSFORM_MENU_SECTION_RANK, TRANSFORM_CREATE_MENU_SECTION, TRANSFORM_SUGGESTED_MENU_SECTION, TRANSFORM_STRUCTURE_MENU_SECTION, TRANSFORM_HEADINGS_MENU_SECTION, MAIN_BLOCK_MENU_SECTION_RANK, TRANSFORM_SUGGESTED_MENU_SECTION_RANK, TRANSFORM_SUGGESTED_MENU_ITEM } from '@atlaskit/editor-common/block-menu';
 import { blockMenuMessages } from '@atlaskit/editor-common/messages';
 import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
-import { fg } from '@atlaskit/platform-feature-flags';
 import { buildChildrenMap, getChildrenMapKey, willComponentRender } from './block-menu-renderer/utils';
 import { CopyLinkDropdownItem } from './copy-link';
 import { CopySection } from './copy-section';
@@ -81,9 +80,9 @@ var getTurnIntoMenuComponents = function getTurnIntoMenuComponents(api) {
         api: api
       }, children);
     },
-    isHidden: fg('platform_editor_block_menu_divider_patch') ? function () {
+    isHidden: function isHidden() {
       return checkIsFormatMenuHidden(api);
-    } : undefined
+    }
   }, {
     type: 'block-menu-section',
     key: TRANSFORM_SUGGESTED_MENU_SECTION.key,
@@ -202,11 +201,9 @@ export var getBlockMenuComponents = function getBlockMenuComponents(_ref7) {
     rank: MAIN_BLOCK_MENU_SECTION_RANK[BLOCK_ACTIONS_MENU_SECTION.key],
     component: function component(_ref8) {
       var children = _ref8.children;
-      return /*#__PURE__*/React.createElement(CopySection, {
-        api: api
-      }, children);
+      return /*#__PURE__*/React.createElement(CopySection, null, children);
     }
-  }], _toConsumableArray(fg('platform_editor_block_menu_copy_section') ? [{
+  }, {
     type: 'block-menu-section',
     key: BLOCK_ACTIONS_COPY_MENU_SECTION.key,
     rank: MAIN_BLOCK_MENU_SECTION_RANK[BLOCK_ACTIONS_COPY_MENU_SECTION.key],
@@ -230,21 +227,7 @@ export var getBlockMenuComponents = function getBlockMenuComponents(_ref7) {
         config: config
       });
     }
-  }] : [{
-    type: 'block-menu-item',
-    key: BLOCK_ACTIONS_COPY_LINK_TO_BLOCK_MENU_ITEM.key,
-    parent: {
-      type: 'block-menu-section',
-      key: BLOCK_ACTIONS_MENU_SECTION.key,
-      rank: BLOCK_ACTIONS_MENU_SECTION_RANK[BLOCK_ACTIONS_COPY_LINK_TO_BLOCK_MENU_ITEM.key]
-    },
-    component: function component() {
-      return /*#__PURE__*/React.createElement(CopyLinkDropdownItem, {
-        api: api,
-        config: config
-      });
-    }
-  }]), [{
+  }, {
     type: 'block-menu-section',
     key: POSITION_MENU_SECTION.key,
     rank: MAIN_BLOCK_MENU_SECTION_RANK[POSITION_MENU_SECTION.key],

package/dist/esm/ui/copy-section.js

@@ -1,16 +1,8 @@
-import React, { useCallback } from 'react';
+import React from 'react';
 import { ToolbarDropdownItemSection } from '@atlaskit/editor-toolbar';
-import { fg } from '@atlaskit/platform-feature-flags';
-import { editorExperiment } from '@atlaskit/tmp-editor-statsig/experiments';
-import { checkIsFormatMenuHidden } from './utils/checkIsFormatMenuHidden';
 export var CopySection = function CopySection(_ref) {
-  var api = _ref.api,
-    children = _ref.children;
-  var isFormatMenuHidden = useCallback(function () {
-    return checkIsFormatMenuHidden(api);
-  }, [api]);
-  var hasSeparator = fg('platform_editor_block_menu_divider_patch') ? true : editorExperiment('platform_synced_block', true) ? true : !isFormatMenuHidden();
+  var children = _ref.children;
   return /*#__PURE__*/React.createElement(ToolbarDropdownItemSection, {
-    hasSeparator: hasSeparator
+    hasSeparator: true
   }, children);
 };

package/dist/esm/ui/utils/checkIsFormatMenuHidden.js

@@ -1,16 +1,10 @@
 import { findSelectedNodeOfType } from '@atlaskit/editor-prosemirror/utils';
-import { fg } from '@atlaskit/platform-feature-flags';
 var getIsFormatMenuHidden = function getIsFormatMenuHidden(selection, schema) {
   var nodes = schema.nodes;
   if (!nodes) {
     return false;
   }
-
-  // When platform_editor_block_menu_divider_patch is enabled, the "Copy synced block"
-  // item is placed inside TRANSFORM_MENU_SECTION, so we must not hide the section for
-  // syncBlock/bodiedSyncBlock nodes — the "Turn into" nested item has its own isHidden
-  // guard that will still hide it for those node types.
-  var disabledOnNodes = fg('platform_editor_block_menu_divider_patch') ? [nodes.rule] : [nodes.syncBlock, nodes.bodiedSyncBlock, nodes.rule];
+  var disabledOnNodes = [nodes.rule];
   var disabledNode = findSelectedNodeOfType(disabledOnNodes)(selection);
   return !!disabledNode;
 };

package/dist/types/ui/copy-section.d.ts

@@ -1,7 +1,4 @@
 import React from 'react';
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { BlockMenuPlugin } from '../blockMenuPluginType';
-export declare const CopySection: ({ api, children, }: {
-    api?: ExtractInjectionAPI<BlockMenuPlugin> | undefined;
+export declare const CopySection: ({ children, }: {
     children: React.ReactNode;
 }) => React.JSX.Element;

package/dist/types-ts4.5/ui/copy-section.d.ts

@@ -1,7 +1,4 @@
 import React from 'react';
-import type { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
-import type { BlockMenuPlugin } from '../blockMenuPluginType';
-export declare const CopySection: ({ api, children, }: {
-    api?: ExtractInjectionAPI<BlockMenuPlugin> | undefined;
+export declare const CopySection: ({ children, }: {
     children: React.ReactNode;
 }) => React.JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@atlaskit/editor-plugin-block-menu",
-	"version": "9.0.13",
+	"version": "9.0.15",
 	"description": "BlockMenu plugin for @atlaskit/editor-core",
 	"author": "Atlassian Pty Ltd",
 	"license": "Apache-2.0",
@@ -44,7 +44,7 @@
 		"@atlaskit/platform-feature-flags": "^1.1.0",
 		"@atlaskit/primitives": "^19.0.0",
 		"@atlaskit/prosemirror-history": "^0.2.0",
-		"@atlaskit/tmp-editor-statsig": "^74.10.0",
+		"@atlaskit/tmp-editor-statsig": "^75.2.0",
 		"@atlaskit/tokens": "^13.0.0",
 		"@babel/runtime": "^7.0.0",
 		"bind-event-listener": "^3.0.0"
@@ -94,18 +94,12 @@
 		"platform_editor_adf_with_localid": {
 			"type": "boolean"
 		},
-		"platform_editor_block_menu_copy_section": {
-			"type": "boolean"
-		},
 		"platform_editor_block_menu_v2_patch_2": {
 			"type": "boolean"
 		},
 		"platform_editor_block_menu_jira_patch_1": {
 			"type": "boolean"
 		},
-		"platform_editor_block_menu_divider_patch": {
-			"type": "boolean"
-		},
 		"cc_blocks_changeboarding": {
 			"type": "boolean"
 		}