@atlaskit/editor-core 185.15.4 → 185.16.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (57) hide show
  1. package/CHANGELOG.md +10 -0
  2. package/dist/cjs/plugins/card/index.js +29 -1
  3. package/dist/cjs/plugins/card/messages.js +20 -0
  4. package/dist/cjs/plugins/card/pm-plugins/actions.js +7 -4
  5. package/dist/cjs/plugins/card/pm-plugins/doc.js +26 -7
  6. package/dist/cjs/plugins/card/pm-plugins/main.js +3 -2
  7. package/dist/cjs/plugins/card/pm-plugins/reducers.js +11 -3
  8. package/dist/cjs/plugins/card/toolbar.js +3 -9
  9. package/dist/cjs/plugins/card/ui/DatasourceModal/ModalWithState.js +25 -0
  10. package/dist/cjs/plugins/card/ui/DatasourceModal/index.js +60 -0
  11. package/dist/cjs/plugins/card/ui/EditLinkToolbar.js +8 -28
  12. package/dist/cjs/version-wrapper.js +1 -1
  13. package/dist/cjs/version.json +1 -1
  14. package/dist/es2019/plugins/card/index.js +29 -1
  15. package/dist/es2019/plugins/card/messages.js +13 -0
  16. package/dist/es2019/plugins/card/pm-plugins/actions.js +3 -2
  17. package/dist/es2019/plugins/card/pm-plugins/doc.js +27 -5
  18. package/dist/es2019/plugins/card/pm-plugins/main.js +3 -2
  19. package/dist/es2019/plugins/card/pm-plugins/reducers.js +12 -3
  20. package/dist/es2019/plugins/card/toolbar.js +4 -10
  21. package/dist/es2019/plugins/card/ui/DatasourceModal/ModalWithState.js +19 -0
  22. package/dist/es2019/plugins/card/ui/DatasourceModal/index.js +48 -0
  23. package/dist/es2019/plugins/card/ui/EditLinkToolbar.js +6 -26
  24. package/dist/es2019/version-wrapper.js +1 -1
  25. package/dist/es2019/version.json +1 -1
  26. package/dist/esm/plugins/card/index.js +30 -1
  27. package/dist/esm/plugins/card/messages.js +13 -0
  28. package/dist/esm/plugins/card/pm-plugins/actions.js +7 -4
  29. package/dist/esm/plugins/card/pm-plugins/doc.js +23 -5
  30. package/dist/esm/plugins/card/pm-plugins/main.js +3 -2
  31. package/dist/esm/plugins/card/pm-plugins/reducers.js +11 -3
  32. package/dist/esm/plugins/card/toolbar.js +4 -10
  33. package/dist/esm/plugins/card/ui/DatasourceModal/ModalWithState.js +17 -0
  34. package/dist/esm/plugins/card/ui/DatasourceModal/index.js +49 -0
  35. package/dist/esm/plugins/card/ui/EditLinkToolbar.js +6 -25
  36. package/dist/esm/version-wrapper.js +1 -1
  37. package/dist/esm/version.json +1 -1
  38. package/dist/types/plugins/card/messages.d.ts +12 -0
  39. package/dist/types/plugins/card/pm-plugins/actions.d.ts +2 -1
  40. package/dist/types/plugins/card/pm-plugins/doc.d.ts +1 -0
  41. package/dist/types/plugins/card/pm-plugins/util/state.d.ts +1 -0
  42. package/dist/types/plugins/card/types.d.ts +3 -0
  43. package/dist/types/plugins/card/ui/DatasourceModal/ModalWithState.d.ts +9 -0
  44. package/dist/{types-ts4.5/plugins/card/ui/DatasourceModal.d.ts → types/plugins/card/ui/DatasourceModal/index.d.ts} +3 -5
  45. package/dist/types/plugins/card/ui/EditLinkToolbar.d.ts +1 -7
  46. package/dist/types-ts4.5/plugins/card/messages.d.ts +12 -0
  47. package/dist/types-ts4.5/plugins/card/pm-plugins/actions.d.ts +2 -1
  48. package/dist/types-ts4.5/plugins/card/pm-plugins/doc.d.ts +1 -0
  49. package/dist/types-ts4.5/plugins/card/pm-plugins/util/state.d.ts +1 -0
  50. package/dist/types-ts4.5/plugins/card/types.d.ts +3 -0
  51. package/dist/types-ts4.5/plugins/card/ui/DatasourceModal/ModalWithState.d.ts +9 -0
  52. package/dist/{types/plugins/card/ui/DatasourceModal.d.ts → types-ts4.5/plugins/card/ui/DatasourceModal/index.d.ts} +3 -5
  53. package/dist/types-ts4.5/plugins/card/ui/EditLinkToolbar.d.ts +1 -7
  54. package/package.json +2 -2
  55. package/dist/cjs/plugins/card/ui/DatasourceModal.js +0 -41
  56. package/dist/es2019/plugins/card/ui/DatasourceModal.js +0 -30
  57. package/dist/esm/plugins/card/ui/DatasourceModal.js +0 -31
