| @@ -344,9 +344,9 @@ | ||
| 344 | 344 | // default to true. |
| 345 | 345 | selectionStart === null || // when not null, compare the two points |
| 346 | 346 | selectionStart !== selectionEnd |
| 347 | 347 | ); |
| 348 | - } catch { | |
| 348 | + } catch (error) { | |
| 349 | 349 | return true; |
| 350 | 350 | } |
| 351 | 351 | } |
| 352 | 352 | |
| @@ -522,22 +522,22 @@ | ||
| 522 | 522 | } |
| 523 | 523 | |
| 524 | 524 | // packages/dom/build-module/dom/caret-range-from-point.mjs |
| 525 | 525 | function caretRangeFromPoint(doc, x, y) { |
| 526 | - if (doc.caretPositionFromPoint) { | |
| 527 | - const point = doc.caretPositionFromPoint(x, y); | |
| 528 | - if (!point) { | |
| 529 | - return null; | |
| 530 | - } | |
| 531 | - const range = doc.createRange(); | |
| 532 | - range.setStart(point.offsetNode, point.offset); | |
| 533 | - range.collapse(true); | |
| 534 | - return range; | |
| 535 | - } | |
| 536 | 526 | if (doc.caretRangeFromPoint) { |
| 537 | 527 | return doc.caretRangeFromPoint(x, y); |
| 538 | 528 | } |
| 539 | - return null; | |
| 529 | + if (!doc.caretPositionFromPoint) { | |
| 530 | + return null; | |
| 531 | + } | |
| 532 | + const point = doc.caretPositionFromPoint(x, y); | |
| 533 | + if (!point) { | |
| 534 | + return null; | |
| 535 | + } | |
| 536 | + const range = doc.createRange(); | |
| 537 | + range.setStart(point.offsetNode, point.offset); | |
| 538 | + range.collapse(true); | |
| 539 | + return range; | |
| 540 | 540 | } |
| 541 | 541 | |
| 542 | 542 | // packages/dom/build-module/dom/hidden-caret-range-from-point.mjs |
| 543 | 543 | function hiddenCaretRangeFromPoint(doc, x, y, container) { |
| @@ -684,9 +684,9 @@ | ||
| 684 | 684 | container.selectionEnd = 0; |
| 685 | 685 | } |
| 686 | 686 | return; |
| 687 | 687 | } |
| 688 | - if (container.contentEditable !== "true") { | |
| 688 | + if (!container.isContentEditable) { | |
| 689 | 689 | return; |
| 690 | 690 | } |
| 691 | 691 | const range = scrollIfNoRange( |
| 692 | 692 | container, |
| @@ -847,8 +847,13 @@ | ||
| 847 | 847 | bdo: { attributes: ["dir"] }, |
| 848 | 848 | wbr: {}, |
| 849 | 849 | "#text": {} |
| 850 | 850 | }; |
| 851 | + var excludedElements = ["#text", "br"]; | |
| 852 | + Object.keys(textContentSchema).filter((element) => !excludedElements.includes(element)).forEach((tag) => { | |
| 853 | + const { [tag]: removedTag, ...restSchema } = textContentSchema; | |
| 854 | + textContentSchema[tag].children = restSchema; | |
| 855 | + }); | |
| 851 | 856 | var embeddedContentSchema = { |
| 852 | 857 | audio: { |
| 853 | 858 | attributes: [ |
| 854 | 859 | "src", |
| @@ -902,16 +907,8 @@ | ||
| 902 | 907 | attributes: ["display", "xmlns"], |
| 903 | 908 | children: "*" |
| 904 | 909 | } |
| 905 | 910 | }; |
| 906 | - var excludedElements = ["#text", "br", "wbr"]; | |
| 907 | - Object.keys(textContentSchema).filter((element) => !excludedElements.includes(element)).forEach((tag) => { | |
| 908 | - const { [tag]: removedTag, ...restSchema } = textContentSchema; | |
| 909 | - textContentSchema[tag].children = { | |
| 910 | - ...restSchema, | |
| 911 | - img: embeddedContentSchema.img | |
| 912 | - }; | |
| 913 | - }); | |
| 914 | 911 | var phrasingContentSchema = { |
| 915 | 912 | ...textContentSchema, |
| 916 | 913 | ...embeddedContentSchema |
| 917 | 914 | }; |
