@onehat/ui 0.3.33 → 0.3.34

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@onehat/ui",
-	"version": "0.3.33",
+	"version": "0.3.34",
 	"description": "Base UI for OneHat apps",
 	"main": "src/index.js",
 	"type": "module",

package/src/Components/Form/Form.js

@@ -1,4 +1,4 @@
-import { useEffect, useState, isValidElement, } from 'react';
+import { useEffect, useState, useRef, isValidElement, } from 'react';
 import {
 	Box,
 	Column,
@@ -106,6 +106,7 @@ function Form(props) {
 			// withAlert
 			alert,
 		} = props,
+		formRef = useRef(),
 		styles = UiGlobals.styles,
 		record = props.record?.length === 1 ? props.record[0] : props.record,
 		isMultiple = _.isArray(record),
@@ -565,6 +566,10 @@ function Form(props) {
 	if (!_.isNil(editorStateRef)) {
 		editorStateRef.current = formState; // Update state so HOC can know what's going on
 	}
+
+	if (self) {
+		self.ref = formRef;
+	}
 	
 	const sizeProps = {};
 	if (!flex && !h && !w) {
@@ -655,7 +660,7 @@ function Form(props) {
 
 	const additionalButtons = buildAdditionalButtons(additionalEditButtons);
 	
-	return <Column {...sizeProps} onLayout={onLayout}>
+	return <Column {...sizeProps} onLayout={onLayout} ref={formRef}>
 
 				<Row px={4} pt={4} alignItems="center" justifyContent="flex-end">
 					{isSingle && editorMode === EDITOR_MODE__EDIT && onBack && 

package/src/Components/Grid/Grid.js

@@ -774,6 +774,9 @@ function GridComponent(props) {
 
 	}, [selectorId, selectorSelected]);
 
+	if (self) {
+		self.ref = gridRef;
+	}
 
 	isAddingRef.current = isAdding;
 

package/src/Components/Hoc/withComponent.js

@@ -18,6 +18,13 @@ export default function withComponent(WrappedComponent) {
 			selfRef = useRef({
 				parent,
 				reference,
+				hasChild: (childRef) => {
+					const {
+							reference,
+						} = childRef,
+						found = _.find(childrenRef.current, (ref, ix) => ix === reference);
+					return !!found;
+				},
 				registerChild: (childRef) => {
 					const {
 							reference,
@@ -44,7 +51,7 @@ export default function withComponent(WrappedComponent) {
 					selfRef.current[name] = method;
 				});
 			}
-			if (parent && reference) {
+			if (parent && reference && !parent.hasChild(selfRef.current)) {
 				parent.registerChild(selfRef.current);
 			}
 			return () => {

package/src/Components/Hoc/withPdfButton.js

@@ -158,8 +158,10 @@ export default function withPdfButton(WrappedComponent) {
 				setIsModalShown(true);
 			},
 		};
-		additionalEditButtons.push(button);
-		if (additionalEditButtons !== additionalViewButtons) { // Ensure they're NOT the same object, otherwise this would be adding it twice!
+		if (!_.find(additionalEditButtons, btn => button.key === btn.key)) { 
+			additionalEditButtons.push(button);
+		}
+		if (!_.find(additionalViewButtons, btn => button.key === btn.key)) { 
 			additionalViewButtons.push(button);
 		}
 	

package/src/Components/Viewer/Viewer.js

@@ -1,3 +1,4 @@
+import { useRef, } from 'react';
 import {
 	Column,
 	Icon,
@@ -45,6 +46,7 @@ function Viewer(props) {
 			selectorSelected,
 
 		} = props,
+		scrollViewRef = useRef(),
 		isMultiple = _.isArray(record),
 		isSideEditor = editorType === EDITOR_TYPE__SIDE,
 		styles = UiGlobals.styles,
@@ -205,13 +207,17 @@ function Viewer(props) {
 			return additionalButtons;
 		};
 
+	if (self) {
+		self.ref = scrollViewRef;
+	}
+
 	const
 		showDeleteBtn = onDelete && viewerCanDelete,
 		showCloseBtn = !isSideEditor,
 		additionalButtons = buildAdditionalButtons();
 
 	return <Column flex={flex} {...props}>
-				<ScrollView width="100%" _web={{ height: 1 }}>
+				<ScrollView width="100%" _web={{ height: 1 }} ref={scrollViewRef}>
 					<Column p={4}>
 						{onEditMode && <Row mb={4} justifyContent="flex-end">
 											<Button