Merge branch 'master' into types/compat-forward-ref-exotic-component

preactjs · May 17, 2023 · a24d26b · a24d26b
2 parents 93bf0e6 + 19f4176
commit a24d26b
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
           npm run lint
           npm run test:unit
       - name: Coveralls GitHub Action
-        uses: coverallsapp/github-action@1.1.3
+        uses: coverallsapp/github-action@v2.1.2
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
       - name: Package

diff --git a/compat/src/index.d.ts b/compat/src/index.d.ts
@@ -74,7 +74,7 @@ declare namespace React {
 
 	export function createPortal(
 		vnode: preact.VNode,
-		container: Element
+		container: Element | DocumentFragment
 	): preact.VNode<any>;
 
 	export function render(

diff --git a/compat/src/render.js b/compat/src/render.js
@@ -118,10 +118,10 @@ options.event = e => {
  */
 function afterEvent(eventType, target) {
 	if (target.value != null) {
-		target.value = target._prevValue;
+		Promise.resolve().then(() => (target.value = target._prevValue));
 	}
 	if (eventType === 'change' && target.checked != null) {
-		target.checked = target._prevValue;
+		Promise.resolve().then(() => (target.checked = target._prevValue));
 	}
 }
 

diff --git a/compat/test/browser/controlledInput.test.js b/compat/test/browser/controlledInput.test.js
@@ -168,7 +168,7 @@ describe('preact/compat controlled inputs', () => {
 		render(<Input />, scratch);
 
 		scratch.firstChild.value = 'A';
-		fireEvent(scratch.firstChild, 'change');
+		await fireEvent(scratch.firstChild, 'change');
 		expect(calls).to.deep.equal(['A']);
 		expect(scratch.firstChild.value).to.equal('A');
 
@@ -208,6 +208,8 @@ describe('preact/compat controlled inputs', () => {
 
 		scratch.firstChild.checked = false;
 		await fireEvent(scratch.firstChild, 'change');
+		// Have to wait for the microtick
+		await new Promise(res => setTimeout(res));
 		expect(calls).to.deep.equal([false]);
 		expect(scratch.firstChild.checked).to.equal(true);
 	});

diff --git a/devtools/src/devtools.js b/devtools/src/devtools.js
@@ -2,7 +2,7 @@ import { options, Fragment, Component } from 'preact';
 
 export function initDevTools() {
 	if (typeof window != 'undefined' && window.__PREACT_DEVTOOLS__) {
-		window.__PREACT_DEVTOOLS__.attachPreact('10.13.2', options, {
+		window.__PREACT_DEVTOOLS__.attachPreact('10.14.1', options, {
 			Fragment,
 			Component
 		});

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "preact",
   "amdName": "preact",
-  "version": "10.13.2",
+  "version": "10.14.1",
   "private": false,
   "description": "Fast 3kb React-compatible Virtual DOM library.",
   "main": "dist/preact.js",

diff --git a/src/diff/props.js b/src/diff/props.js
@@ -117,6 +117,8 @@ export function setProperty(dom, name, value, oldValue, isSvg) {
 			// cast to `0` instead
 			name !== 'tabIndex' &&
 			name !== 'download' &&
+			name !== 'rowSpan' &&
+			name !== 'colSpan' &&
 			name in dom
 		) {
 			try {

diff --git a/src/jsx.d.ts b/src/jsx.d.ts
@@ -2097,7 +2097,7 @@ export namespace JSXInternal {
 		animate: SVGAttributes<SVGAnimateElement>;
 		circle: SVGAttributes<SVGCircleElement>;
 		animateMotion: SVGAttributes<SVGAnimateMotionElement>;
-		animateTransform: SVGAttributes<SVGAnimateElement>;
+		animateTransform: SVGAttributes<SVGAnimateTransformElement>;
 		clipPath: SVGAttributes<SVGClipPathElement>;
 		defs: SVGAttributes<SVGDefsElement>;
 		desc: SVGAttributes<SVGDescElement>;

diff --git a/test/browser/render.test.js b/test/browser/render.test.js
@@ -414,6 +414,48 @@ describe('render()', () => {
 		});
 	}
 
+	// Test for #3969
+	it('should clear rowspan and colspan', () => {
+		let update;
+		class App extends Component {
+			constructor(props) {
+				super(props);
+				this.state = { active: true };
+				update = this.setState.bind(this);
+			}
+
+			render() {
+				return (
+					<div>
+						{this.state.active ? (
+							<table>
+								<tr>
+									<td rowSpan={2} colSpan={2}>
+										Foo
+									</td>
+								</tr>
+							</table>
+						) : (
+							<table>
+								<tr>
+									<td>Foo</td>
+								</tr>
+							</table>
+						)}
+					</div>
+				);
+			}
+		}
+
+		render(<App />, scratch);
+
+		update({ active: false });
+		rerender();
+
+		expect(scratch.querySelector('td[rowspan]')).to.equal(null);
+		expect(scratch.querySelector('td[colspan]')).to.equal(null);
+	});
+
 	// Test for preactjs/preact#651
 	it('should set enumerable boolean attribute', () => {
 		render(<input spellcheck={false} />, scratch);