@atlaskit/editor-core 98.4.0 → 98.4.3

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 (51) hide show
  1. package/CHANGELOG.md +15 -0
  2. package/dist/es2015/plugins/base/index.js +5 -0
  3. package/dist/es2015/plugins/base/index.js.map +1 -1
  4. package/dist/es2015/plugins/base/pm-plugins/newline-preserve-marks.d.ts +4 -0
  5. package/dist/es2015/plugins/base/pm-plugins/newline-preserve-marks.js +36 -0
  6. package/dist/es2015/plugins/base/pm-plugins/newline-preserve-marks.js.map +1 -0
  7. package/dist/es2015/plugins/media/nodeviews/media.d.ts +2 -0
  8. package/dist/es2015/plugins/media/nodeviews/media.js +2 -33
  9. package/dist/es2015/plugins/media/nodeviews/media.js.map +1 -1
  10. package/dist/es2015/plugins/media/nodeviews/mediaSingle.d.ts +9 -0
  11. package/dist/es2015/plugins/media/nodeviews/mediaSingle.js +68 -2
  12. package/dist/es2015/plugins/media/nodeviews/mediaSingle.js.map +1 -1
  13. package/dist/es2015/plugins/media/pm-plugins/main.d.ts +1 -1
  14. package/dist/es2015/plugins/media/pm-plugins/main.js +1 -1
  15. package/dist/es2015/plugins/media/pm-plugins/main.js.map +1 -1
  16. package/dist/es2015/plugins/media/ui/ResizableMediaSingle/index.d.ts +2 -0
  17. package/dist/es2015/plugins/media/ui/ResizableMediaSingle/index.js +16 -9
  18. package/dist/es2015/plugins/media/ui/ResizableMediaSingle/index.js.map +1 -1
  19. package/dist/es2015/plugins/media/ui/ResizableMediaSingle/types.d.ts +2 -2
  20. package/dist/es2015/plugins/rank.js +1 -0
  21. package/dist/es2015/plugins/rank.js.map +1 -1
  22. package/dist/es2015/plugins/table/nodeviews/TableComponent.js +4 -3
  23. package/dist/es2015/plugins/table/nodeviews/TableComponent.js.map +1 -1
  24. package/dist/es2015/plugins/table/utils/fix-tables.js +85 -17
  25. package/dist/es2015/plugins/table/utils/fix-tables.js.map +1 -1
  26. package/dist/es5/plugins/base/index.js +5 -0
  27. package/dist/es5/plugins/base/index.js.map +1 -1
  28. package/dist/es5/plugins/base/pm-plugins/newline-preserve-marks.d.ts +4 -0
  29. package/dist/es5/plugins/base/pm-plugins/newline-preserve-marks.js +38 -0
  30. package/dist/es5/plugins/base/pm-plugins/newline-preserve-marks.js.map +1 -0
  31. package/dist/es5/plugins/media/nodeviews/media.d.ts +2 -0
  32. package/dist/es5/plugins/media/nodeviews/media.js +2 -33
  33. package/dist/es5/plugins/media/nodeviews/media.js.map +1 -1
  34. package/dist/es5/plugins/media/nodeviews/mediaSingle.d.ts +9 -0
  35. package/dist/es5/plugins/media/nodeviews/mediaSingle.js +68 -2
  36. package/dist/es5/plugins/media/nodeviews/mediaSingle.js.map +1 -1
  37. package/dist/es5/plugins/media/pm-plugins/main.d.ts +1 -1
  38. package/dist/es5/plugins/media/pm-plugins/main.js +1 -1
  39. package/dist/es5/plugins/media/pm-plugins/main.js.map +1 -1
  40. package/dist/es5/plugins/media/ui/ResizableMediaSingle/index.d.ts +2 -0
  41. package/dist/es5/plugins/media/ui/ResizableMediaSingle/index.js +16 -9
  42. package/dist/es5/plugins/media/ui/ResizableMediaSingle/index.js.map +1 -1
  43. package/dist/es5/plugins/media/ui/ResizableMediaSingle/types.d.ts +2 -2
  44. package/dist/es5/plugins/rank.js +1 -0
  45. package/dist/es5/plugins/rank.js.map +1 -1
  46. package/dist/es5/plugins/table/nodeviews/TableComponent.js +4 -3
  47. package/dist/es5/plugins/table/nodeviews/TableComponent.js.map +1 -1
  48. package/dist/es5/plugins/table/utils/fix-tables.js +85 -17
  49. package/dist/es5/plugins/table/utils/fix-tables.js.map +1 -1
  50. package/dist/package.json +1 -1
  51. package/package.json +1 -1
@@ -1,6 +1,7 @@
1
1
  import * as tslib_1 from "tslib";
2
2
  import * as React from 'react';
3
3
  import rafSchedule from 'raf-schd';
4
+ import { TableMap } from 'prosemirror-tables';
4
5
  import { browser, calcTableWidth, akEditorMobileBreakoutPoint, } from '@atlaskit/editor-common';
5
6
  import TableFloatingControls from '../ui/TableFloatingControls';
6
7
  import ColumnControls from '../ui/TableFloatingControls/ColumnControls';
