Merge branch 'master' into domProps

Author: ntilwalli

.github/workflows/main.yml

@@ -0,0 +1,20 @@
+name: CI
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install
+        run: npm install
+      - name: Compile
+        run: npm run compile
+      - name: Test
+        run: npm test

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cycle/react",
-  "version": "2.7.0",
+  "version": "2.8.0",
   "description": "Utilities to interoperate between Cycle.js and React",
   "author": "Andre Staltz <[email protected]>",
   "license": "MIT",

src/h.ts

@@ -2,7 +2,7 @@ import {
   createElement,
   ReactElement,
   ReactNode,
-  ReactType,
+  ElementType,
   ReactHTML,
   Attributes,
 } from 'react';
@@ -29,7 +29,7 @@ type PropsLike<P> = P & PropsExtensions & Attributes;
 type Children = string | Array<ReactNode>;
 
 function createElementSpreading<P = any>(
-  type: ReactType<P> | keyof ReactHTML,
+  type: ElementType<P> | keyof ReactHTML,
   props: PropsLike<P> | null,
   children: Children,
 ): ReactElement<P> {
@@ -41,7 +41,7 @@ function createElementSpreading<P = any>(
 }
 
 function hyperscriptProps<P = any>(
-  type: ReactType<P> | keyof ReactHTML,
+  type: ElementType<P> | keyof ReactHTML,
   props: PropsLike<P>,
 ): ReactElement<P> {
   if (!shouldIncorporate(props)) {
@@ -52,14 +52,14 @@ function hyperscriptProps<P = any>(
 }
 
 function hyperscriptChildren<P = any>(
-  type: ReactType<P> | keyof ReactHTML,
+  type: ElementType<P> | keyof ReactHTML,
   children: Children,
 ): ReactElement<P> {
   return createElementSpreading(type, null, children);
 }
 
 function hyperscriptPropsChildren<P = any>(
-  type: ReactType<P> | keyof ReactHTML,
+  type: ElementType<P> | keyof ReactHTML,
   props: PropsLike<P>,
   children: Children,
 ): ReactElement<P> {
@@ -71,7 +71,7 @@ function hyperscriptPropsChildren<P = any>(
 }
 
 export function h<P = any>(
-  type: ReactType<P> | keyof ReactHTML,
+  type: ElementType<P> | keyof ReactHTML,
   a?: PropsLike<P> | Children,
   b?: Children,
 ): ReactElement<P> {