@oliasoft-open-source/react-ui-library 4.13.0-beta-18 → 4.13.0-beta-20

package/dist/index.d.ts

@@ -1042,7 +1042,6 @@ declare interface IPredefinedOption {
     label: string;
     valueKey?: string;
     unit?: string;
-    linked?: boolean;
 }
 
 export declare interface IPrintHeaderProps {
@@ -1566,6 +1565,7 @@ export declare interface IUnitInputProps {
     warning?: string | boolean | null;
     predefinedOptions?: IPredefinedOption[] | null;
     initialPredefinedOption?: string;
+    predefinedOptionLinked?: boolean;
     validationCallback?: (name: string, error: string | null) => any;
     disabledValidation?: boolean;
     allowEmpty?: boolean;
@@ -1871,7 +1871,7 @@ declare type TUnitTableCellShape = TCellShape | IUnitTableStaticCell | IUnitTabl
 
 declare type UnitContextType = any;
 
-export declare const UnitInput: ({ name, placeholder, disabled, disabledUnit, error, left, small, width, value, unitkey, initUnit, noConversion, onChange, onClick, onFocus, onSwitchUnit, unitTemplate, testId, warning, predefinedOptions, initialPredefinedOption, validationCallback, disabledValidation, allowEmpty, convertBackToStorageUnit, enableCosmeticRounding, enableDisplayRounding, roundDisplayValue, }: IUnitInputProps) => JSX_2.Element;
+export declare const UnitInput: ({ name, placeholder, disabled, disabledUnit, error, left, small, width, value, unitkey, initUnit, noConversion, onChange, onClick, onFocus, onSwitchUnit, unitTemplate, testId, warning, predefinedOptions, initialPredefinedOption, predefinedOptionLinked, validationCallback, disabledValidation, allowEmpty, convertBackToStorageUnit, enableCosmeticRounding, enableDisplayRounding, roundDisplayValue, }: IUnitInputProps) => JSX_2.Element;
 
 export declare const UnitTable: ({ table, unitConfig, convertBackToStorageUnit, enableCosmeticRounding, enableDisplayRounding, }: IUnitTableProps) => JSX_2.Element;
 

package/dist/index.js

@@ -70292,6 +70292,7 @@ const PredefinedOptionsMenu = ({
   onPredefinedOptionSelect,
   disabled: disabled2,
   initialPredefinedOption,
+  predefinedOptionLinked,
   predefinedOptionsMenuState,
   setPredefinedOptionsMenuState,
   testId
@@ -70347,12 +70348,12 @@ const PredefinedOptionsMenu = ({
         initialPredefinedOption
       )
     );
-  }, [initialPredefinedOption]);
+  }, [initialPredefinedOption, predefinedOptionLinked]);
   useEffect(() => {
     if (initialPredefinedOptionObject) {
       setPredefinedOptionsMenuState(PredefinedOptionsMenuState.PREDEFINED);
       setFoundPredefinedMenuOption(initialPredefinedOptionObject);
-      if (!(initialPredefinedOptionObject == null ? void 0 : initialPredefinedOptionObject.linked)) {
+      if (predefinedOptionLinked) {
         onPredefinedOptionSelect(initialPredefinedOptionObject.value, {
           predefinedSelected: true,
           predefinedOption: initialPredefinedOptionObject
@@ -70364,7 +70365,7 @@ const PredefinedOptionsMenu = ({
     initialPredefinedOptionObject == null ? void 0 : initialPredefinedOptionObject.label
   ]);
   useEffect(() => {
-    const foundOption = predefinedOptions.find((option2) => {
+    const foundOption = predefinedOptionLinked && predefinedOptions.find((option2) => {
       const convertedValue = convertPredefinedOptions(option2);
       return convertedValue === withUnit(displayLayer == null ? void 0 : displayLayer.value, (displayLayer == null ? void 0 : displayLayer.unit) ?? "");
     });
@@ -70377,7 +70378,7 @@ const PredefinedOptionsMenu = ({
       setPredefinedOptionsMenuState(PredefinedOptionsMenuState.CUSTOM);
       setFoundPredefinedMenuOption(void 0);
     }
-  }, [extractedValue]);
+  }, [extractedValue, predefinedOptionLinked]);
   const sectionsPredefinedMenu = [
     {
       type: MenuType.OPTION,
@@ -70445,6 +70446,7 @@ const UnitInput = ({
   warning: warning2 = null,
   predefinedOptions,
   initialPredefinedOption = "",
+  predefinedOptionLinked = true,
   validationCallback = () => ({ name: "", error: null }),
   disabledValidation = false,
   allowEmpty = false,
@@ -70455,7 +70457,7 @@ const UnitInput = ({
 }) => {
   const context2 = useUnitContext();
   const runAfterUpdate = useRunAfterUpdate();
-  const [predefinedOptionsMenuState, setPredefinedOptionsMenuState] = useState(PredefinedOptionsMenuState.CUSTOM);
+  const [predefinedOptionsMenuState, setPredefinedOptionsMenuState] = useState(PredefinedOptionsMenuState.PREDEFINED);
   if (typeof value === "number") {
     value = `${value}`;
   }
@@ -70531,23 +70533,30 @@ const UnitInput = ({
   };
   useEffect(() => {
     if (initDisplayUnit) {
+      let newValue, newUnit = "";
       if (previousInitUnit !== initDisplayUnit) {
-        safeConvertValue({
+        const { value: resultValue } = safeConvertValue({
           value,
           toUnit: initDisplayUnit,
           unitkey,
           defaultFromUnit: propUnit,
           doNotConvertValue: noConversion
         });
+        newValue = resultValue;
+        newUnit = initDisplayUnit;
       } else if (withUnit(displayLayer.value, displayLayer.unit) !== value) {
-        safeConvertValue({
+        const { value: resultValue } = safeConvertValue({
           value,
           toUnit: displayLayer.unit,
           unitkey,
           defaultFromUnit: propUnit,
           doNotConvertValue: noConversion
         });
-        displayLayer.unit;
+        newValue = resultValue;
+        newUnit = displayLayer.unit;
+      }
+      if (newValue !== void 0 && !initialPredefinedOption) {
+        setDisplayLayer({ value: newValue, unit: newUnit });
       }
     }
   }, [initDisplayUnit, value, error2]);
@@ -70584,7 +70593,7 @@ const UnitInput = ({
             displayLayer,
             onPredefinedOptionSelect: (newValue, optionState) => {
               var _a2;
-              if ((_a2 = optionState == null ? void 0 : optionState.predefinedOption) == null ? void 0 : _a2.linked) {
+              if (predefinedOptionLinked && ((_a2 = optionState == null ? void 0 : optionState.predefinedOption) == null ? void 0 : _a2.unit)) {
                 onChange({
                   target: {
                     value: withUnit(displayLayer == null ? void 0 : displayLayer.value, displayLayer == null ? void 0 : displayLayer.unit),
@@ -70610,6 +70619,7 @@ const UnitInput = ({
             },
             disabled: disabled2,
             initialPredefinedOption,
+            predefinedOptionLinked,
             predefinedOptionsMenuState,
             setPredefinedOptionsMenuState
           }