@instructure/ui-react-utils 8.10.1-snapshot.9 → 8.10.3-snapshot.2

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [8.10.2](https://github.com/instructure/instructure-ui/compare/v8.10.1...v8.10.2) (2021-10-01)
+
+**Note:** Version bump only for package @instructure/ui-react-utils
+
+## [8.10.1](https://github.com/instructure/instructure-ui/compare/v8.10.0...v8.10.1) (2021-10-01)
+
+**Note:** Version bump only for package @instructure/ui-react-utils
+
 # [8.10.0](https://github.com/instructure/instructure-ui/compare/v8.9.1...v8.10.0) (2021-09-28)
 
 **Note:** Version bump only for package @instructure/ui-react-utils

package/es/safeCloneElement.js

@@ -38,6 +38,7 @@ function safeCloneElement(element, props, ...children) {
   const cloneRef = props.ref;
   const originalRef = element.ref;
   const originalRefIsAFunction = typeof originalRef === 'function';
+  const cloneRefIsFunction = typeof cloneRef === 'function';
   const mergedProps = { ...props
   };
 
@@ -73,8 +74,13 @@ Ignoring ref: ${originalRef}`);
   return /*#__PURE__*/React.cloneElement(element, { ...mergedProps,
 
     ref(component) {
-      ;
-      cloneRef(component);
+      if (cloneRefIsFunction) {
+        ;
+        cloneRef(component);
+      } else {
+        cloneRef.current = component;
+      }
+
       originalRef(component);
     }
 

package/lib/safeCloneElement.js

@@ -51,6 +51,7 @@ function safeCloneElement(element, props, ...children) {
   const cloneRef = props.ref;
   const originalRef = element.ref;
   const originalRefIsAFunction = typeof originalRef === 'function';
+  const cloneRefIsFunction = typeof cloneRef === 'function';
   const mergedProps = { ...props
   };
 
@@ -86,8 +87,13 @@ Ignoring ref: ${originalRef}`);
   return /*#__PURE__*/_react.default.cloneElement(element, { ...mergedProps,
 
     ref(component) {
-      ;
-      cloneRef(component);
+      if (cloneRefIsFunction) {
+        ;
+        cloneRef(component);
+      } else {
+        cloneRef.current = component;
+      }
+
       originalRef(component);
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/ui-react-utils",
-  "version": "8.10.1-snapshot.9+93b506fe0",
+  "version": "8.10.3-snapshot.2+ccdf8f43b",
   "description": "A React utility library made by Instructure Inc.",
   "author": "Instructure, Inc. Engineering and Product Design",
   "type": "commonjs",
@@ -23,17 +23,17 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "@instructure/ui-babel-preset": "8.10.1-snapshot.9+93b506fe0",
-    "@instructure/ui-test-utils": "8.10.1-snapshot.9+93b506fe0"
+    "@instructure/ui-babel-preset": "8.10.3-snapshot.2+ccdf8f43b",
+    "@instructure/ui-test-utils": "8.10.3-snapshot.2+ccdf8f43b"
   },
   "dependencies": {
     "@babel/runtime": "^7.13.10",
     "@emotion/is-prop-valid": "^1",
-    "@instructure/console": "8.10.1-snapshot.9+93b506fe0",
-    "@instructure/shared-types": "8.10.1-snapshot.9+93b506fe0",
-    "@instructure/ui-decorator": "8.10.1-snapshot.9+93b506fe0",
-    "@instructure/ui-dom-utils": "8.10.1-snapshot.9+93b506fe0",
-    "@instructure/ui-utils": "8.10.1-snapshot.9+93b506fe0",
+    "@instructure/console": "8.10.3-snapshot.2+ccdf8f43b",
+    "@instructure/shared-types": "8.10.3-snapshot.2+ccdf8f43b",
+    "@instructure/ui-decorator": "8.10.3-snapshot.2+ccdf8f43b",
+    "@instructure/ui-dom-utils": "8.10.3-snapshot.2+ccdf8f43b",
+    "@instructure/ui-utils": "8.10.3-snapshot.2+ccdf8f43b",
     "prop-types": "^15"
   },
   "peerDependencies": {
@@ -44,5 +44,5 @@
     "access": "public"
   },
   "sideEffects": false,
-  "gitHead": "93b506fe0860718ebe2cc2729fd023e3e7489231"
+  "gitHead": "ccdf8f43b56a8edef32600281692dfeb436d5a01"
 }

package/src/safeCloneElement.ts

@@ -46,6 +46,7 @@ function safeCloneElement<
   const cloneRef = props.ref
   const originalRef = element.ref
   const originalRefIsAFunction = typeof originalRef === 'function'
+  const cloneRefIsFunction = typeof cloneRef === 'function'
 
   const mergedProps = { ...props }
 
@@ -92,7 +93,12 @@ Ignoring ref: ${originalRef}`
     {
       ...mergedProps,
       ref(component: any) {
-        ;(cloneRef as (instance: any) => void)(component)
+        if (cloneRefIsFunction) {
+          ;(cloneRef as (instance: any) => void)(component)
+        } else {
+          //@ts-expect-error needed for backwards compat
+          cloneRef.current = component
+        }
         originalRef(component)
       }
     },

package/types/safeCloneElement.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"safeCloneElement.d.ts","sourceRoot":"","sources":["../src/safeCloneElement.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,EAAE,eAAe,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAKvE;;;;;;;;GAQG;AACH,iBAAS,gBAAgB,CACvB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG;IAAE,KAAK,CAAC,EAAE,GAAG,CAAA;CAAE,GAAG,eAAe,CAAC,CAAC,CAAC,EAEpE,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG;IAAE,GAAG,CAAC,EAAE,GAAG,CAAA;CAAE,EACxC,KAAK,EAAE,CAAC,EACR,GAAG,QAAQ,EAAE,SAAS,EAAE,oEAyDzB;AAED,eAAe,gBAAgB,CAAA;AAC/B,OAAO,EAAE,gBAAgB,EAAE,CAAA"}
+{"version":3,"file":"safeCloneElement.d.ts","sourceRoot":"","sources":["../src/safeCloneElement.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAAE,EAAE,eAAe,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAKvE;;;;;;;;GAQG;AACH,iBAAS,gBAAgB,CACvB,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG;IAAE,KAAK,CAAC,EAAE,GAAG,CAAA;CAAE,GAAG,eAAe,CAAC,CAAC,CAAC,EAEpE,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG;IAAE,GAAG,CAAC,EAAE,GAAG,CAAA;CAAE,EACxC,KAAK,EAAE,CAAC,EACR,GAAG,QAAQ,EAAE,SAAS,EAAE,oEA+DzB;AAED,eAAe,gBAAgB,CAAA;AAC/B,OAAO,EAAE,gBAAgB,EAAE,CAAA"}