@atlaskit/editor-plugin-synced-block 5.3.22 → 5.3.23
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,13 @@
|
|
|
1
1
|
# @atlaskit/editor-plugin-synced-block
|
|
2
2
|
|
|
3
|
+
## 5.3.23
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [`e4b932a41725c`](https://bitbucket.org/atlassian/atlassian-frontend-monorepo/commits/e4b932a41725c) -
|
|
8
|
+
[ux] EDITOR-5459 fix merging logic for subtype in resolve sync block instance
|
|
9
|
+
- Updated dependencies
|
|
10
|
+
|
|
3
11
|
## 5.3.22
|
|
4
12
|
|
|
5
13
|
### Patch Changes
|
|
@@ -98,14 +98,18 @@ var subTypeIconMapNew = {
|
|
|
98
98
|
};
|
|
99
99
|
var getConfluenceSubTypeIcon = function getConfluenceSubTypeIcon(sourceAri, subType) {
|
|
100
100
|
if ((0, _platformFeatureFlags.fg)('platform_synced_block_patch_3')) {
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
101
|
+
try {
|
|
102
|
+
var _getPageIdAndTypeFrom = (0, _editorSyncedBlockProvider.getPageIdAndTypeFromConfluencePageAri)({
|
|
103
|
+
ari: sourceAri
|
|
104
|
+
}),
|
|
105
|
+
pageType = _getPageIdAndTypeFrom.type;
|
|
106
|
+
if (pageType === 'blogpost') {
|
|
107
|
+
return _quotationMark.default;
|
|
108
|
+
} else {
|
|
109
|
+
return subType && subType in subTypeIconMapNew ? subTypeIconMapNew[subType] : _page.default;
|
|
110
|
+
}
|
|
111
|
+
} catch (_unused) {
|
|
112
|
+
return _page.default;
|
|
109
113
|
}
|
|
110
114
|
}
|
|
111
115
|
return subType && subType in subTypeIconMap ? subTypeIconMap[subType] : _page.default;
|
|
@@ -82,15 +82,19 @@ const subTypeIconMapNew = {
|
|
|
82
82
|
};
|
|
83
83
|
const getConfluenceSubTypeIcon = (sourceAri, subType) => {
|
|
84
84
|
if (fg('platform_synced_block_patch_3')) {
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
85
|
+
try {
|
|
86
|
+
const {
|
|
87
|
+
type: pageType
|
|
88
|
+
} = getPageIdAndTypeFromConfluencePageAri({
|
|
89
|
+
ari: sourceAri
|
|
90
|
+
});
|
|
91
|
+
if (pageType === 'blogpost') {
|
|
92
|
+
return QuotationMarkIcon;
|
|
93
|
+
} else {
|
|
94
|
+
return subType && subType in subTypeIconMapNew ? subTypeIconMapNew[subType] : PageIcon;
|
|
95
|
+
}
|
|
96
|
+
} catch {
|
|
97
|
+
return PageIcon;
|
|
94
98
|
}
|
|
95
99
|
}
|
|
96
100
|
return subType && subType in subTypeIconMap ? subTypeIconMap[subType] : PageIcon;
|
|
@@ -89,14 +89,18 @@ var subTypeIconMapNew = {
|
|
|
89
89
|
};
|
|
90
90
|
var getConfluenceSubTypeIcon = function getConfluenceSubTypeIcon(sourceAri, subType) {
|
|
91
91
|
if (fg('platform_synced_block_patch_3')) {
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
92
|
+
try {
|
|
93
|
+
var _getPageIdAndTypeFrom = getPageIdAndTypeFromConfluencePageAri({
|
|
94
|
+
ari: sourceAri
|
|
95
|
+
}),
|
|
96
|
+
pageType = _getPageIdAndTypeFrom.type;
|
|
97
|
+
if (pageType === 'blogpost') {
|
|
98
|
+
return QuotationMarkIcon;
|
|
99
|
+
} else {
|
|
100
|
+
return subType && subType in subTypeIconMapNew ? subTypeIconMapNew[subType] : PageIcon;
|
|
101
|
+
}
|
|
102
|
+
} catch (_unused) {
|
|
103
|
+
return PageIcon;
|
|
100
104
|
}
|
|
101
105
|
}
|
|
102
106
|
return subType && subType in subTypeIconMap ? subTypeIconMap[subType] : PageIcon;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaskit/editor-plugin-synced-block",
|
|
3
|
-
"version": "5.3.
|
|
3
|
+
"version": "5.3.23",
|
|
4
4
|
"description": "SyncedBlock plugin for @atlaskit/editor-core",
|
|
5
5
|
"author": "Atlassian Pty Ltd",
|
|
6
6
|
"license": "Apache-2.0",
|
|
@@ -61,7 +61,7 @@
|
|
|
61
61
|
"react-intl-next": "npm:react-intl@^5.18.1"
|
|
62
62
|
},
|
|
63
63
|
"peerDependencies": {
|
|
64
|
-
"@atlaskit/editor-common": "^111.
|
|
64
|
+
"@atlaskit/editor-common": "^111.15.0",
|
|
65
65
|
"react": "^18.2.0"
|
|
66
66
|
},
|
|
67
67
|
"devDependencies": {
|