@onehat/ui 0.3.75 → 0.3.76

package/package.json

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

package/src/Components/Form/Form.js

@@ -499,8 +499,18 @@ function Form(props) {
 											</Row>;
 							}
 								
-							let requiredIndicator = null;
-							if (propertyDef?.validator?.spec && !propertyDef.validator.spec.optional) {
+							let isRequired = false,
+								requiredIndicator = null;
+							if (editorType === EDITOR_TYPE__PLAIN) {
+								// submitted validator
+								if (validator?.fields && validator.fields[name]?.exclusiveTests?.required) {
+									isRequired = true;
+								}
+							} else if (propertyDef?.validator?.spec && !propertyDef.validator.spec.optional) {
+								// property definition
+								isRequired = true;
+							}
+							if (isRequired) {
 								requiredIndicator = <Text color="#f00" fontSize="30px" pr={1}>*</Text>;
 							}
 							if (!disableLabels && label && editorType !== EDITOR_TYPE__INLINE) {

package/src/Components/Hoc/withPdfButton.js

@@ -43,6 +43,7 @@ export default function withPdfButton(WrappedComponent) {
 			} = props,
 			[isModalShown, setIsModalShown] = useState(false),
 			[width, height] = useAdjustedWindowSize(500, 800),
+			propertyNames = [],
 			buildModalItems = () => {
 				const modalItems = _.map(_.cloneDeep(items), (item, ix) => buildNextLayer(item, ix, columnDefaults)); // clone, as we don't want to alter the item by reference
 
@@ -57,10 +58,8 @@ export default function withPdfButton(WrappedComponent) {
 						} else {
 							name = ancillaryItem.title;
 						}
-						if (!inArray(name, ['Photos', 'Videos', 'Files'])) {
-							return;
-						}
 						name = 'ancillary___' + name;
+						propertyNames.push(name); // for validator
 						items.push({
 							title: ancillaryItem.title,
 							label: ancillaryItem.title,
@@ -77,6 +76,7 @@ export default function withPdfButton(WrappedComponent) {
 						items,
 						showToggleAllCheckbox: true,
 						isCollapsible: false,
+						ml: 3, // since it's not in a column, which normally adds pl: 3
 					});
 				}
 	
@@ -112,14 +112,18 @@ export default function withPdfButton(WrappedComponent) {
 						item.title = propertyDef.title;
 					}
 				}
+				if (name) {
+					propertyNames.push(name); // for validator
+				}
 				item.type = 'Checkbox';
 				return item;
 			},
-			buildValidator = (modalItems) => {
-
-				// TODO: Build a real validator that checks all modalItems as booleans
-
-				return yup.object();
+			buildValidator = () => {
+				const propertyValidatorDefs = {};
+				_.each(propertyNames, (name) => {
+					propertyValidatorDefs[name] = yup.boolean().required();
+				});
+				return yup.object(propertyValidatorDefs);
 			},
 			getStartingValues = (modalItems) => {
 				const startingValues = {};
@@ -171,7 +175,7 @@ export default function withPdfButton(WrappedComponent) {
 			const
 				modalItems = buildModalItems(),
 				startingValues = getStartingValues(modalItems),
-				validator = buildValidator(modalItems);
+				validator = buildValidator();
 			modal = <Modal
 						isOpen={true}
 						onClose={() => setIsModalShown(false)}

package/src/Components/Icons/Bookmark.js

@@ -0,0 +1,20 @@
+// Font Awesome Pro 6.2.1 by @fontawesome - https://fontawesome.com License - https://fontawesome.com/license (Commercial License) Copyright 2022 Fonticons, Inc.
+import * as React from "react"
+import Svg, { Path } from "react-native-svg"
+import { Icon } from 'native-base';
+
+function SvgComponent(props) {
+  return (
+    <Icon
+      xmlns="http://www.w3.org/2000/svg"
+      height={16}
+      width={12}
+      viewBox="0 0 384 512"
+      {...props}
+    >
+      <Path d="M0 48v439.7C0 501.1 10.9 512 24.3 512c5 0 9.9-1.5 14-4.4L192 400l153.7 107.6c4.1 2.9 9 4.4 14 4.4 13.4 0 24.3-10.9 24.3-24.3V48c0-26.5-21.5-48-48-48H48C21.5 0 0 21.5 0 48z" />
+    </Icon>
+  )
+}
+
+export default SvgComponent

package/src/Constants/AppStates.js

@@ -0,0 +1,3 @@
+export const APP_STATE_ACTIVE = 'active';
+export const APP_STATE_INACTIVE = 'inactive';
+export const APP_STATE_BACKGROUND = 'background';