@atlaskit/editor-plugin-caption 1.1.1 → 1.1.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @atlaskit/editor-plugin-caption
 
+## 1.1.3
+
+### Patch Changes
+
+- [#94413](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/94413) [`6fa79788f5a8`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/6fa79788f5a8) - Disallow editing of Media caption in live view mode
+
+## 1.1.2
+
+### Patch Changes
+
+- [#94901](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/pull-requests/94901) [`da964fcdc828`](https://stash.atlassian.com/projects/CONFCLOUD/repos/confluence-frontend/commits/da964fcdc828) - [ED-23097] Bump ADF schema to version 35.12.1
+
 ## 1.1.1
 
 ### Patch Changes

package/dist/cjs/nodeviews/index.js

@@ -16,19 +16,25 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _react = _interopRequireDefault(require("react"));
 var _selectionBasedNodeView = require("@atlaskit/editor-common/selection-based-node-view");
 var _ui = require("@atlaskit/editor-common/ui");
+var _platformFeatureFlags = require("@atlaskit/platform-feature-flags");
 function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2.default)(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2.default)(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2.default)(this, result); }; }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 var CaptionNodeView = exports.CaptionNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
   (0, _inherits2.default)(CaptionNodeView, _SelectionBasedNodeVi);
   var _super = _createSuper(CaptionNodeView);
