@instructure/ui-react-utils 10.16.1-snapshot-0 → 10.16.1-snapshot-1

package/lib/ensureSingleChild.js

@@ -1,13 +1,13 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 exports.ensureSingleChild = ensureSingleChild;
-var _react = _interopRequireWildcard(require("react"));
+var _react = require("react");
 var _safeCloneElement = require("./safeCloneElement");
+var _jsxRuntime = require("@emotion/react/jsx-runtime");
 /*
  * The MIT License (MIT)
  *
@@ -45,13 +45,15 @@ var _safeCloneElement = require("./safeCloneElement");
  * @param {ReactNode} child
  * @param {Object} props - props for child
  * @returns {ReactElement|null} cloned instance for a single child, or children wrapped in a span
- */
-function ensureSingleChild(child, props = {}) {
+ */function ensureSingleChild(child, props = {}) {
   const childCount = _react.Children.count(child);
   if (childCount === 0) {
     return null;
   } else if (typeof child === 'string' && child.length > 0 || childCount > 1) {
-    return /*#__PURE__*/_react.default.createElement("span", props, child);
+    return (0, _jsxRuntime.jsx)("span", {
+      ...props,
+      children: child
+    });
   } else {
     // TODO: check that we can only end up here if child is ReactElement
     return (0, _safeCloneElement.safeCloneElement)(Array.isArray(child) ? child[0] : child, props);

package/lib/safeCloneElement.js

@@ -1,12 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 exports.safeCloneElement = safeCloneElement;
-var _react = _interopRequireDefault(require("react"));
+var _react = require("react");
 var _console = require("@instructure/console");
 var _createChainedFunction = require("@instructure/ui-utils/lib/createChainedFunction.js");
 /*
@@ -74,12 +73,12 @@ function safeCloneElement(element, props, ...children) {
     }
   });
   if (originalRef == null || cloneRef == null) {
-    return /*#__PURE__*/_react.default.cloneElement(element, mergedProps, ...children);
+    return /*#__PURE__*/(0, _react.cloneElement)(element, mergedProps, ...children);
   }
   (0, _console.logWarn)(originalRefIsAFunction, `Cloning an element with a ref that will be overwritten because the ref \
 is not a function. Use a composable callback-style ref instead. \
 Ignoring ref: ${originalRef}`);
-  return /*#__PURE__*/_react.default.cloneElement(element, {
+  return /*#__PURE__*/(0, _react.cloneElement)(element, {
     ...mergedProps,
     ref(component) {
       if (cloneRefIsFunction) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/ui-react-utils",
-  "version": "10.16.1-snapshot-0",
+  "version": "10.16.1-snapshot-1",
   "description": "A React utility library made by Instructure Inc.",
   "author": "Instructure, Inc. Engineering and Product Design",
   "module": "./es/index.js",
@@ -22,7 +22,7 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@instructure/ui-babel-preset": "10.16.1-snapshot-0",
+    "@instructure/ui-babel-preset": "10.16.1-snapshot-1",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.0.1",
     "vitest": "^2.1.8"
@@ -30,11 +30,11 @@
   "dependencies": {
     "@babel/runtime": "^7.26.0",
     "@emotion/is-prop-valid": "^1.3.1",
-    "@instructure/console": "10.16.1-snapshot-0",
-    "@instructure/shared-types": "10.16.1-snapshot-0",
-    "@instructure/ui-decorator": "10.16.1-snapshot-0",
-    "@instructure/ui-dom-utils": "10.16.1-snapshot-0",
-    "@instructure/ui-utils": "10.16.1-snapshot-0",
+    "@instructure/console": "10.16.1-snapshot-1",
+    "@instructure/shared-types": "10.16.1-snapshot-1",
+    "@instructure/ui-decorator": "10.16.1-snapshot-1",
+    "@instructure/ui-dom-utils": "10.16.1-snapshot-1",
+    "@instructure/ui-utils": "10.16.1-snapshot-1",
     "hoist-non-react-statics": "^3.3.2",
     "prop-types": "^15.8.1"
   },

package/src/DeterministicIdContext/DeterministicIdContextProvider.tsx

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-import React from 'react'
+
 import {
   DeterministicIdContext,
   defaultDeterministicIDMap

package/src/DeterministicIdContext/withDeterministicId.tsx

@@ -21,7 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
-import React, { forwardRef, useContext } from 'react'
+import { ComponentClass, forwardRef, useContext } from 'react'
 import type {
   ForwardRefExoticComponent,
   PropsWithoutRef,
@@ -50,7 +50,7 @@ type WithDeterministicIdProps = {
 const withDeterministicId = decorator((ComposedComponent: InstUIComponent) => {
   type Props = PropsWithoutRef<Record<string, unknown>> & RefAttributes<any>
   const WithDeterministicId: ForwardRefExoticComponent<Props> & {
-    originalType?: React.ComponentClass
+    originalType?: ComponentClass
   } = forwardRef((props: Props, ref: React.ForwardedRef<any>) => {
     const componentName =
       ComposedComponent.componentId ||

package/src/__new-tests__/DeterministicIdContext.test.tsx

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-import React from 'react'
+import { Component } from 'react'
 
 import { render, screen } from '@testing-library/react'
 import '@testing-library/jest-dom'
@@ -34,7 +34,7 @@ import {
 import type { WithDeterministicIdProps } from '../DeterministicIdContext'
 
 @withDeterministicId()
-class TestComponent extends React.Component<
+class TestComponent extends Component<
   React.PropsWithChildren<WithDeterministicIdProps>
 > {
   render() {
@@ -46,7 +46,7 @@ class TestComponent extends React.Component<
   }
 }
 
-class WrapperComponent extends React.Component {
+class WrapperComponent extends Component {
   render() {
     return (
       <div>

package/src/__new-tests__/callRenderProp.test.tsx

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-import React from 'react'
+import { Component } from 'react'
 import PropTypes from 'prop-types'
 
 import { render } from '@testing-library/react'
@@ -56,7 +56,7 @@ describe('callRenderProp', () => {
   })
 
   it('React classes', () => {
-    class Foo extends React.Component {
+    class Foo extends Component {
       render() {
         return <div>hello</div>
       }
@@ -112,7 +112,7 @@ describe('callRenderProp', () => {
 
     it('should pass props correctly to React classes', () => {
       type FooProps = { shape?: string }
-      class Foo extends React.Component<FooProps> {
+      class Foo extends Component<FooProps> {
         static propTypes = {
           shape: PropTypes.oneOf(['circle', 'rectangle'])
         }

package/src/__new-tests__/deprecated.test.tsx

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-import React, { Component } from 'react'
+import { Component } from 'react'
 import { vi } from 'vitest'
 import PropTypes from 'prop-types'
 

package/src/__new-tests__/experimental.test.tsx

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-import React, { Component } from 'react'
+import { Component } from 'react'
 import { vi } from 'vitest'
 import PropTypes from 'prop-types'
 

package/src/__new-tests__/hack.test.tsx

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-import React, { Component } from 'react'
+import { Component } from 'react'
 import { vi } from 'vitest'
 import PropTypes from 'prop-types'
 

package/src/__new-tests__/safeCloneElement.test.tsx

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-import React, { ReactElement, ReactNode } from 'react'
+import { ReactElement, ReactNode } from 'react'
 import { vi } from 'vitest'
 
 import { createChainedFunction } from '@instructure/ui-utils'

package/src/ensureSingleChild.tsx

@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-import React, { Children, ReactElement, ReactNode } from 'react'
+import { Children, ReactElement, ReactNode } from 'react'
 import { safeCloneElement } from './safeCloneElement'
 
 /**

package/src/safeCloneElement.ts

@@ -22,13 +22,14 @@
  * SOFTWARE.
  */
 
-import React, {
+import {
   Attributes,
   FunctionComponentElement,
   ComponentElement,
   ReactElement,
   ReactNode,
-  DOMElement
+  DOMElement,
+  cloneElement
 } from 'react'
 
 import { logWarn as warn } from '@instructure/console'
@@ -93,7 +94,7 @@ function safeCloneElement<
   })
 
   if (originalRef == null || cloneRef == null) {
-    return React.cloneElement<P>(element, mergedProps, ...children) as E
+    return cloneElement<P>(element, mergedProps, ...children) as E
   }
 
   warn(
@@ -103,7 +104,7 @@ is not a function. Use a composable callback-style ref instead. \
 Ignoring ref: ${originalRef}`
   )
 
-  return React.cloneElement<P>(
+  return cloneElement<P>(
     element,
     {
       ...mergedProps,