@wordpress/dom 4.52.0 → 4.54.0

package/src/dom/get-rectangle-from-range.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import { assertIsDefined } from '../utils/assert-is-defined';
 
 /**
@@ -91,6 +88,36 @@ export default function getRectangleFromRange( range ) {
 		return null;
 	}
 
+	// A collapsed range at a soft line wrap is equally ambiguous: the same
+	// position ends one line and starts the next. Some browsers (Gecko)
+	// return a single rectangle for it, on the upper line, regardless of
+	// where the caret is. Detect the boundary by measuring the characters
+	// around the position: when they sit on different lines, there is no
+	// way to know which line the caret is on, so don't return anything.
+	if (
+		rects.length === 1 &&
+		startContainer.nodeType === startContainer.TEXT_NODE &&
+		range.startOffset > 0 &&
+		range.startOffset < /** @type {Text} */ ( startContainer ).length
+	) {
+		assertIsDefined( ownerDocument, 'ownerDocument' );
+		const measure = (
+			/** @type {number} */ start,
+			/** @type {number} */ end
+		) => {
+			const charRange = ownerDocument.createRange();
+			charRange.setStart( startContainer, start );
+			charRange.setEnd( startContainer, end );
+			return charRange.getBoundingClientRect();
+		};
+		const before = measure( range.startOffset - 1, range.startOffset );
+		const after = measure( range.startOffset, range.startOffset + 1 );
+
+		if ( before.bottom <= after.top ) {
+			return null;
+		}
+	}
+
 	let rect = rects[ 0 ];
 
 	// If the collapsed range starts (and therefore ends) at an element node,

package/src/dom/get-scroll-container.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import getComputedStyle from './get-computed-style';
 
 /**

package/src/dom/hidden-caret-range-from-point.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import caretRangeFromPoint from './caret-range-from-point';
 import getComputedStyle from './get-computed-style';
 

package/src/dom/input-field-has-uncollapsed-selection.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import isTextField from './is-text-field';
 import isHTMLInputElement from './is-html-input-element';
 

package/src/dom/insert-after.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import { assertIsDefined } from '../utils/assert-is-defined';
 
 /**

package/src/dom/is-edge.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import isRTL from './is-rtl';
 import getRangeHeight from './get-range-height';
 import getRectangleFromRange from './get-rectangle-from-range';

package/src/dom/is-entirely-selected.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import { assertIsDefined } from '../utils/assert-is-defined';
 import isInputOrTextArea from './is-input-or-text-area';
 

package/src/dom/is-form-element.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import isInputOrTextArea from './is-input-or-text-area';
 
 /**

package/src/dom/is-horizontal-edge.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import isEdge from './is-edge';
 
 /**

package/src/dom/is-number-input.js

@@ -1,11 +1,4 @@
-/**
- * WordPress dependencies
- */
 import deprecated from '@wordpress/deprecated';
-
-/**
- * Internal dependencies
- */
 import isHTMLInputElement from './is-html-input-element';
 
 /**

package/src/dom/is-rtl.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import getComputedStyle from './get-computed-style';
 
 /**

package/src/dom/is-selection-forward.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import { assertIsDefined } from '../utils/assert-is-defined';
 
 /**

package/src/dom/is-text-field.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import isHTMLInputElement from './is-html-input-element';
 
 /**

package/src/dom/is-vertical-edge.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import isEdge from './is-edge';
 
 /**

package/src/dom/place-caret-at-edge.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import hiddenCaretRangeFromPoint from './hidden-caret-range-from-point';
 import { assertIsDefined } from '../utils/assert-is-defined';
 import isInputOrTextArea from './is-input-or-text-area';

package/src/dom/place-caret-at-horizontal-edge.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import placeCaretAtEdge from './place-caret-at-edge';
 
 /**

package/src/dom/place-caret-at-vertical-edge.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import placeCaretAtEdge from './place-caret-at-edge';
 
 /**

package/src/dom/remove-invalid-html.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import cleanNodeList from './clean-node-list';
 
 /**

package/src/dom/remove.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import { assertIsDefined } from '../utils/assert-is-defined';
 
 /**

package/src/dom/replace-tag.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import { assertIsDefined } from '../utils/assert-is-defined';
 
 /**

package/src/dom/replace.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import { assertIsDefined } from '../utils/assert-is-defined';
 import insertAfter from './insert-after';
 import remove from './remove';

package/src/dom/safe-html.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import remove from './remove';
 
 /**

package/src/dom/strip-html.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import safeHTML from './safe-html';
 
 /**

package/src/dom/test/safe-html.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import safeHTML from '../safe-html';
 
 describe( 'safeHTML', () => {

package/src/dom/test/strip-html.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import stripHTML from '../strip-html';
 
 describe( 'stripHTML', () => {

package/src/dom/unwrap.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import { assertIsDefined } from '../utils/assert-is-defined';
 
 /**

package/src/dom/wrap.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import { assertIsDefined } from '../utils/assert-is-defined';
 
 /**

package/src/index.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import * as focusable from './focusable';
 import * as tabbable from './tabbable';
 

package/src/tabbable.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import { find as findFocusable } from './focusable';
 
 /**
@@ -127,7 +124,7 @@ function compareObjectTabbables( a, b ) {
 }
 
 /**
- * Givin focusable elements, filters out tabbable element.
+ * Given focusable elements, filters out tabbable element.
  *
  * @param {HTMLElement[]} focusables Focusable elements to filter.
  *

package/src/test/dom.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import {
 	isHorizontalEdge,
 	placeCaretAtHorizontalEdge,
@@ -8,7 +5,6 @@ import {
 	removeInvalidHTML,
 	isEmpty,
 } from '../dom';
-
 import { getPhrasingContentSchema } from '../phrasing-content';
 
 describe( 'DOM', () => {
@@ -286,6 +282,24 @@ describe( 'removeInvalidHTML', () => {
 		const output = '<p>test</p>';
 		expect( removeInvalidHTML( input, schema ) ).toEqual( output );
 	} );
+
+	it( 'should preserve whitespace from inline elements containing only whitespace', () => {
+		const input = 'The following space:<em> </em>should not be removed.';
+		const output = 'The following space: should not be removed.';
+		expect( removeInvalidHTML( input, schema ) ).toBe( output );
+	} );
+
+	it( 'should still remove truly empty inline elements', () => {
+		const input = 'no space:<em></em>here';
+		const output = 'no space:here';
+		expect( removeInvalidHTML( input, schema ) ).toBe( output );
+	} );
+
+	it( 'should still remove empty block-level elements that should have children', () => {
+		const input = '<figure> </figure>';
+		const output = '';
+		expect( removeInvalidHTML( input, schema ) ).toBe( output );
+	} );
 } );
 
 describe( 'isEmpty', () => {

package/src/test/focusable.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import createElement from './utils/create-element';
 import { find } from '../focusable';
 

package/src/test/tabbable.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import createElement from './utils/create-element';
 import { find } from '../tabbable';
 

package/src/test/utils.js

@@ -1,6 +1,3 @@
-/**
- * Internal dependencies
- */
 import { assertIsDefined } from '../utils/assert-is-defined';
 
 describe( 'assertIsDefined', () => {