wip commit 5

Author: balzss

packages/__docs__/src/Select/index.tsx

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-import { Component, Children } from 'react'
+import { Component, Children, ReactElement } from 'react'
 import PropTypes from 'prop-types'
 
 import { Select as UISelect } from '@instructure/ui-select'
@@ -77,7 +77,7 @@ class Select extends Component<SelectProps, SelectState> {
   getOptionData(options: React.ReactElement[]) {
     //TODO remove any
     const data: any = []
-    Children.forEach(options, (child: React.ReactElement) => {
+    Children.forEach(options, (child: ReactElement) => {
       const { value, children, ...rest } = child.props
       data.push({ value, label: children, ...rest })
     })

packages/emotion/src/InstUISettingsProvider/__tests__/InstUISettingProvider.test.tsx

@@ -22,12 +22,10 @@
  * SOFTWARE.
  */
 
- 
- 
+import { Component } from 'react'
 import { expect, mount, spy } from '@instructure/ui-test-utils'
 import canvas from '@instructure/ui-themes'
 import { InstUISettingsProvider } from '../index'
-import { jsx } from '../../index'
 import { textDirectionContextConsumer } from '@instructure/ui-i18n'
 import type { TextDirectionContextConsumerProps } from '@instructure/ui-i18n'
 

packages/ui-a11y-utils/src/hasVisibleChildren.ts

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-import { ReactNode } from 'react'
+import { Children, ReactNode } from 'react'
 import { matchComponentTypes } from '@instructure/ui-react-utils'
 
 import { ScreenReaderContent } from '@instructure/ui-a11y-content'

packages/ui-alerts/src/Alert/index.tsx

@@ -21,8 +21,8 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
- 
-import { Component } from 'react'
+
+import { Fragment, Component } from 'react'
 import ReactDOM from 'react-dom'
 import keycode from 'keycode'
 

packages/ui-breadcrumb/src/Breadcrumb/index.tsx

@@ -22,8 +22,8 @@
  * SOFTWARE.
  */
 
- 
-import { Component } from 'react'
+
+import { isValidElement, cloneElement, Children, Component } from 'react'
 
 import { View } from '@instructure/ui-view'
 import { testable } from '@instructure/ui-testable'
@@ -63,7 +63,7 @@ class Breadcrumb extends Component<BreadcrumbProps> {
   }
 
   addAriaCurrent = (child: React.ReactNode) => {
-    const updatedChild = React.cloneElement(
+    const updatedChild = cloneElement(
       child as React.ReactElement<{ 'aria-current'?: string }>,
       {
         'aria-current': 'page'
@@ -91,7 +91,7 @@ class Breadcrumb extends Component<BreadcrumbProps> {
 
     return Children.map(children, (child, index) => {
       const isLastElement = index === numChildren - 1
-      if (React.isValidElement(child)) {
+      if (isValidElement(child)) {
         const isCurrentPage = child.props.isCurrentPage || false
         if (isAriaCurrentSet && isCurrentPage) {
           console.warn(

packages/ui-checkbox/src/Checkbox/__new-tests__/Checkbox.test.tsx

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
- 
+import { createRef } from 'react'
 import { fireEvent, render, screen, waitFor } from '@testing-library/react'
 import { vi } from 'vitest'
 import userEvent from '@testing-library/user-event'
@@ -185,7 +185,7 @@ describe('<Checkbox />', () => {
     })
 
     it('focuses with the focus helper', () => {
-      const checkboxRef = React.createRef<Checkbox>()
+      const checkboxRef = createRef<Checkbox>()
       render(<Checkbox ref={checkboxRef} {...initProps} />)
       const checkboxElement = screen.getByRole('checkbox')
 

packages/ui-code-editor/src/CodeMirrorWrapper/index.tsx

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
- 
+import { Component } from 'react'
 import codemirror from 'codemirror'
 
 // Language modes

packages/ui-drawer-layout/src/DrawerLayout/index.tsx

@@ -22,8 +22,7 @@
  * SOFTWARE.
  */
 
- 
-import { Children, Component, createContext } from 'react'
+import { ComponentElement, Children, Component, createContext } from 'react'
 
 import { textDirectionContextConsumer } from '@instructure/ui-i18n'
 import {

packages/ui-drilldown/src/Drilldown/index.tsx

@@ -22,9 +22,7 @@
  * SOFTWARE.
  */
 
- 
- 
-import { Component, ReactElement, ReactNode } from 'react'
+import { Children, Component, ReactElement, ReactNode } from 'react'
 
 import { warn, error } from '@instructure/console'
 import { testable } from '@instructure/ui-testable'

packages/ui-flex/src/Flex/index.tsx

@@ -22,8 +22,7 @@
  * SOFTWARE.
  */
 
- 
-import { Children, Component } from 'react'
+import { ComponentElement, Children, Component } from 'react'
 
 import {
   safeCloneElement,