From a07aaef3ddf9739c011a3caab243bd8b8eeb2cc1 Mon Sep 17 00:00:00 2001 From: Mohmaed Shahin Date: Fri, 11 Apr 2025 16:55:27 +0400 Subject: [PATCH 1/9] final development --- .../progress-bar-native/src/ProgressBar.tsx | 33 +++++++++++++++- .../progress-bar-native/src/ProgressBar.xml | 39 ++++++++++++++----- .../typings/ProgressBarProps.d.ts | 14 ++++++- 3 files changed, 73 insertions(+), 13 deletions(-) diff --git a/packages/pluggableWidgets/progress-bar-native/src/ProgressBar.tsx b/packages/pluggableWidgets/progress-bar-native/src/ProgressBar.tsx index 7a8e886cc..579cbbb02 100644 --- a/packages/pluggableWidgets/progress-bar-native/src/ProgressBar.tsx +++ b/packages/pluggableWidgets/progress-bar-native/src/ProgressBar.tsx @@ -52,21 +52,50 @@ export function ProgressBar(props: ProgressBarProps): JSX.Elem const validationMessages = validate(); const progress = calculateProgress(); - + const { showProgressCaption, showDefaultProgressCaption,progressCaption,useDefaulMendixColor,customColor} = props; return ( + + {showProgressCaption && ( + + + + { showDefaultProgressCaption ?(progress * 100)+'%' :progressCaption.value} + + {validationMessages.length > 0 && ( {validationMessages.join("\n")} )} + )} ); } diff --git a/packages/pluggableWidgets/progress-bar-native/src/ProgressBar.xml b/packages/pluggableWidgets/progress-bar-native/src/ProgressBar.xml index f654efb3f..729951199 100644 --- a/packages/pluggableWidgets/progress-bar-native/src/ProgressBar.xml +++ b/packages/pluggableWidgets/progress-bar-native/src/ProgressBar.xml @@ -1,4 +1,4 @@ - + Progress bar Display progress in a horizontal bar. @@ -7,24 +7,45 @@ - - Current value - The current progress value. - - Minimum value The lowest possible progress value. If current value is lower than this value, progress will be still minimum value - + Maximum value The highest possible progress value. If current value is higher than this value, progress will be still maximum value - + + + + Current value + The current progress value. + + + + Show Progress Caption + + + + Show Default Caption + e.g 70% + + + Custom progress caption + + + + Default Color + Use mendix default progress color + + + Custom Color Code + HEX code e.g. #ff5733 + - + diff --git a/packages/pluggableWidgets/progress-bar-native/typings/ProgressBarProps.d.ts b/packages/pluggableWidgets/progress-bar-native/typings/ProgressBarProps.d.ts index 145267a3f..16b1cf37b 100644 --- a/packages/pluggableWidgets/progress-bar-native/typings/ProgressBarProps.d.ts +++ b/packages/pluggableWidgets/progress-bar-native/typings/ProgressBarProps.d.ts @@ -10,9 +10,14 @@ import { Big } from "big.js"; export interface ProgressBarProps