@ultraviolet/ui 1.15.0 → 1.15.1

package/dist/index.d.ts

@@ -1503,7 +1503,7 @@ type ModalProps = {
     hideOnClickOutside?: boolean;
     preventBodyScroll?: boolean;
     ariaLabel?: string;
-    disclosure?: ReactNode | ((state: ModalState) => ReactNode);
+    disclosure?: ReactElement | ((state: ModalState) => ReactElement);
     isClosable?: boolean;
     onClose?: () => void;
     onBeforeClose?: () => Promise<void> | void;

package/dist/src/components/Modal/Disclosure.js

@@ -1,4 +1,4 @@
-import { useEffect, isValidElement, cloneElement, createRef } from 'react';
+import { useEffect, useMemo, isValidElement, cloneElement, createRef } from 'react';
 
 const Disclosure = _ref => {
   let {
@@ -17,25 +17,27 @@ const Disclosure = _ref => {
       element?.removeEventListener('click', handleOpen);
     };
   }, [handleOpen, disclosureRef]);
-  if (typeof disclosure === 'function') {
-    return disclosure({
-      visible,
-      onClose: handleClose,
-      toggle,
-      onOpen: handleOpen,
-      modalId: id,
-      hide: handleClose
-    });
+  const finalDisclosure = useMemo(() => {
+    if (typeof disclosure === 'function') {
+      return disclosure({
+        visible,
+        onClose: handleClose,
+        toggle,
+        onOpen: handleOpen,
+        modalId: id,
+        hide: handleClose
+      });
+    }
+    return disclosure;
+  }, [disclosure, handleOpen, handleClose, id, toggle, visible]);
+  if (! /*#__PURE__*/isValidElement(finalDisclosure)) {
+    return null;
   }
-  if ( /*#__PURE__*/isValidElement(disclosure)) {
-    return /*#__PURE__*/cloneElement(disclosure, {
-      ...disclosure.props,
-      ref: disclosureRef,
-      'aria-controls': id,
-      'aria-haspopup': 'dialog'
-    });
-  }
-  return null;
+  return /*#__PURE__*/cloneElement(finalDisclosure, {
+    ref: disclosureRef,
+    'aria-controls': id,
+    'aria-haspopup': 'dialog'
+  });
 };
 
 export { Disclosure };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ultraviolet/ui",
-  "version": "1.15.0",
+  "version": "1.15.1",
   "description": "Ultraviolet UI",
   "homepage": "https://github.com/scaleway/ultraviolet#readme",
   "repository": {