@@ -117,9 +118,9 @@ var TableComponent = /** @class */ (function (_super) {
117
118
  var _a = this.props, view = _a.view, node = _a.node, getPos = _a.getPos, containerWidth = _a.containerWidth;
118
119
  var prevAttrs = prevProps.node.attrs;
119
120
  var currentAttrs = node.attrs;
120
- var prevColCount = prevProps.node.firstChild.childCount;
121
- var currentColCount = node.firstChild.childCount;
122
- if (prevColCount !== currentColCount ||
121
+ var prevMap = TableMap.get(prevProps.node);
122
+ var currentMap = TableMap.get(node);
123
+ if (prevMap.width !== currentMap.width ||
123
124
  prevAttrs.layout !== currentAttrs.layout ||
124
125
  prevAttrs.isNumberColumnEnabled !== currentAttrs.isNumberColumnEnabled ||
125
126
  prevAttrs.__autoSize !== currentAttrs.__autoSize ||
@@ -1 +1 @@
1
- {"version":3,"file":"TableComponent.js","sourceRoot":"","sources":["../../../../../src/plugins/table/nodeviews/TableComponent.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"TableComponent.js","sourceRoot":"","sources":["../../../../../src/plugins/table/nodeviews/TableComponent.tsx"],"names":[],"mappings":"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"}
@@ -1,7 +1,24 @@
1
1
  import * as tslib_1 from "tslib";
2
+ import { getCellsInColumn } from 'prosemirror-utils';
3
+ import { TableMap } from 'prosemirror-tables';
2
4
  import { sendLogs } from '../../../utils/sendLogs';
3
5
  import { parseDOMColumnWidths } from '../utils';
4
- var fixTable = function (table, tablePos, tr) {
6
+ var fireAnalytics = function (properties) {
7
+ if (properties === void 0) { properties = {}; }
8
+ return sendLogs({
9
+ events: [
10
+ {
11
+ name: 'atlaskit.fabric.editor.fixtable',
12
+ product: 'atlaskit',
13
+ properties: properties,
14
+ serverTime: new Date().getTime(),
15
+ server: 'local',
16
+ user: '-',
17
+ },
18
+ ],
19
+ });
20
+ };
21
+ var removeEmptyRows = function (table, tablePos, tr) {
5
22
  var rows = [];
6
23
  var hasProblems = false;
7
24
  // detect if table has empty rows that we need to remove
@@ -43,25 +60,69 @@ var fixTable = function (table, tablePos, tr) {
43
60
  // remove the table if it's not fixable
44
61
  if (!rows.length) {
45
62
  // ED-6141: send analytics event
46
- sendLogs({
47
- events: [
48
- {
49
- name: 'atlaskit.fabric.editor.fixtable',
50
- product: 'atlaskit',
51
- properties: {
52
- message: 'Delete table with empty rows',
53
- },
54
- serverTime: new Date().getTime(),
55
- server: 'local',
56
- user: '-',
57
- },
58
- ],
59
- });
63
+ fireAnalytics({ message: 'removeEmptyRows' });
60
64
  return tr.delete(tablePos, tablePos + table.nodeSize);
61
65
  }
62
66
  var newTable = table.type.createChecked(table.attrs, rows, table.marks);
63
67
  return tr.replaceWith(tablePos, tablePos + table.nodeSize, newTable);
64
68
  };
69
+ var removeEmptyColumns = function (table, tablePos, tr) {
70
+ // detect if a table has columns with minimum colspan > 1
71
+ // so that we know there's invisible columns that we need to remove
72
+ var map = TableMap.get(table);
73
+ var colsMinColspan = [];
74
+ var _loop_1 = function (colIndex) {
75
+ var cells = getCellsInColumn(colIndex)(tr.selection);
76
+ if (cells) {
77
+ cells.forEach(function (cell) {
78
+ if (!colsMinColspan[colIndex] ||
79
+ colsMinColspan[colIndex] > cell.node.attrs.colspan) {
80
+ colsMinColspan[colIndex] = cell.node.attrs.colspan;
81
+ }
82
+ });
83
+ }
84
+ };
85
+ for (var colIndex = 0; colIndex < map.width; colIndex++) {
86
+ _loop_1(colIndex);
87
+ }
88
+ if (!colsMinColspan.some(function (colspan) { return colspan > 1; })) {
89
+ return tr;
90
+ }
91
+ var rows = [];
92
+ var _loop_2 = function (rowIndex) {
93
+ var rowCells = [];
94
+ Object.keys(colsMinColspan)
95
+ .map(Number)
96
+ .forEach(function (colIndex) {
97
+ var cellPos = map.map[colIndex + rowIndex * map.width] + tablePos + 1;
98
+ var columnCells = getCellsInColumn(colIndex)(tr.selection);
99
+ var cell = (columnCells || []).find(function (cell) { return cell.pos === cellPos; });
100
+ if (cell) {
101
+ if (colsMinColspan[colIndex] > 1) {
102
+ var colspan = cell.node.attrs.colspan - colsMinColspan[colIndex] + 1;
103
+ var colwidth = cell.node.attrs.colwidth;
104
+ var newCell = cell.node.type.createChecked(tslib_1.__assign({}, cell.node.attrs, { colspan: colspan, colwidth: colwidth ? colwidth.slice(0, colspan) : null }), cell.node.content, cell.node.marks);
105
+ rowCells.push(newCell);
106
+ }
107
+ else {
108
+ rowCells.push(cell.node);
109
+ }
110
+ }
111
+ });
112
+ var row = table.child(rowIndex);
113
+ if (row) {
114
+ rows.push(row.type.createChecked(row.attrs, rowCells, row.marks));
115
+ }
116
+ };
117
+ for (var rowIndex = 0; rowIndex < map.height; rowIndex++) {
118
+ _loop_2(rowIndex);
119
+ }
120
+ if (!rows.length) {
121
+ return tr;
122
+ }
123
+ var newTable = table.type.createChecked(table.attrs, rows, table.marks);
124
+ return tr.replaceWith(tablePos, tablePos + table.nodeSize, newTable);
125
+ };
65
126
  // We attempt to patch the document when we have extra, unneeded, column widths
66
127
  // Take this node for example:
67
128
  //
@@ -70,18 +131,25 @@ var fixTable = function (table, tablePos, tr) {
70
131
  // This row only spans two columns, yet it contains widths for 3.
71
132
  // We remove the third width here, assumed duplicate content.
72
133
  export var removeExtraneousColumnWidths = function (node, basePos, tr) {
73
- return replaceCells(tr, node, basePos, function (cell) {
134
+ var hasProblems = false;
135
+ tr = replaceCells(tr, node, basePos, function (cell) {
74
136
  var _a = cell.attrs, colwidth = _a.colwidth, colspan = _a.colspan;
75
137
  if (colwidth && colwidth.length > colspan) {
138
+ hasProblems = true;
76
139
  return cell.type.createChecked(tslib_1.__assign({}, cell.attrs, { colwidth: colwidth.slice(0, colspan) }), cell.content, cell.marks);
77
140
  }
78
141
  return cell;
79
142
  });
143
+ if (hasProblems) {
144
+ fireAnalytics({ message: 'removeExtraneousColumnWidths' });
145
+ }
146
+ return tr;
80
147
  };
81
148
  export var fixTables = function (tr) {
82
149
  tr.doc.descendants(function (node, pos) {
83
150
  if (node.type.name === 'table') {
84
- tr = fixTable(node, pos, tr);
151
+ tr = removeEmptyRows(node, pos, tr);
152
+ tr = removeEmptyColumns(node, pos, tr);
85
153
  tr = removeExtraneousColumnWidths(node, pos, tr);
86
154
  }
87
155
  });
@@ -1 +1 @@
1
- {"version":3,"file":"fix-tables.js","sourceRoot":"","sources":["../../../../../src/plugins/table/utils/fix-tables.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,EAAE,oBAAoB,EAAE,MAAM,UAAU,CAAC;AAEhD,IAAM,QAAQ,GAAG,UACf,KAAa,EACb,QAAgB,EAChB,EAAe;IAEf,IAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,IAAI,WAAW,GAAG,KAAK,CAAC;IAExB,wDAAwD;IACxD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC,EAAE,EAAE;QACzC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE;YAC9B,WAAW,GAAG,IAAI,CAAC;YACnB,MAAM;SACP;KACF;IAED,IAAI,CAAC,WAAW,EAAE;QAChB,OAAO,EAAE,CAAC;KACX;IAED,KAAK,IAAI,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,KAAK,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE;QAC9D,IAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAClC,IAAI,GAAG,CAAC,UAAU,EAAE;YAClB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SAChB;aAAM;YACL,KAAK,IAAI,CAAC,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;gBACzC,IAAM,KAAK,GAAa,EAAE,CAAC;gBAC3B,IAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;gBAEzB,KAAK,IAAI,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,QAAQ,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE;oBACjE,IAAM,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;oBAC9B,IAAA,4BAAO,CAAgB;oBAC/B,IAAI,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,MAAM,EAAE;wBAClC,KAAK,CAAC,IAAI,CACR,IAAI,CAAC,IAAI,CAAC,aAAa,sBAEhB,IAAI,CAAC,KAAK,IACb,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,CAAC,KAEjC,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,KAAK,CACX,CACF,CAAC;qBACH;yBAAM;wBACL,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;qBAClB;iBACF;gBACD,2DAA2D;gBAC3D,IAAI,KAAK,CAAC,MAAM,EAAE;oBAChB,IAAI,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC;iBAC/D;aACF;SACF;KACF;IAED,uCAAuC;IACvC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;QAChB,gCAAgC;QAChC,QAAQ,CAAC;YACP,MAAM,EAAE;gBACN;oBACE,IAAI,EAAE,iCAAiC;oBACvC,OAAO,EAAE,UAAU;oBACnB,UAAU,EAAE;wBACV,OAAO,EAAE,8BAA8B;qBACxC;oBACD,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE;oBAChC,MAAM,EAAE,OAAO;oBACf,IAAI,EAAE,GAAG;iBACV;aACF;SACF,CAAC,CAAC;QACH,OAAO,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;KACvD;IAED,IAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAC1E,OAAO,EAAE,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;AACvE,CAAC,CAAC;AAEF,+EAA+E;AAC/E,8BAA8B;AAC9B,EAAE;AACF,uDAAuD;AACvD,EAAE;AACF,iEAAiE;AACjE,6DAA6D;AAC7D,MAAM,CAAC,IAAM,4BAA4B,GAAG,UAAC,IAAI,EAAE,OAAO,EAAE,EAAE;IAC5D,OAAO,YAAY,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,UAAA,IAAI;QACnC,IAAA,eAAkC,EAAhC,sBAAQ,EAAE,oBAAsB,CAAC;QAEzC,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAG,OAAO,EAAE;YACzC,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,sBAEvB,IAAI,CAAC,KAAK,IACb,QAAQ,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,KAEtC,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,KAAK,CACX,CAAC;SACH;QAED,OAAO,IAAI,CAAC;IACd,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,IAAM,SAAS,GAAG,UAAC,EAAe;IACvC,EAAE,CAAC,GAAG,CAAC,WAAW,CAAC,UAAC,IAAI,EAAE,GAAG;QAC3B,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE;YAC9B,EAAE,GAAG,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;YAC7B,EAAE,GAAG,4BAA4B,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;SAClD;IACH,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAEF,4DAA4D;AAC5D,oCAAoC;AACpC,+BAA+B;AAC/B,2EAA2E;AAC3E,2DAA2D;AAC3D,EAAE;AACF,4EAA4E;AAC5E,gCAAgC;AAChC,EAAE;AACF,yEAAyE;AACzE,0GAA0G;AAC1G,MAAM,CAAC,IAAM,iBAAiB,GAAG,UAC/B,EAAe,EACf,IAAY,EACZ,KAAuB,EACvB,OAAe;IAEf,IAAM,SAAS,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAE9C,IAAI,CAAC,OAAO,CAAC,UAAC,OAAO,EAAE,SAAS,EAAE,CAAC;QACjC,OAAO,CAAC,OAAO,CAAC,UAAC,OAAO,EAAE,SAAS,EAAE,CAAC;YACpC,IAAM,GAAG,GAAG,SAAS,GAAG,SAAS,GAAG,OAAO,GAAG,CAAC,CAAC;YAEhD,EAAE,CAAC,aAAa,CAAC,GAAG,EAAE,SAAS,uBAC1B,OAAO,CAAC,KAAK,IAChB,QAAQ,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IACnE,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,qCAAqC;IACrC,OAAO,EAAE;SACN,aAAa,CAAC,OAAO,EAAE,SAAS,uBAC5B,IAAI,CAAC,KAAK,IACb,UAAU,EAAE,KAAK,IACjB;SACD,OAAO,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;AACpC,CAAC,CAAC;AAEF,kCAAkC;AAClC,IAAM,YAAY,GAAG,UAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU;IACnD,IAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,KAAK,IAAI,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,KAAK,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE;QAC9D,IAAM,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAClC,IAAM,KAAK,GAAa,EAAE,CAAC;QAE3B,KAAK,IAAI,QAAQ,GAAG,CAAC,EAAE,QAAQ,GAAG,GAAG,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE;YAC5D,IAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;YAEjC,QAAQ;YACR,uEAAuE;YACvE,wGAAwG;YACxG,IAAM,IAAI,GAAG,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;YAClD,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,KAAK,EAAE;gBACnC,aAAa,EAAE,CAAC;aACjB;YACD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAClB;QAED,IAAI,KAAK,CAAC,MAAM,EAAE;YAChB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;SAChE;KACF;IAED,mDAAmD;IACnD,qDAAqD;IACrD,IAAI,IAAI,CAAC,MAAM,IAAI,aAAa,KAAK,CAAC,EAAE;QACtC,IAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;QAC1E,OAAO,EAAE,CAAC,WAAW,CAAC,QAAQ,EAAE,QAAQ,GAAG,KAAK,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;KACtE;IAED,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC"}
1
+ {"version":3,"file":"fix-tables.js","sourceRoot":"","sources":["../../../../../src/plugins/table/utils/fix-tables.ts"],"names":[],"mappings":"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"}
@@ -7,6 +7,7 @@ var prosemirror_keymap_1 = require("prosemirror-keymap");
7
7
  var adf_schema_1 = require("@atlaskit/adf-schema");
8
8
  var filter_steps_1 = require("./pm-plugins/filter-steps");
9
9
  var focus_handler_1 = require("./pm-plugins/focus-handler");
10
+ var newline_preserve_marks_1 = require("./pm-plugins/newline-preserve-marks");
10
11
  var inline_cursor_target_1 = require("./pm-plugins/inline-cursor-target");
11
12
  var react_nodeview_1 = require("./pm-plugins/react-nodeview");
12
13
  var basePlugin = {
@@ -27,6 +28,10 @@ var basePlugin = {
27
28
  return focus_handler_1.default(dispatch);
28
29
  },
29
30
  },
31
+ {
32
+ name: 'newlinePreserveMarksPlugin',
33
+ plugin: newline_preserve_marks_1.default,
34
+ },
30
35
  { name: 'reactNodeView', plugin: function () { return react_nodeview_1.plugin; } },
31
36
  { name: 'history', plugin: function () { return prosemirror_history_1.history(); } },
32
37
  // should be last :(
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/base/index.ts"],"names":[],"mappings":";;;AAAA,6DAAkD;AAClD,2DAA8C;AAC9C,yDAA4C;AAC5C,mDAA4D;AAE5D,0DAA0D;AAC1D,4DAA4D;AAC5D,0EAAyE;AACzE,8DAAsE;AAEtE,IAAM,UAAU,GAAiB;IAC/B,SAAS;QACP,OAAO;YACL;gBACE,IAAI,EAAE,mBAAmB;gBACzB,MAAM,EAAE,cAAM,OAAA,sBAAiB,EAAE,EAAnB,CAAmB;aAClC;YACD;gBACE,IAAI,EAAE,0BAA0B;gBAChC,MAAM,EAAE,cAAM,OAAA,8BAAwB,EAAE,EAA1B,CAA0B;aACzC;YACD;gBACE,IAAI,EAAE,oBAAoB;gBAC1B,MAAM,EAAE,UAAC,EAAY;wBAAV,sBAAQ;oBAAO,OAAA,uBAAkB,CAAC,QAAQ,CAAC;gBAA5B,CAA4B;aACvD;YACD,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,cAAM,OAAA,uBAAa,EAAb,CAAa,EAAE;YACtD,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,cAAM,OAAA,6BAAO,EAAE,EAAT,CAAS,EAAE;YAC5C,oBAAoB;YACpB;gBACE,IAAI,EAAE,iBAAiB;gBACvB,MAAM,EAAE;oBACN,OAAA,2BAAM,sBACD,iCAAU,IACb,OAAO,EAAE,cAAM,OAAA,IAAI,EAAJ,CAAI,EACnB,OAAO,EAAE,cAAM,OAAA,IAAI,EAAJ,CAAI,IACnB;gBAJF,CAIE;aACL;SACF,CAAC;IACJ,CAAC;IACD,KAAK;QACH,OAAO;YACL,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,gBAAG,EAAE;YAC1B,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,sBAAS,EAAE;YACtC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAI,EAAE;SAC7B,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,kBAAe,UAAU,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/base/index.ts"],"names":[],"mappings":";;;AAAA,6DAAkD;AAClD,2DAA8C;AAC9C,yDAA4C;AAC5C,mDAA4D;AAE5D,0DAA0D;AAC1D,4DAA4D;AAC5D,8EAA6E;AAC7E,0EAAyE;AACzE,8DAAsE;AAEtE,IAAM,UAAU,GAAiB;IAC/B,SAAS;QACP,OAAO;YACL;gBACE,IAAI,EAAE,mBAAmB;gBACzB,MAAM,EAAE,cAAM,OAAA,sBAAiB,EAAE,EAAnB,CAAmB;aAClC;YACD;gBACE,IAAI,EAAE,0BAA0B;gBAChC,MAAM,EAAE,cAAM,OAAA,8BAAwB,EAAE,EAA1B,CAA0B;aACzC;YACD;gBACE,IAAI,EAAE,oBAAoB;gBAC1B,MAAM,EAAE,UAAC,EAAY;wBAAV,sBAAQ;oBAAO,OAAA,uBAAkB,CAAC,QAAQ,CAAC;gBAA5B,CAA4B;aACvD;YACD;gBACE,IAAI,EAAE,4BAA4B;gBAClC,MAAM,EAAE,gCAA0B;aACnC;YACD,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,cAAM,OAAA,uBAAa,EAAb,CAAa,EAAE;YACtD,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,cAAM,OAAA,6BAAO,EAAE,EAAT,CAAS,EAAE;YAC5C,oBAAoB;YACpB;gBACE,IAAI,EAAE,iBAAiB;gBACvB,MAAM,EAAE;oBACN,OAAA,2BAAM,sBACD,iCAAU,IACb,OAAO,EAAE,cAAM,OAAA,IAAI,EAAJ,CAAI,EACnB,OAAO,EAAE,cAAM,OAAA,IAAI,EAAJ,CAAI,IACnB;gBAJF,CAIE;aACL;SACF,CAAC;IACJ,CAAC;IACD,KAAK;QACH,OAAO;YACL,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,gBAAG,EAAE;YAC1B,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,sBAAS,EAAE;YACtC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAI,EAAE;SAC7B,CAAC;IACJ,CAAC;CACF,CAAC;AAEF,kBAAe,UAAU,CAAC"}
@@ -0,0 +1,4 @@
1
+ import { PluginKey, Plugin } from 'prosemirror-state';
2
+ export declare const newlinePreserveMarksKey: PluginKey<any>;
3
+ declare const _default: () => Plugin<any>;
4
+ export default _default;
@@ -0,0 +1,38 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ var prosemirror_state_1 = require("prosemirror-state");
4
+ var prosemirror_keymap_1 = require("prosemirror-keymap");
5
+ var commands_1 = require("../../../utils/commands");
6
+ var type_ahead_1 = require("../../../plugins/type-ahead");
7
+ var main_1 = require("../../../plugins/emoji/pm-plugins/main");
8
+ exports.newlinePreserveMarksKey = new prosemirror_state_1.PluginKey('newlinePreserveMarksPlugin');
9
+ var isSelectionEndOfParagraph = function (state) {
10
+ return state.selection.$to.parent.type === state.schema.nodes.paragraph &&
11
+ state.selection.$to.pos === state.doc.resolve(state.selection.$to.pos).end();
12
+ };
13
+ var isSelectionAligned = function (state) {
14
+ return !!state.selection.$to.parent.marks.find(function (m) { return m.type === state.schema.marks.alignment; });
15
+ };
16
+ var isTypeaheadNotDisplaying = function (state) {
17
+ return !type_ahead_1.typeAheadPluginKey.getState(state).active &&
18
+ !main_1.emojiPluginKey.getState(state).queryActive;
19
+ };
20
+ var splitBlockPreservingMarks = function (state, dispatch) {
21
+ dispatch(state.tr.split(state.tr.mapping.map(state.selection.$from.pos), 1));
22
+ return true;
23
+ };
24
+ exports.default = (function () {
25
+ return new prosemirror_state_1.Plugin({
26
+ key: exports.newlinePreserveMarksKey,
27
+ props: {
28
+ handleKeyDown: prosemirror_keymap_1.keydownHandler({
29
+ Enter: commands_1.filter([
30
+ isSelectionEndOfParagraph,
31
+ isSelectionAligned,
32
+ isTypeaheadNotDisplaying,
33
+ ], splitBlockPreservingMarks),
34
+ }),
35
+ },
36
+ });
37
+ });
38
+ //# sourceMappingURL=newline-preserve-marks.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"newline-preserve-marks.js","sourceRoot":"","sources":["../../../../../src/plugins/base/pm-plugins/newline-preserve-marks.ts"],"names":[],"mappings":";;AAAA,uDAAmE;AACnE,yDAAoD;AACpD,oDAAiD;AACjD,0DAAiE;AACjE,+DAAwE;AAE3D,QAAA,uBAAuB,GAAG,IAAI,6BAAS,CAClD,4BAA4B,CAC7B,CAAC;AAEF,IAAM,yBAAyB,GAAG,UAAC,KAAkB;IACnD,OAAA,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,KAAK,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS;QAChE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE;AAD5E,CAC4E,CAAC;AAE/E,IAAM,kBAAkB,GAAG,UAAC,KAAkB;IAC5C,OAAA,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CACrC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,EAAvC,CAAuC,CAC7C;AAFD,CAEC,CAAC;AAEJ,IAAM,wBAAwB,GAAG,UAAC,KAAkB;IAClD,OAAA,CAAC,+BAAkB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,MAAM;QAC1C,CAAC,qBAAc,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,WAAW;AAD3C,CAC2C,CAAC;AAE9C,IAAM,yBAAyB,GAAG,UAAC,KAAkB,EAAE,QAAQ;IAC7D,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC7E,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,mBAAe;IACb,OAAA,IAAI,0BAAM,CAAC;QACT,GAAG,EAAE,+BAAuB;QAC5B,KAAK,EAAE;YACL,aAAa,EAAE,mCAAc,CAAC;gBAC5B,KAAK,EAAE,iBAAM,CACX;oBACE,yBAAyB;oBACzB,kBAAkB;oBAClB,wBAAwB;iBACzB,EACD,yBAAyB,CAC1B;aACF,CAAC;SACH;KACF,CAAC;AAdF,CAcE,EAAC"}
@@ -26,6 +26,7 @@ export interface MediaNodeProps extends ReactNodeProps {
26
26
  }) => void;
27
27
  editorAppearance: EditorAppearance;
28
28
  mediaProvider?: Promise<MediaProvider>;
29
+ viewContext?: Context;
29
30
  }
30
31
  export interface Props extends Partial<MediaBaseAttributes> {
31
32
  type: MediaType;
@@ -40,6 +41,7 @@ export interface Props extends Partial<MediaBaseAttributes> {
40
41
  context: Context;
41
42
  disableOverlay?: boolean;
42
43
  mediaProvider?: Promise<MediaProvider>;
44
+ viewContext?: Context;
43
45
  }
44
46
  export interface MediaNodeState {
45
47
  viewContext?: Context;
@@ -13,31 +13,6 @@ var MediaNode = /** @class */ (function (_super) {
13
13
  tslib_1.__extends(MediaNode, _super);
14
14
  function MediaNode(props) {
15
15
  var _this = _super.call(this, props) || this;
16
- _this.hasBeenMounted = false;
17
- _this.state = {
18
- viewContext: undefined,
19
- };
20
- _this.updateMediaContext = function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
21
- var _a, viewContext;
22
- return tslib_1.__generator(this, function (_b) {
23
- switch (_b.label) {
24
- case 0:
25
- if (!this.props.mediaProvider) return [3 /*break*/, 3];
26
- _a = this;
27
- return [4 /*yield*/, this.props.mediaProvider];
28
- case 1:
29
- _a.mediaProvider = _b.sent();
30
- return [4 /*yield*/, this.mediaProvider.viewContext];
31
- case 2:
32
- viewContext = _b.sent();
33
- if (viewContext && this.hasBeenMounted) {
34
- this.setState({ viewContext: viewContext });
35
- }
36
- _b.label = 3;
37
- case 3: return [2 /*return*/];
38
- }
39
- });
40
- }); };
41
16
  _this.handleNewNode = function (props) {
42
17
  var node = props.node;
43
18
  // +1 indicates the media node inside the mediaSingle nodeview
@@ -49,7 +24,7 @@ var MediaNode = /** @class */ (function (_super) {
49
24
  }
50
25
  MediaNode.prototype.shouldComponentUpdate = function (nextProps, nextState) {
51
26
  if (this.props.selected !== nextProps.selected ||
52
- this.state.viewContext !== nextState.viewContext ||
27
+ this.props.viewContext !== nextProps.viewContext ||
53
28
  this.props.node.attrs.id !== nextProps.node.attrs.id ||
54
29
  this.props.node.attrs.collection !== nextProps.node.attrs.collection ||
55
30
  this.props.cardDimensions !== nextProps.cardDimensions) {
@@ -58,17 +33,11 @@ var MediaNode = /** @class */ (function (_super) {
58
33
  return false;
59
34
  };
60
35
  MediaNode.prototype.componentDidMount = function () {
61
- this.hasBeenMounted = true;
62
36
  this.handleNewNode(this.props);
63
- this.updateMediaContext();
64
37
  };
65
38
  MediaNode.prototype.componentWillUnmount = function () {
66
39
  var node = this.props.node;
67
40
  this.pluginState.handleMediaNodeUnmount(node);
68
- this.hasBeenMounted = false;
69
- };
70
- MediaNode.prototype.componentWillReceiveProps = function (props) {
71
- this.updateMediaContext();
72
41
  };
73
42
  MediaNode.prototype.componentDidUpdate = function () {
74
43
  this.pluginState.updateElement();
@@ -76,7 +45,7 @@ var MediaNode = /** @class */ (function (_super) {
76
45
  MediaNode.prototype.render = function () {
77
46
  var _a = this.props, node = _a.node, selected = _a.selected, cardDimensions = _a.cardDimensions, onClick = _a.onClick, editorAppearance = _a.editorAppearance;
78
47
  var _b = node.attrs, id = _b.id, type = _b.type, collection = _b.collection, url = _b.url, __key = _b.__key;
79
- var viewContext = this.state.viewContext;
48
+ var viewContext = this.props.viewContext;
80
49
  /**
81
50
  * On mobile we don't receive a collectionName until the `upload-end` event.
82
51
  * We don't want to render a proper card until we have a valid collection.
@@ -1 +1 @@
1
- {"version":3,"file":"media.js","sourceRoot":"","sources":["../../../../../src/plugins/media/nodeviews/media.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"media.js","sourceRoot":"","sources":["../../../../../src/plugins/media/nodeviews/media.tsx"],"names":[],"mappings":"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"}
@@ -7,6 +7,7 @@ import ReactNodeView from '../../../nodeviews/ReactNodeView';
7
7
  import { EventDispatcher } from '../../../event-dispatcher';
8
8
  import { MediaProvider } from '../types';
9
9
  import { EditorAppearance } from '../../../types';
10
+ import { Context } from '@atlaskit/media-core';
10
11
  export interface MediaSingleNodeProps {
11
12
  node: PMNode;
12
13
  eventDispatcher: EventDispatcher;
@@ -21,15 +22,23 @@ export interface MediaSingleNodeProps {
21
22
  export interface MediaSingleNodeState {
22
23
  width?: number;
23
24
  height?: number;
25
+ viewContext?: Context;
24
26
  }
25
27
  export default class MediaSingleNode extends Component<MediaSingleNodeProps, MediaSingleNodeState> {
26
28
  private mediaPluginState;
27
29
  state: {
28
30
  height: undefined;
29
31
  width: undefined;
32
+ viewContext: undefined;
30
33
  };
31
34
  constructor(props: any);
32
35
  componentDidUpdate(): void;
36
+ componentDidMount(): Promise<void>;
37
+ getRemoteDimensions(): Promise<false | {
38
+ id: any;
39
+ height: number | undefined;
40
+ width: number | undefined;
41
+ } | undefined>;
33
42
  private onExternalImageLoaded;
34
43
  selectMediaSingle: ({ event }: CardEvent) => void;
35
44
  updateSize: (width: number | null, layout: MediaSingleLayout) => void;
@@ -24,6 +24,7 @@ var MediaSingleNode = /** @class */ (function (_super) {
24
24
  _this.state = {
25
25
  height: undefined,
26
26
  width: undefined,
27
+ viewContext: undefined,
27
28
  };
28
29
  _this.onExternalImageLoaded = function (_a) {
29
30
  var width = _a.width, height = _a.height;
@@ -59,6 +60,71 @@ var MediaSingleNode = /** @class */ (function (_super) {
59
60
  this.mediaPluginState.updateLayout(layout);
60
61
  }
61
62
  };
63
+ MediaSingleNode.prototype.componentDidMount = function () {
64
+ return tslib_1.__awaiter(this, void 0, void 0, function () {
65
+ var mediaProvider, viewContext, updatedDimensions;
66
+ return tslib_1.__generator(this, function (_a) {
67
+ switch (_a.label) {
68
+ case 0: return [4 /*yield*/, this.props.mediaProvider];
69
+ case 1:
70
+ mediaProvider = _a.sent();
71
+ if (!mediaProvider) return [3 /*break*/, 3];
72
+ return [4 /*yield*/, mediaProvider.viewContext];
73
+ case 2:
74
+ viewContext = _a.sent();
75
+ this.setState({
76
+ viewContext: viewContext,
77
+ });
78
+ _a.label = 3;
79
+ case 3: return [4 /*yield*/, this.getRemoteDimensions()];
80
+ case 4:
81
+ updatedDimensions = _a.sent();
82
+ if (updatedDimensions) {
83
+ this.mediaPluginState.updateMediaNodeAttrs(updatedDimensions.id, {
84
+ height: updatedDimensions.height,
85
+ width: updatedDimensions.width,
86
+ }, true);
87
+ }
88
+ return [2 /*return*/];
89
+ }
90
+ });
91
+ });
92
+ };
93
+ MediaSingleNode.prototype.getRemoteDimensions = function () {
94
+ return tslib_1.__awaiter(this, void 0, void 0, function () {
95
+ var mediaProvider, _a, id, collection, height, width, viewContext, state;
96
+ return tslib_1.__generator(this, function (_b) {
97
+ switch (_b.label) {
98
+ case 0: return [4 /*yield*/, this.props.mediaProvider];
99
+ case 1:
100
+ mediaProvider = _b.sent();
101
+ if (!mediaProvider || !this.props.node.firstChild) {
102
+ return [2 /*return*/, false];
103
+ }
104
+ _a = this.props.node.firstChild.attrs, id = _a.id, collection = _a.collection, height = _a.height, width = _a.width;
105
+ if (height && width) {
106
+ return [2 /*return*/];
107
+ }
108
+ return [4 /*yield*/, mediaProvider.viewContext];
109
+ case 2:
110
+ viewContext = _b.sent();
111
+ return [4 /*yield*/, viewContext.getImageMetadata(id, {
112
+ collection: collection,
113
+ })];
114
+ case 3:
115
+ state = _b.sent();
116
+ if (!state || !state.original) {
117
+ return [2 /*return*/, false];
118
+ }
119
+ return [2 /*return*/, {
120
+ id: id,
121
+ height: state.original.height,
122
+ width: state.original.width,
123
+ }];
124
+ }
125
+ });
126
+ });
127
+ };
62
128
  MediaSingleNode.prototype.render = function () {
63
129
  var _a = this.props, selected = _a.selected, getPos = _a.getPos, node = _a.node, state = _a.view.state, editorAppearance = _a.editorAppearance;
64
130
  var _b = node.attrs, layout = _b.layout, mediaSingleWidth = _b.width;
@@ -102,8 +168,8 @@ var MediaSingleNode = /** @class */ (function (_super) {
102
168
  lineLength: this.props.lineLength,
103
169
  pctWidth: mediaSingleWidth,
104
170
  };
105
- var MediaChild = (React.createElement(media_1.default, { node: childNode, view: this.props.view, getPos: this.props.getPos, cardDimensions: cardDimensions, mediaProvider: this.props.mediaProvider, selected: selected(), onClick: this.selectMediaSingle, onExternalImageLoaded: this.onExternalImageLoaded, editorAppearance: editorAppearance }));
106
- return canResize ? (React.createElement(ResizableMediaSingle_1.default, tslib_1.__assign({}, props, { view: this.props.view, getPos: getPos, updateSize: this.updateSize, displayGrid: grid_1.createDisplayGrid(this.props.eventDispatcher), gridSize: 12, mediaProvider: this.props.mediaProvider, state: this.props.view.state, appearance: this.mediaPluginState.options.appearance, selected: this.props.selected() }), MediaChild)) : (React.createElement(editor_common_1.MediaSingle, tslib_1.__assign({}, props), MediaChild));
171
+ var MediaChild = (React.createElement(media_1.default, { node: childNode, view: this.props.view, getPos: this.props.getPos, cardDimensions: cardDimensions, viewContext: this.state.viewContext, selected: selected(), onClick: this.selectMediaSingle, onExternalImageLoaded: this.onExternalImageLoaded, editorAppearance: editorAppearance }));
172
+ return canResize ? (React.createElement(ResizableMediaSingle_1.default, tslib_1.__assign({}, props, { view: this.props.view, getPos: getPos, updateSize: this.updateSize, displayGrid: grid_1.createDisplayGrid(this.props.eventDispatcher), gridSize: 12, viewContext: this.state.viewContext, state: this.props.view.state, appearance: this.mediaPluginState.options.appearance, selected: this.props.selected() }), MediaChild)) : (React.createElement(editor_common_1.MediaSingle, tslib_1.__assign({}, props), MediaChild));
107
173
  };
108
174
  return MediaSingleNode;
109
175
  }(react_1.Component));
@@ -1 +1 @@
1
- {"version":3,"file":"mediaSingle.js","sourceRoot":"","sources":["../../../../../src/plugins/media/nodeviews/mediaSingle.tsx"],"names":[],"mappings":";;;AAAA,6BAA+B;AAC/B,+BAAkC;AAIlC,yDAAqE;AAErE,uDAAqE;AACrE,2CAAgE;AAChE,kEAA6D;AAC7D,iCAAgC;AAChC,+DAA0D;AAC1D,qCAA0D;AAC1D,kFAAoG;AACpG,wCAAkD;AAClD,mEAA8D;AAC9D,8CAA0D;AAI1D,yDAAkD;AAElD,IAAM,aAAa,GAAG,GAAG,CAAC;AAC1B,IAAM,cAAc,GAAG,GAAG,CAAC;AAmB3B;IAA6C,2CAG5C;IAQC,yBAAY,KAAK;QAAjB,YACE,kBAAM,KAAK,CAAC,SAIb;QAVD,WAAK,GAAG;YACN,MAAM,EAAE,SAAS;YACjB,KAAK,EAAE,SAAS;SACjB,CAAC;QAgBM,2BAAqB,GAAG,UAAC,EAAiB;gBAAf,gBAAK,EAAE,kBAAM;YAC9C,KAAI,CAAC,QAAQ,CACX;gBACE,KAAK,OAAA;gBACL,MAAM,QAAA;aACP,EACD;gBACE,KAAI,CAAC,WAAW,EAAE,CAAC;YACrB,CAAC,CACF,CAAC;QACJ,CAAC,CAAC;QAEF,uBAAiB,GAAG,UAAC,EAAoB;gBAAlB,gBAAK;YAC1B,4FAA4F;YAC5F,2DAA2D;YAC3D,KAAK,CAAC,eAAe,EAAE,CAAC;YACxB,wBAAgB,CAAC,KAAI,CAAC,KAAK,CAAC,IAAI,EAAE,KAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QACzD,CAAC,CAAC;QAEF,gBAAU,GAAG,UAAC,KAAoB,EAAE,MAAyB;YACrD,IAAA,qBAAqC,EAAnC,gBAAK,EAAE,sBAA4B,CAAC;YAC5C,IAAM,GAAG,GAAG,KAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAChC,IAAI,OAAO,GAAG,KAAK,WAAW,EAAE;gBAC9B,OAAO;aACR;YACD,OAAO,QAAQ,CACb,KAAK,CAAC,EAAE,CAAC,aAAa,CAAC,GAAG,EAAE,SAAS,uBAChC,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,IACxB,MAAM,QAAA;gBACN,KAAK,OAAA,IACL,CACH,CAAC;QACJ,CAAC,CAAC;QA5CA,KAAI,CAAC,gBAAgB,GAAG,eAAQ,CAAC,QAAQ,CACvC,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CACF,CAAC;;IACxB,CAAC;IAED,4CAAkB,GAAlB;QACU,IAAA,qCAAM,CAA2B;QACzC,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE;YACzB,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;SAC5C;IACH,CAAC;IAoCD,gCAAM,GAAN;QACQ,IAAA,eAMQ,EALZ,sBAAQ,EACR,kBAAM,EACN,cAAI,EACI,qBAAK,EACb,sCACY,CAAC;QAET,IAAA,eAAgD,EAA9C,kBAAM,EAAE,2BAAsC,CAAC;QACvD,IAAM,SAAS,GAAG,IAAI,CAAC,UAAW,CAAC;QAE/B,IAAA,oBAAyC,EAAvC,gBAAK,EAAE,kBAAM,EAAE,cAAwB,CAAC;QAE9C,IAAI,IAAI,KAAK,UAAU,EAAE;YACjB,IAAA,eAAuD,EAArD,qBAAiB,EAAE,uBAAkC,CAAC;YAE9D,IAAI,KAAK,KAAK,IAAI,EAAE;gBAClB,KAAK,GAAG,UAAU,IAAI,aAAa,CAAC;aACrC;YAED,IAAI,MAAM,KAAK,IAAI,EAAE;gBACnB,MAAM,GAAG,WAAW,IAAI,cAAc,CAAC;aACxC;SACF;QAED,IAAI,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,aAAa,CAAC;QAE9D,IAAM,GAAG,GAAG,MAAM,EAAE,CAAC;QACrB,IAAI,GAAG,EAAE;YACP,IAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC9B,IAAA,uBAA6C,EAA3C,gBAAK,EAAE,gCAAoC,CAAC;YACpD,IAAM,YAAY,GAAG,CAAC,CAAC,oDAAgC,CAAC,IAAI,EAAE;gBAC5D,KAAK;gBACL,aAAa;aACd,CAAC,CAAC;YACH,SAAS,GAAG,SAAS,IAAI,CAAC,YAAY,CAAC;SACxC;QAED,IAAI,KAAK,KAAK,IAAI,IAAI,MAAM,KAAK,IAAI,EAAE;YACrC,KAAK,GAAG,aAAa,CAAC;YACtB,MAAM,GAAG,cAAc,CAAC;SACzB;QAED,IAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;QACnC,IAAM,UAAU,GAAG,CAAC,MAAM,GAAG,KAAK,CAAC,GAAG,SAAS,CAAC;QAChD,IAAM,cAAc,GAAG;YACrB,KAAK,EAAK,SAAS,OAAI;YACvB,MAAM,EAAK,UAAU,OAAI;SAC1B,CAAC;QAEF,IAAM,KAAK,GAAG;YACZ,MAAM,QAAA;YACN,KAAK,OAAA;YACL,MAAM,QAAA;YAEN,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK;YAChC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU;YACjC,QAAQ,EAAE,gBAAgB;SAC3B,CAAC;QAEF,IAAM,UAAU,GAAG,CACjB,oBAAC,eAAS,IACR,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EACrB,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,EACzB,cAAc,EAAE,cAAc,EAC9B,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,EACvC,QAAQ,EAAE,QAAQ,EAAE,EACpB,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAC/B,qBAAqB,EAAE,IAAI,CAAC,qBAAqB,EACjD,gBAAgB,EAAE,gBAAgB,GAClC,CACH,CAAC;QAEF,OAAO,SAAS,CAAC,CAAC,CAAC,CACjB,oBAAC,8BAAoB,uBACf,KAAK,IACT,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EACrB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,WAAW,EAAE,wBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,EAC1D,QAAQ,EAAE,EAAE,EACZ,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa,EACvC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAC5B,UAAU,EAAE,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,UAAU,EACpD,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,KAE9B,UAAU,CACU,CACxB,CAAC,CAAC,CAAC,CACF,oBAAC,2BAAW,uBAAK,KAAK,GAAG,UAAU,CAAe,CACnD,CAAC;IACJ,CAAC;IACH,sBAAC;AAAD,CAAC,AAzJD,CAA6C,iBAAS,GAyJrD;;AAED;IAAkC,+CAAa;IAA/C;QAAA,qEAiEC;QAhEC,oBAAc,GAAG,CAAC,CAAC;;IAgErB,CAAC;IA9DC,oCAAM,GAAN;QAAA,iBAsCC;QArCO,IAAA,6BAAgE,EAA9D,oCAAe,EAAE,sCAA6C,CAAC;QACvE,IAAM,gBAAgB,GAAG,eAAQ,CAAC,QAAQ,CACxC,IAAI,CAAC,IAAI,CAAC,KAAK,CACI,CAAC;QAEtB,OAAO,CACL,oBAAC,6BAAa,IACZ,SAAS,EAAE,CAAC,eAAe,CAAC,EAC5B,eAAe,EAAE,gBAAgB,CAAC,OAAO,CAAC,eAAe,EACzD,UAAU,EAAE,UAAC,EAAiB;oBAAf,gCAAa;gBAC1B,OAAO,CACL,oBAAC,yBAAe,IACd,UAAU,EAAE,KAAI,CAAC,IAAI,EACrB,OAAO,EAAE;wBACP,KAAK,EAAE,iBAAc;wBACrB,kBAAkB,EAAE,yBAAqB;qBAC1C,EACD,MAAM,EAAE,UAAC,EAA6B;4BAA3B,gBAAK,EAAE,0CAAkB;wBAClC,OAAO,CACL,oBAAC,eAAe,IACd,KAAK,EAAE,KAAK,CAAC,KAAK,EAClB,UAAU,EAAE,KAAK,CAAC,UAAU,EAC5B,IAAI,EAAE,KAAI,CAAC,IAAI,EACf,MAAM,EAAE,KAAI,CAAC,MAAM,EACnB,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,KAAI,CAAC,IAAI,EACf,QAAQ,EAAE,cAAM,OAAA,KAAI,CAAC,MAAM,EAAE,KAAK,kBAAkB,EAApC,CAAoC,EACpD,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,gBAAgB,GAClC,CACH,CAAC;oBACJ,CAAC,GACD,CACH,CAAC;YACJ,CAAC,GACD,CACH,CAAC;IACJ,CAAC;IAED,0CAAY,GAAZ;QACE;;;;;WAKG;QACH,OAAO,QAAQ,CAAC,aAAa,CAAC,uBAAO,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACnE,CAAC;IAED,4CAAc,GAAd;QACE,IAAI,IAAI,CAAC,GAAG,EAAE;YACZ,IAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC;YAEvC,IAAI,UAAU,KAAK,IAAI,CAAC,cAAc,EAAE;gBACtC,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC;gBACjC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE,cAAM,OAAA,IAAI,EAAJ,CAAI,CAAC,CAAC;aACxC;SACF;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IACH,0BAAC;AAAD,CAAC,AAjED,CAAkC,uBAAa,GAiE9C;AAEY,QAAA,oBAAoB,GAAG,UAClC,iBAAiB,EACjB,eAAe,EACf,gBAAgB,IACb,OAAA,UAAC,IAAY,EAAE,IAAgB,EAAE,MAAoB;IACxD,OAAO,IAAI,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,iBAAiB,EAAE;QACpE,eAAe,iBAAA;QACf,gBAAgB,kBAAA;KACjB,CAAC,CAAC,IAAI,EAAE,CAAC;AACZ,CAAC,EALI,CAKJ,CAAC"}
1
+ {"version":3,"file":"mediaSingle.js","sourceRoot":"","sources":["../../../../../src/plugins/media/nodeviews/mediaSingle.tsx"],"names":[],"mappings":";;;AAAA,6BAA+B;AAC/B,+BAAkC;AAIlC,yDAAqE;AAErE,uDAAqE;AACrE,2CAAgE;AAChE,kEAA6D;AAC7D,iCAAgC;AAChC,+DAA0D;AAC1D,qCAA0D;AAC1D,kFAAoG;AACpG,wCAAkD;AAClD,mEAA8D;AAC9D,8CAA0D;AAI1D,yDAAkD;AAGlD,IAAM,aAAa,GAAG,GAAG,CAAC;AAC1B,IAAM,cAAc,GAAG,GAAG,CAAC;AAoB3B;IAA6C,2CAG5C;IASC,yBAAY,KAAK;QAAjB,YACE,kBAAM,KAAK,CAAC,SAIb;QAXD,WAAK,GAAG;YACN,MAAM,EAAE,SAAS;YACjB,KAAK,EAAE,SAAS;YAChB,WAAW,EAAE,SAAS;SACvB,CAAC;QA8DM,2BAAqB,GAAG,UAAC,EAAiB;gBAAf,gBAAK,EAAE,kBAAM;YAC9C,KAAI,CAAC,QAAQ,CACX;gBACE,KAAK,OAAA;gBACL,MAAM,QAAA;aACP,EACD;gBACE,KAAI,CAAC,WAAW,EAAE,CAAC;YACrB,CAAC,CACF,CAAC;QACJ,CAAC,CAAC;QAEF,uBAAiB,GAAG,UAAC,EAAoB;gBAAlB,gBAAK;YAC1B,4FAA4F;YAC5F,2DAA2D;YAC3D,KAAK,CAAC,eAAe,EAAE,CAAC;YACxB,wBAAgB,CAAC,KAAI,CAAC,KAAK,CAAC,IAAI,EAAE,KAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QACzD,CAAC,CAAC;QAEF,gBAAU,GAAG,UAAC,KAAoB,EAAE,MAAyB;YACrD,IAAA,qBAAqC,EAAnC,gBAAK,EAAE,sBAA4B,CAAC;YAC5C,IAAM,GAAG,GAAG,KAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;YAChC,IAAI,OAAO,GAAG,KAAK,WAAW,EAAE;gBAC9B,OAAO;aACR;YACD,OAAO,QAAQ,CACb,KAAK,CAAC,EAAE,CAAC,aAAa,CAAC,GAAG,EAAE,SAAS,uBAChC,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,IACxB,MAAM,QAAA;gBACN,KAAK,OAAA,IACL,CACH,CAAC;QACJ,CAAC,CAAC;QA1FA,KAAI,CAAC,gBAAgB,GAAG,eAAQ,CAAC,QAAQ,CACvC,KAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CACF,CAAC;;IACxB,CAAC;IAED,4CAAkB,GAAlB;QACU,IAAA,qCAAM,CAA2B;QACzC,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE;YACzB,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;SAC5C;IACH,CAAC;IAEK,2CAAiB,GAAvB;;;;;4BACwB,qBAAM,IAAI,CAAC,KAAK,CAAC,aAAa,EAAA;;wBAA9C,aAAa,GAAG,SAA8B;6BAChD,aAAa,EAAb,wBAAa;wBACK,qBAAM,aAAa,CAAC,WAAW,EAAA;;wBAA7C,WAAW,GAAG,SAA+B;wBACnD,IAAI,CAAC,QAAQ,CAAC;4BACZ,WAAW,aAAA;yBACZ,CAAC,CAAC;;4BAEqB,qBAAM,IAAI,CAAC,mBAAmB,EAAE,EAAA;;wBAApD,iBAAiB,GAAG,SAAgC;wBAC1D,IAAI,iBAAiB,EAAE;4BACrB,IAAI,CAAC,gBAAgB,CAAC,oBAAoB,CACxC,iBAAiB,CAAC,EAAE,EACpB;gCACE,MAAM,EAAE,iBAAiB,CAAC,MAAM;gCAChC,KAAK,EAAE,iBAAiB,CAAC,KAAK;6BAC/B,EACD,IAAI,CACL,CAAC;yBACH;;;;;KACF;IAEK,6CAAmB,GAAzB;;;;;4BACwB,qBAAM,IAAI,CAAC,KAAK,CAAC,aAAa,EAAA;;wBAA9C,aAAa,GAAG,SAA8B;wBACpD,IAAI,CAAC,aAAa,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,EAAE;4BACjD,sBAAO,KAAK,EAAC;yBACd;wBACK,KAAoC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,EAAlE,EAAE,QAAA,EAAE,UAAU,gBAAA,EAAE,MAAM,YAAA,EAAE,KAAK,WAAA,CAAsC;wBAC3E,IAAI,MAAM,IAAI,KAAK,EAAE;4BACnB,sBAAO;yBACR;wBACmB,qBAAM,aAAa,CAAC,WAAW,EAAA;;wBAA7C,WAAW,GAAG,SAA+B;wBACrC,qBAAM,WAAW,CAAC,gBAAgB,CAAC,EAAE,EAAE;gCACnD,UAAU,YAAA;6BACX,CAAC,EAAA;;wBAFI,KAAK,GAAG,SAEZ;wBAEF,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE;4BAC7B,sBAAO,KAAK,EAAC;yBACd;wBAED,sBAAO;gCACL,EAAE,IAAA;gCACF,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,MAAM;gCAC7B,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK;6BAC5B,EAAC;;;;KACH;IAoCD,gCAAM,GAAN;QACQ,IAAA,eAMQ,EALZ,sBAAQ,EACR,kBAAM,EACN,cAAI,EACI,qBAAK,EACb,sCACY,CAAC;QAET,IAAA,eAAgD,EAA9C,kBAAM,EAAE,2BAAsC,CAAC;QACvD,IAAM,SAAS,GAAG,IAAI,CAAC,UAAW,CAAC;QAE/B,IAAA,oBAAyC,EAAvC,gBAAK,EAAE,kBAAM,EAAE,cAAwB,CAAC;QAE9C,IAAI,IAAI,KAAK,UAAU,EAAE;YACjB,IAAA,eAAuD,EAArD,qBAAiB,EAAE,uBAAkC,CAAC;YAE9D,IAAI,KAAK,KAAK,IAAI,EAAE;gBAClB,KAAK,GAAG,UAAU,IAAI,aAAa,CAAC;aACrC;YAED,IAAI,MAAM,KAAK,IAAI,EAAE;gBACnB,MAAM,GAAG,WAAW,IAAI,cAAc,CAAC;aACxC;SACF;QAED,IAAI,SAAS,GAAG,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,aAAa,CAAC;QAE9D,IAAM,GAAG,GAAG,MAAM,EAAE,CAAC;QACrB,IAAI,GAAG,EAAE;YACP,IAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAC9B,IAAA,uBAA6C,EAA3C,gBAAK,EAAE,gCAAoC,CAAC;YACpD,IAAM,YAAY,GAAG,CAAC,CAAC,oDAAgC,CAAC,IAAI,EAAE;gBAC5D,KAAK;gBACL,aAAa;aACd,CAAC,CAAC;YACH,SAAS,GAAG,SAAS,IAAI,CAAC,YAAY,CAAC;SACxC;QAED,IAAI,KAAK,KAAK,IAAI,IAAI,MAAM,KAAK,IAAI,EAAE;YACrC,KAAK,GAAG,aAAa,CAAC;YACtB,MAAM,GAAG,cAAc,CAAC;SACzB;QAED,IAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;QACnC,IAAM,UAAU,GAAG,CAAC,MAAM,GAAG,KAAK,CAAC,GAAG,SAAS,CAAC;QAChD,IAAM,cAAc,GAAG;YACrB,KAAK,EAAK,SAAS,OAAI;YACvB,MAAM,EAAK,UAAU,OAAI;SAC1B,CAAC;QAEF,IAAM,KAAK,GAAG;YACZ,MAAM,QAAA;YACN,KAAK,OAAA;YACL,MAAM,QAAA;YAEN,cAAc,EAAE,IAAI,CAAC,KAAK,CAAC,KAAK;YAChC,UAAU,EAAE,IAAI,CAAC,KAAK,CAAC,UAAU;YACjC,QAAQ,EAAE,gBAAgB;SAC3B,CAAC;QAEF,IAAM,UAAU,GAAG,CACjB,oBAAC,eAAS,IACR,IAAI,EAAE,SAAS,EACf,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EACrB,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,EACzB,cAAc,EAAE,cAAc,EAC9B,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,EACnC,QAAQ,EAAE,QAAQ,EAAE,EACpB,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAC/B,qBAAqB,EAAE,IAAI,CAAC,qBAAqB,EACjD,gBAAgB,EAAE,gBAAgB,GAClC,CACH,CAAC;QAEF,OAAO,SAAS,CAAC,CAAC,CAAC,CACjB,oBAAC,8BAAoB,uBACf,KAAK,IACT,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,EACrB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,IAAI,CAAC,UAAU,EAC3B,WAAW,EAAE,wBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,EAC1D,QAAQ,EAAE,EAAE,EACZ,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,EACnC,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,EAC5B,UAAU,EAAE,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,UAAU,EACpD,QAAQ,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,KAE9B,UAAU,CACU,CACxB,CAAC,CAAC,CAAC,CACF,oBAAC,2BAAW,uBAAK,KAAK,GAAG,UAAU,CAAe,CACnD,CAAC;IACJ,CAAC;IACH,sBAAC;AAAD,CAAC,AAxMD,CAA6C,iBAAS,GAwMrD;;AAED;IAAkC,+CAAa;IAA/C;QAAA,qEAiEC;QAhEC,oBAAc,GAAG,CAAC,CAAC;;IAgErB,CAAC;IA9DC,oCAAM,GAAN;QAAA,iBAsCC;QArCO,IAAA,6BAAgE,EAA9D,oCAAe,EAAE,sCAA6C,CAAC;QACvE,IAAM,gBAAgB,GAAG,eAAQ,CAAC,QAAQ,CACxC,IAAI,CAAC,IAAI,CAAC,KAAK,CACI,CAAC;QAEtB,OAAO,CACL,oBAAC,6BAAa,IACZ,SAAS,EAAE,CAAC,eAAe,CAAC,EAC5B,eAAe,EAAE,gBAAgB,CAAC,OAAO,CAAC,eAAe,EACzD,UAAU,EAAE,UAAC,EAAiB;oBAAf,gCAAa;gBAC1B,OAAO,CACL,oBAAC,yBAAe,IACd,UAAU,EAAE,KAAI,CAAC,IAAI,EACrB,OAAO,EAAE;wBACP,KAAK,EAAE,iBAAc;wBACrB,kBAAkB,EAAE,yBAAqB;qBAC1C,EACD,MAAM,EAAE,UAAC,EAA6B;4BAA3B,gBAAK,EAAE,0CAAkB;wBAClC,OAAO,CACL,oBAAC,eAAe,IACd,KAAK,EAAE,KAAK,CAAC,KAAK,EAClB,UAAU,EAAE,KAAK,CAAC,UAAU,EAC5B,IAAI,EAAE,KAAI,CAAC,IAAI,EACf,MAAM,EAAE,KAAI,CAAC,MAAM,EACnB,aAAa,EAAE,aAAa,EAC5B,IAAI,EAAE,KAAI,CAAC,IAAI,EACf,QAAQ,EAAE,cAAM,OAAA,KAAI,CAAC,MAAM,EAAE,KAAK,kBAAkB,EAApC,CAAoC,EACpD,eAAe,EAAE,eAAe,EAChC,gBAAgB,EAAE,gBAAgB,GAClC,CACH,CAAC;oBACJ,CAAC,GACD,CACH,CAAC;YACJ,CAAC,GACD,CACH,CAAC;IACJ,CAAC;IAED,0CAAY,GAAZ;QACE;;;;;WAKG;QACH,OAAO,QAAQ,CAAC,aAAa,CAAC,uBAAO,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACnE,CAAC;IAED,4CAAc,GAAd;QACE,IAAI,IAAI,CAAC,GAAG,EAAE;YACZ,IAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC;YAEvC,IAAI,UAAU,KAAK,IAAI,CAAC,cAAc,EAAE;gBACtC,IAAI,CAAC,cAAc,GAAG,UAAU,CAAC;gBACjC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,EAAE,cAAM,OAAA,IAAI,EAAJ,CAAI,CAAC,CAAC;aACxC;SACF;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IACH,0BAAC;AAAD,CAAC,AAjED,CAAkC,uBAAa,GAiE9C;AAEY,QAAA,oBAAoB,GAAG,UAClC,iBAAiB,EACjB,eAAe,EACf,gBAAgB,IACb,OAAA,UAAC,IAAY,EAAE,IAAgB,EAAE,MAAoB;IACxD,OAAO,IAAI,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,iBAAiB,EAAE;QACpE,eAAe,iBAAA;QACf,gBAAgB,kBAAA;KACjB,CAAC,CAAC,IAAI,EAAE,CAAC;AACZ,CAAC,EALI,CAKJ,CAAC"}
@@ -90,7 +90,7 @@ export declare class MediaPluginState {
90
90
  private destroyPickers;
91
91
  private initPickers;
92
92
  private trackNewMediaEvent;
93
- private updateMediaNodeAttrs;
93
+ updateMediaNodeAttrs: (id: string, attrs: object, isMediaSingle: boolean) => void;
94
94
  private collectionFromProvider;
95
95
  private handleMediaState;
96
96
  private notifyPluginStateSubscribers;
@@ -289,7 +289,7 @@ var MediaPluginState = /** @class */ (function () {
289
289
  return memo;
290
290
  }
291
291
  var node = nodeWithPos.node;
292
- if (node.attrs.__key === id) {
292
+ if (node.attrs.id === id) {
293
293
  return nodeWithPos;
294
294
  }
295
295
  return memo;