@lexical/html 0.9.2 → 0.11.0

package/LexicalHtml.dev.js

@@ -17,8 +17,8 @@ var lexical = require('lexical');
  */
 
 function $generateNodesFromDOM(editor, dom) {
-  let lexicalNodes = [];
   const elements = dom.body ? dom.body.childNodes : [];
+  let lexicalNodes = [];
 
   for (let i = 0; i < elements.length; i++) {
     const element = elements[i];
@@ -52,7 +52,7 @@ function $generateHtmlFromNodes(editor, selection) {
 }
 
 function $appendNodesToHTML(editor, currentNode, parentElement, selection$1 = null) {
-  let shouldInclude = selection$1 != null ? currentNode.isSelected() : true;
+  let shouldInclude = selection$1 != null ? currentNode.isSelected(selection$1) : true;
   const shouldExclude = lexical.$isElementNode(currentNode) && currentNode.excludeFromCopy('html');
   let target = currentNode;
 
@@ -122,7 +122,7 @@ function getConversionFunction(domNode, editor) {
 
 const IGNORE_TAGS = new Set(['STYLE', 'SCRIPT']);
 
-function $createNodesFromDOM(node, editor, forChildMap = new Map(), parentLexicalNode, preformatted = false) {
+function $createNodesFromDOM(node, editor, forChildMap = new Map(), parentLexicalNode) {
   let lexicalNodes = [];
 
   if (IGNORE_TAGS.has(node.nodeName)) {
@@ -131,12 +131,13 @@ function $createNodesFromDOM(node, editor, forChildMap = new Map(), parentLexica
 
   let currentLexicalNode = null;
   const transformFunction = getConversionFunction(node, editor);
-  const transformOutput = transformFunction ? transformFunction(node, undefined, preformatted) : null;
+  const transformOutput = transformFunction ? transformFunction(node) : null;
   let postTransform = null;
 
   if (transformOutput !== null) {
     postTransform = transformOutput.after;
-    currentLexicalNode = transformOutput.node;
+    const transformNodes = transformOutput.node;
+    currentLexicalNode = Array.isArray(transformNodes) ? transformNodes[transformNodes.length - 1] : transformNodes;
 
     if (currentLexicalNode !== null) {
       for (const [, forChildFunction] of forChildMap) {
@@ -148,7 +149,7 @@ function $createNodesFromDOM(node, editor, forChildMap = new Map(), parentLexica
       }
 
       if (currentLexicalNode) {
-        lexicalNodes.push(currentLexicalNode);
+        lexicalNodes.push(...(Array.isArray(transformNodes) ? transformNodes : [currentLexicalNode]));
       }
     }
 
@@ -163,7 +164,7 @@ function $createNodesFromDOM(node, editor, forChildMap = new Map(), parentLexica
   let childLexicalNodes = [];
 
   for (let i = 0; i < children.length; i++) {
-    childLexicalNodes.push(...$createNodesFromDOM(children[i], editor, new Map(forChildMap), currentLexicalNode, preformatted || (transformOutput && transformOutput.preformatted) === true));
+    childLexicalNodes.push(...$createNodesFromDOM(children[i], editor, new Map(forChildMap), currentLexicalNode));
   }
 
   if (postTransform != null) {

package/LexicalHtml.js.flow

@@ -17,6 +17,12 @@ import type {
   GridSelection,
 } from 'lexical';
 
+export type FindCachedParentDOMNode = (
+  node: Node,
+  searchFn: FindCachedParentDOMNodeSearchFn,
+) => null | Node;
+export type FindCachedParentDOMNodeSearchFn = (node: Node) => boolean;
+
 declare export function $generateHtmlFromNodes(
   editor: LexicalEditor,
   selection?: RangeSelection | NodeSelection | GridSelection | null,

package/LexicalHtml.prod.js

@@ -4,9 +4,10 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-'use strict';var n=require("@lexical/selection"),q=require("lexical");
-function r(c,d,h,a=null){let e=null!=a?d.isSelected():!0,m=q.$isElementNode(d)&&d.excludeFromCopy("html");var b=d;null!==a&&(b=n.$cloneWithProperties(d),b=q.$isTextNode(b)&&null!=a?n.$sliceSelectedTextNodeContent(a,b):b);let f=q.$isElementNode(b)?b.getChildren():[],{element:k,after:g}=b.exportDOM(c);if(!k)return!1;let l=document.createDocumentFragment();for(let p=0;p<f.length;p++){let t=f[p],w=r(c,t,l,a);!e&&q.$isElementNode(d)&&w&&d.extractWithChild(t,a,"html")&&(e=!0)}e&&!m?(k.append(l),h.append(k),
-g&&(c=g.call(b,k))&&k.replaceWith(c)):h.append(l);return e}let u=new Set(["STYLE","SCRIPT"]);
-function v(c,d,h=new Map,a,e=!1){let m=[];if(u.has(c.nodeName))return m;let b=null;var {nodeName:f}=c,k=d._htmlConversions.get(f.toLowerCase());f=null;if(void 0!==k)for(g of k)k=g(c),null!==k&&(null===f||f.priority<k.priority)&&(f=k);var g=(g=null!==f?f.conversion:null)?g(c,void 0,e):null;f=null;if(null!==g){f=g.after;b=g.node;if(null!==b){for(var [,l]of h)if(b=l(b,a),!b)break;b&&m.push(b)}null!=g.forChild&&h.set(c.nodeName,g.forChild)}c=c.childNodes;a=[];for(l=0;l<c.length;l++)a.push(...v(c[l],d,
-new Map(h),b,e||!0===(g&&g.preformatted)));null!=f&&(a=f(a));null==b?m=m.concat(a):q.$isElementNode(b)&&b.append(...a);return m}exports.$generateHtmlFromNodes=function(c,d){if("undefined"===typeof document||"undefined"===typeof window)throw Error("To use $generateHtmlFromNodes in headless mode please initialize a headless browser implementation such as JSDom before calling this function.");let h=document.createElement("div"),a=q.$getRoot().getChildren();for(let e=0;e<a.length;e++)r(c,a[e],h,d);return h.innerHTML};
-exports.$generateNodesFromDOM=function(c,d){let h=[];d=d.body?d.body.childNodes:[];for(let e=0;e<d.length;e++){var a=d[e];u.has(a.nodeName)||(a=v(a,c),null!==a&&(h=h.concat(a)))}return h}
+'use strict';var m=require("@lexical/selection"),q=require("lexical");
+function r(c,d,h,a=null){let e=null!=a?d.isSelected(a):!0,k=q.$isElementNode(d)&&d.excludeFromCopy("html");var f=d;null!==a&&(f=m.$cloneWithProperties(d),f=q.$isTextNode(f)&&null!=a?m.$sliceSelectedTextNodeContent(a,f):f);let g=q.$isElementNode(f)?f.getChildren():[],{element:b,after:l}=f.exportDOM(c);if(!b)return!1;let n=document.createDocumentFragment();for(let p=0;p<g.length;p++){let t=g[p],w=r(c,t,n,a);!e&&q.$isElementNode(d)&&w&&d.extractWithChild(t,a,"html")&&(e=!0)}e&&!k?(b.append(n),h.append(b),
+l&&(c=l.call(f,b))&&b.replaceWith(c)):h.append(n);return e}let u=new Set(["STYLE","SCRIPT"]);
+function v(c,d,h=new Map,a){let e=[];if(u.has(c.nodeName))return e;let k=null;var f,{nodeName:g}=c,b=d._htmlConversions.get(g.toLowerCase());g=null;if(void 0!==b)for(f of b)b=f(c),null!==b&&(null===g||g.priority<b.priority)&&(g=b);g=(f=null!==g?g.conversion:null)?f(c):null;f=null;if(null!==g){f=g.after;b=g.node;k=Array.isArray(b)?b[b.length-1]:b;if(null!==k){for(var [,l]of h)if(k=l(k,a),!k)break;k&&e.push(...(Array.isArray(b)?b:[k]))}null!=g.forChild&&h.set(c.nodeName,g.forChild)}c=c.childNodes;a=
+[];for(l=0;l<c.length;l++)a.push(...v(c[l],d,new Map(h),k));null!=f&&(a=f(a));null==k?e=e.concat(a):q.$isElementNode(k)&&k.append(...a);return e}
+exports.$generateHtmlFromNodes=function(c,d){if("undefined"===typeof document||"undefined"===typeof window)throw Error("To use $generateHtmlFromNodes in headless mode please initialize a headless browser implementation such as JSDom before calling this function.");let h=document.createElement("div"),a=q.$getRoot().getChildren();for(let e=0;e<a.length;e++)r(c,a[e],h,d);return h.innerHTML};
+exports.$generateNodesFromDOM=function(c,d){d=d.body?d.body.childNodes:[];let h=[];for(let e=0;e<d.length;e++){var a=d[e];u.has(a.nodeName)||(a=v(a,c),null!==a&&(h=h.concat(a)))}return h}

package/package.json

@@ -8,10 +8,10 @@
     "html"
   ],
   "license": "MIT",
-  "version": "0.9.2",
+  "version": "0.11.0",
   "main": "LexicalHtml.js",
   "peerDependencies": {
-    "lexical": "0.9.2"
+    "lexical": "0.11.0"
   },
   "repository": {
     "type": "git",
@@ -19,6 +19,6 @@
     "directory": "packages/lexical-html"
   },
   "dependencies": {
-    "@lexical/selection": "0.9.2"
+    "@lexical/selection": "0.11.0"
   }
 }