Merge pull request #3382 from memark/prepare-react-19

JustFly1984 · web-flow · commit b383fb0dd79a · 2024-10-09T01:34:28.000+07:00
Prepare for React 19
diff --git a/packages/react-google-maps-api-gatsby-example/src/examples/example-directions.tsx b/packages/react-google-maps-api-gatsby-example/src/examples/example-directions.tsx
@@ -6,6 +6,7 @@ import {
 } from '@react-google-maps/api'
 import * as PropTypes from 'prop-types'
 import {
+  type JSX,
   memo,
   useCallback,
   useMemo,
diff --git a/packages/react-google-maps-api-gatsby-example/src/examples/example-drawing.tsx b/packages/react-google-maps-api-gatsby-example/src/examples/example-drawing.tsx
@@ -1,5 +1,5 @@
 // eslint-disable-next-line node/no-extraneous-import
-import { type CSSProperties, memo } from 'react'
+import { type CSSProperties, type JSX, memo } from 'react'
 import PropTypes from 'prop-types'
 import { GoogleMap, DrawingManager } from '@react-google-maps/api'
 
diff --git a/packages/react-google-maps-api-gatsby-example/src/examples/example-ground.tsx b/packages/react-google-maps-api-gatsby-example/src/examples/example-ground.tsx
@@ -1,5 +1,5 @@
 // eslint-disable-next-line node/no-extraneous-import
-import { type CSSProperties, memo } from 'react'
+import { type CSSProperties, type JSX, memo } from 'react'
 import PropTypes from 'prop-types'
 import { GoogleMap, GroundOverlay } from '@react-google-maps/api'
 
diff --git a/packages/react-google-maps-api-gatsby-example/src/examples/example-heatmap.tsx b/packages/react-google-maps-api-gatsby-example/src/examples/example-heatmap.tsx
@@ -1,5 +1,5 @@
 // eslint-disable-next-line node/no-extraneous-import
-import { type CSSProperties, memo, useMemo } from 'react'
+import { type CSSProperties, type JSX, memo, useMemo } from 'react'
 import PropTypes from 'prop-types'
 import {
   GoogleMap,
diff --git a/packages/react-google-maps-api-gatsby-example/src/examples/example-options.tsx b/packages/react-google-maps-api-gatsby-example/src/examples/example-options.tsx
@@ -1,5 +1,5 @@
 // eslint-disable-next-line node/no-extraneous-import
-import { type CSSProperties, memo } from 'react'
+import { type CSSProperties, type JSX, memo } from 'react'
 import PropTypes from 'prop-types'
 import { GoogleMap } from '@react-google-maps/api'
 
diff --git a/packages/react-google-maps-api-gatsby-example/src/examples/example-overlay-view.tsx b/packages/react-google-maps-api-gatsby-example/src/examples/example-overlay-view.tsx
@@ -1,5 +1,5 @@
 // eslint-disable-next-line node/no-extraneous-import
-import { type CSSProperties, memo, useCallback, useState } from 'react'
+import { type CSSProperties, type JSX, memo, useCallback, useState } from 'react'
 import PropTypes from 'prop-types'
 import { GoogleMap, OverlayViewF, MarkerF, OVERLAY_MOUSE_TARGET, MARKER_LAYER,  } from '@react-google-maps/api'
 
diff --git a/packages/react-google-maps-api-gatsby-example/src/examples/example-search-box.tsx b/packages/react-google-maps-api-gatsby-example/src/examples/example-search-box.tsx
@@ -1,5 +1,5 @@
 // eslint-disable-next-line node/no-extraneous-import
-import { type CSSProperties, memo } from 'react'
+import { type CSSProperties, type JSX, memo } from 'react'
 import PropTypes from 'prop-types'
 import { GoogleMap, StandaloneSearchBox } from '@react-google-maps/api'
 
diff --git a/packages/react-google-maps-api-gatsby-example/src/examples/example-shapes.tsx b/packages/react-google-maps-api-gatsby-example/src/examples/example-shapes.tsx
@@ -1,5 +1,5 @@
 // eslint-disable-next-line node/no-extraneous-import
-import { type CSSProperties, memo, useCallback, useMemo, useState, ChangeEventHandler } from 'react'
+import { type CSSProperties, type JSX, memo, useCallback, useMemo, useState, ChangeEventHandler } from 'react'
 import PropTypes from 'prop-types'
 import {
   GoogleMap,
diff --git a/packages/react-google-maps-api-gatsby-example/src/examples/example-traffic.tsx b/packages/react-google-maps-api-gatsby-example/src/examples/example-traffic.tsx
@@ -1,5 +1,5 @@
 // eslint-disable-next-line node/no-extraneous-import
-import { type CSSProperties, memo } from 'react'
+import { type CSSProperties, type JSX, memo } from 'react'
 import PropTypes from 'prop-types'
 import { GoogleMap, TrafficLayer } from '@react-google-maps/api'
 
diff --git a/packages/react-google-maps-api-gatsby-example/src/examples/example-transit.tsx b/packages/react-google-maps-api-gatsby-example/src/examples/example-transit.tsx
@@ -1,5 +1,5 @@
 // eslint-disable-next-line node/no-extraneous-import
-import { type CSSProperties, memo } from 'react'
+import { type CSSProperties, type JSX, memo } from 'react'
 import PropTypes from 'prop-types'
 import { GoogleMap, TransitLayer } from '@react-google-maps/api'
 
diff --git a/packages/react-google-maps-api/src/LoadScript.tsx b/packages/react-google-maps-api/src/LoadScript.tsx
@@ -1,4 +1,4 @@
-import { createRef, PureComponent, type ReactNode, type RefObject } from 'react'
+import { createRef, type JSX, PureComponent, type ReactNode, type RefObject } from 'react'
 import invariant from 'invariant'
 
 import { injectScript } from './utils/injectscript'
diff --git a/packages/react-google-maps-api/src/__tests__/components/circle.test.tsx b/packages/react-google-maps-api/src/__tests__/components/circle.test.tsx
@@ -1,8 +1,8 @@
 /**
  * @jest-environment jsdom
  */
-import type { JSX } from 'react'
 
+import { type JSX } from "react"
 import { render, cleanup } from "@testing-library/react"
 import GoogleMap from  "../../GoogleMap"
 import Circle, { type CircleProps } from '../../components/drawing/Circle'
diff --git a/packages/react-google-maps-api/src/components/addons/MarkerClusterer.tsx b/packages/react-google-maps-api/src/components/addons/MarkerClusterer.tsx
@@ -1,5 +1,6 @@
 import {
   type ContextType,
+  type JSX,
   PureComponent,
   useState,
   memo,
diff --git a/packages/react-google-maps-api/src/components/directions/DirectionsRenderer.md b/packages/react-google-maps-api/src/components/directions/DirectionsRenderer.md
@@ -2,7 +2,7 @@
 
 ```jsx
 const ScriptLoaded = require("../../docs/ScriptLoaded").default;
-import React, { memo, useCallback, useMemo, useRef, useState } from 'react';
+import React, { type JSX, memo, useCallback, useMemo, useRef, useState } from 'react';
 
 import {
   GoogleMap,
diff --git a/packages/react-google-maps-api/src/components/directions/DirectionsRenderer.tsx b/packages/react-google-maps-api/src/components/directions/DirectionsRenderer.tsx
@@ -1,4 +1,4 @@
-import { type ContextType, PureComponent } from 'react'
+import { type ContextType, type JSX, PureComponent } from 'react'
 
 import { unregisterEvents, applyUpdatersToPropsAndRegisterEvents } from '../../utils/helper'
 
diff --git a/packages/react-google-maps-api/src/components/dom/OverlayView.stories.tsx b/packages/react-google-maps-api/src/components/dom/OverlayView.stories.tsx
@@ -1,5 +1,6 @@
 // eslint-disable-next-line node/no-extraneous-import
 import type { StoryFn, Meta } from '@storybook/react'
+import { type JSX } from "react"
 import GoogleMap from '../../GoogleMap'
 import { OverlayViewF, OVERLAY_LAYER } from './OverlayView'
 
diff --git a/packages/react-google-maps-api/src/components/drawing/Marker.tsx b/packages/react-google-maps-api/src/components/drawing/Marker.tsx
@@ -11,6 +11,7 @@ import {
   type ReactNode,
   type ContextType,
   type ReactElement,
+  type JSX,
 } from 'react'
 
 import { unregisterEvents, applyUpdatersToPropsAndRegisterEvents } from '../../utils/helper'
diff --git a/packages/react-google-maps-api/src/components/places/Autocomplete.tsx b/packages/react-google-maps-api/src/components/places/Autocomplete.tsx
@@ -1,4 +1,4 @@
-import { Children, type ContextType, createRef, PureComponent, type ReactChild, type RefObject } from 'react'
+import { Children, type ContextType, createRef, type JSX, PureComponent, type ReactNode, type RefObject } from 'react'
 
 import { unregisterEvents, applyUpdatersToPropsAndRegisterEvents } from '../../utils/helper'
 
@@ -43,7 +43,7 @@ interface AutocompleteState {
 
 export interface AutocompleteProps {
   // required
-  children: ReactChild
+  children: ReactNode
   /** The area in which to search for places. */
   bounds?: google.maps.LatLngBounds | google.maps.LatLngBoundsLiteral | undefined
   /** The component restrictions. Component restrictions are used to restrict predictions to only those within the parent component. For example, the country. */
diff --git a/packages/react-google-maps-api/src/components/places/StandaloneSearchBox.tsx b/packages/react-google-maps-api/src/components/places/StandaloneSearchBox.tsx
@@ -1,4 +1,4 @@
-import { Children, type ContextType, createRef, PureComponent, type ReactNode, type RefObject } from 'react'
+import { Children, type ContextType, createRef, type JSX, PureComponent, type ReactNode, type RefObject } from 'react'
 
 import invariant from 'invariant'
 
diff --git a/packages/react-google-maps-api/src/docs/DocsApiKeyInput.tsx b/packages/react-google-maps-api/src/docs/DocsApiKeyInput.tsx
@@ -1,4 +1,4 @@
-import { type ChangeEvent, Component, type FormEvent, type ReactNode } from 'react'
+import { type ChangeEvent, Component, type JSX, type FormEvent, type ReactNode } from 'react'
 import { setKey, getKey } from './docs-api-key'
 
 import LoadScript from '../LoadScript'
diff --git a/packages/react-google-maps-api/src/docs/ScriptLoaded.tsx b/packages/react-google-maps-api/src/docs/ScriptLoaded.tsx
@@ -1,12 +1,12 @@
-import { Component, type ReactChild, type ReactChildren } from 'react'
+import { Component, type JSX, type ReactNode } from 'react'
 
 interface ScriptLoadedState {
   scriptLoaded: boolean
 }
 
 interface ScriptLoadedProps {
   // eslint-disable-next-line @typescript-eslint/ban-types
-  children: ReactChild | ReactChildren | Function
+  children: ReactNode | ReactNode[] | Function
 }
 
 function SpanIntro(): JSX.Element {