@@ -1,13 +1,11 @@
1
1
  /// <reference types="react" />
2
- import { Node } from 'prosemirror-model';
3
- import { EditorState } from 'prosemirror-state';
4
2
  import { EditorView } from 'prosemirror-view';
5
3
  import { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
4
+ import { DatasourceModalType } from '@atlaskit/editor-common/types';
6
5
  type DatasourceModalProps = {
7
- state: EditorState;
8
6
  view: EditorView;
9
- node: Node;
10
7
  editorAnalyticsApi?: EditorAnalyticsAPI;
8
+ modalType?: DatasourceModalType;
11
9
  };
12
- export declare const DatasourceModal: ({ state, view, node, }: DatasourceModalProps) => JSX.Element | null;
10
+ export declare const DatasourceModal: ({ view, modalType }: DatasourceModalProps) => JSX.Element | null;
13
11
  export {};
@@ -1,6 +1,5 @@
1
1
  import React from 'react';
2
2
  import { Node } from 'prosemirror-model';
3
- import { EditorState } from 'prosemirror-state';
4
3
  import { EditorView } from 'prosemirror-view';
5
4
  import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
6
5
  import { UIAnalyticsEvent } from '@atlaskit/analytics-next';
@@ -45,9 +44,4 @@ export declare const buildEditLinkToolbar: ({ providerFactory, node, linkPicker,
45
44
  pluginInjectionApi: ExtractInjectionAPI<typeof cardPlugin> | undefined;
46
45
  }) => FloatingToolbarItem<Command>;
47
46
  export declare const editLinkToolbarConfig: (showLinkingToolbar: boolean, lpLinkPicker: boolean) => Partial<FloatingToolbarConfig>;
48
- export declare const editDatasource: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
49
- export declare const openDatasourceModal: ({ state, node, editorAnalyticsApi, }: {
50
- state: EditorState;
51
- node: Node;
52
- editorAnalyticsApi?: EditorAnalyticsAPI | undefined;
53
- }) => FloatingToolbarItem<Command>;
47
+ export declare const editDatasource: (node: Node, editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
@@ -0,0 +1,12 @@
1
+ export declare const messages: {
2
+ datasourceJiraIssue: {
3
+ id: string;
4
+ defaultMessage: string;
5
+ description: string;
6
+ };
7
+ datasourceJiraIssueDescription: {
8
+ id: string;
9
+ defaultMessage: string;
10
+ description: string;
11
+ };
12
+ };
@@ -3,6 +3,7 @@ import { CardProvider } from '@atlaskit/editor-common/provider-factory';
3
3
  import { CardPluginAction, Request, CardInfo, SmartLinkEventsNext } from '../types';
4
4
  import { SmartLinkEvents } from '@atlaskit/smart-card';
5
5
  import { DatasourceTableLayout } from '../ui/LayoutButton/types';
6
+ import { DatasourceModalType } from '@atlaskit/editor-common/types';
6
7
  export declare const cardAction: (tr: Transaction, action: CardPluginAction) => Transaction;
7
8
  export declare const resolveCard: (url: string) => (tr: Transaction) => Transaction;
8
9
  export declare const queueCards: (requests: Request[]) => (tr: Transaction) => Transaction;
@@ -18,5 +19,5 @@ export declare const setCardLayoutAndDatasourceTableRef: ({ layout, datasourceTa
18
19
  }) => (tr: Transaction) => Transaction;
19
20
  export declare const showLinkToolbar: (tr: Transaction) => Transaction;
20
21
  export declare const hideLinkToolbar: (tr: Transaction) => Transaction;
21
- export declare const showDatasourceModal: (tr: Transaction) => Transaction;
22
+ export declare const showDatasourceModal: (modalType: DatasourceModalType) => (tr: Transaction) => Transaction;
22
23
  export declare const hideDatasourceModal: (tr: Transaction) => Transaction;
@@ -20,3 +20,4 @@ export declare const updateCard: (href: string, sourceEvent?: UIAnalyticsEvent |
20
20
  export declare const changeSelectedCardToText: (text: string, editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
21
21
  export declare const setSelectedCardAppearance: (appearance: CardAppearance, editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
22
22
  export declare const updateExistingDatasource: (state: EditorState, node: Node, newAdf: DatasourceAdf | InlineCardAdf, view: EditorView) => void;
23
+ export declare const insertDatasource: (state: EditorState, adf: DatasourceAdf | InlineCardAdf, view: EditorView) => void;
@@ -24,6 +24,7 @@ export declare const getPluginStateWithUpdatedPos: (pluginState: CardPluginState
24
24
  smartLinkEventsNext?: import("../../types").SmartLinkEventsNext | undefined;
25
25
  editorAppearance?: import("@atlaskit/editor-common/types").EditorAppearance | undefined;
26
26
  showDatasourceModal: boolean;
27
+ datasourceModalType?: "jira" | undefined;
27
28
  datasourceTableRef?: HTMLElement | undefined;
28
29
  layout?: import("../../ui/LayoutButton/types").DatasourceTableLayout | undefined;
29
30
  };
@@ -6,6 +6,7 @@ import type { CardOptions, CardReplacementInputMethod } from '@atlaskit/editor-c
6
6
  import type { EditorAppearance } from '@atlaskit/editor-common/types';
7
7
  import { LinkPickerOptions } from '@atlaskit/editor-common/types';
8
8
  import { DatasourceTableLayout } from './ui/LayoutButton/types';
9
+ import { DatasourceModalType } from '@atlaskit/editor-common/types';
9
10
  export type CardInfo = {
10
11
  title?: string;
11
12
  url?: string;
@@ -101,6 +102,7 @@ export type CardPluginState = {
101
102
  smartLinkEventsNext?: SmartLinkEventsNext;
102
103
  editorAppearance?: EditorAppearance;
103
104
  showDatasourceModal: boolean;
105
+ datasourceModalType?: DatasourceModalType;
104
106
  datasourceTableRef?: HTMLElement;
105
107
  layout?: DatasourceTableLayout;
106
108
  };
@@ -134,6 +136,7 @@ export type HideLinkToolbar = {
134
136
  };
135
137
  export type ShowDatasourceModal = {
136
138
  type: 'SHOW_DATASOURCE_MODAL';
139
+ modalType: DatasourceModalType;
137
140
  };
138
141
  export type HideDatasourceModal = {
139
142
  type: 'HIDE_DATASOURCE_MODAL';
@@ -0,0 +1,9 @@
1
+ /// <reference types="react" />
2
+ import { EditorView } from 'prosemirror-view';
3
+ import { ExtractInjectionAPI } from '@atlaskit/editor-common/types';
4
+ import type cardPlugin from '../../index';
5
+ declare const ModalWithState: ({ api, editorView, }: {
6
+ api: ExtractInjectionAPI<typeof cardPlugin> | undefined;
7
+ editorView: EditorView;
8
+ }) => JSX.Element | null;
9
+ export default ModalWithState;
@@ -1,13 +1,11 @@
1
1
  /// <reference types="react" />
2
- import { Node } from 'prosemirror-model';
3
- import { EditorState } from 'prosemirror-state';
4
2
  import { EditorView } from 'prosemirror-view';
5
3
  import { EditorAnalyticsAPI } from '@atlaskit/editor-common/analytics';
4
+ import { DatasourceModalType } from '@atlaskit/editor-common/types';
6
5
  type DatasourceModalProps = {
7
- state: EditorState;
8
6
  view: EditorView;
9
- node: Node;
10
7
  editorAnalyticsApi?: EditorAnalyticsAPI;
8
+ modalType?: DatasourceModalType;
11
9
  };
12
- export declare const DatasourceModal: ({ state, view, node, }: DatasourceModalProps) => JSX.Element | null;
10
+ export declare const DatasourceModal: ({ view, modalType }: DatasourceModalProps) => JSX.Element | null;
13
11
  export {};
@@ -1,6 +1,5 @@
1
1
  import React from 'react';
2
2
  import { Node } from 'prosemirror-model';
3
- import { EditorState } from 'prosemirror-state';
4
3
  import { EditorView } from 'prosemirror-view';
5
4
  import { ProviderFactory } from '@atlaskit/editor-common/provider-factory';
6
5
  import { UIAnalyticsEvent } from '@atlaskit/analytics-next';
@@ -45,9 +44,4 @@ export declare const buildEditLinkToolbar: ({ providerFactory, node, linkPicker,
45
44
  pluginInjectionApi: ExtractInjectionAPI<typeof cardPlugin> | undefined;
46
45
  }) => FloatingToolbarItem<Command>;
47
46
  export declare const editLinkToolbarConfig: (showLinkingToolbar: boolean, lpLinkPicker: boolean) => Partial<FloatingToolbarConfig>;
48
- export declare const editDatasource: (editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
49
- export declare const openDatasourceModal: ({ state, node, editorAnalyticsApi, }: {
50
- state: EditorState;
51
- node: Node;
52
- editorAnalyticsApi?: EditorAnalyticsAPI | undefined;
53
- }) => FloatingToolbarItem<Command>;
47
+ export declare const editDatasource: (node: Node, editorAnalyticsApi: EditorAnalyticsAPI | undefined) => Command;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@atlaskit/editor-core",
3
- "version": "185.15.4",
3
+ "version": "185.16.0",
4
4
  "description": "A package contains Atlassian editor core functionality",
5
5
  "publishConfig": {
6
6
  "registry": "https://registry.npmjs.org/"
@@ -55,7 +55,7 @@
55
55
  "@atlaskit/code": "^14.6.0",
56
56
  "@atlaskit/date": "^0.10.0",
57
57
  "@atlaskit/datetime-picker": "^12.7.0",
58
- "@atlaskit/editor-common": "^74.20.0",
58
+ "@atlaskit/editor-common": "^74.21.0",
59
59
  "@atlaskit/editor-json-transformer": "^8.10.0",
60
60
  "@atlaskit/editor-markdown-transformer": "^5.2.5",
61
61
  "@atlaskit/editor-palette": "1.5.1",
@@ -1,41 +0,0 @@
1
- "use strict";
2
-
3
- var _typeof = require("@babel/runtime/helpers/typeof");
4
- Object.defineProperty(exports, "__esModule", {
5
- value: true
6
- });
7
- exports.DatasourceModal = void 0;
8
- var _react = _interopRequireWildcard(require("react"));
9
- var _linkDatasource = require("@atlaskit/link-datasource");
10
- var _actions = require("../pm-plugins/actions");
11
- var _doc = require("../pm-plugins/doc");
12
- 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); }
13
- 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; }
14
- var DatasourceModal = function DatasourceModal(_ref) {
15
- var state = _ref.state,
16
- view = _ref.view,
17
- node = _ref.node;
18
- var isJiraDatasource = node.attrs.datasource.parameters.jql;
19
- var onClose = (0, _react.useCallback)(function () {
20
- view.dispatch((0, _actions.hideDatasourceModal)(view.state.tr));
21
- }, [view]);
22
- var onInsert = (0, _react.useCallback)(function (newAdf) {
23
- (0, _doc.updateExistingDatasource)(state, node, newAdf, view);
24
- }, [state, node, view]);
25
- if (isJiraDatasource) {
26
- var _node$attrs$datasourc, _node$attrs$datasourc2;
27
- return /*#__PURE__*/_react.default.createElement("div", {
28
- "data-testId": "jira-config-modal"
29
- }, /*#__PURE__*/_react.default.createElement(_linkDatasource.JiraIssuesConfigModal, {
30
- datasourceId: node.attrs.datasource.id,
31
- visibleColumnKeys: (_node$attrs$datasourc = node.attrs.datasource.views[0]) === null || _node$attrs$datasourc === void 0 ? void 0 : (_node$attrs$datasourc2 = _node$attrs$datasourc.properties) === null || _node$attrs$datasourc2 === void 0 ? void 0 : _node$attrs$datasourc2.columns.map(function (column) {
32
- return column.key;
33
- }),
34
- parameters: node.attrs.datasource.parameters,
35
- onCancel: onClose,
36
- onInsert: onInsert
37
- }));
38
- }
39
- return null; // null for now until we have modal component that handles other datasources
40
- };
41
- exports.DatasourceModal = DatasourceModal;
@@ -1,30 +0,0 @@
1
- import React, { useCallback } from 'react';
2
- import { JiraIssuesConfigModal } from '@atlaskit/link-datasource';
3
- import { hideDatasourceModal } from '../pm-plugins/actions';
4
- import { updateExistingDatasource } from '../pm-plugins/doc';
5
- export const DatasourceModal = ({
6
- state,
7
- view,
8
- node
9
- }) => {
10
- const isJiraDatasource = node.attrs.datasource.parameters.jql;
11
- const onClose = useCallback(() => {
12
- view.dispatch(hideDatasourceModal(view.state.tr));
13
- }, [view]);
14
- const onInsert = useCallback(newAdf => {
15
- updateExistingDatasource(state, node, newAdf, view);
16
- }, [state, node, view]);
17
- if (isJiraDatasource) {
18
- var _node$attrs$datasourc, _node$attrs$datasourc2;
19
- return /*#__PURE__*/React.createElement("div", {
20
- "data-testId": "jira-config-modal"
21
- }, /*#__PURE__*/React.createElement(JiraIssuesConfigModal, {
22
- datasourceId: node.attrs.datasource.id,
23
- visibleColumnKeys: (_node$attrs$datasourc = node.attrs.datasource.views[0]) === null || _node$attrs$datasourc === void 0 ? void 0 : (_node$attrs$datasourc2 = _node$attrs$datasourc.properties) === null || _node$attrs$datasourc2 === void 0 ? void 0 : _node$attrs$datasourc2.columns.map(column => column.key),
24
- parameters: node.attrs.datasource.parameters,
25
- onCancel: onClose,
26
- onInsert: onInsert
27
- }));
28
- }
29
- return null; // null for now until we have modal component that handles other datasources
30
- };
@@ -1,31 +0,0 @@
1
- import React, { useCallback } from 'react';
2
- import { JiraIssuesConfigModal } from '@atlaskit/link-datasource';
3
- import { hideDatasourceModal } from '../pm-plugins/actions';
4
- import { updateExistingDatasource } from '../pm-plugins/doc';
5
- export var DatasourceModal = function DatasourceModal(_ref) {
6
- var state = _ref.state,
7
- view = _ref.view,
8
- node = _ref.node;
9
- var isJiraDatasource = node.attrs.datasource.parameters.jql;
10
- var onClose = useCallback(function () {
11
- view.dispatch(hideDatasourceModal(view.state.tr));
12
- }, [view]);
13
- var onInsert = useCallback(function (newAdf) {
14
- updateExistingDatasource(state, node, newAdf, view);
15
- }, [state, node, view]);
16
- if (isJiraDatasource) {
17
- var _node$attrs$datasourc, _node$attrs$datasourc2;
18
- return /*#__PURE__*/React.createElement("div", {
19
- "data-testId": "jira-config-modal"
20
- }, /*#__PURE__*/React.createElement(JiraIssuesConfigModal, {
21
- datasourceId: node.attrs.datasource.id,
22
- visibleColumnKeys: (_node$attrs$datasourc = node.attrs.datasource.views[0]) === null || _node$attrs$datasourc === void 0 ? void 0 : (_node$attrs$datasourc2 = _node$attrs$datasourc.properties) === null || _node$attrs$datasourc2 === void 0 ? void 0 : _node$attrs$datasourc2.columns.map(function (column) {
23
- return column.key;
24
- }),
25
- parameters: node.attrs.datasource.parameters,
26
- onCancel: onClose,
27
- onInsert: onInsert
28
- }));
29
- }
30
- return null; // null for now until we have modal component that handles other datasources
31
- };