@atlaskit/editor-plugin-card 0.8.1 → 0.8.3

package/.eslintrc.js

@@ -2,6 +2,18 @@ module.exports = {
   rules: {
     '@typescript-eslint/no-duplicate-imports': 'error',
     '@typescript-eslint/no-explicit-any': 'error',
+    '@typescript-eslint/ban-types': [
+      'error',
+      {
+        types: {
+          'React.FC':
+            'Please use types directly on props instead, and explicitly define children if required',
+          'React.FunctionalComponent':
+            'Please use types directly on props instead, and explicitly define children if required',
+        },
+        extendDefaults: false,
+      },
+    ],
   },
   overrides: [
     {

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @atlaskit/editor-plugin-card
 
+## 0.8.3
+
+### Patch Changes
+
+- Updated dependencies
+
+## 0.8.2
+
+### Patch Changes
+
+- [`4e7058a65f4`](https://bitbucket.org/atlassian/atlassian-frontend/commits/4e7058a65f4) - Add eslint rule to ban React.FC and React.FunctionalComponent in editor. In most packages this is still a warning.
+- [`08c899663fa`](https://bitbucket.org/atlassian/atlassian-frontend/commits/08c899663fa) - Add datasource failed analytic events to datasourceErrorBoundary
+- Updated dependencies
+
 ## 0.8.1
 
 ### Patch Changes

package/dist/cjs/datasourceErrorBoundary.js

@@ -14,6 +14,7 @@ var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/ge
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _react = _interopRequireDefault(require("react"));
 var _adfSchema = require("@atlaskit/adf-schema");
+var _linkDatasource = require("@atlaskit/link-datasource");
 var _doc = require("./pm-plugins/doc");
 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() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } /* eslint-disable @repo/internal/react/no-class-components */
@@ -52,11 +53,13 @@ var DatasourceErrorBoundary = /*#__PURE__*/function (_React$Component) {
         view = _this$props.view;
       if (this.state.isError) {
         if (url && (0, _adfSchema.isSafeUrl)(url)) {
-          return (0, _doc.setSelectedCardAppearance)('inline', undefined)(view.state, view.dispatch);
+          return /*#__PURE__*/_react.default.createElement(_linkDatasource.DatasourceRenderFailedAnalyticsWrapper, null, (0, _doc.setSelectedCardAppearance)('inline', undefined)(view.state, view.dispatch));
+        } else {
+          return /*#__PURE__*/_react.default.createElement(_linkDatasource.DatasourceRenderFailedAnalyticsWrapper, null, /*#__PURE__*/_react.default.createElement(UnsupportedComponent, null));
         }
-        return /*#__PURE__*/_react.default.createElement(UnsupportedComponent, null);
+      } else {
+        return this.props.children;
       }
-      return this.props.children;
     }
   }], [{
     key: "getDerivedStateFromError",

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

@@ -1,13 +1,12 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.LayoutButton = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _react = _interopRequireWildcard(require("react"));
+var _react = require("react");
 var _react2 = require("@emotion/react");
 var _reactIntlNext = require("react-intl-next");
 var _hooks = require("@atlaskit/editor-common/hooks");
@@ -19,8 +18,6 @@ var _expand = _interopRequireDefault(require("@atlaskit/icon/glyph/editor/expand
 var _colors = require("@atlaskit/theme/colors");
 var _actions = require("../../pm-plugins/actions");
 var _utils2 = require("./utils");
-function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
-function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2.default)(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; } /** @jsx jsx */
 var toolbarButtonWrapperStyles = (0, _react2.css)({

package/dist/es2019/datasourceErrorBoundary.js

@@ -2,6 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 /* eslint-disable @repo/internal/react/no-class-components */
 import React from 'react';
 import { isSafeUrl } from '@atlaskit/adf-schema';
+import { DatasourceRenderFailedAnalyticsWrapper } from '@atlaskit/link-datasource';
 import { setSelectedCardAppearance } from './pm-plugins/doc';
 export class DatasourceErrorBoundary extends React.Component {
   constructor(...args) {
@@ -32,10 +33,12 @@ export class DatasourceErrorBoundary extends React.Component {
     } = this.props;
     if (this.state.isError) {
       if (url && isSafeUrl(url)) {
-        return setSelectedCardAppearance('inline', undefined)(view.state, view.dispatch);
+        return /*#__PURE__*/React.createElement(DatasourceRenderFailedAnalyticsWrapper, null, setSelectedCardAppearance('inline', undefined)(view.state, view.dispatch));
+      } else {
+        return /*#__PURE__*/React.createElement(DatasourceRenderFailedAnalyticsWrapper, null, /*#__PURE__*/React.createElement(UnsupportedComponent, null));
       }
-      return /*#__PURE__*/React.createElement(UnsupportedComponent, null);
+    } else {
+      return this.props.children;
     }
-    return this.props.children;
   }
 }

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

@@ -1,5 +1,5 @@
 /** @jsx jsx */
-import React, { useCallback, useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
 import { css, jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';

package/dist/esm/datasourceErrorBoundary.js

@@ -10,6 +10,7 @@ function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Re
 /* eslint-disable @repo/internal/react/no-class-components */
 import React from 'react';
 import { isSafeUrl } from '@atlaskit/adf-schema';
+import { DatasourceRenderFailedAnalyticsWrapper } from '@atlaskit/link-datasource';
 import { setSelectedCardAppearance } from './pm-plugins/doc';
 export var DatasourceErrorBoundary = /*#__PURE__*/function (_React$Component) {
   _inherits(DatasourceErrorBoundary, _React$Component);
@@ -46,11 +47,13 @@ export var DatasourceErrorBoundary = /*#__PURE__*/function (_React$Component) {
         view = _this$props.view;
       if (this.state.isError) {
         if (url && isSafeUrl(url)) {
-          return setSelectedCardAppearance('inline', undefined)(view.state, view.dispatch);
+          return /*#__PURE__*/React.createElement(DatasourceRenderFailedAnalyticsWrapper, null, setSelectedCardAppearance('inline', undefined)(view.state, view.dispatch));
+        } else {
+          return /*#__PURE__*/React.createElement(DatasourceRenderFailedAnalyticsWrapper, null, /*#__PURE__*/React.createElement(UnsupportedComponent, null));
         }
-        return /*#__PURE__*/React.createElement(UnsupportedComponent, null);
+      } else {
+        return this.props.children;
       }
-      return this.props.children;
     }
   }], [{
     key: "getDerivedStateFromError",

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

@@ -2,7 +2,7 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /** @jsx jsx */
-import React, { useCallback, useMemo } from 'react';
+import { useCallback, useMemo } from 'react';
 import { css, jsx } from '@emotion/react';
 import { injectIntl } from 'react-intl-next';
 import { useSharedPluginState } from '@atlaskit/editor-common/hooks';

package/dist/types/datasourceErrorBoundary.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import { APIError } from '@atlaskit/smart-card';
-import { DatasourceProps } from './nodeviews/datasource';
+import type { APIError } from '@atlaskit/smart-card';
+import type { DatasourceProps } from './nodeviews/datasource';
 export declare class DatasourceErrorBoundary extends React.Component<{
     url?: string;
     unsupportedComponent: React.ComponentType;

package/dist/types/ui/LayoutButton/index.d.ts

@@ -1,9 +1,9 @@
-/** @jsx jsx */
-import React from 'react';
-import { WrappedComponentProps } from 'react-intl-next';
-import { LayoutButtonProps, LayoutButtonWrapperProps } from './types';
-export declare const LayoutButton: React.FC<LayoutButtonProps>;
-declare const _default: React.FC<import("react-intl-next").WithIntlProps<LayoutButtonWrapperProps & WrappedComponentProps<"intl">>> & {
-    WrappedComponent: React.ComponentType<LayoutButtonWrapperProps & WrappedComponentProps<"intl">>;
+/// <reference types="react" />
+import { jsx } from '@emotion/react';
+import type { WrappedComponentProps } from 'react-intl-next';
+import type { LayoutButtonProps, LayoutButtonWrapperProps } from './types';
+export declare const LayoutButton: ({ onLayoutChange, layout, intl: { formatMessage }, mountPoint, boundariesElement, scrollableElement, targetElement, testId, }: LayoutButtonProps) => jsx.JSX.Element | null;
+declare const _default: import("react").FC<import("react-intl-next").WithIntlProps<LayoutButtonWrapperProps & WrappedComponentProps<"intl">>> & {
+    WrappedComponent: import("react").ComponentType<LayoutButtonWrapperProps & WrappedComponentProps<"intl">>;
 };
 export default _default;

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

@@ -1,6 +1,6 @@
 import React from 'react';
-import { APIError } from '@atlaskit/smart-card';
-import { DatasourceProps } from './nodeviews/datasource';
+import type { APIError } from '@atlaskit/smart-card';
+import type { DatasourceProps } from './nodeviews/datasource';
 export declare class DatasourceErrorBoundary extends React.Component<{
     url?: string;
     unsupportedComponent: React.ComponentType;

package/dist/types-ts4.5/ui/LayoutButton/index.d.ts

@@ -1,9 +1,9 @@
-/** @jsx jsx */
-import React from 'react';
-import { WrappedComponentProps } from 'react-intl-next';
-import { LayoutButtonProps, LayoutButtonWrapperProps } from './types';
-export declare const LayoutButton: React.FC<LayoutButtonProps>;
-declare const _default: React.FC<import("react-intl-next").WithIntlProps<LayoutButtonWrapperProps & WrappedComponentProps<"intl">>> & {
-    WrappedComponent: React.ComponentType<LayoutButtonWrapperProps & WrappedComponentProps<"intl">>;
+/// <reference types="react" />
+import { jsx } from '@emotion/react';
+import type { WrappedComponentProps } from 'react-intl-next';
+import type { LayoutButtonProps, LayoutButtonWrapperProps } from './types';
+export declare const LayoutButton: ({ onLayoutChange, layout, intl: { formatMessage }, mountPoint, boundariesElement, scrollableElement, targetElement, testId, }: LayoutButtonProps) => jsx.JSX.Element | null;
+declare const _default: import("react").FC<import("react-intl-next").WithIntlProps<LayoutButtonWrapperProps & WrappedComponentProps<"intl">>> & {
+    WrappedComponent: import("react").ComponentType<LayoutButtonWrapperProps & WrappedComponentProps<"intl">>;
 };
 export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaskit/editor-plugin-card",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "description": "Card plugin for @atlaskit/editor-core",
   "author": "Atlassian Pty Ltd",
   "license": "Apache-2.0",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@atlaskit/adf-schema": "^29.1.0",
     "@atlaskit/analytics-next": "^9.1.0",
-    "@atlaskit/editor-common": "^75.6.0",
+    "@atlaskit/editor-common": "^76.0.0",
     "@atlaskit/editor-plugin-analytics": "^0.2.0",
     "@atlaskit/editor-plugin-decorations": "^0.2.0",
     "@atlaskit/editor-plugin-feature-flags": "^1.0.0",
@@ -42,10 +42,10 @@
     "@atlaskit/editor-plugin-hyperlink": "^0.5.0",
     "@atlaskit/editor-plugin-width": "^0.2.0",
     "@atlaskit/editor-prosemirror": "1.1.0",
-    "@atlaskit/editor-shared-styles": "^2.7.0",
+    "@atlaskit/editor-shared-styles": "^2.8.0",
     "@atlaskit/icon": "^21.12.0",
     "@atlaskit/link-analytics": "^8.3.0",
-    "@atlaskit/link-datasource": "^1.3.0",
+    "@atlaskit/link-datasource": "^1.4.0",
     "@atlaskit/platform-feature-flags": "^0.2.0",
     "@atlaskit/smart-card": "^26.28.0",
     "@atlaskit/theme": "^12.6.0",