@pie-element/select-text 6.5.3-next.550 → 6.5.3-next.560

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 (5) hide show
  1. package/configure/lib/utils.js +24 -37
  2. package/configure/lib/utils.js.map +1 -1
  3. package/lib/utils.js +24 -37
  4. package/lib/utils.js.map +1 -1
  5. package/package.json +2 -2
package/configure/lib/utils.js CHANGED
@@ -24,14 +24,6 @@ var createElementFromHTML = function createElementFromHTML() {
24
24
  return div;
25
25
  };
26
26
 
27
- var parseBrs = function parseBrs(dom) {
28
- var brs = dom.querySelectorAll('br');
29
- brs.forEach(function (br) {
30
- return br.replaceWith('\n');
31
- });
32
- dom.innerHTML = dom.innerHTML.replace(/\n\n/g, '\n');
33
- };
34
-
35
27
  var parseParagraph = function parseParagraph(paragraph, end) {
36
28
  if (end) {
37
29
  return paragraph.innerHTML;
@@ -52,53 +44,48 @@ var parseParagraphs = function parseParagraphs(dom) {
52
44
 
53
45
  var prepareText = function prepareText(text) {
54
46
  var txtDom = createElementFromHTML(text);
55
-
56
- if (txtDom.querySelectorAll('div').length === 0) {
57
- var div = document.createElement('div');
58
- div.innerHTML = '<div separator=\'true\'>'.concat(txtDom.innerHTML, '</div>');
59
- txtDom = div;
60
- } // if no dom elements, we just return the text
61
-
62
-
47
+ var div = document.createElement('div');
48
+ div.innerHTML = '<div separator=\'true\'>'.concat(txtDom.innerHTML, '</div>');
49
+ txtDom = div;
63
50
  var allDomElements = Array.from(txtDom.querySelectorAll('*'));
64
51
 
65
52
  if (allDomElements.length === 0) {
66
53
  return text;
67
54
  }
68
55
 
69
- parseBrs(txtDom);
70
56
  return parseParagraphs(txtDom);
71
57
  };
72
58
 
73
59
  var _default = function _default(model) {
74
- // parsing
75
- var modelText = prepareText(model.text);
76
- var newTokens = (model.tokens || []).reduce(function (acc, token) {
77
- var tokenText = prepareText(model.text.slice(token.start, token.end));
60
+ if (!model) return model; // parsing
61
+
62
+ var modelText = prepareText(model.text || '');
63
+ var newTokens = (model.tokens || []).reduce(function (acc) {
64
+ var token = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
65
+ var tokenText = prepareText((model.text || '').slice(token.start, token.end));
78
66
 
79
67
  if (!tokenText) {
80
- return token;
68
+ return [].concat((0, _toConsumableArray2["default"])(acc), [token]);
81
69
  }
82
70
 
83
- function getAllIndexes(arr, val) {
84
- var indexes = [],
85
- i = -1;
86
-
87
- while ((i = (arr || '').indexOf(val, i + 1)) != -1) {
88
- if (!(acc.filter(function (_ref) {
89
- var start = _ref.start,
90
- text = _ref.text;
91
- return text === val && start === i;
92
- }) || []).length) {
93
- indexes.push(i);
71
+ var getStartIndex = function getStartIndex(start) {
72
+ var length = start;
73
+
74
+ while (length >= 0) {
75
+ var newStartIndex = modelText.slice(length).indexOf(tokenText);
76
+
77
+ if (newStartIndex >= 0) {
78
+ return newStartIndex + length;
94
79
  }
80
+
81
+ length--;
95
82
  }
96
83
 
97
- return indexes;
98
- }
84
+ return 0;
85
+ };
99
86
 
100
- var indexes = getAllIndexes(modelText, tokenText);
101
- var newStart = indexes[0];
87
+ var lastToken = acc[acc.length - 1];
88
+ var newStart = getStartIndex(lastToken ? lastToken.end : token.start);
102
89
  var newEnd = newStart + tokenText.length;
103
90
  return [].concat((0, _toConsumableArray2["default"])(acc), [_objectSpread(_objectSpread({}, token), {}, {
104
91
  text: tokenText,
package/configure/lib/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/utils.js"],"names":["createElementFromHTML","htmlString","arguments","length","undefined","div","document","createElement","innerHTML","trim","parseBrs","dom","brs","querySelectorAll","forEach","br","replaceWith","replace","parseParagraph","paragraph","end","concat","parseParagraphs","paragraphs","str","par","index","prepareText","text","txtDom","allDomElements","Array","from","model","modelText","newTokens","tokens","reduce","acc","token","tokenText","slice","start","getAllIndexes","arr","val","indexes","i","indexOf","filter","push","newStart","newEnd"],"mappings":"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","sourcesContent":["import React from 'react';\n\nvar createElementFromHTML = function createElementFromHTML() {\n var htmlString = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';\n var div = document.createElement('div');\n div.innerHTML = htmlString.trim();\n return div;\n};\n\nvar parseBrs = function parseBrs(dom) {\n var brs = dom.querySelectorAll('br');\n brs.forEach(function (br) {\n return br.replaceWith('\\n');\n });\n dom.innerHTML = dom.innerHTML.replace(/\\n\\n/g, '\\n');\n};\n\nvar parseParagraph = function parseParagraph(paragraph, end) {\n if (end) {\n return paragraph.innerHTML;\n }\n\n return ''.concat(paragraph.innerHTML, '\\n\\n');\n};\n\nvar parseParagraphs = function parseParagraphs(dom) {\n var paragraphs = dom.querySelectorAll('div[separator=true]'); // separate variable for easily debugging, if needed\n\n var str = '';\n paragraphs.forEach(function (par, index) {\n str += parseParagraph(par, index === paragraphs.length - 1);\n });\n return str || null;\n};\n\nvar prepareText = function prepareText(text) {\n var txtDom = createElementFromHTML(text);\n\n if (txtDom.querySelectorAll('div').length === 0) {\n var div = document.createElement('div');\n div.innerHTML = '<div separator=\\'true\\'>'.concat(txtDom.innerHTML, '</div>');\n txtDom = div;\n } // if no dom elements, we just return the text\n\n var allDomElements = Array.from(txtDom.querySelectorAll('*'));\n\n if (allDomElements.length === 0) {\n return text;\n }\n\n parseBrs(txtDom);\n return parseParagraphs(txtDom);\n};\n\nexport default (model) => {\n// parsing\n const modelText = prepareText(model.text);\n\n const newTokens = (model.tokens || []).reduce((acc, token) => {\n const tokenText = prepareText(model.text.slice(token.start, token.end));\n\n if (!tokenText) {\n return token;\n }\n\n function getAllIndexes(arr, val) {\n var indexes = [], i = -1;\n\n while ((i = (arr || '').indexOf(val, i + 1)) != -1) {\n if (!(acc.filter(({ start, text }) => (text === val && start === i)) || []).length) {\n indexes.push(i);\n }\n }\n\n return indexes;\n }\n\n var indexes = getAllIndexes(modelText, tokenText);\n\n const newStart = indexes[0];\n const newEnd = newStart + tokenText.length;\n\n return [\n ...acc,\n {\n ...token,\n text: tokenText,\n start: newStart,\n end: newEnd\n }\n ];\n }, []);\n\n\n return {\n ...model,\n tokens: newTokens,\n text: modelText\n }\n}\n"],"file":"utils.js"}
1
+ {"version":3,"sources":["../src/utils.js"],"names":["createElementFromHTML","htmlString","arguments","length","undefined","div","document","createElement","innerHTML","trim","parseParagraph","paragraph","end","concat","parseParagraphs","dom","paragraphs","querySelectorAll","str","forEach","par","index","prepareText","text","txtDom","allDomElements","Array","from","model","modelText","newTokens","tokens","reduce","acc","token","tokenText","slice","start","getStartIndex","newStartIndex","indexOf","lastToken","newStart","newEnd"],"mappings":";;;;;;;;;;;;;AAAA;;;;;;AAEA,IAAIA,qBAAqB,GAAG,SAASA,qBAAT,GAAiC;AAC3D,MAAIC,UAAU,GAAGC,SAAS,CAACC,MAAV,GAAmB,CAAnB,IAAwBD,SAAS,CAAC,CAAD,CAAT,KAAiBE,SAAzC,GAAqDF,SAAS,CAAC,CAAD,CAA9D,GAAoE,EAArF;AACA,MAAIG,GAAG,GAAGC,QAAQ,CAACC,aAAT,CAAuB,KAAvB,CAAV;AACAF,EAAAA,GAAG,CAACG,SAAJ,GAAgBP,UAAU,CAACQ,IAAX,EAAhB;AACA,SAAOJ,GAAP;AACD,CALD;;AAOA,IAAIK,cAAc,GAAG,SAASA,cAAT,CAAwBC,SAAxB,EAAmCC,GAAnC,EAAwC;AAC3D,MAAIA,GAAJ,EAAS;AACP,WAAOD,SAAS,CAACH,SAAjB;AACD;;AAED,SAAO,GAAGK,MAAH,CAAUF,SAAS,CAACH,SAApB,EAA+B,MAA/B,CAAP;AACD,CAND;;AAQA,IAAIM,eAAe,GAAG,SAASA,eAAT,CAAyBC,GAAzB,EAA8B;AAClD,MAAIC,UAAU,GAAGD,GAAG,CAACE,gBAAJ,CAAqB,qBAArB,CAAjB,CADkD,CACY;;AAE9D,MAAIC,GAAG,GAAG,EAAV;AACAF,EAAAA,UAAU,CAACG,OAAX,CAAmB,UAAUC,GAAV,EAAeC,KAAf,EAAsB;AACvCH,IAAAA,GAAG,IAAIR,cAAc,CAACU,GAAD,EAAMC,KAAK,KAAKL,UAAU,CAACb,MAAX,GAAoB,CAApC,CAArB;AACD,GAFD;AAGA,SAAOe,GAAG,IAAI,IAAd;AACD,CARD;;AAUA,IAAII,WAAW,GAAG,SAASA,WAAT,CAAqBC,IAArB,EAA2B;AAC3C,MAAIC,MAAM,GAAGxB,qBAAqB,CAACuB,IAAD,CAAlC;AAEA,MAAIlB,GAAG,GAAGC,QAAQ,CAACC,aAAT,CAAuB,KAAvB,CAAV;AACAF,EAAAA,GAAG,CAACG,SAAJ,GAAgB,2BAA2BK,MAA3B,CAAkCW,MAAM,CAAChB,SAAzC,EAAoD,QAApD,CAAhB;AACAgB,EAAAA,MAAM,GAAGnB,GAAT;AAEA,MAAIoB,cAAc,GAAGC,KAAK,CAACC,IAAN,CAAWH,MAAM,CAACP,gBAAP,CAAwB,GAAxB,CAAX,CAArB;;AAEA,MAAIQ,cAAc,CAACtB,MAAf,KAA0B,CAA9B,EAAiC;AAC/B,WAAOoB,IAAP;AACD;;AAED,SAAOT,eAAe,CAACU,MAAD,CAAtB;AACD,CAdD;;eAgBe,kBAACI,KAAD,EAAW;AACxB,MAAI,CAACA,KAAL,EAAY,OAAOA,KAAP,CADY,CAGxB;;AACA,MAAMC,SAAS,GAAGP,WAAW,CAACM,KAAK,CAACL,IAAN,IAAc,EAAf,CAA7B;AAEA,MAAMO,SAAS,GAAG,CAACF,KAAK,CAACG,MAAN,IAAgB,EAAjB,EAAqBC,MAArB,CAA4B,UAACC,GAAD,EAAqB;AAAA,QAAfC,KAAe,uEAAP,EAAO;AACjE,QAAMC,SAAS,GAAGb,WAAW,CAAC,CAACM,KAAK,CAACL,IAAN,IAAc,EAAf,EAAmBa,KAAnB,CAAyBF,KAAK,CAACG,KAA/B,EAAsCH,KAAK,CAACtB,GAA5C,CAAD,CAA7B;;AAEA,QAAI,CAACuB,SAAL,EAAgB;AACd,2DAAWF,GAAX,IAAgBC,KAAhB;AACD;;AAED,QAAMI,aAAa,GAAG,SAAhBA,aAAgB,CAACD,KAAD,EAAW;AAC/B,UAAIlC,MAAM,GAAGkC,KAAb;;AAEA,aAAOlC,MAAM,IAAI,CAAjB,EAAoB;AAClB,YAAIoC,aAAa,GAAGV,SAAS,CAACO,KAAV,CAAgBjC,MAAhB,EAAwBqC,OAAxB,CAAgCL,SAAhC,CAApB;;AAEA,YAAII,aAAa,IAAI,CAArB,EAAwB;AACtB,iBAAOA,aAAa,GAAGpC,MAAvB;AACD;;AAEDA,QAAAA,MAAM;AACP;;AAED,aAAO,CAAP;AACD,KAdD;;AAgBA,QAAMsC,SAAS,GAAGR,GAAG,CAACA,GAAG,CAAC9B,MAAJ,GAAa,CAAd,CAArB;AACA,QAAMuC,QAAQ,GAAGJ,aAAa,CAACG,SAAS,GAAGA,SAAS,CAAC7B,GAAb,GAAmBsB,KAAK,CAACG,KAAnC,CAA9B;AACA,QAAMM,MAAM,GAAGD,QAAQ,GAAGP,SAAS,CAAChC,MAApC;AAEA,yDACK8B,GADL,oCAGOC,KAHP;AAIIX,MAAAA,IAAI,EAAEY,SAJV;AAKIE,MAAAA,KAAK,EAAEK,QALX;AAMI9B,MAAAA,GAAG,EAAE+B;AANT;AASD,GApCiB,EAoCf,EApCe,CAAlB;AAuCA,yCACKf,KADL;AAEEG,IAAAA,MAAM,EAAED,SAFV;AAGEP,IAAAA,IAAI,EAAEM;AAHR;AAKD,C","sourcesContent":["import React from 'react';\n\nvar createElementFromHTML = function createElementFromHTML() {\n var htmlString = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';\n var div = document.createElement('div');\n div.innerHTML = htmlString.trim();\n return div;\n};\n\nvar parseParagraph = function parseParagraph(paragraph, end) {\n if (end) {\n return paragraph.innerHTML;\n }\n\n return ''.concat(paragraph.innerHTML, '\\n\\n');\n};\n\nvar parseParagraphs = function parseParagraphs(dom) {\n var paragraphs = dom.querySelectorAll('div[separator=true]'); // separate variable for easily debugging, if needed\n\n var str = '';\n paragraphs.forEach(function (par, index) {\n str += parseParagraph(par, index === paragraphs.length - 1);\n });\n return str || null;\n};\n\nvar prepareText = function prepareText(text) {\n var txtDom = createElementFromHTML(text);\n\n var div = document.createElement('div');\n div.innerHTML = '<div separator=\\'true\\'>'.concat(txtDom.innerHTML, '</div>');\n txtDom = div;\n\n var allDomElements = Array.from(txtDom.querySelectorAll('*'));\n\n if (allDomElements.length === 0) {\n return text;\n }\n\n return parseParagraphs(txtDom);\n};\n\nexport default (model) => {\n if (!model) return model;\n\n // parsing\n const modelText = prepareText(model.text || '');\n\n const newTokens = (model.tokens || []).reduce((acc, token = {}) => {\n const tokenText = prepareText((model.text || '').slice(token.start, token.end));\n\n if (!tokenText) {\n return [...acc, token];\n }\n\n const getStartIndex = (start) => {\n let length = start;\n\n while (length >= 0) {\n let newStartIndex = modelText.slice(length).indexOf(tokenText);\n\n if (newStartIndex >= 0) {\n return newStartIndex + length;\n }\n\n length--;\n }\n\n return 0;\n };\n\n const lastToken = acc[acc.length - 1];\n const newStart = getStartIndex(lastToken ? lastToken.end : token.start);\n const newEnd = newStart + tokenText.length;\n\n return [\n ...acc,\n {\n ...token,\n text: tokenText,\n start: newStart,\n end: newEnd\n }\n ];\n }, []);\n\n\n return {\n ...model,\n tokens: newTokens,\n text: modelText\n }\n}\n"],"file":"utils.js"}
package/lib/utils.js CHANGED
@@ -24,14 +24,6 @@ var createElementFromHTML = function createElementFromHTML() {
24
24
  return div;
25
25
  };
26
26
 
27
- var parseBrs = function parseBrs(dom) {
28
- var brs = dom.querySelectorAll('br');
29
- brs.forEach(function (br) {
30
- return br.replaceWith('\n');
31
- });
32
- dom.innerHTML = dom.innerHTML.replace(/\n\n/g, '\n');
33
- };
34
-
35
27
  var parseParagraph = function parseParagraph(paragraph, end) {
36
28
  if (end) {
37
29
  return paragraph.innerHTML;
@@ -52,53 +44,48 @@ var parseParagraphs = function parseParagraphs(dom) {
52
44
 
53
45
  var prepareText = function prepareText(text) {
54
46
  var txtDom = createElementFromHTML(text);
55
-
56
- if (txtDom.querySelectorAll('div').length === 0) {
57
- var div = document.createElement('div');
58
- div.innerHTML = '<div separator=\'true\'>'.concat(txtDom.innerHTML, '</div>');
59
- txtDom = div;
60
- } // if no dom elements, we just return the text
61
-
62
-
47
+ var div = document.createElement('div');
48
+ div.innerHTML = '<div separator=\'true\'>'.concat(txtDom.innerHTML, '</div>');
49
+ txtDom = div;
63
50
  var allDomElements = Array.from(txtDom.querySelectorAll('*'));
64
51
 
65
52
  if (allDomElements.length === 0) {
66
53
  return text;
67
54
  }
68
55
 
69
- parseBrs(txtDom);
70
56
  return parseParagraphs(txtDom);
71
57
  };
72
58
 
73
59
  var _default = function _default(model) {
74
- // parsing
75
- var modelText = prepareText(model.text);
76
- var newTokens = (model.tokens || []).reduce(function (acc, token) {
77
- var tokenText = prepareText(model.text.slice(token.start, token.end));
60
+ if (!model) return model; // parsing
61
+
62
+ var modelText = prepareText(model.text || '');
63
+ var newTokens = (model.tokens || []).reduce(function (acc) {
64
+ var token = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
65
+ var tokenText = prepareText((model.text || '').slice(token.start, token.end));
78
66
 
79
67
  if (!tokenText) {
80
- return token;
68
+ return [].concat((0, _toConsumableArray2["default"])(acc), [token]);
81
69
  }
82
70
 
83
- function getAllIndexes(arr, val) {
84
- var indexes = [],
85
- i = -1;
86
-
87
- while ((i = (arr || '').indexOf(val, i + 1)) != -1) {
88
- if (!(acc.filter(function (_ref) {
89
- var start = _ref.start,
90
- text = _ref.text;
91
- return text === val && start === i;
92
- }) || []).length) {
93
- indexes.push(i);
71
+ var getStartIndex = function getStartIndex(start) {
72
+ var length = start;
73
+
74
+ while (length >= 0) {
75
+ var newStartIndex = modelText.slice(length).indexOf(tokenText);
76
+
77
+ if (newStartIndex >= 0) {
78
+ return newStartIndex + length;
94
79
  }
80
+
81
+ length--;
95
82
  }
96
83
 
97
- return indexes;
98
- }
84
+ return 0;
85
+ };
99
86
 
100
- var indexes = getAllIndexes(modelText, tokenText);
101
- var newStart = indexes[0];
87
+ var lastToken = acc[acc.length - 1];
88
+ var newStart = getStartIndex(lastToken ? lastToken.end : token.start);
102
89
  var newEnd = newStart + tokenText.length;
103
90
  return [].concat((0, _toConsumableArray2["default"])(acc), [_objectSpread(_objectSpread({}, token), {}, {
104
91
  text: tokenText,
package/lib/utils.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"sources":["../src/utils.js"],"names":["createElementFromHTML","htmlString","arguments","length","undefined","div","document","createElement","innerHTML","trim","parseBrs","dom","brs","querySelectorAll","forEach","br","replaceWith","replace","parseParagraph","paragraph","end","concat","parseParagraphs","paragraphs","str","par","index","prepareText","text","txtDom","allDomElements","Array","from","model","modelText","newTokens","tokens","reduce","acc","token","tokenText","slice","start","getAllIndexes","arr","val","indexes","i","indexOf","filter","push","newStart","newEnd"],"mappings":"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","sourcesContent":["import React from 'react';\n\nvar createElementFromHTML = function createElementFromHTML() {\n var htmlString = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';\n var div = document.createElement('div');\n div.innerHTML = htmlString.trim();\n return div;\n};\n\nvar parseBrs = function parseBrs(dom) {\n var brs = dom.querySelectorAll('br');\n brs.forEach(function (br) {\n return br.replaceWith('\\n');\n });\n dom.innerHTML = dom.innerHTML.replace(/\\n\\n/g, '\\n');\n};\n\nvar parseParagraph = function parseParagraph(paragraph, end) {\n if (end) {\n return paragraph.innerHTML;\n }\n\n return ''.concat(paragraph.innerHTML, '\\n\\n');\n};\n\nvar parseParagraphs = function parseParagraphs(dom) {\n var paragraphs = dom.querySelectorAll('div[separator=true]'); // separate variable for easily debugging, if needed\n\n var str = '';\n paragraphs.forEach(function (par, index) {\n str += parseParagraph(par, index === paragraphs.length - 1);\n });\n return str || null;\n};\n\nvar prepareText = function prepareText(text) {\n var txtDom = createElementFromHTML(text);\n\n if (txtDom.querySelectorAll('div').length === 0) {\n var div = document.createElement('div');\n div.innerHTML = '<div separator=\\'true\\'>'.concat(txtDom.innerHTML, '</div>');\n txtDom = div;\n } // if no dom elements, we just return the text\n\n var allDomElements = Array.from(txtDom.querySelectorAll('*'));\n\n if (allDomElements.length === 0) {\n return text;\n }\n\n parseBrs(txtDom);\n return parseParagraphs(txtDom);\n};\n\nexport default (model) => {\n// parsing\n const modelText = prepareText(model.text);\n\n const newTokens = (model.tokens || []).reduce((acc, token) => {\n const tokenText = prepareText(model.text.slice(token.start, token.end));\n\n if (!tokenText) {\n return token;\n }\n\n function getAllIndexes(arr, val) {\n var indexes = [], i = -1;\n\n while ((i = (arr || '').indexOf(val, i + 1)) != -1) {\n if (!(acc.filter(({ start, text }) => (text === val && start === i)) || []).length) {\n indexes.push(i);\n }\n }\n\n return indexes;\n }\n\n var indexes = getAllIndexes(modelText, tokenText);\n\n const newStart = indexes[0];\n const newEnd = newStart + tokenText.length;\n\n return [\n ...acc,\n {\n ...token,\n text: tokenText,\n start: newStart,\n end: newEnd\n }\n ];\n }, []);\n\n\n return {\n ...model,\n tokens: newTokens,\n text: modelText\n }\n}\n"],"file":"utils.js"}
1
+ {"version":3,"sources":["../src/utils.js"],"names":["createElementFromHTML","htmlString","arguments","length","undefined","div","document","createElement","innerHTML","trim","parseParagraph","paragraph","end","concat","parseParagraphs","dom","paragraphs","querySelectorAll","str","forEach","par","index","prepareText","text","txtDom","allDomElements","Array","from","model","modelText","newTokens","tokens","reduce","acc","token","tokenText","slice","start","getStartIndex","newStartIndex","indexOf","lastToken","newStart","newEnd"],"mappings":"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","sourcesContent":["import React from 'react';\n\nvar createElementFromHTML = function createElementFromHTML() {\n var htmlString = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';\n var div = document.createElement('div');\n div.innerHTML = htmlString.trim();\n return div;\n};\n\nvar parseParagraph = function parseParagraph(paragraph, end) {\n if (end) {\n return paragraph.innerHTML;\n }\n\n return ''.concat(paragraph.innerHTML, '\\n\\n');\n};\n\nvar parseParagraphs = function parseParagraphs(dom) {\n var paragraphs = dom.querySelectorAll('div[separator=true]'); // separate variable for easily debugging, if needed\n\n var str = '';\n paragraphs.forEach(function (par, index) {\n str += parseParagraph(par, index === paragraphs.length - 1);\n });\n return str || null;\n};\n\nvar prepareText = function prepareText(text) {\n var txtDom = createElementFromHTML(text);\n\n var div = document.createElement('div');\n div.innerHTML = '<div separator=\\'true\\'>'.concat(txtDom.innerHTML, '</div>');\n txtDom = div;\n\n var allDomElements = Array.from(txtDom.querySelectorAll('*'));\n\n if (allDomElements.length === 0) {\n return text;\n }\n\n return parseParagraphs(txtDom);\n};\n\nexport default (model) => {\n if (!model) return model;\n\n // parsing\n const modelText = prepareText(model.text || '');\n\n const newTokens = (model.tokens || []).reduce((acc, token = {}) => {\n const tokenText = prepareText((model.text || '').slice(token.start, token.end));\n\n if (!tokenText) {\n return [...acc, token];\n }\n\n const getStartIndex = (start) => {\n let length = start;\n\n while (length >= 0) {\n let newStartIndex = modelText.slice(length).indexOf(tokenText);\n\n if (newStartIndex >= 0) {\n return newStartIndex + length;\n }\n\n length--;\n }\n\n return 0;\n };\n\n const lastToken = acc[acc.length - 1];\n const newStart = getStartIndex(lastToken ? lastToken.end : token.start);\n const newEnd = newStart + tokenText.length;\n\n return [\n ...acc,\n {\n ...token,\n text: tokenText,\n start: newStart,\n end: newEnd\n }\n ];\n }, []);\n\n\n return {\n ...model,\n tokens: newTokens,\n text: modelText\n }\n}\n"],"file":"utils.js"}
package/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "access": "public"
5
5
  },
6
6
  "repository": "pie-framework/pie-elements",
7
- "version": "6.5.3-next.550+0e4e8ca70",
7
+ "version": "6.5.3-next.560+d638ff263",
8
8
  "description": "",
9
9
  "dependencies": {
10
10
  "@material-ui/core": "^3.9.2",
@@ -19,7 +19,7 @@
19
19
  },
20
20
  "author": "",
21
21
  "license": "ISC",
22
- "gitHead": "0e4e8ca70e9e75484310685500fea56144d1f0b8",
22
+ "gitHead": "d638ff2638d681459716ff8797bc4295476d64ed",
23
23
  "scripts": {
24
24
  "postpublish": "../../scripts/postpublish"
25
25
  },