@onehat/ui 0.4.8 → 0.4.10

package/package.json

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

package/src/Components/Form/Field/Combo/Combo.js

@@ -55,6 +55,7 @@ export function ComboComponent(props) {
 			isEditor = false,
 			isDisabled = false,
 			isInTag = false,
+			minimizeForRow = false,
 			tooltipPlacement = 'bottom',
 			placeholder,
 			onRowPress,
@@ -542,28 +543,29 @@ export function ComboComponent(props) {
 						`}
 					/>;
 	}
+	const triggerClassName = `
+		Combo-trigger
+		h-full
+		border
+		border-l-0
+		border-gray-400
+		rounded-l-none
+		rounded-r-md
+		${styles.FORM_COMBO_TRIGGER_BG}
+		${styles.FORM_COMBO_TRIGGER_BG_HOVER}
+	`;
 	trigger = <IconButton
 				{...testProps('trigger')}
 				ref={triggerRef}
 				icon={CaretDown}
 				_icon={{
-					size: 'sm',
+					size: 'md',
 					className: 'text-grey-500',
 				}}
 				isDisabled={isDisabled}
 				onPress={onTriggerPress}
 				onBlur={onTriggerBlur}
-				className={`
-					trigger
-					h-full
-					border
-					border-l-0
-					border-gray-400
-					rounded-l-none
-					rounded-r-md
-					${styles.FORM_COMBO_TRIGGER_BG}
-					${styles.FORM_COMBO_TRIGGER_BG_HOVER}
-				`}
+				className={triggerClassName}
 			/>;
 
 	if (UiGlobals.mode === UI_MODE_WEB) {
@@ -619,6 +621,7 @@ export function ComboComponent(props) {
 							grow
 							h-full
 							min-h-0
+							max-h-[40px]
 							flex-1
 							m-0
 							rounded-tr-none
@@ -1009,15 +1012,19 @@ export function ComboComponent(props) {
 		refProps.ref = tooltipRef;
 	}
 
-	const className = `
+	let className = `
 		Combo-HStack
 		flex-1
 		h-[40px]
+		min-h-[40px]
 		justify-center
-		items-center
+		items-stretch
 	`;
 	if (props.className) {
-		props.className += ' ' + className;
+		className += ' ' + props.className;
+	}
+	if (minimizeForRow) {
+		className += ' h-auto min-h-0 max-h-[40px]';
 	}
 	
 	if (isRendered && additionalButtons?.length && containerWidth < 500) {

package/src/Components/Form/Field/Date.js

@@ -48,6 +48,7 @@ export const DateElement = forwardRef((props, ref) => {
 			_input = {},
 			isDisabled = false,
 			limitWidth = false,
+			minimizeForRow = false,
 			minValue,
 			maxValue,
 			testID,
@@ -219,7 +220,6 @@ export const DateElement = forwardRef((props, ref) => {
 			}
 		};
 
-
 	useEffect(() => {
 
 		// When value changes from outside, adjust text value
@@ -576,6 +576,9 @@ export const DateElement = forwardRef((props, ref) => {
 	if (props.className) {
 		className += props.className;
 	}
+	if (minimizeForRow) {
+		className += ' h-auto min-h-0 max-h-[50px]';
+	}
 	const style = props.style || {};
 	if (!_.isNil(height)) {
 		style.height = height;

package/src/Components/Form/Field/Input.js

@@ -30,6 +30,7 @@ const InputElement = forwardRef((props, ref) => {
 			rightIcon,
 			rightIconHandler,
 			placeholder,
+			className,
 			...propsToPass
 		} = props,
 		styles = UiGlobals.styles,
@@ -109,10 +110,6 @@ const InputElement = forwardRef((props, ref) => {
 	if (!disableAutoFlex && !hasWidth(props) && !hasFlex(props)) {
 		style.flex = 1;
 	}
-	// flex-1
-	// block
-	// h-auto
-	// h-[10px]
 	let inputClassName = `
 			Input
 			${styles.FORM_INPUT_BG}
@@ -125,15 +122,14 @@ const InputElement = forwardRef((props, ref) => {
 			h-auto
 			w-full
 			p-2
-			text-left
+			text-center
 			${styles.FORM_INPUT_FONTSIZE}
 			${styles.FORM_INPUT_BG}
 			${styles.FORM_INPUT_BG_FOCUS}
 			${styles.FORM_INPUT_BG_HOVER}
 		`;
-	if (props.className) {
-		inputClassName += props.className;
-		inputFieldClassName += props.className;
+	if (className) {
+		inputClassName += className;
 	}
 	
 	return <Input

package/src/Components/Form/Field/Slider.js

@@ -30,6 +30,7 @@ const
 				maxValue = 100,
 				step = 10,
 				autoSubmitDelay = UiGlobals.autoSubmitDelay,
+				minimizeForRow = false,
 				tooltip = null,
 				isDisabled = false,
 				testID,
@@ -150,12 +151,24 @@ const
 		}
 
 		let className = `
-			w-full
-			items-center
-		`;
+				w-full
+				items-center
+			`,
+			inputClassName = `
+				InputWithTooltip
+				h-full
+				w-[60px]
+				mr-4
+				text-center
+				rounded-md
+				${styles.SLIDER_READOUT_FONTSIZE}
+			`;
 		if (props.className) {
 			className += ' ' + props.className;
 		}
+		if (minimizeForRow) {
+			inputClassName += ' h-auto min-h-0 max-h-[50px] mr-1';
+		}
 		
 		return <HStack
 					className={className}
@@ -168,16 +181,7 @@ const
 						onKeyPress={onInputKeyPress}
 						isDisabled={isDisabled}
 						disableAutoFlex={true}
-						className={`
-							InputWithTooltip
-							h-full
-							w-[50px]
-							p-2
-							mr-4
-							text-center
-							rounded-md
-							${styles.SLIDER_READOUT_FONTSIZE}
-						`}
+						className={inputClassName}
 						{...props._input}
 					/>
 					<HStack className="flex-1">

package/src/Components/Form/Field/Tag/Tag.js

@@ -22,7 +22,6 @@ function TagComponent(props) {
 			isViewOnly = false,
 			isValueAlwaysArray,
 			isValueAsStringifiedJson,
-			isFilter = false,
 			minimizeForRow = false,
 			Editor,
 			_combo = {},
@@ -274,8 +273,8 @@ function TagComponent(props) {
 		Tag-valueBoxes-container
 		w-full
 		min-h-[40px]
-		flex-wrap
 		max-h-[200px]
+		flex-wrap
 		overflow-auto
 		border
 		border-grey-300
@@ -286,12 +285,20 @@ function TagComponent(props) {
 		${styles.FORM_TAG_PADDING}
 	`,
 	comboClassName = '';
+	if (_combo.className) {
+		comboClassName = _combo.className;
+	}
 	if (minimizeForRow) {
-		valueBoxesClassName += ' h-auto min-h-0 flex-1 max-h-[50px] overflow-auto';
-		comboClassName += ' h-auto min-h-0 flex-1';
+		if (isViewOnly) {
+			// combo is not shown, so allow valueBoxes to take up more space
+			valueBoxesClassName += ' h-auto min-h-[50px] max-h-[50px] overflow-auto flex-1';
+		} else {
+			// shrink both down
+			valueBoxesClassName += ' h-auto min-h-[25px] max-h-[25px] overflow-auto flex-1';
+			comboClassName += ' h-auto min-h-0 max-h-[25px] flex-1';
+		}
 	}
 	
-	
 	return <VStack
 				className={className}
 				style={style}
@@ -311,6 +318,7 @@ function TagComponent(props) {
 									tooltip={tooltip}
 									usePermissions={props.usePermissions}
 									{..._combo}
+									className={comboClassName}
 								/>}
 			</VStack>;
 	

package/src/Components/Form/Field/TextArea.js

@@ -91,7 +91,8 @@ const
 			inputClassName += ' ' + props.className;
 		}
 		if (minimizeForRow) {
-			textareaClassName += ' max-h-[50px] overflow-auto';
+			textareaClassName += ' h-auto min-h-0 max-h-[40px] overflow-auto';
+			inputClassName += ' py-0';
 		}
 
 		return <Textarea className={textareaClassName}>

package/src/Components/Form/FieldSet.js

@@ -76,7 +76,7 @@ export default function FieldSet(props) {
 			}
 		};
 
-	const className = `
+	let className = `
 		FieldSet-Box
 		mb-4
 		mx-0
@@ -86,7 +86,7 @@ export default function FieldSet(props) {
 		${styles.FORM_FIELDSET_BG}
 	`;
 	if (props.className) {
-		props.className += className;
+		className += props.className;
 	}
 
 	

package/src/Components/Form/Form.js

@@ -315,6 +315,7 @@ function Form(props) {
 					let element = <Element
 										{...testProps('field-' + fieldName)}
 										value={value}
+										minimizeForRow={true}
 										parent={self}
 										reference={fieldName}
 										{...configPropsToPass}
@@ -378,7 +379,7 @@ function Form(props) {
 											dynamicProps = getDynamicProps({ fieldState, formSetValue, formGetValues, formState });
 										}
 
-										let elementClassName = 'Form-Element flex-1';
+										let elementClassName = 'Form-Element';
 										if (type.match(/Tag/)) {
 											elementClassName += ' overflow-auto';
 										}
@@ -643,10 +644,10 @@ function Form(props) {
 					if (defaults?.labelWidth) {
 						style.width = defaults.labelWidth;
 					}
-					if (!style.width) {
-						style.width = '50px';
-					}
 					if (containerWidth > styles.FORM_STACK_ROW_THRESHOLD) {
+						if (!style.width) {
+							style.width = '100px';
+						}
 						element = <HStack className="Form-HStack1 w-full py-1">
 										<Label style={style}>{label}</Label>
 										{element}
@@ -724,7 +725,7 @@ function Form(props) {
 								dynamicProps = getDynamicProps({ fieldState, formSetValue, formGetValues, formState });
 							}
 
-							let elementClassName = 'Form-Element field-' + name + ' flex-1';
+							let elementClassName = 'Form-Element field-' + name + ' w-full';
 							const defaultsClassName = defaults.className;
 							if (defaultsClassName) {
 								elementClassName += ' ' + defaultsClassName;
@@ -774,7 +775,7 @@ function Form(props) {
 							if (message) {
 								message = <Text className="text-[#f00]">{message}</Text>;
 							}
-							element = <VStack className="Form-VStack4 pt-1 flex-1">
+							element = <VStack className="Form-VStack4 w-full pt-1">
 											{element}
 											{message}
 										</VStack>;
@@ -782,14 +783,14 @@ function Form(props) {
 							if (item.additionalEditButtons) {
 								const buttons = buildAdditionalButtons(item.additionalEditButtons, self, { fieldState, formSetValue, formGetValues, formState });
 								if (containerWidth > styles.FORM_STACK_ROW_THRESHOLD) {
-									element = <HStack className="Form-HStack5 flex-1 flex-wrap">
+									element = <HStack className="Form-HStack5 w-full flex-wrap">
 													{element}
 													{buttons}
 												</HStack>;
 								} else {
-									element = <VStack className="Form-VStack6 flex-1 w-full">
+									element = <VStack className="Form-VStack6 w-full">
 												{element}
-												<HStack className="Form-HStack7-VStack flex-1 w-full mt-1 flex-wrap">
+												<HStack className="Form-HStack7-VStack w-full mt-1 flex-wrap">
 													{buttons}
 												</HStack>
 											</VStack>;
@@ -819,22 +820,22 @@ function Form(props) {
 								if (defaults?.labelWidth) {
 									style.width = defaults.labelWidth;
 								}
-								if (!style.width) {
-									style.width = '50px';
-								}
 								if (containerWidth > styles.FORM_STACK_ROW_THRESHOLD) {
-									element = <HStack className="Form-HStack8 flex-1">
+									if (!style.width) {
+										style.width = '100px';
+									}
+									element = <HStack className="Form-HStack8 w-full">
 								 					<Label style={style}>{requiredIndicator}{label}</Label>
 													{element}
 								 				</HStack>;
 								} else {
-									element = <VStack className="Form-VStack9 flex-1 mt-3">
+									element = <VStack className="Form-VStack9 w-full mt-3">
 													<Label style={style}>{requiredIndicator}{label}</Label>
 													{element}
 												</VStack>;
 								}
 							} else if (disableLabels && requiredIndicator) {
-								element = <HStack className="Form-HStack10 flex-1">
+								element = <HStack className="Form-HStack10 w-full">
 												{requiredIndicator}
 												{element}
 											</HStack>;
@@ -855,9 +856,10 @@ function Form(props) {
 										key={ix}
 										className={`
 											Form-HStack11
+											min-h-[50px]
+											w-full
 											flex-none
 											pb-2
-											h-[50px]
 											${error ? 'bg-[#fdd]' : ''}
 										`}
 									>
@@ -1149,16 +1151,15 @@ function Form(props) {
 		if (!isEditorViewOnly && !hideResetButton) {
 			showResetBtn = true;
 		}
-		if (editorType !== EDITOR_TYPE__SIDE) { // side editor won't show either close or cancel buttons!
-			// determine whether we should show the close or cancel button
+		// determine whether we should show the close or cancel button
+		if (editorType !== EDITOR_TYPE__SIDE) {
 			if (isEditorViewOnly) {
 				showCloseBtn = true;
 			} else {
-				const formIsDirty = formState.isDirty;
 				// if (editorType === EDITOR_TYPE__WINDOWED && onCancel) {
 				// 	showCancelBtn = true;
 				// }
-				if (formIsDirty || isPhantom) {
+				if (formState.isDirty || isPhantom) {
 					if (isSingle && onCancel) {
 						showCancelBtn = true;
 					}
@@ -1168,6 +1169,11 @@ function Form(props) {
 					}
 				}
 			}
+		} else {
+			// side editor only
+			if (isPhantom && isSingle && onCancel) {
+				showCancelBtn = true;
+			}
 		}
 		if (!isEditorViewOnly && onSave) {
 			showSaveBtn = true;
@@ -1207,7 +1213,7 @@ function Form(props) {
 					<Button
 						{...testProps('cancelBtn')}
 						key="cancelBtn"
-						variant="outline"
+						variant={editorType === EDITOR_TYPE__INLINE ? 'solid' : 'outline'}
 						onPress={onCancel}
 						className="text-white mr-2"
 						text="Cancel"
@@ -1217,7 +1223,7 @@ function Form(props) {
 					<Button
 						{...testProps('closeBtn')}
 						key="closeBtn"
-						variant="outline"
+						variant={editorType === EDITOR_TYPE__INLINE ? 'solid' : 'outline'}
 						onPress={onClose}
 						className="text-white mr-2"
 						text="Close"

package/src/Components/Grid/Grid.js

@@ -365,7 +365,7 @@ function GridComponent(props) {
 					onPress={() => setIsReorderMode(!isReorderMode)}
 					icon={isReorderMode ? NoReorderRows : ReorderRows}
 					_icon={{
-						className: styles.GRID_TOOLBAR_ITEMS_COLOR,
+						className: styles.TOOLBAR_ITEMS_COLOR,
 					}}
 					tooltip="Reorder Rows"
 				/>);
@@ -466,28 +466,36 @@ function GridComponent(props) {
 							onContextMenu(item, e, selection);
 						}
 					}}
-					className="flex-row grow-1">
+					className="flex-row grow">
 					{({
 						hovered,
 						focused,
 						pressed,
 					}) => {
 						if (isHeaderRow) {
-							return <GridHeaderRow
-										Repository={Repository}
-										columnsConfig={localColumnsConfig}
-										setColumnsConfig={setLocalColumnsConfig}
-										hideNavColumn={hideNavColumn}
-										canColumnsSort={canColumnsSort}
-										canColumnsReorder={canColumnsReorder}
-										canColumnsResize={canColumnsResize}
-										setSelection={setSelection}
-										gridRef={gridRef}
-										isHovered={hovered}
-										isInlineEditorShown={isInlineEditorShown}
-										areRowsDragSource={areRowsDragSource}
-										showColumnsSelector={showColumnsSelector}
-									/>;
+							let headerRow = <GridHeaderRow
+												Repository={Repository}
+												columnsConfig={localColumnsConfig}
+												setColumnsConfig={setLocalColumnsConfig}
+												hideNavColumn={hideNavColumn}
+												canColumnsSort={canColumnsSort}
+												canColumnsReorder={canColumnsReorder}
+												canColumnsResize={canColumnsResize}
+												setSelection={setSelection}
+												gridRef={gridRef}
+												isHovered={hovered}
+												isInlineEditorShown={isInlineEditorShown}
+												areRowsDragSource={areRowsDragSource}
+												showColumnsSelector={showColumnsSelector}
+											/>;
+							if (showRowExpander) {
+								// align the header row to content rows
+								headerRow = <HStack className="">
+												<Box className="w-[40px]"></Box>
+												{headerRow}
+											</HStack>;
+							}
+							return headerRow;
 						}
 
 						const
@@ -572,15 +580,29 @@ function GridComponent(props) {
 
 			if (showRowExpander && !isHeaderRow) {
 				const isExpanded = getIsExpanded(index);
-				rowComponent = <VStack>
-									<HStack>
+				let className = `
+					Grid-rowExpander
+					w-full
+					flex-none
+				`;
+				if (rowProps?.className) {
+					className += ' ' + rowProps.className;
+				}
+				rowComponent = <VStack className={className}>
+									<HStack
+										className={`
+											Grid-rowExpander-HStack
+											w-full
+											grow
+										`}
+									>
 										<ExpandButton
 											isExpanded={isExpanded}
 											onToggle={() => setIsExpanded(index, !isExpanded)}
 											_icon={{
 												size: 'sm',
 											}}
-											className="py-0"
+											className="Grid-rowExpander-expandBtn py-0"
 											tooltip="Expand/Contract Row"
 										/>
 										{rowComponent}
@@ -1156,13 +1178,14 @@ function GridComponent(props) {
 				/>;
 	
 	if (CURRENT_MODE === UI_MODE_WEB) {
+		// fix scrolling bug on nested FlatLists (inner one would not scroll without this)
 		grid = <ScrollView
 					horizontal={false}
-					className="ScrollView"
+					className="ScrollView overflow-auto"
 					contentContainerStyle={{
 						height: '100%',
 					}}
-				>{grid}</ScrollView>; // fix scrolling bug on nested FlatLists
+				>{grid}</ScrollView>;
 	} else
 	if (CURRENT_MODE === UI_MODE_NATIVE) {
 		grid = <ScrollView className="flex-1 w-full">{grid}</ScrollView>
@@ -1228,6 +1251,7 @@ function GridComponent(props) {
 					className={`
 						gridContainer
 						w-full
+						h-full
 						flex-1
 						min-h-[40px]
 						${gridContainerBorderClassName}
@@ -1244,7 +1268,8 @@ function GridComponent(props) {
 		grid = <Box
 					ref={dropTargetRef}
 					className={`
-						dropTarget
+						Grid-dropTarget
+						h-full
 						w-full
 						border-[#0ff]
 						${canDrop && isOver ? "border-[4px]" : "border-[0px]"}

package/src/Components/Grid/GridRow.js

@@ -250,8 +250,8 @@ function GridRow(props) {
 									className={`
 										GridRow-phantom
 										absolute
-										h-[2px]
-										w-[2px]
+										h-2
+										w-2
 										top-0
 										left-0
 										bg-[#f00]
@@ -310,10 +310,11 @@ function GridRow(props) {
 		if (isOnlyOneVisibleColumn) {
 			rowClassName += ' w-full';
 		}
+		if (rowProps?.className) {
+			rowClassName += ' ' + rowProps.className;
+		}
 		if (isOver) {
 			rowClassName += ' border-4 border-[#0ff]';
-		} else {
-			rowClassName += ' border-b border-b-grey-100';
 		}
 		return <HStackNative
 					{...testProps('row' + (isSelected ? '-selected' : ''))}
@@ -337,6 +338,7 @@ function GridRow(props) {
 		isInlineEditorShown,
 		isSelected,
 		isHovered,
+		isOver,
 		index,
 		dragSourceRef,
 		dropTargetRef,

package/src/Components/Hoc/withAlert.js

@@ -105,7 +105,9 @@ function withAlert(WrappedComponent) {
 					}),
 					onOk: () => {
 						hideModal();
-						onOk();
+						if (onOk) {
+							onOk();
+						}
 					},
 					includeCancel,
 					canClose,

package/src/Components/Hoc/withPresetButtons.js

@@ -188,7 +188,7 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 					case ADD:
 						key = 'addBtn';
 						text = 'Add';
-						handler = onAdd;
+						handler = (parent, e) => onAdd();
 						icon = Plus;
 						if (selectorId && !selectorSelected) {
 							isDisabled = true;
@@ -200,7 +200,7 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 					case EDIT:
 						key = 'editBtn';
 						text = 'Edit';
-						handler = onEdit;
+						handler = (parent, e) => onEdit();
 						icon = Edit;
 						if (selectorId && !selectorSelected) {
 							isDisabled = true;
@@ -216,6 +216,7 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 						key = 'deleteBtn';
 						text = 'Delete';
 						handler = onDelete;
+						handler = (parent, e) => onDelete();
 						icon = Trash;
 						if (selectorId && !selectorSelected) {
 							isDisabled = true;
@@ -236,7 +237,7 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 					case VIEW:
 						key = 'viewBtn';
 						text = 'View';
-						handler = onView;
+						handler = (parent, e) => onView();
 						icon = Eye;
 						isDisabled = !selection.length || selection.length !== 1;
 						if (selectorId && !selectorSelected) {
@@ -249,7 +250,7 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 					case COPY:
 						key = 'copyBtn';
 						text = 'Copy to Clipboard';
-						handler = onCopyToClipboard;
+						handler = (parent, e) => onCopyToClipboard();
 						icon = Clipboard;
 						isDisabled = !selection.length;
 						if (selectorId && !selectorSelected) {
@@ -262,7 +263,7 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 					case DUPLICATE:
 						key = 'duplicateBtn';
 						text = 'Duplicate';
-						handler = onDuplicate;
+						handler = (parent, e) => onDuplicate();
 						icon = Duplicate;
 						isDisabled = !selection.length || selection.length !== 1;
 						if (selectorId && !selectorSelected) {
@@ -283,7 +284,7 @@ export default function withPresetButtons(WrappedComponent, isGrid = false) {
 					case UPLOAD_DOWNLOAD:
 						key = 'uploadDownloadBtn';
 						text = 'Upload/Download';
-						handler = onUploadDownload;
+						handler = (parent, e) => onUploadDownload();
 						icon = UploadDownload;
 						break;
 					default:

package/src/Components/Icons/Gauge.js

@@ -4,8 +4,8 @@ import { Path, Svg } from 'react-native-svg';
 
 const SvgComponent = createIcon({
 	Root: Svg,
-	viewBox: '0 0 10.46 10.46',
-	path: <Path d="M0 5.23C0 2.34 2.34 0 5.23 0s5.23 2.34 5.23 5.23-2.34 5.23-5.23 5.23S0 8.12 0 5.23zm5.89-3.27c0-.36-.29-.65-.65-.65s-.65.29-.65.65.29.65.65.65.65-.29.65-.65zM5.24 8.5c.72 0 1.31-.59 1.31-1.31 0-.36-.14-.68-.37-.91L7.49 3.3c.11-.25 0-.54-.25-.65s-.54 0-.65.25L5.28 5.88h-.04c-.72 0-1.31.59-1.31 1.31S4.52 8.5 5.24 8.5zM3.6 2.94c0-.36-.29-.65-.65-.65s-.65.29-.65.65.29.65.65.65.65-.29.65-.65zM1.96 5.88c.36 0 .65-.29.65-.65s-.29-.65-.65-.65-.65.29-.65.65.29.65.65.65zm7.19-.65c0-.36-.29-.65-.65-.65s-.65.29-.65.65.29.65.65.65.65-.29.65-.65z" />
+	viewBox: '0 0 512 512',
+	path: <Path d="M0 256a256 256 0 11512 0 256 256 0 11-512 0zm320 96c0-26.9-16.5-49.9-40-59.3V88c0-13.3-10.7-24-24-24s-24 10.7-24 24v204.7c-23.5 9.5-40 32.5-40 59.3 0 35.3 28.7 64 64 64s64-28.7 64-64zM144 176a32 32 0 100-64 32 32 0 100 64zm-16 80a32 32 0 10-64 0 32 32 0 1064 0zm288 32a32 32 0 100-64 32 32 0 100 64zm-16-144a32 32 0 10-64 0 32 32 0 1064 0z" />,
 });
 
 export default SvgComponent

package/src/Components/Toolbar/Pagination.js

@@ -61,6 +61,7 @@ export default function Pagination(props) {
 								{...testProps('showMoreBtn')}
 								key="showMoreBtn"
 								reference="showMoreBtn"
+								className="Pagination-showMoreBtn"
 								parent={self}
 								onPress={() => Repository.showMore()}
 								isDisabled={isDisabled}
@@ -70,6 +71,7 @@ export default function Pagination(props) {
 			if (!Repository.isLocal) {
 				items.push(<ReloadButton
 					key="reloadPageBtn"
+					className="Pagination-reloadPageBtn"
 					_icon={iconProps}
 					Repository={Repository}
 					self={self}
@@ -82,6 +84,7 @@ export default function Pagination(props) {
 								{...testProps('firstPageBtn')}
 								key="firstPageBtn"
 								reference="firstPageBtn"
+								className="Pagination-firstPageBtn"
 								parent={self}
 								isDisabled={isDisabled}
 								icon={AnglesLeft}
@@ -93,6 +96,7 @@ export default function Pagination(props) {
 								{...testProps('prevPageBtn')}
 								key="prevPageBtn"
 								reference="prevPageBtn"
+								className="Pagination-prevPageBtn"
 								parent={self}
 								isDisabled={isDisabled}
 								icon={AngleLeft}
@@ -101,31 +105,38 @@ export default function Pagination(props) {
 								tooltip="Previous Page"
 							/>);
 				if (!minimize) {
-					items.push(<HStack
-									key="pageSelector"
-									className={`
-										pageSelector
-										w-[100px]
-										mx-2
-										justify-center
-										items-center
-										bg-[#f00]
-									`}>
-									{/* <Text className="page mr-1">Page</Text>
-									<Input
-										{...testProps('pageInput')}
-										reference="pageInput"
-										parent={self}
-										keyboardType="numeric"
-										value={page?.toString()}
-										onChangeValue={(value) => Repository.setPage(value)}
-										maxValue={totalPages}
-										isDisabled={totalPages === 1}
-										className="pageInput w-[30px] text-center bg-grey-100"
-										tooltip="Set Page"
-									/>
-									<Text className="of ml-1">of {totalPages}</Text> */}
-								</HStack>);
+					items.push(<Text
+						key="page"
+						className="Pagination-page mx-1"
+					>Page</Text>);
+					items.push(<Input
+						{...testProps('pageInput')}
+						key="pageInput"
+						reference="pageInput"
+						parent={self}
+						keyboardType="numeric"
+						value={page?.toString()}
+						onChangeValue={(value) => Repository.setPage(value)}
+						maxValue={totalPages}
+						isDisabled={totalPages === 1}
+						className={`
+							Pagination-pageInput
+							min-w-[40px]
+							w-[40px]
+							text-center
+							bg-grey-100
+						`}
+						tooltip="Set Page"
+					/>);
+					items.push(<Text
+						key="totalPages"
+						className={`
+							Pagination-totalPages
+							whitespace-nowrap
+							inline-flex
+							mx-1
+						`}
+					>{`of ${totalPages}`}</Text>);
 				}
 
 				isDisabled = page === totalPages || totalPages <= 1;
@@ -133,6 +144,7 @@ export default function Pagination(props) {
 								{...testProps('nextPageBtn')}
 								key="nextPageBtn"
 								reference="nextPageBtn"
+								className="Pagination-nextPageBtn"
 								parent={self}
 								isDisabled={isDisabled}
 								icon={AngleRight}
@@ -144,6 +156,7 @@ export default function Pagination(props) {
 								{...testProps('lastPageBtn')}
 								key="lastPageBtn"
 								reference="lastPageBtn"
+								className="Pagination-lastPageBtn"
 								parent={self}
 								isDisabled={isDisabled}
 								icon={AnglesRight}
@@ -156,6 +169,7 @@ export default function Pagination(props) {
 			if (!Repository.isLocal) {
 				items.push(<ReloadButton
 					key="reloadPageBtn"
+					className="Pagination-reloadPageBtn"
 					_icon={iconProps}
 					Repository={Repository}
 					self={self}
@@ -178,13 +192,26 @@ export default function Pagination(props) {
 				}
 				items.push(<Text
 								key="pageDisplay"
-								className="pageDisplay ml-3 min-w-[200px]"
-							>Displaying {pageSpan} of {total}</Text>);
+								className={`
+									Pagination-pageDisplay
+									whitespace-nowrap
+									inline-flex
+									mx-1
+								`}
+							>{`Displaying ${pageSpan} of ${total}`}</Text>);
 			}
 		}
 		return <HStack
 					style={{ userSelect: 'none', }}
-					className="Pagination justify-start items-center px-2 "
+					className={`
+						Pagination
+						flex-none
+						gap-1
+						justify-start
+						items-center
+						px-2
+						mr-3
+					`}
 				>
 					{items}
 				</HStack>;