-  function CaptionNodeView() {
+  function CaptionNodeView(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, reactComponent) {
     var _this;
+    var hasContext = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
+    var viewShouldUpdate = arguments.length > 8 ? arguments[8] : undefined;
+    var hasIntlContext = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : false;
+    var pluginInjectionApi = arguments.length > 10 ? arguments[10] : undefined;
     (0, _classCallCheck2.default)(this, CaptionNodeView);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _super.call.apply(_super, [this].concat(args));
+    _this = _super.call(this, node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, reactComponent, hasContext, viewShouldUpdate, hasIntlContext);
     (0, _defineProperty2.default)((0, _assertThisInitialized2.default)(_this), "selected", _this.insideSelection());
+    _this.pluginInjectionApi = pluginInjectionApi;
+    if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
+      _this.handleEditorDisabledChanged();
+    }
     return _this;
   }
   (0, _createClass2.default)(CaptionNodeView, [{
@@ -45,10 +51,27 @@ var CaptionNodeView = exports.CaptionNodeView = /*#__PURE__*/function (_Selectio
       // setting a className prevents PM/Chrome mutation observer from
       // incorrectly deleting nodes
       dom.className = 'caption-wrapper';
+      if ((0, _platformFeatureFlags.getBooleanFF)('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
+        var _this$pluginInjection;
+        dom.setAttribute('contenteditable', (_this$pluginInjection = this.pluginInjectionApi) !== null && _this$pluginInjection !== void 0 && (_this$pluginInjection = _this$pluginInjection.editorDisabled) !== null && _this$pluginInjection !== void 0 && (_this$pluginInjection = _this$pluginInjection.sharedState.currentState()) !== null && _this$pluginInjection !== void 0 && _this$pluginInjection.editorDisabled ? 'false' : 'true');
+      }
       return {
         dom: dom
       };
     }
+  }, {
+    key: "handleEditorDisabledChanged",
+    value: function handleEditorDisabledChanged() {
+      var _this$pluginInjection2,
+        _this2 = this;
+      if ((_this$pluginInjection2 = this.pluginInjectionApi) !== null && _this$pluginInjection2 !== void 0 && _this$pluginInjection2.editorDisabled) {
+        this.cleanupEditorDisabledListener = this.pluginInjectionApi.editorDisabled.sharedState.onChange(function (sharedState) {
+          if (_this2.contentDOM) {
+            _this2.contentDOM.setAttribute('contenteditable', sharedState.nextSharedState.editorDisabled ? 'false' : 'true');
+          }
+        });
+      }
+    }
   }, {
     key: "render",
     value: function render(_props, forwardRef) {
@@ -70,12 +93,20 @@ var CaptionNodeView = exports.CaptionNodeView = /*#__PURE__*/function (_Selectio
       this.selected = newSelected;
       return selectedStateChange;
     }
+  }, {
+    key: "destroy",
+    value: function destroy() {
+      if (this.cleanupEditorDisabledListener) {
+        this.cleanupEditorDisabledListener();
+      }
+      this.cleanupEditorDisabledListener = undefined;
+    }
   }]);
   return CaptionNodeView;
 }(_selectionBasedNodeView.SelectionBasedNodeView);
 function captionNodeView(portalProviderAPI, eventDispatcher, pluginInjectionApi) {
   return function (node, view, getPos) {
     var hasIntlContext = true;
-    return new CaptionNodeView(node, view, getPos, portalProviderAPI, eventDispatcher, {}, undefined, undefined, undefined, hasIntlContext).init();
+    return new CaptionNodeView(node, view, getPos, portalProviderAPI, eventDispatcher, {}, undefined, undefined, undefined, hasIntlContext, pluginInjectionApi).init();
   };
 }

package/dist/es2019/nodeviews/index.js

@@ -2,10 +2,15 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 import React from 'react';
 import { SelectionBasedNodeView } from '@atlaskit/editor-common/selection-based-node-view';
 import { Caption } from '@atlaskit/editor-common/ui';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 export class CaptionNodeView extends SelectionBasedNodeView {
-  constructor(...args) {
-    super(...args);
+  constructor(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, reactComponent, hasContext = false, viewShouldUpdate, hasIntlContext = false, pluginInjectionApi) {
+    super(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, reactComponent, hasContext, viewShouldUpdate, hasIntlContext);
     _defineProperty(this, "selected", this.insideSelection());
+    this.pluginInjectionApi = pluginInjectionApi;
+    if (getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
+      this.handleEditorDisabledChanged();
+    }
   }
   createDomRef() {
     const domRef = document.createElement('figcaption');
@@ -17,10 +22,24 @@ export class CaptionNodeView extends SelectionBasedNodeView {
     // setting a className prevents PM/Chrome mutation observer from
     // incorrectly deleting nodes
     dom.className = 'caption-wrapper';
+    if (getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
+      var _this$pluginInjection, _this$pluginInjection2, _this$pluginInjection3;
+      dom.setAttribute('contenteditable', (_this$pluginInjection = this.pluginInjectionApi) !== null && _this$pluginInjection !== void 0 && (_this$pluginInjection2 = _this$pluginInjection.editorDisabled) !== null && _this$pluginInjection2 !== void 0 && (_this$pluginInjection3 = _this$pluginInjection2.sharedState.currentState()) !== null && _this$pluginInjection3 !== void 0 && _this$pluginInjection3.editorDisabled ? 'false' : 'true');
+    }
     return {
       dom
     };
   }
+  handleEditorDisabledChanged() {
+    var _this$pluginInjection4;
+    if ((_this$pluginInjection4 = this.pluginInjectionApi) !== null && _this$pluginInjection4 !== void 0 && _this$pluginInjection4.editorDisabled) {
+      this.cleanupEditorDisabledListener = this.pluginInjectionApi.editorDisabled.sharedState.onChange(sharedState => {
+        if (this.contentDOM) {
+          this.contentDOM.setAttribute('contenteditable', sharedState.nextSharedState.editorDisabled ? 'false' : 'true');
+        }
+      });
+    }
+  }
   render(_props, forwardRef) {
     return /*#__PURE__*/React.createElement(Caption, {
       selected: this.insideSelection(),
@@ -38,10 +57,16 @@ export class CaptionNodeView extends SelectionBasedNodeView {
     this.selected = newSelected;
     return selectedStateChange;
   }
+  destroy() {
+    if (this.cleanupEditorDisabledListener) {
+      this.cleanupEditorDisabledListener();
+    }
+    this.cleanupEditorDisabledListener = undefined;
+  }
 }
 export default function captionNodeView(portalProviderAPI, eventDispatcher, pluginInjectionApi) {
   return (node, view, getPos) => {
     const hasIntlContext = true;
-    return new CaptionNodeView(node, view, getPos, portalProviderAPI, eventDispatcher, {}, undefined, undefined, undefined, hasIntlContext).init();
+    return new CaptionNodeView(node, view, getPos, portalProviderAPI, eventDispatcher, {}, undefined, undefined, undefined, hasIntlContext, pluginInjectionApi).init();
   };
 }

package/dist/esm/nodeviews/index.js

@@ -10,17 +10,23 @@ function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.
 import React from 'react';
 import { SelectionBasedNodeView } from '@atlaskit/editor-common/selection-based-node-view';
 import { Caption } from '@atlaskit/editor-common/ui';
+import { getBooleanFF } from '@atlaskit/platform-feature-flags';
 export var CaptionNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
   _inherits(CaptionNodeView, _SelectionBasedNodeVi);
   var _super = _createSuper(CaptionNodeView);
-  function CaptionNodeView() {
+  function CaptionNodeView(node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, reactComponent) {
     var _this;
+    var hasContext = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
+    var viewShouldUpdate = arguments.length > 8 ? arguments[8] : undefined;
+    var hasIntlContext = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : false;
+    var pluginInjectionApi = arguments.length > 10 ? arguments[10] : undefined;
     _classCallCheck(this, CaptionNodeView);
-    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-      args[_key] = arguments[_key];
-    }
-    _this = _super.call.apply(_super, [this].concat(args));
+    _this = _super.call(this, node, view, getPos, portalProviderAPI, eventDispatcher, reactComponentProps, reactComponent, hasContext, viewShouldUpdate, hasIntlContext);
     _defineProperty(_assertThisInitialized(_this), "selected", _this.insideSelection());
+    _this.pluginInjectionApi = pluginInjectionApi;
+    if (getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
+      _this.handleEditorDisabledChanged();
+    }
     return _this;
   }
   _createClass(CaptionNodeView, [{
@@ -37,10 +43,27 @@ export var CaptionNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
       // setting a className prevents PM/Chrome mutation observer from
       // incorrectly deleting nodes
       dom.className = 'caption-wrapper';
+      if (getBooleanFF('platform.editor.live-view.disable-editing-in-view-mode_fi1rx')) {
+        var _this$pluginInjection;
+        dom.setAttribute('contenteditable', (_this$pluginInjection = this.pluginInjectionApi) !== null && _this$pluginInjection !== void 0 && (_this$pluginInjection = _this$pluginInjection.editorDisabled) !== null && _this$pluginInjection !== void 0 && (_this$pluginInjection = _this$pluginInjection.sharedState.currentState()) !== null && _this$pluginInjection !== void 0 && _this$pluginInjection.editorDisabled ? 'false' : 'true');
+      }
       return {
         dom: dom
       };
     }
+  }, {
+    key: "handleEditorDisabledChanged",
+    value: function handleEditorDisabledChanged() {
+      var _this$pluginInjection2,
+        _this2 = this;
+      if ((_this$pluginInjection2 = this.pluginInjectionApi) !== null && _this$pluginInjection2 !== void 0 && _this$pluginInjection2.editorDisabled) {
+        this.cleanupEditorDisabledListener = this.pluginInjectionApi.editorDisabled.sharedState.onChange(function (sharedState) {
+          if (_this2.contentDOM) {
+            _this2.contentDOM.setAttribute('contenteditable', sharedState.nextSharedState.editorDisabled ? 'false' : 'true');
+          }
+        });
+      }
+    }
   }, {
     key: "render",
     value: function render(_props, forwardRef) {
@@ -62,12 +85,20 @@ export var CaptionNodeView = /*#__PURE__*/function (_SelectionBasedNodeVi) {
       this.selected = newSelected;
       return selectedStateChange;
     }
+  }, {
+    key: "destroy",
+    value: function destroy() {
+      if (this.cleanupEditorDisabledListener) {
+        this.cleanupEditorDisabledListener();
+      }
+      this.cleanupEditorDisabledListener = undefined;
+    }
   }]);
   return CaptionNodeView;
 }(SelectionBasedNodeView);
 export default function captionNodeView(portalProviderAPI, eventDispatcher, pluginInjectionApi) {
   return function (node, view, getPos) {
     var hasIntlContext = true;
-    return new CaptionNodeView(node, view, getPos, portalProviderAPI, eventDispatcher, {}, undefined, undefined, undefined, hasIntlContext).init();
+    return new CaptionNodeView(node, view, getPos, portalProviderAPI, eventDispatcher, {}, undefined, undefined, undefined, hasIntlContext, pluginInjectionApi).init();
   };
 }

package/dist/types/nodeviews/index.d.ts

@@ -1,7 +1,7 @@
-/// <reference types="react" />
+import React from 'react';
 import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import type { PortalProviderAPI } from '@atlaskit/editor-common/portal-provider';
-import type { ForwardRef } from '@atlaskit/editor-common/react-node-view';
+import type { ForwardRef, ReactComponentProps, shouldUpdate } from '@atlaskit/editor-common/react-node-view';
 import { SelectionBasedNodeView } from '@atlaskit/editor-common/selection-based-node-view';
 import type { ExtractInjectionAPI, getPosHandler } from '@atlaskit/editor-common/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
@@ -9,11 +9,16 @@ import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { CaptionPlugin } from '../types';
 export declare class CaptionNodeView extends SelectionBasedNodeView {
     private selected;
+    private cleanupEditorDisabledListener?;
+    pluginInjectionApi?: ExtractInjectionAPI<CaptionPlugin>;
+    constructor(node: PMNode, view: EditorView, getPos: getPosHandler, portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, reactComponentProps: ReactComponentProps, reactComponent?: React.ComponentType<React.PropsWithChildren<unknown>>, hasContext?: boolean, viewShouldUpdate?: shouldUpdate, hasIntlContext?: boolean, pluginInjectionApi?: ExtractInjectionAPI<CaptionPlugin>);
     createDomRef(): HTMLElement;
     getContentDOM(): {
         dom: HTMLDivElement;
     };
+    handleEditorDisabledChanged(): void;
     render(_props: never, forwardRef: ForwardRef): JSX.Element;
     viewShouldUpdate(nextNode: PMNode): boolean;
+    destroy(): void;
 }
 export default function captionNodeView(portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, pluginInjectionApi: ExtractInjectionAPI<CaptionPlugin> | undefined): (node: PMNode, view: EditorView, getPos: getPosHandler) => CaptionNodeView;

package/dist/types/types.d.ts

@@ -1,5 +1,9 @@
-import type { NextEditorPlugin } from '@atlaskit/editor-common/types';
+import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 export type CaptionPlugin = NextEditorPlugin<'caption', {
-    dependencies: [typeof analyticsPlugin];
+    dependencies: [
+        typeof analyticsPlugin,
+        OptionalPlugin<EditorDisabledPlugin>
+    ];
 }>;

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

@@ -1,7 +1,7 @@
-/// <reference types="react" />
+import React from 'react';
 import type { EventDispatcher } from '@atlaskit/editor-common/event-dispatcher';
 import type { PortalProviderAPI } from '@atlaskit/editor-common/portal-provider';
-import type { ForwardRef } from '@atlaskit/editor-common/react-node-view';
+import type { ForwardRef, ReactComponentProps, shouldUpdate } from '@atlaskit/editor-common/react-node-view';
 import { SelectionBasedNodeView } from '@atlaskit/editor-common/selection-based-node-view';
 import type { ExtractInjectionAPI, getPosHandler } from '@atlaskit/editor-common/types';
 import type { Node as PMNode } from '@atlaskit/editor-prosemirror/model';
@@ -9,11 +9,16 @@ import type { EditorView } from '@atlaskit/editor-prosemirror/view';
 import type { CaptionPlugin } from '../types';
 export declare class CaptionNodeView extends SelectionBasedNodeView {
     private selected;
+    private cleanupEditorDisabledListener?;
+    pluginInjectionApi?: ExtractInjectionAPI<CaptionPlugin>;
+    constructor(node: PMNode, view: EditorView, getPos: getPosHandler, portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, reactComponentProps: ReactComponentProps, reactComponent?: React.ComponentType<React.PropsWithChildren<unknown>>, hasContext?: boolean, viewShouldUpdate?: shouldUpdate, hasIntlContext?: boolean, pluginInjectionApi?: ExtractInjectionAPI<CaptionPlugin>);
     createDomRef(): HTMLElement;
     getContentDOM(): {
         dom: HTMLDivElement;
     };
+    handleEditorDisabledChanged(): void;
     render(_props: never, forwardRef: ForwardRef): JSX.Element;
     viewShouldUpdate(nextNode: PMNode): boolean;
+    destroy(): void;
 }
 export default function captionNodeView(portalProviderAPI: PortalProviderAPI, eventDispatcher: EventDispatcher, pluginInjectionApi: ExtractInjectionAPI<CaptionPlugin> | undefined): (node: PMNode, view: EditorView, getPos: getPosHandler) => CaptionNodeView;

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

@@ -1,7 +1,9 @@
-import type { NextEditorPlugin } from '@atlaskit/editor-common/types';
+import type { NextEditorPlugin, OptionalPlugin } from '@atlaskit/editor-common/types';
 import type { analyticsPlugin } from '@atlaskit/editor-plugin-analytics';
+import type { EditorDisabledPlugin } from '@atlaskit/editor-plugin-editor-disabled';
 export type CaptionPlugin = NextEditorPlugin<'caption', {
     dependencies: [
-        typeof analyticsPlugin
+        typeof analyticsPlugin,
+        OptionalPlugin<EditorDisabledPlugin>
     ];
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-caption",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "Caption plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -32,24 +32,25 @@
     ".": "./src/index.ts"
   },
   "dependencies": {
-    "@atlaskit/adf-schema": "^35.10.0",
-    "@atlaskit/editor-common": "^78.31.0",
+    "@atlaskit/adf-schema": "^35.12.1",
+    "@atlaskit/editor-common": "^78.36.0",
     "@atlaskit/editor-plugin-analytics": "^1.1.0",
+    "@atlaskit/editor-plugin-editor-disabled": "^1.1.0",
     "@atlaskit/editor-prosemirror": "4.0.0",
+    "@atlaskit/platform-feature-flags": "^0.2.0",
     "@babel/runtime": "^7.0.0"
   },
   "devDependencies": {
     "@atlaskit/editor-plugin-copy-button": "^1.1.0",
     "@atlaskit/editor-plugin-decorations": "^1.1.0",
-    "@atlaskit/editor-plugin-editor-disabled": "^1.1.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.1.0",
-    "@atlaskit/editor-plugin-floating-toolbar": "^1.3.0",
+    "@atlaskit/editor-plugin-floating-toolbar": "^1.4.0",
     "@atlaskit/editor-plugin-focus": "^1.2.0",
     "@atlaskit/editor-plugin-grid": "^1.1.0",
     "@atlaskit/editor-plugin-guideline": "^1.1.0",
     "@atlaskit/editor-plugin-selection": "^1.2.0",
     "@atlaskit/editor-plugin-width": "^1.1.0",
-    "@atlaskit/renderer": "^109.20.0",
+    "@atlaskit/renderer": "^109.22.0",
     "@atlassian/atlassian-frontend-prettier-config-1.0.0": "npm:@atlassian/atlassian-frontend-prettier-config@1.0.0"
   },
   "peerDependencies": {
@@ -85,5 +86,10 @@
       ]
     }
   },
-  "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.0"
+  "prettier": "@atlassian/atlassian-frontend-prettier-config-1.0.0",
+  "platform-feature-flags": {
+    "platform.editor.live-view.disable-editing-in-view-mode_fi1rx": {
+      "type": "boolean"
+    }
+  }
 }