@atlaskit/editor-synced-block-provider 3.5.0 → 3.5.2

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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,20 @@
1
1
  # @atlaskit/editor-synced-block-provider
2
2
 
3
+ ## 3.5.2
4
+
5
+ ### Patch Changes
6
+
7
+ - [`54cbf654939aa`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/54cbf654939aa) -
8
+ Send current document ARI when fetching block
9
+
10
+ ## 3.5.1
11
+
12
+ ### Patch Changes
13
+
14
+ - [`19ca45d2afec9`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/19ca45d2afec9) -
15
+ EDITOR-3596 Fix mentions and profile card in Synced Blocks in Jira Renderer
16
+ - Updated dependencies
17
+
3
18
  ## 3.5.0
4
19
 
5
20
  ### Minor Changes
@@ -137,13 +137,13 @@ var BlockError = exports.BlockError = /*#__PURE__*/function (_Error) {
137
137
  }( /*#__PURE__*/(0, _wrapNativeSuper2.default)(Error));
138
138
  var getSyncedBlockContent = exports.getSyncedBlockContent = /*#__PURE__*/function () {
139
139
  var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2(_ref2) {
140
- var blockAri, response;
140
+ var blockAri, documentAri, response;
141
141
  return _regenerator.default.wrap(function _callee2$(_context2) {
142
142
  while (1) switch (_context2.prev = _context2.next) {
143
143
  case 0:
144
- blockAri = _ref2.blockAri;
144
+ blockAri = _ref2.blockAri, documentAri = _ref2.documentAri;
145
145
  _context2.next = 3;
146
- return (0, _retry.fetchWithRetry)("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
146
+ return (0, _retry.fetchWithRetry)("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)) + (documentAri ? "?documentAri=".concat(encodeURIComponent(documentAri)) : ''), {
147
147
  method: 'GET',
148
148
  headers: COMMON_HEADERS
149
149
  });
@@ -732,10 +732,12 @@ var createBlockServiceFetchOnlyAPIProvider = exports.createBlockServiceFetchOnly
732
732
  };
733
733
  };
734
734
  var useMemoizedBlockServiceFetchOnlyAPIProvider = exports.useMemoizedBlockServiceFetchOnlyAPIProvider = function useMemoizedBlockServiceFetchOnlyAPIProvider(_ref8) {
735
- var cloudId = _ref8.cloudId;
735
+ var cloudId = _ref8.cloudId,
736
+ parentAri = _ref8.parentAri;
736
737
  return (0, _react.useMemo)(function () {
737
738
  return createBlockServiceFetchOnlyAPIProvider({
738
- cloudId: cloudId
739
+ cloudId: cloudId,
740
+ parentAri: parentAri
739
741
  });
740
- }, [cloudId]);
742
+ }, [cloudId, parentAri]);
741
743
  };
@@ -391,7 +391,7 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
391
391
  // When a block is moved, the old component unmounts before the new one mounts.
392
392
  // By delaying deletion, we give the new component time to subscribe and
393
393
  // cancel this pending deletion, preserving the cached data.
394
- // TODO: EDITOR-4152 - Rework this logic
394
+ // TODO: EDITOR-4152 - Rework this logic
395
395
  var deletionTimeout = setTimeout(function () {
396
396
  // Only delete if still no subscribers (wasn't re-subscribed)
397
397
  if (!_this3.subscriptions.has(resourceId)) {
@@ -504,6 +504,16 @@ var ReferenceSyncBlockStoreManager = exports.ReferenceSyncBlockStoreManager = /*
504
504
  taskDecisionProvider: parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.taskDecisionProvider
505
505
  });
506
506
  this.providerFactories.set(resourceId, providerFactory);
507
+ } else {
508
+ if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.mentionProvider) {
509
+ providerFactory.setProvider('mentionProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.mentionProvider);
510
+ }
511
+ if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.profilecardProvider) {
512
+ providerFactory.setProvider('profilecardProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.profilecardProvider);
513
+ }
514
+ if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.taskDecisionProvider) {
515
+ providerFactory.setProvider('taskDecisionProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.taskDecisionProvider);
516
+ }
507
517
  }
508
518
  if (providerCreator) {
509
519
  try {
@@ -100,9 +100,10 @@ export class BlockError extends Error {
100
100
  }
101
101
  }
102
102
  export const getSyncedBlockContent = async ({
103
- blockAri
103
+ blockAri,
104
+ documentAri
104
105
  }) => {
105
- const response = await fetchWithRetry(`${BLOCK_SERVICE_API_URL}/block/${encodeURIComponent(blockAri)}`, {
106
+ const response = await fetchWithRetry(`${BLOCK_SERVICE_API_URL}/block/${encodeURIComponent(blockAri)}` + (documentAri ? `?documentAri=${encodeURIComponent(documentAri)}` : ''), {
106
107
  method: 'GET',
107
108
  headers: COMMON_HEADERS
108
109
  });
@@ -499,7 +499,9 @@ export const createBlockServiceFetchOnlyAPIProvider = ({
499
499
  };
500
500
  };
501
501
  export const useMemoizedBlockServiceFetchOnlyAPIProvider = ({
502
- cloudId
502
+ cloudId,
503
+ parentAri
503
504
  }) => useMemo(() => createBlockServiceFetchOnlyAPIProvider({
504
- cloudId
505
- }), [cloudId]);
505
+ cloudId,
506
+ parentAri
507
+ }), [cloudId, parentAri]);
@@ -273,7 +273,7 @@ export class ReferenceSyncBlockStoreManager {
273
273
  // When a block is moved, the old component unmounts before the new one mounts.
274
274
  // By delaying deletion, we give the new component time to subscribe and
275
275
  // cancel this pending deletion, preserving the cached data.
276
- // TODO: EDITOR-4152 - Rework this logic
276
+ // TODO: EDITOR-4152 - Rework this logic
277
277
  const deletionTimeout = setTimeout(() => {
278
278
  // Only delete if still no subscribers (wasn't re-subscribed)
279
279
  if (!this.subscriptions.has(resourceId)) {
@@ -383,6 +383,16 @@ export class ReferenceSyncBlockStoreManager {
383
383
  taskDecisionProvider: parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.taskDecisionProvider
384
384
  });
385
385
  this.providerFactories.set(resourceId, providerFactory);
386
+ } else {
387
+ if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.mentionProvider) {
388
+ providerFactory.setProvider('mentionProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.mentionProvider);
389
+ }
390
+ if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.profilecardProvider) {
391
+ providerFactory.setProvider('profilecardProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.profilecardProvider);
392
+ }
393
+ if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.taskDecisionProvider) {
394
+ providerFactory.setProvider('taskDecisionProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.taskDecisionProvider);
395
+ }
386
396
  }
387
397
  if (providerCreator) {
388
398
  try {
@@ -130,13 +130,13 @@ export var BlockError = /*#__PURE__*/function (_Error) {
130
130
  }( /*#__PURE__*/_wrapNativeSuper(Error));
131
131
  export var getSyncedBlockContent = /*#__PURE__*/function () {
132
132
  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(_ref2) {
133
- var blockAri, response;
133
+ var blockAri, documentAri, response;
134
134
  return _regeneratorRuntime.wrap(function _callee2$(_context2) {
135
135
  while (1) switch (_context2.prev = _context2.next) {
136
136
  case 0:
137
- blockAri = _ref2.blockAri;
137
+ blockAri = _ref2.blockAri, documentAri = _ref2.documentAri;
138
138
  _context2.next = 3;
139
- return fetchWithRetry("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)), {
139
+ return fetchWithRetry("".concat(BLOCK_SERVICE_API_URL, "/block/").concat(encodeURIComponent(blockAri)) + (documentAri ? "?documentAri=".concat(encodeURIComponent(documentAri)) : ''), {
140
140
  method: 'GET',
141
141
  headers: COMMON_HEADERS
142
142
  });
@@ -726,10 +726,12 @@ export var createBlockServiceFetchOnlyAPIProvider = function createBlockServiceF
726
726
  };
727
727
  };
728
728
  export var useMemoizedBlockServiceFetchOnlyAPIProvider = function useMemoizedBlockServiceFetchOnlyAPIProvider(_ref8) {
729
- var cloudId = _ref8.cloudId;
729
+ var cloudId = _ref8.cloudId,
730
+ parentAri = _ref8.parentAri;
730
731
  return useMemo(function () {
731
732
  return createBlockServiceFetchOnlyAPIProvider({
732
- cloudId: cloudId
733
+ cloudId: cloudId,
734
+ parentAri: parentAri
733
735
  });
734
- }, [cloudId]);
736
+ }, [cloudId, parentAri]);
735
737
  };
@@ -385,7 +385,7 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
385
385
  // When a block is moved, the old component unmounts before the new one mounts.
386
386
  // By delaying deletion, we give the new component time to subscribe and
387
387
  // cancel this pending deletion, preserving the cached data.
388
- // TODO: EDITOR-4152 - Rework this logic
388
+ // TODO: EDITOR-4152 - Rework this logic
389
389
  var deletionTimeout = setTimeout(function () {
390
390
  // Only delete if still no subscribers (wasn't re-subscribed)
391
391
  if (!_this3.subscriptions.has(resourceId)) {
@@ -498,6 +498,16 @@ export var ReferenceSyncBlockStoreManager = /*#__PURE__*/function () {
498
498
  taskDecisionProvider: parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.taskDecisionProvider
499
499
  });
500
500
  this.providerFactories.set(resourceId, providerFactory);
501
+ } else {
502
+ if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.mentionProvider) {
503
+ providerFactory.setProvider('mentionProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.mentionProvider);
504
+ }
505
+ if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.profilecardProvider) {
506
+ providerFactory.setProvider('profilecardProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.profilecardProvider);
507
+ }
508
+ if (parentDataProviders !== null && parentDataProviders !== void 0 && parentDataProviders.taskDecisionProvider) {
509
+ providerFactory.setProvider('taskDecisionProvider', parentDataProviders === null || parentDataProviders === void 0 ? void 0 : parentDataProviders.taskDecisionProvider);
510
+ }
501
511
  }
502
512
  if (providerCreator) {
503
513
  try {
@@ -64,6 +64,7 @@ export declare const isBlockContentResponse: (response: BlockContentResponse | B
64
64
  export declare const getReferenceSyncedBlocks: (documentAri: string) => Promise<ReferenceSyncedBlockResponse>;
65
65
  export type GetSyncedBlockContentRequest = {
66
66
  blockAri: string;
67
+ documentAri?: string;
67
68
  };
68
69
  export type DeleteSyncedBlockRequest = {
69
70
  blockAri: string;
@@ -101,7 +102,7 @@ export declare class BlockError extends Error {
101
102
  readonly status: number;
102
103
  constructor(status: number);
103
104
  }
104
- export declare const getSyncedBlockContent: ({ blockAri, }: GetSyncedBlockContentRequest) => Promise<BlockContentResponse>;
105
+ export declare const getSyncedBlockContent: ({ blockAri, documentAri, }: GetSyncedBlockContentRequest) => Promise<BlockContentResponse>;
105
106
  /**
106
107
  * Batch retrieves multiple synced blocks by their ARIs.
107
108
  *
@@ -83,12 +83,13 @@ export declare const useMemoizedBlockServiceAPIProviders: ({ cloudId, parentAri,
83
83
  };
84
84
  interface BlockServiceFetchOnlyAPIProviderProps {
85
85
  cloudId: string;
86
+ parentAri?: string;
86
87
  }
87
88
  export declare const createBlockServiceFetchOnlyAPIProvider: ({ cloudId, }: BlockServiceFetchOnlyAPIProviderProps) => {
88
89
  fetchProvider: BlockServiceADFFetchProvider;
89
90
  writeProvider: undefined;
90
91
  };
91
- export declare const useMemoizedBlockServiceFetchOnlyAPIProvider: ({ cloudId, }: BlockServiceFetchOnlyAPIProviderProps) => {
92
+ export declare const useMemoizedBlockServiceFetchOnlyAPIProvider: ({ cloudId, parentAri, }: BlockServiceFetchOnlyAPIProviderProps) => {
92
93
  fetchProvider: BlockServiceADFFetchProvider;
93
94
  writeProvider: undefined;
94
95
  };
@@ -64,6 +64,7 @@ export declare const isBlockContentResponse: (response: BlockContentResponse | B
64
64
  export declare const getReferenceSyncedBlocks: (documentAri: string) => Promise<ReferenceSyncedBlockResponse>;
65
65
  export type GetSyncedBlockContentRequest = {
66
66
  blockAri: string;
67
+ documentAri?: string;
67
68
  };
68
69
  export type DeleteSyncedBlockRequest = {
69
70
  blockAri: string;
@@ -101,7 +102,7 @@ export declare class BlockError extends Error {
101
102
  readonly status: number;
102
103
  constructor(status: number);
103
104
  }
104
- export declare const getSyncedBlockContent: ({ blockAri, }: GetSyncedBlockContentRequest) => Promise<BlockContentResponse>;
105
+ export declare const getSyncedBlockContent: ({ blockAri, documentAri, }: GetSyncedBlockContentRequest) => Promise<BlockContentResponse>;
105
106
  /**
106
107
  * Batch retrieves multiple synced blocks by their ARIs.
107
108
  *
@@ -83,12 +83,13 @@ export declare const useMemoizedBlockServiceAPIProviders: ({ cloudId, parentAri,
83
83
  };
84
84
  interface BlockServiceFetchOnlyAPIProviderProps {
85
85
  cloudId: string;
86
+ parentAri?: string;
86
87
  }
87
88
  export declare const createBlockServiceFetchOnlyAPIProvider: ({ cloudId, }: BlockServiceFetchOnlyAPIProviderProps) => {
88
89
  fetchProvider: BlockServiceADFFetchProvider;
89
90
  writeProvider: undefined;
90
91
  };
91
- export declare const useMemoizedBlockServiceFetchOnlyAPIProvider: ({ cloudId, }: BlockServiceFetchOnlyAPIProviderProps) => {
92
+ export declare const useMemoizedBlockServiceFetchOnlyAPIProvider: ({ cloudId, parentAri, }: BlockServiceFetchOnlyAPIProviderProps) => {
92
93
  fetchProvider: BlockServiceADFFetchProvider;
93
94
  writeProvider: undefined;
94
95
  };
package/package.json CHANGED
@@ -34,7 +34,7 @@
34
34
  "uuid": "^3.1.0"
35
35
  },
36
36
  "peerDependencies": {
37
- "@atlaskit/editor-common": "^111.2.0",
37
+ "@atlaskit/editor-common": "^111.6.0",
38
38
  "react": "^18.2.0"
39
39
  },
40
40
  "devDependencies": {
@@ -77,7 +77,7 @@
77
77
  }
78
78
  },
79
79
  "name": "@atlaskit/editor-synced-block-provider",
80
- "version": "3.5.0",
80
+ "version": "3.5.2",
81
81
  "description": "Synced Block Provider for @atlaskit/editor-plugin-synced-block",
82
82
  "author": "Atlassian Pty Ltd",
83
83
  "license": "Apache-2.0",